Changeset 41

Timestamp:

05/20/2006 11:37:18 (3 years ago)

Author:

why

Message:

• lib/markaby/builder.rb: return output helpers as fragments (thanks, murphy!)
  

Files:

• branches/xhtml-careful/lib/markaby/builder.rb (modified) (3 diffs)

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

@@ -146 +146 @@
         block = proc { text(str) }
       end
-      stream = @streams.first
-      f1 = stream.length
-      @builder.method_missing(tag, *args, &block)
-      f2 = stream.length - f1
-      Fragment.new(stream, f1, f2)
+      fragment { @builder.method_missing(tag, *args, &block) }
     end
 
@@ -186 +182 @@
       elsif @helpers.respond_to?(sym)
         r = @helpers.send(sym, *args, &block)
-        @builder << r if @output_helpers
-        r
+        if @output_helpers
+            fragment { @builder << r }
+        else
+            r
+        end
       elsif instance_variable_get("@#{sym}")
         instance_variable_get("@#{sym}")
@@ -228 +227 @@
     end
 
+    private
+
+    def fragment
+      stream = @streams.first
+      f1 = stream.length
+      yield
+      f2 = stream.length - f1
+      Fragment.new(stream, f1, f2)
+    end
+
   end
   class Fragment