ruport-util 0.13.0 → 0.14.0

data/Rakefile

@@ -33,7 +33,7 @@ end
 
 spec = Gem::Specification.new do |spec|
   spec.name = "ruport-util"
-  spec.version = "0.13.0"
+  spec.version = "0.14.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "A set of tools and helper libs for Ruby Reports"
   spec.files =  Dir.glob("{example,lib,test,bin}/**/**/*") +
@@ -48,7 +48,7 @@ spec = Gem::Specification.new do |spec|
   spec.extra_rdoc_files = %w{INSTALL}
   spec.rdoc_options << '--title' << 'ruport-util Documentation' <<
                        '--main' << 'INSTALL' << '-q'
-  spec.add_dependency('ruport', ">=1.4.0")
+  spec.add_dependency('ruport', ">=1.6.0")
   spec.add_dependency('mailfactory',">=1.2.3")
   spec.add_dependency('rubyzip','>=0.9.1')
   spec.author = "Gregory Brown"

data/lib/ruport/util.rb

@@ -1,6 +1,6 @@
 module Ruport
   module Util
-    VERSION = "0.13.0"
+    VERSION = "0.14.0"
 
     file = __FILE__
     file = File.readlink(file) if File.symlink?(file)

data/lib/ruport/util/generator.rb

@@ -12,8 +12,8 @@ module Ruport
         raise "Report #{ARGV[1]} exists!"
       end
 
-      if File.exist? "lib/renderers/#{ARGV[1]}.rb"
-        raise "Renderer #{ARGV[1]} exists!"
+      if File.exist? "lib/controllers/#{ARGV[1]}.rb"
+        raise "Controller #{ARGV[1]} exists!"
       end
     end
   end
@@ -80,14 +80,14 @@ module Ruport
     mkdir project        
     puts "creating directories.."
     %w[ test config output data data/models lib lib/reports 
-        lib/renderers sql util ].each do |d|
+        lib/controllers sql util ].each do |d|
       m="#{project}/#{d}" 
       puts "  #{m}"
       mkdir(m)
     end
     
     puts "creating files.."
-    %w[reports helpers renderers templates].each { |f|
+    %w[reports helpers controllers templates].each { |f|
       m = "#{project}/lib/#{f}.rb"
       puts "  #{m}"
       touch(m)
@@ -116,8 +116,8 @@ end
 task :build do
   if ENV['report']
     sh "ruby util/build report #{ENV['report']}"
-  elsif ENV['renderer']
-    sh "ruby util/build renderer #{ENV['renderer']}"
+  elsif ENV['controller']
+    sh "ruby util/build controller #{ENV['controller']}"
   elsif ENV['model']
     sh "ruby util/build model #{ENV['model']}"
   end
@@ -200,16 +200,16 @@ EOR
   puts "class name: #{class_name}" 
   File.open("test/test_#{ARGV[1]}.rb","w") { |f| f << TEST }  
 
-elsif ARGV[0].eql? "renderer"
+elsif ARGV[0].eql? "controller"
 
   check_for_files
-  File.open("lib/renderers.rb","a") { |f|
-    f.puts("require \"lib/renderers/#{ARGV[1]}\"")
+  File.open("lib/controllers.rb","a") { |f|
+    f.puts("require \"lib/controllers/#{ARGV[1]}\"")
   }
 REP = <<EOR
 require "lib/init"
 
-class #{class_name} < Ruport::Renderer
+class #{class_name} < Ruport::Controller
   stage :#{class_name.downcase}
 end
 
@@ -227,7 +227,7 @@ EOR
 
 TEST = <<EOR
 require "test/unit"
-require "lib/renderers/#{ARGV[1]}"
+require "lib/controllers/#{ARGV[1]}"
 
 class Test#{class_name} < Test::Unit::TestCase
   def test_flunk
@@ -235,8 +235,8 @@ class Test#{class_name} < Test::Unit::TestCase
   end
 end
 EOR
-  puts "renderer file: lib/renderers/#{ARGV[1]}.rb"
-  File.open("lib/renderers/#{ARGV[1]}.rb", "w") { |f| f << REP }
+  puts "controller file: lib/contollers/#{ARGV[1]}.rb"
+  File.open("lib/controllers/#{ARGV[1]}.rb", "w") { |f| f << REP }
   puts "test file: test/test_#{ARGV[1]}.rb"
 
   puts "class name: #{class_name}"
@@ -309,7 +309,7 @@ creating directories..
   labyrith/data/models
   labyrith/lib
   labyrith/lib/reports
-  labyrith/lib/renderers
+  labyrith/lib/controllers
   labyrith/templates
   labyrith/sql
   labyrith/log
@@ -317,7 +317,7 @@ creating directories..
 creating files..
   labyrith/lib/reports.rb
   labyrith/lib/helpers.rb
-  labyrith/lib/renderers.rb
+  labyrith/lib/controllers.rb
   labyrith/lib/init.rb
   labyrith/config/environment.rb
   labyrith/util/build
@@ -342,7 +342,7 @@ folders laying around, along with some helpful tools at your disposal.
  * test : unit tests stored here can be auto-run
  * config : holds a configuration file which is shared across your applications
  * reports : when reports are autogenerated, they are stored here
- * renderers : autogenerated formatting system extensions are stored here
+ * controllers : autogenerated formatting system extensions are stored here
  * models : stores autogenerated activerecord models 
  * templates : erb templates may be stored here
  * sql : SQL files can be stored here, which are pre-processed by erb
@@ -419,12 +419,12 @@ project, you should do it in this file.
 
  $ rope my_reverser
  $ cd my_reverser
- $ rake build renderer=reverser
+ $ rake build controller=reverser
 
 Edit test/test_reverser.rb to look like the code below:
 
  require "test/unit"
- require "lib/renderers/reverser"
+ require "lib/controllers/reverser"
 
  class TestReverser < Test::Unit::TestCase
    def test_reverser
@@ -432,11 +432,11 @@ Edit test/test_reverser.rb to look like the code below:
    end
  end
 
-Now edit lib/renderers/reverser.rb to look like this:
+Now edit lib/controllers/reverser.rb to look like this:
 
  require "lib/init"
 
- class Reverser < Ruport::Renderer
+ class Reverser < Ruport::Controller
    stage :reverser
  end
 
@@ -450,7 +450,7 @@ Now edit lib/renderers/reverser.rb to look like this:
 
  end
 
-The tests should pass.  You can now generate a quick report using this renderer
+The tests should pass.  You can now generate a quick report using this controller
 
  $ rake build report=reversed_report
 
@@ -470,7 +470,7 @@ Edit test/test_reversed_report.rb as such:
 edit lib/reports/reversed_report.rb as below and run the tests.
 
  require "lib/init"  
- require "lib/renderers/reverser"
+ require "lib/controllers/reverser"
  class ReversedReport < Ruport::Report
 
    renders_with Reverser

data/lib/ruport/util/graph.rb

@@ -1,29 +1,22 @@
-# renderer/graph.rb
+# graph.rb
 # Generalized graphing support for Ruby Reports
 #
 # Written by Gregory Brown, Copright December 2006, All Rights Reserved.
 #
 # This is free software.  See LICENSE and COPYING for details.
 #
-begin
-  require "rubygems"
-  gem "ruport", ">= 1.2.2"
-rescue LoadError
-  nil
-end    
-
 module Ruport
 
-  module Renderer::Hooks
+  module Controller::Hooks
     module ClassMethods
       def renders_as_graph(options={})
-        renders_with Ruport::Renderer::Graph, options
+        renders_with Ruport::Controller::Graph, options
       end
     end
   end
   
-  class Renderer
-    class Graph < Renderer
+  class Controller
+    class Graph < Controller
        
       prepare :graph 
       stage :graph   

data/lib/ruport/util/graph/amline.rb

@@ -1,7 +1,7 @@
 class Ruport::Formatter  
   module Graph  
     class Amline < Ruport::Formatter
-      renders :amline, :for => Ruport::Renderer::Graph
+      renders :amline, :for => Ruport::Controller::Graph
 
       def initialize
         Ruport.quiet { require "hpricot" }

data/lib/ruport/util/graph/gruff.rb

@@ -3,7 +3,7 @@ class Ruport::Formatter
     
     class Gruff < Ruport::Formatter
 
-      renders [:png,:jpg], :for => Ruport::Renderer::Graph
+      renders [:png,:jpg], :for => Ruport::Controller::Graph
 
       def initialize
         Ruport.quiet { require 'gruff' }

data/lib/ruport/util/graph/o_f_c.rb

@@ -84,7 +84,7 @@ class Ruport::Formatter
   # * build_graph
   # * finalize_graph
     class OFC < Ruport::Formatter
-        renders :ofc, :for => Ruport::Renderer::Graph
+        renders :ofc, :for => Ruport::Controller::Graph
         
       # Attribute of the OpenFlashChart object
         attr_reader :graph

data/lib/ruport/util/graph/scruffy.rb

@@ -2,7 +2,7 @@ class Ruport::Formatter
   module Graph
     class Scruffy < Ruport::Formatter
 
-      renders :svg, :for => Ruport::Renderer::Graph
+      renders :svg, :for => Ruport::Controller::Graph
 
       # a hash of Scruffy themes.
       #

data/lib/ruport/util/invoice.rb

@@ -1,6 +1,6 @@
-module Ruport
-  class Renderer #:nodoc:
-    class Invoice < Ruport::Renderer 
+module Ruport     
+  class Controller #:nodoc:
+    class Invoice < Ruport::Controller 
                
       required_option :customer_info,:company_info,:order_info,:comments
 
@@ -73,7 +73,7 @@ module Ruport
       class PDF < Ruport::Formatter::PDF
         
         include InvoiceHelpers
-        renders :pdf, :for => Renderer::Invoice
+        renders :pdf, :for => Controller::Invoice
 
         def build_invoice_headers
           build_company_header

data/lib/ruport/util/ods.rb

@@ -8,7 +8,7 @@ module Ruport
   class Formatter::ODS < Formatter
     BLANK_ODS = File.join(Ruport::Util::BASEDIR, 'example', 'data', 'blank.ods')
 
-    renders :ods, :for => [ Renderer::Row, Renderer::Table]
+    renders :ods, :for => [ Controller::Row, Controller::Table]
 
     def prepare_table
       output << %{<?xml version="1.0" encoding="UTF-8"?>
@@ -30,11 +30,11 @@ module Ruport
     end
 
     def build_table_body
-      render_data_by_row
+       data.each { |r| build_row(r) }
     end
 
-    def build_row
-      table_row{ build_cells(data.to_a) }
+    def build_row(row=data)
+      table_row{ build_cells(row.to_a) }
     end
 
     def table_row

data/lib/ruport/util/report.rb

@@ -44,7 +44,7 @@ module Ruport
   #
   class Report   
     extend Forwardable
-    include Renderer::Hooks
+    include Controller::Hooks
         
     # This is a simplified interface to Ruport::Query.
     #

data/lib/ruport/util/xls.rb

@@ -3,7 +3,7 @@ require 'tmpdir'
 require 'zip/zip'
 
 module Ruport
-  # This class provides Excel output for Ruport's Table renderers.
+  # This class provides Excel output for Ruport's Table controllers.
   # It can export to format :
   #  * Excel 2003 (use spreadsheet/excel gems)
   #  * Excel 2003 XML
@@ -17,7 +17,7 @@ module Ruport
   #       * xlsxml => Excel 2003 XML
   #
   class Formatter::XLS < Formatter
-    renders :xls, :for => [ Renderer::Row, Renderer::Table]
+    renders :xls, :for => [Controller::Row, Controller::Table]
 
     def initialize
       Ruport.quiet {
@@ -81,7 +81,7 @@ module Ruport
   # Excel 2007 OpenXML
   class Formatter::XLSX < Formatter
     BLANK_XLSX = File.join(Ruport::Util::BASEDIR, 'example', 'data', 'blank.xlsx')
-    renders :xlsx, :for => [ Renderer::Row, Renderer::Table]
+    renders :xlsx, :for => [ Controller::Row, Controller::Table]
 
     def initialize
     end
@@ -219,7 +219,7 @@ module Ruport
   
   # Excel 2003 XML
   class Formatter::XLSXML < Formatter
-    renders :xlsxml, :for => [ Renderer::Row, Renderer::Table]
+    renders :xlsxml, :for => [ Controller::Row, Controller::Table]
    
     def prepare_table
      output << %{<?xml version="1.0" encoding="UTF-8"?><?mso-application progid="Excel.Sheet"?>

data/test/helper.rb

@@ -1,6 +1,6 @@
 begin
   require "rubygems"
-  gem "ruport", "=1.2.3" 
+  gem "ruport", "=1.6.0" 
 rescue LoadError
   nil
 end   

data/test/test_graph_ofc.rb

@@ -6,16 +6,16 @@ require "ruport/util/graph/o_f_c"
 
 describe 'Graph OpenFlashCharts' do
   before :all do
-     @renderer = Ruport::Renderer::Graph
+     @controller = Ruport::Controller::Graph
   end
 
   it 'Render Bar chart' do
-    @renderer = Ruport::Renderer::Graph
-    @renderer.should_not be_nil
+    @controller = Ruport::Controller::Graph
+    @controller.should_not be_nil
     @table = Table(%w(name))
     @table << [[3,2,6,7,1,3,2,7,9,1,15,14]]
     @table.should_not be_nil
-    @report = @renderer.render(:ofc, :data => @table, 
+    @report = @controller.render(:ofc, :data => @table, 
 		:chart_types => [[:bar_glass, 50, '#9933CC', '#8010A0', 'PAGE VIEWS', 10]],
 		:x_labels => %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec),
                 :title => 'Page views By Visitor',
@@ -37,15 +37,15 @@ describe 'Graph OpenFlashCharts' do
   end
   
   it 'Render Multiline' do
-    @renderer = Ruport::Renderer::Graph
+    @controller = Ruport::Controller::Graph
     @table = Table(%w(name))
     @table << [(1..12).to_a.map{|x| x * 1.3}]
     @table << [(1..12).to_a.map{|x| Math.sin(x) + 3}]
     @table << [(1..6).to_a + (1..6).to_a.reverse]
     @table << [(1..2).to_a + (1..2).to_a.reverse + (3..8).to_a]
-    @renderer.should_not be_nil
+    @controller.should_not be_nil
     @table.should_not be_nil
-    @report = @renderer.render(:ofc, :data => @table, 
+    @report = @controller.render(:ofc, :data => @table, 
 		:chart_types => [[:line, 2, '#9933CC', 'Page Views', 12],
 				[:area_hollow, 2, 3, 25, '#CC3399', 'Visitors', 12],
                                 [:line_dot, 3,5,'0xCC3399', 'Downloads', 12],
@@ -70,12 +70,12 @@ describe 'Graph OpenFlashCharts' do
   end
   
   it 'Render Pie' do
-    @renderer = Ruport::Renderer::Graph
+    @controller = Ruport::Controller::Graph
     @table = Table(%w(name))
     @table << [(1..12).to_a.map{|x| x * 1.3}]
-    @renderer.should_not be_nil
+    @controller.should_not be_nil
     @table.should_not be_nil
-    @report = @renderer.render(:ofc, :data => @table, 
+    @report = @controller.render(:ofc, :data => @table, 
 		:chart_types => [[:pie, 80, '#9933CC', '#8010A0']],
 		:x_labels => %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec),
                 :pie_slice_colors => ['#d01f3c','#356aa0','#C79810'])

data/test/test_graph_renderer.rb

@@ -3,7 +3,7 @@ require 'test/helper'
 Ruport.quiet { testcase_requires 'scruffy' }
 
 class MockGraphPlugin < Ruport::Formatter
-  renders :mock, :for => Ruport::Renderer::Graph
+  renders :mock, :for => Ruport::Controller::Graph
   def prepare_graph 
     output << "prepare"
   end
@@ -17,7 +17,7 @@ end
 
 describe 'Graph Renderer' do
   before :all do
-    @graph = Ruport::Renderer::Graph
+    @graph = Ruport::Controller::Graph
     @data = Graph(%w[a b c],[[1,2,3],[4,5,6]])
   end
 

data/test/test_invoice.rb

@@ -2,13 +2,13 @@ require 'test/helper'
 
 describe 'Invoice' do
   before :all do
-    @invoice = Ruport::Renderer::Invoice
+    @invoice = Ruport::Controller::Invoice
     @data = Table(%w[a b c]) << [1,2,3]
   end
 
   it 'should raise if the required options are not set' do
     lambda{ @invoice.render_pdf }.
-      should raise_error(Ruport::Renderer::RequiredOptionNotSet)
+      should raise_error(Ruport::Controller::RequiredOptionNotSet)
   end
 
   it "shouldn't raise if options are given correct in hash form" do

data/test/test_report.rb

@@ -2,7 +2,7 @@ require 'test/helper'
 require 'net/smtp'
 
 class SampleReport < Ruport::Report
-  renders_with Ruport::Renderer::Table
+  renders_with Ruport::Controller::Table
 
   def renderable_data(format)
     Table(%w[not abc]) << %w[o r] << %w[one two] << %w[thr ee]
@@ -57,11 +57,11 @@ describe 'Writing Report to files' do
     @report.save_as(filename).should_not be_nil
   end   
   
-  it 'should yield the renderer object' do
+  it 'should yield the controller object' do
     file_mock(mode = 'w', filename = 'foo.csv', 
                           content = "not,abc\no,r\none,two\nthr,ee\n")
     @report.save_as(filename) do |r|
-      r.should be_an_instance_of(Ruport::Renderer::Table)
+      r.should be_an_instance_of(Ruport::Controller::Table)
     end
   end
 end
@@ -79,14 +79,14 @@ describe 'MyReport rendering' do
     @my_report.data = table
   end
 
-  it 'should renders_with Renderer::Table' do
-    MyReport.renders_with Ruport::Renderer::Table
+  it 'should renders_with Controller::Table' do
+    MyReport.renders_with Ruport::Controller::Table
     generate @table
     @my_report.to_csv.should == "a,b,c\n1,2,3\n4,5,6\n"
   end
 
-  it 'should renders_with Renderer::Table and optional headers' do
-    MyReport.renders_with Ruport::Renderer::Table, :show_table_headers => false
+  it 'should renders_with Controller::Table and optional headers' do
+    MyReport.renders_with Ruport::Controller::Table, :show_table_headers => false
     generate @table
 
     @my_report.to_csv.should == "1,2,3\n4,5,6\n"
@@ -118,6 +118,6 @@ describe 'MyReport rendering' do
     MyReport.renders_as_grouping
     generate Grouping(@table, :by => 'a')
 
-    @my_report.to_csv.should == "1\n\nb,c\n2,3\n\n4\n\nb,c\n5,6\n\n"
+    @my_report.to_csv.should == "1\n\nb,c\n2,3\n4\n\nb,c\n5,6\n\n"
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: ruport-util
 version: !ruby/object:Gem::Version 
-  version: 0.13.0
-date: 2008-02-08 00:00:00 -05:00
+  version: 0.14.0
+date: 2008-04-02 00:00:00 -04:00
 summary: A set of tools and helper libs for Ruby Reports
 require_paths: 
 - lib
@@ -30,78 +30,78 @@ authors:
 - Gregory Brown
 files: 
 - example/data
+- example/data/amline_settings.xml
+- example/data/blank.xlsx
+- example/data/amline_graph.xml
+- example/data/blank.ods
 - example/draw_graph.rb
 - example/form.rb
-- example/graph_report.rb
 - example/gruff_report.rb
+- example/ods.rb
 - example/invoice_report.rb
-- example/mailer.rb
 - example/managed_report.rb
-- example/ods.rb
-- example/data/amline_graph.xml
-- example/data/amline_settings.xml
-- example/data/blank.ods
-- example/data/blank.xlsx
-- lib/open_flash_chart.rb
+- example/mailer.rb
+- example/graph_report.rb
 - lib/ruport
 - lib/ruport/util
-- lib/ruport/util.rb
-- lib/ruport/util/bench.rb
-- lib/ruport/util/generator.rb
 - lib/ruport/util/graph
+- lib/ruport/util/graph/scruffy.rb
+- lib/ruport/util/graph/amline.rb
+- lib/ruport/util/graph/o_f_c.rb
+- lib/ruport/util/graph/gruff.rb
+- lib/ruport/util/pdf
+- lib/ruport/util/pdf/form.rb
+- lib/ruport/util/bench.rb
 - lib/ruport/util/graph.rb
-- lib/ruport/util/invoice.rb
-- lib/ruport/util/mailer.rb
 - lib/ruport/util/ods.rb
-- lib/ruport/util/ods_table.rb
-- lib/ruport/util/pdf
 - lib/ruport/util/query.rb
-- lib/ruport/util/report.rb
 - lib/ruport/util/report_manager.rb
+- lib/ruport/util/generator.rb
 - lib/ruport/util/xls.rb
+- lib/ruport/util/mailer.rb
+- lib/ruport/util/report.rb
+- lib/ruport/util/invoice.rb
 - lib/ruport/util/xls_table.rb
-- lib/ruport/util/graph/amline.rb
-- lib/ruport/util/graph/gruff.rb
-- lib/ruport/util/graph/o_f_c.rb
-- lib/ruport/util/graph/scruffy.rb
-- lib/ruport/util/pdf/form.rb
+- lib/ruport/util/ods_table.rb
+- lib/ruport/util.rb
+- lib/open_flash_chart.rb
 - test/helper
-- test/helper.rb
-- test/samples
-- test/test_format_ods.rb
-- test/test_format_xls.rb
-- test/test_graph_ofc.rb
-- test/test_graph_renderer.rb
-- test/test_hpricot_traverser.rb
-- test/test_invoice.rb
-- test/test_mailer.rb
-- test/test_ods_table.rb
-- test/test_query.rb
-- test/test_report.rb
-- test/test_report_manager.rb
-- test/test_xls_table.rb
 - test/helper/layout.rb
 - test/helper/wrap.rb
+- test/samples
 - test/samples/data.csv
 - test/samples/foo.rtxt
 - test/samples/people.ods
 - test/samples/people.xls
+- test/test_format_xls.rb
+- test/helper.rb
+- test/test_hpricot_traverser.rb
+- test/test_query.rb
+- test/test_report_manager.rb
+- test/test_graph_renderer.rb
+- test/test_graph_ofc.rb
+- test/test_mailer.rb
+- test/test_report.rb
+- test/test_invoice.rb
+- test/test_format_ods.rb
+- test/test_ods_table.rb
+- test/test_xls_table.rb
 - bin/csv2ods
 - bin/rope
 - Rakefile
 - INSTALL
 test_files: 
-- test/test_format_ods.rb
 - test/test_format_xls.rb
-- test/test_graph_ofc.rb
-- test/test_graph_renderer.rb
 - test/test_hpricot_traverser.rb
-- test/test_invoice.rb
-- test/test_mailer.rb
-- test/test_ods_table.rb
 - test/test_query.rb
-- test/test_report.rb
 - test/test_report_manager.rb
+- test/test_graph_renderer.rb
+- test/test_graph_ofc.rb
+- test/test_mailer.rb
+- test/test_report.rb
+- test/test_invoice.rb
+- test/test_format_ods.rb
+- test/test_ods_table.rb
 - test/test_xls_table.rb
 rdoc_options: 
 - --title
@@ -126,7 +126,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mailfactory