ruport-util 0.7.1 → 0.7.2

data/Rakefile

@@ -33,7 +33,7 @@ end
 
 spec = Gem::Specification.new do |spec|
   spec.name = "ruport-util"
-  spec.version = "0.7.1"
+  spec.version = "0.7.2"
   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/lib/ruport/util/graph.rb

@@ -107,7 +107,7 @@ module Ruport
 
     # generates a scruffy graph object
     def initialize
-      quiet { require 'scruffy' }
+      Ruport.quiet { require 'scruffy' }
       
       @graph = Scruffy::Graph.new
     end

data/lib/ruport/util/mailer.rb

@@ -99,11 +99,13 @@ module Ruport
     #   mailer.deliver :from => "gregory.t.brown@gmail.com",
     #                  :to   => "greg7224@gmail.com"
     #
-    def deliver(options={})
+    def deliver(options={})           
+      to = options.delete(:to)
+      mail_object.to = Array(to).join(",")
       options.each { |k,v| send("#{k}=",v) if respond_to? "#{k}=" }
       
       Net::SMTP.start(@host,@port,@host,@user,@password,@auth) do |smtp|
-        smtp.send_message((options[:mail_object] || mail_object).to_s, options[:from], options[:to] )
+        smtp.send_message((options[:mail_object] || mail_object).to_s, options[:from], to)
       end
     end
 
@@ -136,10 +138,9 @@ module Ruport
     def send_to(adds)
       use_mailer(:default) unless @mailer
       m = Mailer.new
-      m.to = adds
       yield(m)
       m.send(:select_mailer,@mailer)
-      m.deliver :from => m.from, :to => m.to
+      m.deliver :from => m.from, :to => adds
     end
 
     # Sets the active mailer to the Ruport::Mailer source requested by <tt>label</tt>.

data/lib/ruport/util/report.rb

@@ -53,9 +53,6 @@ module Ruport
     #   #from string 
     #   result = query "select * from foo"
     #
-    #   #from file 
-    #   result = query "my_query.sql", :origin => :file
-    # 
     # You can use multistatement SQL:
     #
     #   # will return the value of the last statement, "select * from foo"
@@ -72,21 +69,14 @@ module Ruport
     #   # will return an Array of DBI::Row objects
     #   result = query "select * from foo", :raw_data => true
     #
-    # You can quickly output in a number of formats:
-    # 
-    #   result = query "select * from foo", :as => :csv
-    #   result = query "select * from foo", :as => :html
-    #   result = query "select * from foo", :as => :pdf
     #
     # See Ruport::Query for details.
     #
     def query(sql, options={})
-      options[:source] ||= :default
-      q = options[:query_obj] || Ruport::Query.new(sql, options)
+      options[:source] ||= :default        
+      q = Ruport::Query.new(sql, options)
       if block_given?
         q.each { |r| yield(r) }
-      elsif options[:as]
-        q.result.as(options[:as])
       else
         q.result
       end

data/lib/ruport/util.rb

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

data/test/test_graph_renderer.rb

@@ -1,6 +1,6 @@
 require 'test/helper'
 
-quiet { testcase_requires 'scruffy' }
+Ruport.quiet { testcase_requires 'scruffy' }
 
 class MockGraphPlugin < Ruport::Formatter
   renders :mock, :for => Ruport::Renderer::Graph

data/test/test_mailer.rb

@@ -24,7 +24,9 @@ describe 'Mailer' do
 
     @default_mailer = @mailer.new :default
     @other_mailer = @mailer.new :other
+  end
 
+  before :each do
     @mail_fields = { :to      => 'clyde@example.com',
                      :from    => 'sue@example.com',
                      :subject => 'Hello',

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruport-util
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2007-06-07 00:00:00 -04:00
+  version: 0.7.2
+date: 2007-07-05 00:00:00 -04:00
 summary: A set of tools and helper libs for Ruby Reports
 require_paths: 
 - lib
@@ -30,50 +30,50 @@ authors:
 - Gregory Brown
 files: 
 - example/data
+- example/data/blank.ods
+- example/mailer.rb
 - example/form.rb
-- example/graph_report.rb
+- example/ods.rb
 - example/invoice_report.rb
-- example/mailer.rb
 - example/managed_report.rb
-- example/ods.rb
-- example/data/blank.ods
+- example/graph_report.rb
 - lib/ruport
 - lib/ruport/util
-- lib/ruport/util.rb
-- lib/ruport/util/bench.rb
+- lib/ruport/util/pdf
+- lib/ruport/util/pdf/form.rb
 - lib/ruport/util/generator.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/pdf
-- lib/ruport/util/report.rb
 - lib/ruport/util/report_manager.rb
-- lib/ruport/util/pdf/form.rb
+- lib/ruport/util/mailer.rb
+- lib/ruport/util/report.rb
+- lib/ruport/util/invoice.rb
+- lib/ruport/util.rb
 - test/helper
-- test/helper.rb
-- test/samples
-- test/test_format_ods.rb
-- test/test_graph_renderer.rb
-- test/test_invoice.rb
-- test/test_mailer.rb
-- test/test_report.rb
-- test/test_report_manager.rb
 - test/helper/layout.rb
 - test/helper/wrap.rb
+- test/samples
 - test/samples/data.csv
 - test/samples/foo.rtxt
+- test/test_mailer.rb
+- test/helper.rb
+- test/test_report_manager.rb
+- test/test_graph_renderer.rb
+- test/test_report.rb
+- test/test_invoice.rb
+- test/test_format_ods.rb
 - bin/csv2ods
 - bin/rope
 - Rakefile
 - INSTALL
 test_files: 
-- test/test_format_ods.rb
-- test/test_graph_renderer.rb
-- test/test_invoice.rb
 - test/test_mailer.rb
-- test/test_report.rb
 - test/test_report_manager.rb
+- test/test_graph_renderer.rb
+- test/test_report.rb
+- test/test_invoice.rb
+- test/test_format_ods.rb
 rdoc_options: 
 - --title
 - ruport-util Documentation