Changeset 52

Timestamp:

05/21/2006 17:43:52 (3 years ago)

Author:

why

Message:

• lib/markaby/builder.rb: removing a bit of the complexity from the retargeting.
  
• test/test_markaby.rb: testing the implicit capture.
  

Location:

branches/xhtml-careful

Files:

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

branches/xhtml-careful/lib/markaby/builder.rb

@@ -81 +81 @@
 
       @margin += 1
-      @builder = ::Builder::XmlMarkup.new(:indent => @indent, :margin => @margin, :target => @streams.first)
+      @builder = ::Builder::XmlMarkup.new(:indent => @indent, :margin => @margin, :target => @streams.last)
+      def @builder.target=(io)
+          @target = io
+      end
 
       if block
@@ -91 +94 @@
     # Returns a string containing the HTML stream.  Internally, the stream is stored as an Array.
     def to_s
-      @streams.first.join
+      @streams.last.join
     end
 
@@ -112 +115 @@
     #
     def capture(&block)
-      old_stream = @streams.first.dup
-      @streams.insert(1, old_stream)
-      @streams.first.replace []
+      @streams.push(builder.target = [])
       str = instance_eval(&block)
-      str = @streams.first.join unless @streams.first.compact.empty?
-      @streams.delete_at(1)
-      @streams.first.replace old_stream
+      str = @streams.last.join unless @streams.last.compact.empty?
+      @streams.pop
+      builder.target = @streams.last
       str
     end
@@ -230 +231 @@
 
     def fragment
-      stream = @streams.first
+      stream = @streams.last
       f1 = stream.length
       yield

branches/xhtml-careful/test/test_markaby.rb

@@ -57 +57 @@
 
   def test_fragments
-    assert_equal %{}, 
-        mab(%q{div { @a = small 'Miniature'; @b = strong 'Large'; h1 "Monkeys"; h2 "Giraffes #{@a} and #{@b}"; h3 "Donkeys"; h4 "Parakeet #{@b} as well..."}})
-    assert_equal %{}, 
-        mab(%q{div { h1 "Monkeys"; h2 "Giraffes #{small 'Miniature' } and #{strong 'Large'}"; h3 "Donkeys"; h4 "Parakeet #{b { i 'Innocent IV' }} in Classic Chartreuse"}})
-    assert_equal %{<div>\n<h1>Monkeys</h1>\n<h2>Giraffes <strong>Miniature</strong>\n</h2>\n<h3>Donkeys</h3>\n</div>\n}, 
-        mab(%q{div { h1 "Monkeys"; h2 "Giraffes #{strong 'Miniature' }"; h3 "Donkeys" }})
+    assert_equal %{<div>\n<h1>Monkeys</h1>\n<h2>\nGiraffes <small>Miniature</small>\n and <strong>Large</strong>\n</h2>\n<h3>Donkeys</h3>\n<h4>\nParakeet <b>\n<i>Innocent IV</i>\n</b>\n in Classic Chartreuse</h4>\n</div>\n}, 
+        mab(%q{div { h1 "Monkeys"; h2 { "Giraffes #{small 'Miniature' } and #{strong 'Large'}" }; h3 "Donkeys"; h4 { "Parakeet #{b { i 'Innocent IV' }} in Classic Chartreuse" } }})
+    assert_equal %{<div>\n<h1>Monkeys</h1>\n<h2>\nGiraffes <strong>Miniature</strong>\n</h2>\n<h3>Donkeys</h3>\n</div>\n}, 
+        mab(%q{div { h1 "Monkeys"; h2 { "Giraffes #{strong 'Miniature' }" }; h3 "Donkeys" }})
+    assert_equal %{<div>\n<h1>Monkeys</h1>\n<h2>\nGiraffes <small>Miniature</small>\n and <strong>Large</strong>\n</h2>\n<h3>Donkeys</h3>\n<h4>\nParakeet <strong>Large</strong>\n as well...</h4>\n</div>\n}, 
+        mab(%q{div { @a = small 'Miniature'; @b = strong 'Large'; h1 "Monkeys"; h2 { "Giraffes #{@a} and #{@b}" }; h3 "Donkeys"; h4 { "Parakeet #{@b} as well..." }}})
   end
 end