ruport 1.6.3 → 1.8.0

data/examples/pdf_table_prawn.rb

@@ -0,0 +1,30 @@
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+
+require "ruport"
+
+table = Ruport::Data::Table.new(
+          :column_names => %w(Make Model Year Class),
+          :data => [
+            %w(Nissan Skyline 1989 B),
+            %w(Mercedes-Benz 500SL 2005 A),
+            %w(Kia Sinatra 2008 C)
+        ])
+
+pdf_options = { :pdf_format => {
+                  :page_layout => :portrait,
+                  :page_size => "LETTER",
+                  },
+                :table_format => {
+                  :cell_style => { :size => 8},
+                  :row_colors => ["FFFFFF","F0F0F0"], 
+                  :column_widths => {
+                    0 => 100,
+                    1 => 100,
+                    2 => 50,
+                    3 => 40
+                    }                    
+                  },
+                :file => 'pdf_table_prawn.pdf'
+                }
+
+table.to_prawn_pdf(pdf_options)

data/examples/pdf_table_simple.rb

@@ -0,0 +1,13 @@
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+require "ruport"
+
+# Quick and simple example using prawn 0.9.0 with to_prawn_pdf.
+table = Ruport::Data::Table.new(
+          :column_names => %w(Make Model Year),
+          :data => [
+            %w(Nissan Skyline 1989),
+            %w(Mercedes-Benz 500SL 2005),
+            %w(Kia Sinatra 2008)
+        ])
+
+table.to_prawn_pdf(:file => 'pdf_table_simple.pdf')

data/examples/row_renderer.rb

@@ -6,7 +6,7 @@ class CSV2Something < Ruport::Controller
 
   module Helpers
     def table_feeder
-      Table(options.csv_file,:has_names => false) { |t,r| yield(r) }
+      Table(options.csv_file,:has_names => false) { |_t,r| yield(r) }
     end
   end
 

data/examples/simple_pdf_lines.rb

@@ -18,7 +18,7 @@ class PDFLines < Ruport::Formatter::PDF
 end
 
 # generate 35 random lines
-data = (0..34).inject([]) { |s,r|
+data = (0..34).inject([]) { |s,_r|
   s << [rand(100),100+rand(400)]
 }
 

data/examples/trac_ticket_status.rb

@@ -41,7 +41,7 @@ class TracSummaryReport
     Grouping(table,:by => :date)
   end
 
-  def renderable_data(format)
+  def renderable_data(_format)
     summary = feed_data.summary :date,
       :opened => lambda { |g| g.sigma { |r| r.opened  } },
       :closed => lambda { |g| g.sigma { |r| r.closed  } },

data/lib/ruport/controller.rb

@@ -165,19 +165,15 @@ class Ruport::Controller
     #  Example:
     #
     #    table.as(:csv, :show_table_headers => false)
-    def as(format,options={})
+    def as(format, options = {})
       raise ControllerNotSetError unless self.class.controller
-      unless self.class.controller.formats.include?(format)
-        raise UnknownFormatError
+      raise UnknownFormatError unless self.class.controller.formats.include?(format)
+      self.class.controller.render(format, self.class.rendering_options.merge(options)) do |rend|
+          rend.data = respond_to?(:renderable_data) ? renderable_data(format) : self
+          yield(rend) if block_given?
       end
-      self.class.controller.render(format,
-        self.class.rendering_options.merge(options)) do |rend|
-          rend.data =
-            respond_to?(:renderable_data) ? renderable_data(format) : self
-          yield(rend) if block_given?  
-      end
-    end      
-    
+    end
+
     def save_as(file,options={})
       file =~ /.*\.(.*)/    
       format = $1
@@ -220,7 +216,8 @@ class Ruport::Controller
     def built_in_formats
      { :html => Ruport::Formatter::HTML,
        :csv  => Ruport::Formatter::CSV,
-       :pdf  => Ruport::Formatter::PDF,
+       :pdf  => Ruport::Formatter::PrawnPDF,
+       :prawn_pdf => Ruport::Formatter::PrawnPDF,
        :text => Ruport::Formatter::Text }
     end
 
@@ -389,16 +386,16 @@ class Ruport::Controller
     #      # other details omitted
     #   end
     def required_option(*opts) 
-      self.required_options ||= []
-      opts.each do |opt|
-        self.required_options << opt 
+      (self.required_options ||= []).concat(opts)
 
-        o = opt
-        unless instance_methods(false).include?(o.to_s)
-          define_method(o) { options.send(o.to_s) }
+      opts.each do |opt|
+        unless method_defined?(opt)
+          define_method(opt) { options.send(opt) }
+        end
+        setter = "#{opt}="
+        unless method_defined?(setter)
+          define_method(setter) {|t| options.send(setter, t) }
         end
-        opt = "#{opt}="
-        define_method(opt) {|t| options.send(opt, t) }
       end
     end
 
@@ -573,7 +570,6 @@ class Ruport::Controller
     else
       execute_stages
     end
-
     finalize self.class.final_stage if self.class.final_stage
     maybe :finalize
   end  

data/lib/ruport/data/feeder.rb

@@ -14,7 +14,7 @@
 #
 # Table Example:
 #
-#   t = Table(%w[a b c]) do |feeder|
+#   t = Ruport::Data::Table(%w[a b c]) do |feeder|
 #      feeder.filter { |r| r.a < 5 }
 #      feeder.transform { |r| r.b = "B: #{r.b}"}    
 #      feeder << [1,2,3]
@@ -108,4 +108,4 @@ class Ruport::Data::Feeder
     @constraints << [:transform,block]
   end
   
-end
+end

data/lib/ruport/data/grouping.rb

@@ -99,7 +99,7 @@ module Ruport::Data
       if @subgroups.empty?
         @subgroups = grouped_data(group_column)
       else
-        @subgroups.each {|name,group|
+        @subgroups.each {|_name,group|
           group.send(:create_subgroups, group_column)
         }
       end
@@ -172,7 +172,7 @@ module Ruport::Data
         cols = Array(options[:by]).dup
         @data = data.to_group.send(:grouped_data, cols.shift)
         cols.each do |col|
-          @data.each do |name,group|
+          @data.each do |_name,group|
             group.send(:create_subgroups, col)
           end
         end    
@@ -200,9 +200,9 @@ module Ruport::Data
     #
     def each 
       if @order.respond_to?(:call) 
-        @data.sort_by { |n,g| @order[g] }.each { |n,g| yield(n,g) }
+        @data.sort_by { |_n,g| @order[g] }.each { |n,g| yield(n,g) }
       elsif @order == :name
-        @data.sort_by { |n,g| n }.each { |name,group| yield(name,group) } 
+        @data.sort_by { |n,_g| n }.each { |name,group| yield(name,group) }
       else
         @data.each { |name,group| yield(name,group) }
       end
@@ -216,7 +216,7 @@ module Ruport::Data
     #   by_size = grouping.sort_grouping_by { |g| g.size }
     def sort_grouping_by(type=nil,&block)
       a = Grouping.new(:by => @grouped_by, :order => type || block)
-      each { |n,g| a << g }
+      each { |_n,g| a << g }
       return a
     end
                                                           
@@ -285,7 +285,7 @@ module Ruport::Data
       else 
         cols = procs.keys + [field]   
       end
-      expected = Table(cols) { |t|
+      Table.new(:column_names => cols) { |t|
         each do |name,group|
           t << procs.inject({field => name}) do |s,r|
             s.merge(r[0] => r[1].call(group))
@@ -327,7 +327,7 @@ module Ruport::Data
     #   grouping.sigma { |r| r.col2 + 1 } #=> 15
     #
     def sigma(column=nil)
-      inject(0) do |s, (group_name, group)|
+      inject(0) do |s, (_group_name, group)|
         if column
           s + group.sigma(column)
         else
@@ -379,7 +379,7 @@ module Kernel
   #
   # Example:
   #
-  #   a = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+  #   a = Ruport::Data::Table.new(%w[a b c], :data => [[1,2,3],[4,5,6]])
   #   b = Grouping(a, :by => "a")   #=> creates a new grouping on column "a"
   #
   def Grouping(*args)

data/lib/ruport/data/record.rb

@@ -55,10 +55,10 @@ module Ruport::Data
       case(data)
       when Array
         @attributes = options[:attributes] || (0...data.length).to_a
-        @data = @attributes.inject({}) { |h,a| h.merge(a => data.shift) }
+        @data = @attributes.each_with_object({}) { |a, h| h[a.freeze] = data.shift }
       when Hash
-        @data = data.dup
-        @attributes = options[:attributes] || data.keys
+        @data = data
+        @attributes = options[:attributes] || @data.keys
       end
     end        
     
@@ -140,7 +140,7 @@ module Ruport::Data
       case name
       when String,Symbol
         self[name] || send(name)
-      when Fixnum
+      when Integer
         self[name]
       else
         raise ArgumentError, "Whatchu Talkin' Bout, Willis?"