ruport-util 0.2.0 → 0.3.0

data/Rakefile

@@ -18,7 +18,7 @@ end
 
 spec = Gem::Specification.new do |spec|
   spec.name = "ruport-util"
-  spec.version = "0.2.0"
+  spec.version = "0.3.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}/**/**/*") +

data/example/mailer.rb

@@ -3,7 +3,7 @@ require "ruport/util/mailer"
 require "fileutils"
 class MyReport < Ruport::Report
   def prepare
-    mailer :default,
+    add_mailer :default,
       :host => "mail.adelphia.net",
       :address => "gregory.t.brown@gmail.com"
    end

data/lib/ruport/util/bench.rb

@@ -0,0 +1,31 @@
+module Ruport::Bench
+  
+  require "benchmark"  
+
+  def bench_case(name,n,&block)
+    2.times { 
+      @run = 0
+      n.times do
+        @bench_prepare.call if @bench_prepare
+        @run += Benchmark.realtime { block.call } 
+      end
+    }     
+    @bench_results << { "name" => name, "iterations" => n, 
+                        "realtime" => (time = sprintf("%.5f",@run)) } 
+    STDERR.puts "> #{name}... ok[#{time}] "
+    @bench_prepare = nil
+  end      
+
+  def bench_prepare(&block)
+    @bench_prepare = block
+  end
+  
+  def bench_suite(&block)
+    STDERR.puts "Running Bench Suite..."
+    @bench_results = Table(%w[name iterations realtime]) 
+    block.call   
+    puts @bench_results   
+    puts "Suite run time: " << sprintf("%.5f",@bench_results.sigma("realtime"))
+  end  
+  
+end

data/lib/ruport/util/graph.rb

@@ -5,7 +5,6 @@
 #
 # This is free software.  See LICENSE and COPYING for details.
 #
-
 begin
   require "rubygems"
   gem "ruport", ">= 0.9.3"

data/lib/ruport/util/invoice.rb

@@ -85,15 +85,8 @@ module Ruport
         end
         
         def build_invoice_body
-         
-          pdf_writer.y = 600
-
-          Ruport::Renderer::Table.render_pdf { |r|
-            r.data = data
-            r.options.formatter = pdf_writer
-            r.options.table_width = options.body_width || 450
-          }
-
+          move_cursor_to 600
+          draw_table data, :width => options.body_width || 450
         end
 
         def build_invoice_footer

data/lib/ruport/util/mailer.rb

@@ -9,7 +9,6 @@ require "forwardable"
 
 module Ruport
   
-  #
   # === Overview
   #
   # This class uses SMTP to provide a simple mail sending mechanism.
@@ -37,9 +36,10 @@ module Ruport
   #                  :text    => "This is what you asked for"
   #
   class Mailer
+
+    class InvalidMailerConfigurationError < RuntimeError; end
     extend Forwardable
    
-    #
     # Creates a new Mailer object. Optionally, you can select a mailer 
     # specified by Ruport::Config.
     #
@@ -58,8 +58,58 @@ module Ruport
     def_delegators( :@mail, :to, :to=, :from, :from=, 
                            :subject, :subject=, :attach, 
                            :text, :text=, :html, :html= )
-   
-    # 
+
+    class << self
+      # :call-seq:
+      #   mailer(mailer_name, options)
+      #
+      # Creates or retrieves a mailer configuration. Available options:
+      # <b><tt>:host</tt></b>::         The SMTP host to use.
+      # <b><tt>:address</tt></b>::      Address the email is being sent from.
+      # <b><tt>:user</tt></b>::         The username to use on the SMTP server
+      # <b><tt>:password</tt></b>::     The password to use on the SMTP server. 
+      #                                 Optional.
+      # <b><tt>:port</tt></b>::         The SMTP port to use. Optional, defaults
+      #                                 to 25.
+      # <b><tt>:auth_type</tt></b>::    SMTP authorization method. Optional, 
+      #                                 defaults to <tt>:plain</tt>.
+      # <b><tt>:mail_klass</tt></b>::   If you don't want to use the default 
+      #                                 <tt>MailFactory</tt> object, you can 
+      #                                 pass another mailer to use here.
+      #                               
+      # Example (creating a mailer config):
+      #   mailer :alternate, :host => "mail.test.com", 
+      #                      :address => "test@test.com",
+      #                      :user => "test", 
+      #                      :password => "blinky"
+      #                      :auth_type => :cram_md5
+      #
+      # Example (retreiving a mailer config):
+      #   mail_conf = mailer(:alternate)  #=> <OpenStruct ..>
+      #   mail_conf.address               #=> test@test.com
+      #
+      def add_mailer(name,options)
+        mailers[name] = OpenStruct.new(options)
+        check_mailer(mailers[name],name)
+      end
+
+      # Alias for <tt>mailers[:default]</tt>.
+      def default_mailer
+        mailers[:default]
+      end
+
+      # Returns all the <tt>mailer</tt>s defined
+      def mailers; @mailers ||= {}; end
+
+      private
+
+      # Verifies that you have provided a host for your mailer.
+      def check_mailer(settings, label) # :nodoc:
+        raise InvalidMailerConfigurationError unless settings.host
+      end
+
+    end
+
     # Sends the message.
     #
     # Example:
@@ -78,7 +128,7 @@ module Ruport
     private
 
     def select_mailer(label)
-      @mailer      = Ruport::Config.mailers[label]
+      @mailer      = self.class.mailers[label]
       @host       = @mailer.host
       @user       = @mailer.user
       @password   = @mailer.password
@@ -110,70 +160,16 @@ module Ruport
       m.deliver :from => m.from, :to => m.to
     end
 
-    # Sets the active mailer to the Ruport::Config source requested by <tt>label</tt>.
+    # Sets the active mailer to the Ruport::Mailer source requested by <tt>label</tt>.
     def use_mailer(label)
       @mailer = label
     end
 
-    def_delegator Ruport::Config, :mailer
+    def_delegator Ruport::Mailer, :add_mailer
  
   end
 
-  module Config
-    module_function
-    # Verifies that you have provided a host for your mailer.
-    def check_mailer(settings, label) # :nodoc:
-      unless settings.host
-        Ruport.log(
-          "Missing host for mailer #{label}",
-          :status => :fatal, :level => :log_only,
-          :raises => ArgumentError
-        )
-      end
-    end
-
-    # :call-seq:
-    #   mailer(mailer_name, options)
-    #
-    # Creates or retrieves a mailer configuration. Available options:
-    # <b><tt>:host</tt></b>::         The SMTP host to use.
-    # <b><tt>:address</tt></b>::      Address the email is being sent from.
-    # <b><tt>:user</tt></b>::         The username to use on the SMTP server
-    # <b><tt>:password</tt></b>::     The password to use on the SMTP server. 
-    #                                 Optional.
-    # <b><tt>:port</tt></b>::         The SMTP port to use. Optional, defaults
-    #                                 to 25.
-    # <b><tt>:auth_type</tt></b>::    SMTP authorization method. Optional, 
-    #                                 defaults to <tt>:plain</tt>.
-    # <b><tt>:mail_klass</tt></b>::   If you don't want to use the default 
-    #                                 <tt>MailFactory</tt> object, you can 
-    #                                 pass another mailer to use here.
-    #                               
-    # Example (creating a mailer config):
-    #   mailer :alternate, :host => "mail.test.com", 
-    #                      :address => "test@test.com",
-    #                      :user => "test", 
-    #                      :password => "blinky"
-    #                      :auth_type => :cram_md5
-    #
-    # Example (retreiving a mailer config):
-    #   mail_conf = mailer(:alternate)  #=> <OpenStruct ..>
-    #   mail_conf.address               #=> test@test.com
-    #
-    def mailer(*args)
-      return mailers[args.first] if args.length == 1
-      mailers[args.first] = OpenStruct.new(*args[1..-1])
-      check_mailer(mailers[args.first],args.first)
-    end
-
-    # Alias for <tt>mailers[:default]</tt>.
-    def default_mailer
-      mailers[:default]
-    end
 
-    # Returns all the <tt>mailer</tt>s defined in this <tt>Config</tt>.
-    def mailers; @mailers ||= {}; end
-  end
 
 
 end

data/lib/ruport/util.rb

@@ -1,3 +1,5 @@
 require "ruport/util/graph"
 require "ruport/util/invoice"
 require "ruport/util/report_manager"
+require "ruport/util/mailer"
+require "ruport/util/bench"

data/test/test_invoice.rb

@@ -4,7 +4,9 @@ require "ruport/util/invoice"
 class TestInvoice < Test::Unit::TestCase
 
   def test_required_options         
-    assert_raises(RuntimeError) { Ruport::Renderer::Invoice.render_pdf }
+    assert_raises(Ruport::Renderer::RequiredOptionNotSet) { 
+      Ruport::Renderer::Invoice.render_pdf 
+    }
     
     #hash form
     assert_nothing_raised {
@@ -26,4 +28,4 @@ class TestInvoice < Test::Unit::TestCase
   end
   
   
-end  
+end  

data/test/test_mailer.rb

@@ -27,8 +27,8 @@ class TestMailer < Test::Unit::TestCase
       :password => "bacon"
     }
 
-    Ruport::Config.mailer :default, @default_opts
-    Ruport::Config.mailer :other, @other_opts
+    Ruport::Mailer.add_mailer :default, @default_opts
+    Ruport::Mailer.add_mailer :other, @other_opts
 
     @default_mailer = Ruport::Mailer.new
     @other_mailer = Ruport::Mailer.new :other 
@@ -52,8 +52,8 @@ class TestMailer < Test::Unit::TestCase
    end
 
   def test_mail_defaults
-    assert_equal( Ruport::Config.mailers[:default], 
-                  Ruport::Config.default_mailer)
+    assert_equal( Ruport::Mailer.mailers[:default], 
+                  Ruport::Mailer.default_mailer)
   end
 
 
@@ -67,7 +67,7 @@ class TestMailer < Test::Unit::TestCase
   end
 
   def test_constructor_without_mailer
-    Ruport::Config.mailers[:default] = nil
+    Ruport::Mailer.mailers[:default] = nil
     assert_raise(RuntimeError) { Ruport::Mailer.new }
   end
  
@@ -80,10 +80,11 @@ class TestMailer < Test::Unit::TestCase
   end
 
   def test_mailer_config_errors
-    assert_raise(ArgumentError) {
-      Ruport::Config.mailer :bar, :user => :foo, :address => "foo@bar.com"
+
+    assert_raise(Ruport::Mailer::InvalidMailerConfigurationError) {
+      Ruport::Mailer.add_mailer :bar, :user => :foo, :address => "foo@bar.com"
     }
-    assert_nothing_raised { Ruport::Config.mailer :bar, :host => "localhost" }
+    assert_nothing_raised { Ruport::Mailer.add_mailer :bar, :host => "localhost" }
   end
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruport-util
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-04-10 00:00:00 -04:00
+  version: 0.3.0
+date: 2007-04-22 00:00:00 -04:00
 summary: A set of tools and helper libs for Ruby Reports
 require_paths: 
 - lib
@@ -29,7 +29,6 @@ post_install_message:
 authors: 
 - Gregory Brown
 files: 
-- example/mailed_report.rb
 - example/invoice_report.rb
 - example/managed_report.rb
 - example/mailer.rb
@@ -37,9 +36,10 @@ files:
 - lib/ruport
 - lib/ruport/util
 - lib/ruport/util.rb
+- lib/ruport/util/mailer.rb
+- lib/ruport/util/bench.rb
 - lib/ruport/util/graph.rb
 - lib/ruport/util/report_manager.rb
-- lib/ruport/util/mailer.rb
 - lib/ruport/util/invoice.rb
 - test/samples
 - test/init.rb