Changeset 104

Timestamp:

02/04/2007 12:07:32 (22 months ago)

Author:

tec

Message:

• lib/markaby/rails.rb: give helpers access to assigns (ticket:51); new namespace
  
• lib/markaby/template.rb: allow different builder classes
  
• test/rails_test.rb: test that helpers have access to assigns
  
• test/rails/test_helper.rb: a helper to test with
  
• test/rails/test_preamble.rb: make sure the helpers can be loaded
  
• test/rails/markaby/index.mab: use the helper
  
• init.rb: new namespace
  

Location:

trunk

Files:

• init.rb (modified) (1 diff)
• lib/markaby/rails.rb (modified) (1 diff)
• lib/markaby/template.rb (modified) (2 diffs)
• test/rails/markaby/index.mab (modified) (1 diff)
• test/rails/test_helper.rb (added)
• test/rails/test_preamble.rb (modified) (1 diff)
• test/rails_test.rb (modified) (3 diffs)

trunk/init.rb

@@ -4 +4 @@
 require 'markaby/rails'
 
-ActionView::Base::register_template_handler 'mab', Markaby::ActionViewTemplateHandler
+ActionView::Base::register_template_handler 'mab', Markaby::Rails::ActionViewTemplateHandler
 
-ActionController::Base.send :include, Markaby::ActionControllerHelpers
+ActionController::Base.send :include, Markaby::Rails::ActionControllerHelpers

trunk/lib/markaby/rails.rb

@@ -13 +13 @@
 
 module Markaby
-
-  # Markaby helpers for Rails.
-  module ActionControllerHelpers
-    # Returns a string of HTML built from the attached +block+.  Any +options+ are
-    # passed into the render method.
-    #
-    # Use this method in your controllers to output Markaby directly from inside.
-    def render_markaby(options = {}, &block)
-      render options.merge({ :text => Builder.new(options[:locals], self, &block).to_s })
-    end
-  end
-
-  class ActionViewTemplateHandler # :nodoc:
-    def initialize(action_view)
-      @action_view = action_view
-    end
-    def render(template, local_assigns, file_path)
-      template = Template.new(template)
-      template.path = file_path
-      template.render(@action_view.assigns.merge(local_assigns), @action_view)
-    end
-  end
-
-  class FauxErbout < ::Builder::BlankSlate # :nodoc:
-    def initialize(builder)
-      @builder = builder
-    end
-    def nil? # see ActionView::Helpers::CaptureHelper#capture
-      true
-    end
-    def method_missing(*args, &block)
-      @builder.send *args, &block
-    end
-  end
-  
-  class Builder # :nodoc:
-    def flash(*args)
-      @helpers.controller.send(:flash, *args)
-    end
-    
-    # Emulate ERB to satisfy helpers like <tt>form_for</tt>.
-    def _erbout
-      @_erbout ||= FauxErbout.new(self)
+  module Rails
+    # Markaby helpers for Rails.
+    module ActionControllerHelpers
+      # Returns a string of HTML built from the attached +block+.  Any +options+ are
+      # passed into the render method.
+      #
+      # Use this method in your controllers to output Markaby directly from inside.
+      def render_markaby(options = {}, &block)
+        render options.merge({ :text => Builder.new(options[:locals], self, &block).to_s })
+      end
     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 content_for(name, &block)
-      @helpers.assigns["content_for_#{name}"] =
-        eval("@content_for_#{name} = (@content_for_#{name} || '') + capture(&block)")
+    class ActionViewTemplateHandler # :nodoc:
+      def initialize(action_view)
+        @action_view = action_view
+      end
+      def render(template, local_assigns, file_path)
+        template = Template.new(template)
+        template.path = file_path
+        template.render(@action_view.assigns.merge(local_assigns), @action_view)
+      end
     end
+      
+    class Builder < Markaby::Builder # :nodoc:
+      def initialize(*args, &block)
+        super *args, &block
+        
+        @assigns.each { |k, v| @helpers.instance_variable_set("@#{k}", v) }
+      end
+      
+      def flash(*args)
+        @helpers.controller.send(:flash, *args)
+      end
+    
+      # Emulate ERB to satisfy helpers like <tt>form_for</tt>.
+      def _erbout
+        @_erbout ||= FauxErbout.new(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 content_for(name, &block)
+        @helpers.assigns["content_for_#{name}"] =
+          eval("@content_for_#{name} = (@content_for_#{name} || '') + capture(&block)")
+      end
+    end
+
+
+    
+    Template.builder_class = Builder
+    
+    class FauxErbout < ::Builder::BlankSlate # :nodoc:
+      def initialize(builder)
+        @builder = builder
+      end
+      def nil? # see ActionView::Helpers::CaptureHelper#capture
+        true
+      end
+      def method_missing(*args, &block)
+        @builder.send *args, &block
+      end
+    end
+
   end
-
 end

trunk/lib/markaby/template.rb

@@ -2 +2 @@
   class Template
 
+    def self.builder_class=(builder)
+      @@builder_class = builder
+    end
+      
+    def self.builder_class
+      @@builder_class ||= Builder
+    end
+    
     attr_accessor :source, :path
     
@@ -9 +17 @@
 
     def render(*args)
-      output = Builder.new(*args)
+      output = self.class.builder_class.new(*args)
 
       if path.nil?

trunk/test/rails/markaby/index.mab

@@ -1 +1 @@
 ul {
+  check_ivar_exists :monkeys
+  
   @monkeys.each { |monkey|
     li monkey.name

trunk/test/rails/test_preamble.rb

@@ -15 +15 @@
 require 'action_controller/test_process'
 
+Dependencies.load_paths.unshift File.dirname(__FILE__)
+
 $:.unshift MARKABY_ROOT
 

trunk/test/rails_test.rb

@@ -2 +2 @@
 
 class MarkabyController < ActionController::Base
+
+  helper :test
+  
   @@locals = { :monkeys => Monkey.find(:all) }
 
@@ -32 +35 @@
     render :inline => mab { ul { Monkey.find(:all).each { |m| li m.name } } }
   end
+
 end
 
@@ -92 +96 @@
     end
   end
+
 end