Changeset 1263

Timestamp:

02/04/08 03:54:39 (10 months ago)

Author:

brian

Message:

Push data.dup down into the formatter, so that well-behaved formatters may choose not to do it.

Add test case to ensure the dup is taking place.

Files:

• ruport/branches/1.4/lib/ruport/formatter.rb (modified) (2 diffs)
• ruport/branches/1.4/lib/ruport/renderer.rb (modified) (1 diff)
• ruport/branches/1.4/test/renderer_test.rb (modified) (3 diffs)

ruport/branches/1.4/lib/ruport/formatter.rb

@@ -137 +137 @@
-   
-    # Set by the <tt>:data</tt> attribute from Renderer#render
-accesso
+reade
-    
-    # Set automatically by Renderer#render(format) or Renderer#render_format
@@ -202 +202 @@
-    end 
-
+    # Sets the data object, making a local copy using #dup. This may have
+    # a significant overhead for large tables, so formatters which don't
+    # modify the data object may wish to override this.
+    def data=(val)
+      @data = val.dup
+    end
+
-    # Clears the output.
-    def clear_output

ruport/branches/1.4/lib/ruport/renderer.rb

@@ -409 +409 @@
-  # Sets +data+ attribute on the active formatter.
-  def data=(val)
-.dup 
+
-  end
-

ruport/branches/1.4/test/renderer_test.rb

@@ -64 +64 @@
-end   
-
+# This formatter modifies the (String) data object passed to it
+class Destructive < Ruport::Formatter
+
+  def prepare_document; end
+
+  def build_header; end
+
+  def build_body
+    output << "You sent #{data}"
+    data.replace("RUBBISH")
+  end
+
+  def build_footer; end
+
+  def finalize_document; end
+end
+
+
-class VanillaBinary < Ruport::Formatter
-  renders :bin, :for => VanillaRenderer
@@ -261 +279 @@
-  class RendererWithManyHooks < Ruport::Renderer
-    add_format DummyText, :text
+    add_format Destructive, :destructive
-
-    prepare :document
@@ -297 +316 @@
-     assert_equal :red, r.options.snapper
-   }
+  end
+
+  def test_formatter_data_dup
+    source = "some text"
+    result = RendererWithManyHooks.render(:destructive, :data => source)
+    assert_equal("You sent some text", result)
+    assert_equal("some text", source)
-  end
-