ruport 0.8.14 → 0.10.0

data/examples/pdf_table_with_title.rb

@@ -1,28 +1,28 @@
 require "ruport"
 
-class TitledPDFTable < Ruport::Format::PDF
+class TitledPDFTable < Ruport::Formatter::PDF
 
-  Ruport::Renderer::Table.add_format self, :titled_pdf
+  renders :titled_pdf, :for => Ruport::Renderer::Table
   
   def add_title( title )  
     rounded_text_box("<b>#{title}</b>") do |o|
       o.fill_color = Color::RGB::Gray80
       o.radius    = 5  
-      o.width     = layout.header_width || 200
-      o.height    = layout.header_height || 20
-      o.font_size = layout.header_font_size || 12
+      o.width     = options.header_width || 200
+      o.height    = options.header_height || 20
+      o.font_size = options.header_font_size || 12
       o.x         = pdf_writer.absolute_right_margin - o.width 
       o.y         = pdf_writer.absolute_top_margin
     end
   end      
 
   def prepare_table
-    layout.header_margin ||= 50
+    options.header_margin ||= 50
   end
 
   def build_table_header
     add_title options.title
-    move_cursor -layout.header_margin 
+    move_cursor -options.header_margin 
   end
 
 end
@@ -31,11 +31,11 @@ end
 a = Ruport::Renderer::Table.render_titled_pdf { |r|
   r.options.title = "This is a sample header"
   r.data = Table(%w[a b]) { |t| t << [1,2] << [3,4] }
-  # NOTE: uncomment some options to play with layout
-  r.layout do |la|
-  #  la.header_margin = 25
-  #  la.header_width = 250
-  #  la.header_height = 50
+  # NOTE: uncomment some options to play with options
+  r.options do |o|
+  #  o.header_margin = 25
+  #  o.header_width = 250
+  #  o.header_height = 50
   end
 }
 

data/examples/rope_examples/itunes/Rakefile

@@ -10,9 +10,30 @@ Rake::TestTask.new do |test|
 end
 
 task :build do
-  sh "ruby util/build report #{ENV['report']}"
+  if ENV['report']
+    sh "ruby util/build report #{ENV['report']}"
+  elsif ENV['renderer']
+    sh "ruby util/build renderer #{ENV['renderer']}"
+  end
 end
 
 task :run do
   sh "ruby lib/reports/#{ENV['report']}.rb"
 end
+
+task :use_utils do
+  raise "File lib/init_utils.rb exists!" if File.exist?('lib/init_utils.rb')
+  File.open('lib/init_utils.rb','w') { |f|
+    if ENV['only']
+      ENV['only'].split(',').each { |e|
+        f.puts "require 'ruport/util/#{e}'"
+      }
+    else
+      f.puts "require 'ruport/util'"
+    end
+  }
+  File.open('lib/init.rb','a') { |f|
+    f.puts '#comment out the line below to disable auto-loading of utils'
+    f.puts 'require "lib/init_utils.rb"'
+  }        
+end

data/examples/rope_examples/itunes/config/environment.rb

@@ -0,0 +1,4 @@
+require "ruport"
+
+Ruport::Query.add_source :default, :user => "root",
+                                   :dsn  => "dbi:mysql:mydb"

data/examples/rope_examples/itunes/lib/init.rb

@@ -1,9 +1,39 @@
 begin
   require "rubygems"
-  gem "ruport","=0.8.0"
+  gem "ruport","=0.9.6"
 rescue LoadError 
   nil
 end
 require "ruport"
 require "lib/helpers"
-require "config/ruport_config"
+require "config/environment"
+
+class String
+  def /(other)
+   self + "/" + other
+  end
+end
+
+class Ruport::Report
+  
+  def output_dir
+    config.output_dir or dir('output')
+  end
+
+  def data_dir
+    config.data_dir or dir('data')
+  end
+
+  def query_dir
+    config.query_dir or dir('sql')
+  end
+
+  def template_dir
+    config.template_dir or dir('templates')
+  end
+
+  private
+  def dir(name)
+    "/Users/mikem836/ruport/itunes/#{name}"
+  end
+end

data/examples/rope_examples/itunes/util/build

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
+require 'lib/init.rb'
+require "ruport/generator"
 include FileUtils
-
-def format_class_name(string)
-  string.downcase.split("_").map { |s| s.capitalize }.join
-end
+include Ruport::Generator::Helpers
 
 unless ARGV.length > 1
   puts "usage: build [command] [options]"
@@ -14,31 +13,23 @@ end
 
 class_name = format_class_name(ARGV[1])
 
-exit if File.exist? "lib/reports/#{ARGV[1]}.rb"
 if ARGV[0].eql? "report"
+  check_for_files
   File.open("lib/reports.rb", "a") { |f| 
     f.puts("require \"lib/reports/#{ARGV[1]}\"")
   }
 REP = <<EOR
 require "lib/init"
 class #{class_name} < Ruport::Report
-  
-  def prepare
 
-  end
- 
   def generate
 
   end
-
-  def cleanup
-
-  end
-
+  
 end
 
 if __FILE__ == $0
-   #{class_name}.run { |res| puts res.results }
+  puts #{class_name}.run
 end
 EOR
 
@@ -52,11 +43,54 @@ class Test#{class_name} < Test::Unit::TestCase
   end
 end
 EOR
-  puts "report file: lib/reports/#{ARGV[1]}.rb"
+
   File.open("lib/reports/#{ARGV[1]}.rb", "w") { |f| f << REP }
+  puts "reports file: lib/reports/#{ARGV[1]}.rb"
   puts "test file: test/test_#{ARGV[1]}.rb"
   puts "class name: #{class_name}" 
   File.open("test/test_#{ARGV[1]}.rb","w") { |f| f << TEST }  
+
+elsif ARGV[0].eql? "renderer"
+
+  check_for_files
+  File.open("lib/renderers.rb","a") { |f|
+    f.puts("require \"lib/renderers/#{ARGV[1]}\"")
+  }
+REP = <<EOR
+require "lib/init"
+
+class #{class_name} < Ruport::Renderer
+  stage :#{class_name.downcase}
+end
+
+class #{class_name}Formatter < Ruport::Formatter
+
+  # change to your format name, or add additional formats
+  renders :my_format, :for => #{class_name}
+
+  def build_#{class_name.downcase}
+  
+  end
+
+end
+EOR
+
+TEST = <<EOR
+require "test/unit"
+require "lib/renderers/#{ARGV[1]}"
+
+class Test#{class_name} < Test::Unit::TestCase
+  def test_flunk
+    flunk "Write your real tests here or in any test/test_* file"
+  end
+end
+EOR
+  puts "renderer file: lib/renderers/#{ARGV[1]}.rb"
+  File.open("lib/renderers/#{ARGV[1]}.rb", "w") { |f| f << REP }
+  puts "test file: test/test_#{ARGV[1]}.rb"
+
+  puts "class name: #{class_name}"
+  File.open("test/test_#{ARGV[1]}.rb","w") { |f| f << TEST }
 else
   puts "Incorrect usage."
 end

data/examples/rope_examples/sales_report/README

@@ -1,4 +1,4 @@
 This example is based on the code in James Healy's excellent formatting system 
-tutorial, but includes updated features from 0.8
+tutorial, but includes updated features from 0.9
 
 http://www.yob.id.au/articles/ruport_formatting_system.html

data/examples/rope_examples/sales_report/Rakefile

@@ -10,9 +10,30 @@ Rake::TestTask.new do |test|
 end
 
 task :build do
-  sh "ruby util/build report #{ENV['report']}"
+  if ENV['report']
+    sh "ruby util/build report #{ENV['report']}"
+  elsif ENV['renderer']
+    sh "ruby util/build renderer #{ENV['renderer']}"
+  end
 end
 
 task :run do
   sh "ruby lib/reports/#{ENV['report']}.rb"
 end
+
+task :use_utils do
+  raise "File lib/init_utils.rb exists!" if File.exist?('lib/init_utils.rb')
+  File.open('lib/init_utils.rb','w') { |f|
+    if ENV['only']
+      ENV['only'].split(',').each { |e|
+        f.puts "require 'ruport/util/#{e}'"
+      }
+    else
+      f.puts "require 'ruport/util'"
+    end
+  }
+  File.open('lib/init.rb','a') { |f|
+    f.puts '#comment out the line below to disable auto-loading of utils'
+    f.puts 'require "lib/init_utils.rb"'
+  }        
+end

data/examples/rope_examples/sales_report/config/environment.rb

@@ -0,0 +1,4 @@
+require "ruport"
+
+Ruport::Query.add_source :default, :user => "root",
+                                   :dsn  => "dbi:mysql:mydb"

data/examples/rope_examples/sales_report/lib/init.rb

@@ -1,9 +1,39 @@
 begin
   require "rubygems"
-  gem "ruport","=0.8.0"
+  gem "ruport","=0.9.6"
 rescue LoadError 
   nil
 end
 require "ruport"
 require "lib/helpers"
-require "config/ruport_config"
+require "config/environment"
+
+class String
+  def /(other)
+   self + "/" + other
+  end
+end
+
+class Ruport::Report
+  
+  def output_dir
+    config.output_dir or dir('output')
+  end
+
+  def data_dir
+    config.data_dir or dir('data')
+  end
+
+  def query_dir
+    config.query_dir or dir('sql')
+  end
+
+  def template_dir
+    config.template_dir or dir('templates')
+  end
+
+  private
+  def dir(name)
+    "/Users/mikem836/sales_report/#{name}"
+  end
+end

data/examples/rope_examples/sales_report/lib/reports/sales.rb

@@ -3,20 +3,16 @@ require "lib/init"
 module MyModule
   class SalesRenderer < Ruport::Renderer
 
-     include Ruport::Renderer::Helpers
-
-     required_option :report_title
+     option :report_title
      required_option :titles
 
-     stage :document_header
-     stage :document_body
+     stage :document_header, :document_body
 
      finalize :document
   end
 
-  class Text < Ruport::Format::Plugin
-
-    SalesRenderer.add_format self, :txt
+  class Text < Ruport::Formatter
+    renders :txt, :for => SalesRenderer
 
     def pad(str, len)
       return "".ljust(len) if str.nil?
@@ -50,20 +46,18 @@ module MyModule
       output << "".ljust(75,"#") << "\n"
     end
 
-    def finalize_document; output end
-
   end
 
-  class PDF < Ruport::Format::PDF
-    SalesRenderer.add_format self, :pdf
+  class PDF < Ruport::Formatter::PDF
+    renders :pdf, :for => SalesRenderer
 
     def add_title( title )  
       rounded_text_box("<b>#{title}</b>") do |o|
         o.fill_color = Color::RGB::Gray80
         o.radius    = 5  
-        o.width     = layout.header_width || 200
-        o.height    = layout.header_height || 20
-        o.font_size = layout.header_font_size || 12
+        o.width     = options.header_width || 200
+        o.height    = options.header_height || 20
+        o.font_size = options.header_font_size || 12
         o.x         = pdf_writer.absolute_right_margin - o.width 
         o.y         = pdf_writer.absolute_top_margin
       end
@@ -86,7 +80,7 @@ module MyModule
     end
 
     def finalize_document
-      output << pdf_writer.render
+      render_pdf
     end 
 
   end

data/examples/rope_examples/sales_report/util/build

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
+require 'lib/init.rb'
+require "ruport/generator"
 include FileUtils
-
-def format_class_name(string)
-  string.downcase.split("_").map { |s| s.capitalize }.join
-end
+include Ruport::Generator::Helpers
 
 unless ARGV.length > 1
   puts "usage: build [command] [options]"
@@ -14,31 +13,23 @@ end
 
 class_name = format_class_name(ARGV[1])
 
-exit if File.exist? "lib/reports/#{ARGV[1]}.rb"
 if ARGV[0].eql? "report"
+  check_for_files
   File.open("lib/reports.rb", "a") { |f| 
     f.puts("require \"lib/reports/#{ARGV[1]}\"")
   }
 REP = <<EOR
 require "lib/init"
 class #{class_name} < Ruport::Report
-  
-  def prepare
 
-  end
- 
   def generate
 
   end
-
-  def cleanup
-
-  end
-
+  
 end
 
 if __FILE__ == $0
-   #{class_name}.run { |res| puts res.results }
+  puts #{class_name}.run
 end
 EOR
 
@@ -52,11 +43,54 @@ class Test#{class_name} < Test::Unit::TestCase
   end
 end
 EOR
-  puts "report file: lib/reports/#{ARGV[1]}.rb"
+
   File.open("lib/reports/#{ARGV[1]}.rb", "w") { |f| f << REP }
+  puts "reports file: lib/reports/#{ARGV[1]}.rb"
   puts "test file: test/test_#{ARGV[1]}.rb"
   puts "class name: #{class_name}" 
   File.open("test/test_#{ARGV[1]}.rb","w") { |f| f << TEST }  
+
+elsif ARGV[0].eql? "renderer"
+
+  check_for_files
+  File.open("lib/renderers.rb","a") { |f|
+    f.puts("require \"lib/renderers/#{ARGV[1]}\"")
+  }
+REP = <<EOR
+require "lib/init"
+
+class #{class_name} < Ruport::Renderer
+  stage :#{class_name.downcase}
+end
+
+class #{class_name}Formatter < Ruport::Formatter
+
+  # change to your format name, or add additional formats
+  renders :my_format, :for => #{class_name}
+
+  def build_#{class_name.downcase}
+  
+  end
+
+end
+EOR
+
+TEST = <<EOR
+require "test/unit"
+require "lib/renderers/#{ARGV[1]}"
+
+class Test#{class_name} < Test::Unit::TestCase
+  def test_flunk
+    flunk "Write your real tests here or in any test/test_* file"
+  end
+end
+EOR
+  puts "renderer file: lib/renderers/#{ARGV[1]}.rb"
+  File.open("lib/renderers/#{ARGV[1]}.rb", "w") { |f| f << REP }
+  puts "test file: test/test_#{ARGV[1]}.rb"
+
+  puts "class name: #{class_name}"
+  File.open("test/test_#{ARGV[1]}.rb","w") { |f| f << TEST }
 else
   puts "Incorrect usage."
 end