Changeset 91

Timestamp:

11/04/2006 06:15:50 (2 years ago)

Author:

tec

Message:

• lib/markaby/builder.rb: subclass ::Builder::XmlMarkup? for a cleaner #initialize,
  and check for string keys in assigns to support Rails controller instance vars.
  
• test/rails_test.rb: test for the latter
  
• test/rails/markaby/index.mab: template for the test
  

Location:

trunk

Files:

• lib/markaby/builder.rb (modified) (4 diffs)
• test/rails/markaby/index.mab (added)
• test/rails_test.rb (modified) (3 diffs)

trunk/lib/markaby/builder.rb

@@ -69 +69 @@
       end
 
-      @builder = ::Builder::XmlMarkup.new(:indent => @indent, :target => @streams.last)
-      class << @builder
-        attr_accessor :target, :level
-      end
+      @builder = XmlMarkup.new(:indent => @indent, :target => @streams.last)
 
       text(capture(&block)) if block
@@ -84 +81 @@
     # Write a +string+ to the HTML stream without escaping it.
     def text(string)
-      @builder << "#{string}"
+      @builder << string.to_s
       nil
     end
@@ -163 +160 @@
       elsif @assigns.has_key?(sym)
         @assigns[sym]
+      elsif @assigns.has_key?(stringy_key = sym.to_s)
+        # Rails' ActionView assigns hash has string keys for
+        # instance variables that are defined in the controller.
+        @assigns[stringy_key]
       elsif @helpers.instance_variables.include?("@#{sym}")
         @helpers.instance_variable_get("@#{sym}")
@@ -267 +268 @@
   end
 
+  class XmlMarkup < ::Builder::XmlMarkup
+    attr_accessor :target, :level
+  end
+  
 end

trunk/test/rails_test.rb

@@ -8 +8 @@
 
   def rescue_action(e) raise e end;
+
+  def index
+    @monkey_names = @@locals[:monkeys].map(&:name)
+  end
 
   def partial_rendering
@@ -32 +36 @@
     @controller = MarkabyController.new
     @controller.template_root = File.join(File.dirname(__FILE__), 'rails')
+    @expected_monkey_names = '<ul><li>Frank</li><li>Benny</li><li>Paul</li></ul>'
+  end
+  
+  def test_index
+    process :index
+    assert_response :success
+    assert_template 'markaby/index'
+    assert_equal @expected_monkey_names, @response.body
   end
   
@@ -51 +63 @@
 
   def test_inline_helper_rendering
-    Markaby::Builder.set :indent, 0
     process :inline_helper_rendering
     assert_response :success
-    assert_equal '<ul><li>Frank</li><li>Benny</li><li>Paul</li></ul>', @response.body
+    assert_equal @expected_monkey_names, @response.body
   end  
 
   def test_basic_inline_rendering
-    Markaby::Builder.set :indent, 0
     process :basic_inline_rendering
     assert_response :success
-    assert_equal '<ul><li>Frank</li><li>Benny</li><li>Paul</li></ul>', @response.body
+    assert_equal @expected_monkey_names, @response.body
   end