Changeset 192

Timestamp:

02/24/07 14:51:12 (2 years ago)

Author:

e.@brainspl.at

Message:

getting close to merging new template work into trunk. PLease hammer away

Files:

• branches/template_engines/lib/merb/mixins/render_mixin.rb (modified) (5 diffs)
• branches/template_engines/lib/merb/template/markaby.rb (modified) (1 diff)

branches/template_engines/lib/merb/mixins/render_mixin.rb

@@ -3 +3 @@
-  module RenderMixin
-    
+    # universal render method. Template handlers are registered
+    # by template extension. So you can use the same render method
+    # for any kind of template that implements an adapter module.
+    # out of the box Merb support Erubis, Markaby and Builder templates
+    #
+    # Erubis template ext:  .herb .jerb .erb
+    # Markaby template ext: .mab
+    # Builder template ext: .rxml .builder .xerb 
+    #
+    # Examples:
+    #
+    # render
+    # looks for views/controllername/actionname.* and renders
+    # the template with the proper engine based on its file extension.
+    #
+    # render :layout => :none
+    # renders the current template with no layout. XMl Builder templates
+    # are exempt from layout by default.
+    # 
+    # render :action => 'foo'
+    # renders views/controllername/foo.*
+    #
+    # render :nothing => 200
+    # renders nothing with a status of 200
+    #
+    # render :js => "$('some-div').toggle();"
+    # if the right hand side of :js => is a string then the proper
+    # javascript headers will be set and the string will be returned 
+    # verbatim as js.
+    #
+    # render :js => :spinner
+    # when the rhs of :js => is a Symbol, it will be used as the 
+    # action/template name so: views/controllername/spinner.jerb
+    # will be rendered as javascript
+    #
+    # render :js => true
+    # this will just look for the current controller/action tenmplate
+    # with the .jerb extension and render it as javascript
+    #
+    # render :xml => @posts.to_xml
+    # render :xml => "<foo><bar>Hi!</bar></foo>"
+    # this will set the appropriate xml headers and render the rhs
+    # of :xml => as a string. SO you can pass any xml string to this
+    # to be rendered. 
+    #
-    def render(opts={}, &blk)
-      action = opts[:action] || params[:action]
-      
-      case
+      when status = opts[:nothing]
+        return render_nothing(status)
-      when partial = opts[:partial]
-        template = find_partial(partial, opts)
-        opts[:layout] = :none
-      when js = opts[:js]
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      else  
-        template = find_template(:action => action)
@@ -24 +83 @@
-      content = engine.transform(options)
-      return engine.exempt_from_layout? ? content : wrap_layout(content, opts)
-    end
-  
-    def wrap_layout(content, opts={})
-      return content if ((opts[:layout] == :none) || (ancestral_trait[:layout] == :none))
-            
-      if ancestral_trait[:layout] != :application
-        layout_choice = find_template(:layout => ancestral_trait[:layout])
-      else
-        if name = find_template(:layout => self.class.name.snake_case)
-          layout_choice = name
-        else
-          layout_choice = find_template(:layout => :application)
-        end  
-      end      
-      
-      _view_context.instance_variable_set('@_layout_content', content)
-      engine = engine_for(layout_choice)
-      options = {
-        :file     => layout_choice,
-        :view_context  => _view_context,
-        :opts => opts
-      }
-      engine.transform(options)
-    end
-    
-  
-    def find_template(opts={})
-      if action = opts[:action]
-        path =
-          File.expand_path(MERB_ROOT / "dist/app/views" / self.class.name.snake_case / action)
-      elsif layout = opts[:layout]
-        path = ancestral_trait[:layout_root] / layout
-      else
-        raise "called find_template without an :action or :layout"  
-      end  
-      extensions = [ancestral_trait[:template_extensions].keys].flatten.uniq
-      glob = "#{path}.{#{opts[:ext] || extensions.join(',')}}"
-      Dir[glob].first
-    end
-    
-    def find_partial(template, opts={})
-      if template =~ /\//
-        t = template.split('/')
-        template = t.pop
-        path = ancestral_trait[:template_root] / t.join('/') / "_#{template}"
-      else  
-        path = ancestral_trait[:template_root]  / self.class.name.snake_case / "_#{template}"
-      end
-      extensions = [ancestral_trait[:template_extensions].keys].flatten.uniq
-      glob = "#{path}.{#{opts[:ext] || extensions.join(',')}}"
-      Dir[glob].first
-    end
-
@@ -89 +97 @@
-    # .jerb extension.
-    def render_js(template=nil)
-
-
+
-    end
-
+
-    # renders nothing but sets the status, defaults
-    # to 200. does send one \n newline char, tyhis is for
@@ -106 +113 @@
-    # explicitely set the template name excluding the file
-    # extension
-what=nil, opts={}, &blk
-what, :layout => :none
+opts={}
+opts.merge({:layout => :none})
-    end 
-    
@@ -120 +127 @@
-    # partials that live there like partial('shared/foo')
-    def partial(template)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-  end  
-  
+

branches/template_engines/lib/merb/template/markaby.rb

@@ -8 +8 @@
-module Markaby  
-  class Builder
-    # Emulate ERB to satisfy helpers like <tt>form_for</tt>.
-    def _buf; self end
-  
-    # Content_for will store the given block in an instance variable for later use 
-    # in another template or in the layout.
-    #
-    # The name of the instance variable is content_for_<name> to stay consistent 
-    # with @content_for_layout which is used by ActionView's layouts.
-    #
-    # Example:
-    #
-    #   content_for("header") do
-    #     h1 "Half Shark and Half Lion"
-    #   end
-    #
-    # If used several times, the variable will contain all the parts concatenated.
-    def throw_content(name, &block)
-      @helpers.instance_variable_set "@_#{name}_content",