Changeset 1292

Timestamp:

03/31/08 14:13:50 (8 months ago)

Author:

sandal

Message:

fix for r385, inspired by Brian's implementation

Files:

• ruport/trunk/examples/anon.rb (added)
• ruport/trunk/lib/ruport/controller.rb (modified) (1 diff)
• ruport/trunk/test/controller_test.rb (moved) (moved from ruport/trunk/test/renderer_test.rb) (1 diff)

ruport/trunk/lib/ruport/controller.rb

@@ -185 +185 @@
-    end
-  end
+
-  
-  
-  class << self
+
+    def built_in_formats
+     { :html => Ruport::Formatter::HTML,
+       :csv  => Ruport::Formatter::CSV,
+       :pdf  => Ruport::Formatter::PDF,
+       :text => Ruport::Formatter::Text }
+    end
+
+    def formatter(*a,&b)
+      case a[0]
+      when Symbol
+        klass = Class.new(built_in_formats[a[0]])
+        klass.renders a[0], :for => self
+      when Hash
+        k,v = a[0].to_a[0]
+        klass = Class.new(v)
+        klass.renders k, :for => self
+      end
+      klass.class_eval(&b)
+    end
-    
-    attr_accessor :first_stage,:final_stage,:required_options,:stages #:nodoc: 

ruport/trunk/test/controller_test.rb

@@ -586 +586 @@
-end
-
+class CustomFormatter < Ruport::Formatter
+  def custom_helper
+    output << "Custom!"
+  end
+end
+
+class ControllerWithAnonymousFormatters < Ruport::Controller
+
+  stage :report
+
+  formatter :html do
+    build :report do
+      output << textile("h1. Hi there")
+    end
+  end
+
+  formatter :csv do
+    build :report do
+      build_row([1,2,3])
+    end
+  end
+
+  formatter :pdf do
+    build :report do 
+      add_text "hello world"
+    end
+  end
+
+  formatter :text do
+    build :report do
+      output << "Hello world"
+    end
+  end
+
+  formatter :custom => CustomFormatter do
+
+    build :report do
+      output << "This is "
+      custom_helper
+    end
+
+  end
+
+end
+
+class TestAnonymousFormatter < Test::Unit::TestCase
+  context "When using built in Ruport formatters" do
+
+    def specify_text_formatter_shortcut_is_accessible
+      assert_equal "Hello world", ControllerWithAnonymousFormatters.render_text
+      assert_equal "1,2,3\n", ControllerWithAnonymousFormatters.render_csv
+      assert_equal "<h1>Hi there</h1>", ControllerWithAnonymousFormatters.render_html
+      assert_not_nil ControllerWithAnonymousFormatters.render_pdf
+    end
+    
+  end
+
+  context "When using custom formatters" do
+    def specify_custom_formatter_shortcut_is_accessible
+      assert_equal "This is Custom!", ControllerWithAnonymousFormatters.render_custom
+    end
+  end
+
+end
+
-class TestControllerHooks < Test::Unit::TestCase
-