Changeset 87

Timestamp:

10/16/2006 14:25:24 (2 years ago)

Author:

tec

Message:

• lib/markaby/builder.rb: stopped adding instance variables from helpers/assigns to Markaby::Builder
  
• test/test_markaby.rb: changed tests to support this
  

Location:

trunk

Files:

• lib/markaby/builder.rb (modified) (4 diffs)
• test/test_markaby.rb (modified) (1 diff)

trunk/lib/markaby/builder.rb

@@ -62 +62 @@
       @streams = [[]]
       @assigns = assigns
+      @helpers = helpers
       @elements = {}
-
-      @@default.each do |k, v|
-        instance_variable_set("@#{k}", @assigns[k] || v)
-      end
-
-      if helpers.nil?
-        @helpers = nil
-      else
-        @helpers = helpers.dup
-        for iv in helpers.instance_variables
-          instance_variable_set(iv, helpers.instance_variable_get(iv))
-        end
-      end
-
-      unless assigns.nil? || assigns.empty?
-        for iv, val in assigns
-          instance_variable_set("@#{iv}", val)
-          unless @helpers.nil?
-            @helpers.instance_variable_set("@#{iv}", val)
-          end
-        end
-      end
 
       @builder = ::Builder::XmlMarkup.new(:indent => @indent, :target => @streams.last)
       class << @builder
         attr_accessor :target, :level
+      end
+
+      @@default.each do |k, v|
+        instance_variable_set("@#{k}", @assigns[k] || v)
       end
 
@@ -114 +97 @@
     #
     def capture(&block)
-      @streams.push(builder.target = [])
+      @streams.push(@builder.target = [])
       @builder.level += 1
       str = instance_eval(&block)
@@ -120 +103 @@
       @streams.pop
       @builder.level -= 1
-      builder.target = @streams.last
+      @builder.target = @streams.last
       str
     end
@@ -178 +161 @@
           r
         end
+      elsif @assigns.has_key?(sym)
+        @assigns[sym]
+      elsif @helpers.instance_variables.include?("@#{sym}")
+        @helpers.instance_variable_get("@#{sym}")
       elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s) 
         @builder.__send__(sym, *args, &block)
-      elsif instance_variables.include?("@#{sym}")
-        instance_variable_get("@#{sym}")
       elsif @tagset.nil?
         tag!(sym, *args, &block)

trunk/test/test_markaby.rb

@@ -58 +58 @@
     assert_equal html, mab { div { @name = 'Steve'; h1 @name; div { @name = 'Gerald'; h2 @name }; h3 @name } }
     assert_equal html, mab { div { @name = 'Steve'; h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
-    assert_equal html, mab(:name => 'Steve') { div { h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
+    assert_equal html, mab(:name => 'Steve') { div { h1 name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
   end
 
-  def test_ivars_without_at_symbol
-    assert_equal "<h1>Hello World</h1>", mab { @message = 'Hello World'; h1 message }
-  end
-  
   def test_helpers
     Markaby::Builder.ignored_helpers.clear