ruport 0.2.5 → 0.2.9

data/CHANGELOG

@@ -1,4 +1,43 @@
-The current version of Ruby Reports is 0.2.5
+The current version of Ruby Reports is 0.2.9
+
+changes since Ruport 0.2.5:
+
+- Added a new examples package with a 666 line walkthrough and more enjoyable
+  demonstratons
+
+- Added support for multiple DSN's via add_dsn and select_dsn
+
+- Added Tagging support for DataSets.
+
+- Added DataSet#select_field and DataSet#select_fields to simplify grabbing
+  data by column
+
+- Report::DataSet now implements to_s, for pretty printing goodness.
+
+- render_text now implemented in Format::Builder
+
+- Format::Builder now accepts headers and footers.
+
+- Format::Builder now can generate complete html via output_type
+
+- Ruport now uses FasterCSV, which is now a dependency.  Yay!  Dependencies!
+  (But it IS 9x faster than the CSV lib that ships with Ruby)
+
+- Added tests to the gem spec... so you can use -t now.
+
+- DataRow#+ implemented.
+
+- Format::Builder#range implemented. (Can now format partial DataSets)
+
+- Fixed a bug in the unit tests that required Ruport to be installed.
+  Now you can test BEFORE you install.  (Sorry about that one...) 
+
+- Commands that return no rows no longer crash the application
+  (But writing to the database is still not fun nor easy)
+
+- templates/ folder now more aptly named scripts/
+
+- Report::Engine#query now returns a DataSet so chaining is possible
 
 changes since Ruport 0.2.2:
 
@@ -89,4 +128,4 @@ FEATURES:
  
 - new method query() will eventually replace select() / execute()
 
-- {examples}[http://ruport.rubyforge.org/examples.zip] available for download
+- {examples}[http://ruport.rubyforge.org/] available for download

data/COPYING

@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

data/README

@@ -6,9 +6,10 @@ of databases via DBI.  It also provides helper methods and utilities to generate
 
 It happens to be alpha software, so if it offends your mother, burns out the innards of your computer, or threatens you in any other way, you may want to wait until further releases to play around with it.
 
-There is a set of examples and a brief walkthrough for this application
-available at http://ruport.rubyforge.org/example.zip which I strongly
-recommend going through
+Please take the time to run through the examples available on RubyForge!
+This is the best way of learning the system:
+
+http://rubyforge.org/frs/?group_id=856&release_id=3656
 
 Otherwise, here is a brief set of installation and setup instructions which will
 hopefully get you going:
@@ -38,9 +39,7 @@ database combination, we'd love to hear how you did it so that  we can improve
 this documentation for the next version of Ruport.  Once you've got DBI 
 installed, the Ruport installation  is a piece of cake.
 
-Ruport is a gem.  It relies on Parse/Input (which will be linked to Ruport
-in future releases) but this can easily be installed using the
---include-dependencies flag.  Make sure you have adequete permissions and run:
+Ruport is a gem.  It relies on FasterCSV but this can easily be installed using the --include-dependencies flag.  Make sure you have adequete permissions and run:
 
 	sudo gem install ruport
 

data/Rakefile

@@ -14,22 +14,24 @@ end
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ruport"
-	spec.version = "0.2.5"
+	spec.version = "0.2.9"
 	spec.platform = Gem::Platform::RUBY
 	spec.summary = "A generalized Ruby report generation and templating engine."
 
-	spec.files = Dir.glob("{bin,lib,test}/**/*.rb").
-	                 delete_if { |item| item.include?("CVS") } +
-	                 ["Rakefile"]
+	spec.files =  spec.files = FileList[
+   'lib/**/*.rb', 'bin/*', '[A-Z]*','test/**/*'].to_a.delete_if { |item|
+   item.include?("CVS") } + ["Rakefile"]
 	spec.require_path = "lib"
 	spec.bindir = "bin"
 	spec.executables << "ruport"
 	
+  spec.test_file = "test/ts_all.rb"
+  
 	spec.has_rdoc = true
 	spec.extra_rdoc_files = %w{README LICENSE TODO AUTHORS CHANGELOG}
 	spec.rdoc_options << '--title' << 'Ruport Documentation' <<
 	                     '--main'  << 'README'
-
+  spec.add_dependency('fastercsv', '>= 0.1.0')
 	spec.author = "Gregory Brown"
 	spec.email = "	gregory.t.brown@gmail.com"
 	spec.rubyforge_project = "ruport"

data/TODO

@@ -2,10 +2,17 @@ TODO:
 
 Bugfixes:
  - Fix the manual that is in the example package so it it reads FakeDB instead
-   of MockDB.  Update the manual to cover new features in 0.2.4
+   of MockDB.  Update the manual to cover new features in 0.3.0 
+
+ - Ruport has some big trouble with running things such as table / database
+   creations.  Gotta work out the kinks here.   
  
 Improvement:
 
+- Tagging...  Add column and set based tagging.
+
+- Transposition in DataSets
+
 - Mail system
 	Make attachments doable
 
@@ -28,17 +35,16 @@ Improvement:
 
 Begin implementing new features:
 
-  DSNs:
+- Formatter:
+   
+   * Implement RSS generation for Format::Builder
 
-  It would be nice to be able to configure any number of databases
-  and then select them by name. (JEG2)
-
-	Charts:
+ - Charts:
 
 		Build something that'll take a data set and build a chart. (SVG?),
 		then dump it into PDF::Writer.
 
-	Multiple query reports:
+ - Multiple query reports:
 	
 		Allow the user to make arbitrary SQL queries,
 		combining the rows, and then iterating through them row by row in the
@@ -47,19 +53,19 @@ Begin implementing new features:
 		This could be done with select taking an array of queries and possibly
 		some ordering instructions
 	
-	Cross database import from file:
+ - Cross database import from file:
 
 		Make an import(file,table,delimiter=",") command that will work
 		regardless of database choice and import the data stored in a file into
 		a specified table.
 
-	Parse/Input tight integration:
+ - Parse/Input tight integration:
 
 		Write wrapper functions over the Parse/Input library to give Ruport the
 		power to feed in any data source such as a CSV, A website, or a log file
 		and do formatting and use the other features of Ruport.
 
-	PDF::Writer and CSV convenience methods:
+ - PDF::Writer and CSV convenience methods:
 		
 		Create functions that will allow basic and common reports to be built
 		using PDF and CSV format without having to write the functionality over
@@ -68,13 +74,19 @@ Begin implementing new features:
 
     [UPDATE: to_csv is in place but can use some additional frosting]
 
-	Logger / Exception handler:
+ - Logger / Exception handler:
 
 		Create a system to handle and log errors as well as provide log messages
 		regarding what Ruport does when a template is run.
     
     [UPDATE: Logger is in place but is not covering many functions]
 
+ -  DataSets should implement tagging, allowing tag conditions to be passed and
+    then applied to rows.  Formulas should be implemented, allowing column
+    generation by Proc.   More about this later. (These are COOL and POWERFUL
+    features... thanks to Greg Gibson for the ideas.
+
+    
 Design considerations:
 
 	Ruport will eventually need to be cleanly seperating between formatting

data/bin/ruport

@@ -21,19 +21,19 @@ require "ruportlib"
 # The library itself is much cleaner.  This is a total hack.
 
 if ARGV[0].nil?
-  puts "Usage: ruport path/to/template or ruport generate project_name"
+  puts "Usage: ruport path/to/script.rb or ruport generate project_name"
   exit
 end
 
 if ARGV[0].eql?("generate")
   if ARGV[1].nil?
-    puts "You must specify a name for your ruport sandbox"
+    puts "You must specify a name for your ruport project"
     exit
   end
   Dir.mkdir(ARGV[1])
   Dir.mkdir("#{ARGV[1]}/log")
   Dir.mkdir("#{ARGV[1]}/reports")
-  Dir.mkdir("#{ARGV[1]}/templates")
+  Dir.mkdir("#{ARGV[1]}/scripts")
   Dir.mkdir("#{ARGV[1]}/config")
   Dir.mkdir("#{ARGV[1]}/queries")
   conf = (<<-END_CONF
@@ -60,12 +60,12 @@ if ARGV[0].eql?("generate")
 ).gsub("  ","")
        
   File.open("#{ARGV[1]}/config/ruport.yaml", "w") { |f| f.puts(conf) }
-  File.open("#{ARGV[1]}/templates/test.rb", "w") { |f|
-    f.puts('query ("show tables;") do |data| @report << data.to_csv end ')
+  File.open("#{ARGV[1]}/scripts/test.rb", "w") { |f|
+    f.puts('@report = query("show tables").to_csv')
   }
   exit
 elsif ARGV[0].eql?("-v")
-  puts "Ruport Version 0.2.5 \nA ruby report generation system by Gregory " +
+  puts "Ruport Version 0.2.9 \nA ruby report generation system by Gregory " +
   "Brown.\nThis application is Free Software under the GPL/Ruby License. " +
   "\nAll praise and/or criticism can be directed to "+
   "gregory.t.brown@gmail.com"

data/lib/ruport/format/builder.rb

@@ -4,30 +4,61 @@ module Ruport
       
       def initialize( data_set )
         @data = data_set
-        @type = nil
+        @original = data_set.dup
+        @format = nil
+        @range = nil
+        @header = nil
+        @footer = nil
+        @output_type = nil
       end
       
-      attr_accessor :type
+      attr_accessor :format, :range, :header, :footer, :output_type
       
       def render
-        send("render_#{@type}")
+        @data = @range ? ( @original[@range] ) : ( @original )
+        send("render_#{@format}")    
       end
       
       def render_csv
-        @data.inject(CSV.generate_line(@data.fields) + "\n") do |out,r|  
-          out << CSV.generate_line(@data.fields.map { |f| r[f] }) + "\n"
-        end
+        ( @header ? "#{@header}\n\n" : "" ) +
+        @data.inject(FasterCSV.generate_line(@original.fields)) do |out,r|  
+          out << FasterCSV.generate_line(@original.fields.map { |f| r[f] })
+        end + ( @footer ? "\n#{@footer}\n" : "" )
       end
-
+      
       def render_html
-        fields_html = "<tr>\n    <td>#{@data.fields.join('</td><td>')}</td>\n  </tr>"
-        @data.inject("<table>\n  #{fields_html}"){|html,row|
+        head_text = ( if @header
+            "  <tr>\n    <th colspan=#{@original.fields.length}>#{@header}" +
+            "</th>\n  </tr>\n" 
+        end )
+        out = "<table>\n#{head_text}  <tr>\n    <th>"+
+              "#{@original.fields.join('</th><th>')}" +
+              "</th>\n  </tr>\n"
+        @data.inject(out) do |html,row|
           html << row.inject("  <tr>\n    "){ |row_html, field|
                     row_html << "<td>#{field}</td>"
-                  } + "\n  </tr>"
-        } + "\n</table>"
+                  } + "\n  </tr>\n"
+        end
+        foot_text = ( if @footer 
+            "  <tr>\n    <th colspan=#{@original.fields.length}>#{@footer}" +
+            "</th>\n  </tr>\n" 
+        end )
+        
+        out << "#{foot_text}</table>"   
+        return out unless @output_type.eql?(:complete) 
+        "<html><head><title></title></head><body>\n#{out}</body></html>\n"
       end
-      
+
+      def render_text
+        header = @header ? "#{@header}\n" : ""
+        header << "fields: ( #{ @original.fields.join(', ') } )\n"
+        indices = (@range)  ? @range.to_a : (0...@original.to_a.length).to_a  
+        @data.inject(header) do |output,row|
+          output << "row#{indices.shift}: ( #{row.to_a.join(', ')} )\n"
+        end + (@footer ? "#{@footer}\n" : "" )
+        
+      end
+            
     end
   end
 end

data/lib/ruport/report/data_row.rb

@@ -13,7 +13,6 @@ module Ruport
     
       include Enumerable
       
-      attr_accessor :fields
     
       # DataRows are essentially arrays with named ordinal fields and
       # awareness  of their oddness and position.
@@ -22,8 +21,15 @@ module Ruport
         @fields   = fields
         @oddness  = oddness
         @position = position
+        @tags     = []
+      end
+      
+      attr_accessor :fields, :tags
+
+      #Returns an array of values.
+      def +(other)
+        self.to_a + other.to_a
       end
-    
 
       # Lets you access individual fields
       #

data/lib/ruport/report/data_set.rb

@@ -41,7 +41,7 @@ module Ruport
       # are equivalent.
       def << ( stuff )
         new_row = Array.new
-        fields.each_with_index do |key, index|
+        @fields.each_with_index do |key, index|
           if stuff.kind_of?(Array)
             new_row[index] = stuff.shift || @default
           else
@@ -55,8 +55,7 @@ module Ruport
         @data << DataRow.new(new_row,@fields,oddness,position)
       end
 
-      # This works in best case scenario.  It should return true if
-      # both DataSets have the same values.  Still working out the kinks here.
+      # checks if one dataset equals another
       def eql?(data2)
         return false unless ( @data.length == data2.data.length and
                               @fields.eql?(data2.fields) )
@@ -68,14 +67,13 @@ module Ruport
 
         return true
       end
-      
 
       # Allows loading of CSV files or YAML dumps.  Returns a DataSet
       def self.load ( source, default="")
         
         return YAML.load(File.open(source)) if source =~ /\.(yaml|yml)/ 
         
-        input = CSV.read(source) if source =~ /\.csv/
+        input = FasterCSV.read(source) if source =~ /\.csv/
         loaded_data = self.new
         loaded_data.fields = input[0]
         loaded_data.default = default
@@ -88,20 +86,68 @@ module Ruport
       # Converts a DataSet to CSV
       def to_csv
         builder = Format::Builder.new(self)
-        builder.type = :csv
+        builder.format = :csv
         builder.render
       end
       # Converts a Dataset to Html
       def to_html 
         builder = Format::Builder.new(self)
-        builder.type = :html
+        builder.format = :html
+        builder.render
+      end
+
+      # Pretty Pretty printing
+      def to_s
+        builder = Format::Builder.new(self)
+        builder.format = :text
         builder.render
       end
+
       # Works like a standard each iterator
       def each(&action)
         @data.each(&action)
       end
 
+      # adds tag to rows
+      def apply_tag(tag,&condition)
+        to_tag = block_given? ?  condition.call(self) : self 
+        to_tag.each { |match| match.tags << tag }
+      end
+      
+      def apply_tags(tags)  
+        tags.each do |tag,block|
+          apply_tag(tag,&block)
+        end
+      end
+
+      def select_field(field)
+        my_data = Report::DataSet.new
+        my_data.fields = [ field ]
+        map { |row| row[field] }.each do |r|
+          my_data << [ r ]
+        end
+        return my_data
+      end
+
+      def select_fields(*fields)
+        my_data = Report::DataSet.new
+        my_data.fields = fields
+        rows = fields.inject([]) { |s,e| s << map { |row| row[e] } }.transpose
+        rows.each do |row|
+          my_data << row
+        end
+        return my_data
+      end
+
+      def tag_matches(tag)
+        my_data = Report::DataSet.new
+        my_data.fields = @fields
+        select { |row| row.tags.include?(tag) }.each do |row|
+          my_data << row
+        end
+        return my_data
+      end
+
     end
   end
 end

data/lib/ruport/report/engine.rb

@@ -35,6 +35,11 @@ module Ruport
         @query_table = nil
         @file        = nil
         @config      = nil
+        @databases   = Hash.new
+        @databases[:default] = { :dsn      => @dsn,
+                                 :user     => @user,
+                                 :password => @password
+                               }
       end
       
       attr_accessor :query_table, :file
@@ -54,15 +59,20 @@ module Ruport
 
       def query ( statement, source = :string, &action )
         query_text = get_query(source,statement)
+        data = DataSet.new
         DBI.connect(@dsn, @user, @password) do |dbh|
-          data = DataSet.new
-          sth = dbh.execute(query_text)
-          if block_given?
-            data.fields = sth.column_names
-            sth.each { |row| data << row }
-            action.call(data)
+          dbh.execute(query_text) do |sth|
+            if sth.rows > 0
+              results = sth.fetch_all
+              data.fields = sth.column_names
+              results.each { |row| data << row }
+              action.call(data) if block_given?
+            else
+              data = nil
+            end
           end
         end
+        return data || "command succeeded. 0 rows returned"
       end 
 
       # Evaluates _code_ from _filename_ as pure ruby code for files ending in
@@ -134,6 +144,12 @@ module Ruport
           raise "Could not open #{query_file}"; exit
         end
       end
+
+      def render ( data ) 
+        builder = Format::Builder.new( data )
+        yield(builder)
+        builder.render
+      end
       
       # Generates the report.  If @pre or @post are defined with lambdas,
       # they will be called before and after the main code.  generate_report
@@ -165,7 +181,20 @@ module Ruport
           @mailer.send_report(@report_name) 
         end
         @post.call if @post
+      
+      end
+
+      def add_dsn(label, dsn, user, password )
+        @databases[label] = { :dsn => dsn, :user => user,
+                             :password => password }
+      end
+
+      def select_dsn(label)
+        @dsn      = @databases[label][:dsn]
+        @user     = @databases[label][:user]
+        @password = @databases[label][:password]
       end
+      
     end
   end
 end

data/lib/ruport/report/fake_engine.rb

@@ -16,7 +16,9 @@ module Ruport
 
       def query ( query, source = :string, &action)
         query = get_query(source, query)
-        yield(@fake_db.process(@dsn,@user,@password, query))
+        data = @fake_db.process(@dsn,@user,@password, query)
+        action.call(data) if block_given?
+        return data
       end
 
     end

data/lib/ruportlib.rb

@@ -7,4 +7,5 @@ require "ruport/report/data_set"
 require "ruport/report/data_row"
 require "ruport/report/fake_mailer"
 require "ruport/format/builder"
+require "faster_csv"
 include Ruport

data/test/addressbook.csv

@@ -0,0 +1,6 @@
+id,name,phone,street,town,state
+1,Inky,555-000-1234,Druary Lane,Union City,CT
+2,Blinky,525-0529-123,Apple Street,Robot Town,NJ
+3,Clyde,247-219-4820,Sandbox Hill,Alvin's Landing,PA
+4,Pacman,283-102-8293,Rat Avenue,Southford,VT
+5,Mrs. Pacman,214-892-1892,Conch Walk,New York,NY

data/test/data.csv

@@ -0,0 +1,3 @@
+"col1","col2","col3"
+"a","b","c"
+"d",,"e"

data/test/tc_builder.rb

@@ -1,25 +1,113 @@
 
 require "test/unit"
-require "lib/ruportlib"
+require "ruportlib"
 class TestBuilder < Test::Unit::TestCase
   def setup
-    @data = Report::DataSet.new
-    @data.fields = %w[ col1 col2 col3 ]
-    @data.default = ""; @data << %w[ a b c ]; @data << %w[ d e f ]
-    @builder = Format::Builder.new( @data )
+    data = Report::DataSet.new
+    data.fields = %w[ col1 col2 col3 ]
+    data.default = ""; data << %w[ a b c ]; data << %w[ d e f ]
+    @builder = Format::Builder.new( data )
   end
 
   def test_render_html
-    @builder.type = :html
-    assert_equal("<table>\n  <tr>\n    <td>col1</td><td>col2</td>" +
-                 "<td>col3</td>\n  </tr>" +
-                 "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>" +
-                 "  <tr>\n    <td>d</td><td>e</td><td>f</td>\n  </tr>" +
-                 "\n</table>", @builder.render )
+    @builder.format = :html
+    assert_equal("<table>\n  <tr>\n    <th>col1</th><th>col2</th>" +
+                 "<th>col3</th>\n  </tr>\n" +
+                 "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>\n" +
+                 "  <tr>\n    <td>d</td><td>e</td><td>f</td>\n  </tr>\n" +
+                 "</table>", @builder.render )
   end
 
+  def test_render_text
+    @builder.format = :text
+    assert_equal( "fields: ( col1, col2, col3 )\n" +
+                  "row0: ( a, b, c )\n" +
+                  "row1: ( d, e, f )\n", @builder.render )
+  end
+  
   def test_render_csv
-    @builder.type = :csv
+    @builder.format = :csv
     assert_equal("col1,col2,col3\na,b,c\nd,e,f\n", @builder.render)
   end
+
+  def test_partial_rendering
+    my_data = Report::DataSet.new
+    my_data.fields = %w[ col1 col2 col3 ]
+    [ %w[ a b c], %w[ d e f ], %w[ g h i ], %w[ j k l ] ].each do |row|
+      my_data << row
+    end
+    
+    my_builder = Format::Builder.new( my_data )
+    my_builder.range = 1..2
+   
+    my_builder.format = :csv
+    assert_equal("col1,col2,col3\nd,e,f\ng,h,i\n", my_builder.render)
+      
+    my_builder.format = :html
+    assert_equal( "<table>\n  <tr>\n    <th>col1</th><th>col2</th>"+
+                  "<th>col3</th>\n  </tr>\n"+
+                  "  <tr>\n    <td>d</td><td>e</td><td>f</td>\n  </tr>\n" +
+                  "  <tr>\n    <td>g</td><td>h</td><td>i</td>\n  </tr>\n" +
+                  "</table>", my_builder.render )
+
+   my_builder.format = :text
+   assert_equal( "fields: ( col1, col2, col3 )\n" +
+                 "row1: ( d, e, f )\nrow2: ( g, h, i )\n",
+                 my_builder.render )
+  end
+
+  def test_complete_output
+    @builder.output_type = :complete
+    @builder.format      = :html
+    assert_equal( "<html><head><title></title></head><body>\n"+
+                  "<table>\n  <tr>\n    <th>col1</th><th>col2</th>" +
+                  "<th>col3</th>\n  </tr>\n" +
+                  "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>\n" +
+                  "  <tr>\n    <td>d</td><td>e</td><td>f</td>\n  </tr>\n" +
+                  "</table></body></html>\n", @builder.render )
+  end
+
+  def test_header
+    @builder.header = "This is a sample header"
+    @builder.format = :csv
+    assert_equal( "This is a sample header\n\n" +
+                  "col1,col2,col3\na,b,c\nd,e,f\n", @builder.render )
+    @builder.format = :html
+    assert_equal( "<table>\n  <tr>\n    <th colspan=3>"+
+                  "This is a sample header</th>\n  </tr>\n"+
+                  "  <tr>\n    <th>col1</th><th>col2</th>" +
+                  "<th>col3</th>\n  </tr>\n" +
+                  "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>\n" +
+                  "  <tr>\n    <td>d</td><td>e</td><td>f</td>\n  </tr>\n" +
+                  "</table>", @builder.render )
+    @builder.format = :text
+    assert_equal( "This is a sample header\n" +
+                  "fields: ( col1, col2, col3 )\n" +
+                  "row0: ( a, b, c )\n" +
+                  "row1: ( d, e, f )\n", @builder.render )
+
+    
+  end
+
+  def test_footer
+    @builder.footer = "This is a sample footer"
+    @builder.format = :csv
+    assert_equal( "col1,col2,col3\na,b,c\nd,e,f\n\n"+
+                  "This is a sample footer\n", @builder.render )
+    @builder.format = :html
+    assert_equal( "<table>\n  <tr>\n    <th>col1</th><th>col2</th>" +
+                  "<th>col3</th>\n  </tr>\n" +
+                  "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>\n" +
+                  "  <tr>\n    <td>d</td><td>e</td><td>f</td>\n  </tr>\n" +
+                  "  <tr>\n    <th colspan=3>"+
+                  "This is a sample footer</th>\n  </tr>\n"+
+                  "</table>", @builder.render )
+    @builder.format = :text
+    assert_equal( "fields: ( col1, col2, col3 )\n" +
+                  "row0: ( a, b, c )\n" +
+                  "row1: ( d, e, f )\n" +
+                  "This is a sample footer\n", @builder.render )
+
+  end
 end
+

data/test/tc_data_set.rb

@@ -69,11 +69,54 @@ class TestDataSet < Test::Unit::TestCase
   end
 
   def test_to_html
-    assert_equal("<table>\n  <tr>\n    <td>col1</td><td>col2</td>" +
-                 "<td>col3</td>\n  </tr>" +
-                 "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>" +
-                 "  <tr>\n    <td>d</td><td></td><td>e</td>\n  </tr>" +
-                 "\n</table>", @data.to_html )
+    assert_equal("<table>\n  <tr>\n    <th>col1</th><th>col2</th>" +
+                 "<th>col3</th>\n  </tr>\n" +
+                 "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>\n" +
+                 "  <tr>\n    <td>d</td><td></td><td>e</td>\n  </tr>\n" +
+                 "</table>", @data.to_html )
   end
 
+  def test_apply_tag
+    address_book = Report::DataSet.load("test/addressbook.csv")
+    address_book.apply_tag(:new_england) do |data|
+      data.select { |entry| %w[CT NH VT RI MA ME].include?(entry["state"]) }
+    end
+    address_book.apply_tag :generic
+    assert_equal( [ address_book[0], address_book[3] ],
+                  address_book.select { |e| e.tags.include?(:new_england) } )
+    assert_equal( address_book.to_a,
+                  address_book.select { |e| e.tags.include?(:generic) } )
+  end
+
+  def test_apply_tags
+    address_book = Report::DataSet.load("test/addressbook.csv")
+    tags = { :new_england => lambda { |data| 
+                 data.select { |e| %w[CT NH VT RI MA ME].include? e["state"] }
+             },
+             :generic => nil
+           }
+    address_book.apply_tags(tags)
+    assert_equal( [ address_book[0], address_book[3] ],
+                  address_book.select { |e| e.tags.include?(:new_england) } )
+    assert_equal( address_book.to_a,
+                  address_book.select { |e| e.tags.include?(:generic) } )
+
+  end
+
+  def test_select_field
+    assert_equal( [["a"],["d"]],
+                  @data.select_field("col1").map { |r| r.to_a } )
+    assert_equal( [["b"],[""]] , 
+                  @data.select_field("col2").map { |r| r.to_a } )
+    assert_equal( [["c"],["e"]],
+                  @data.select_field("col3").map { |r| r.to_a } )
+  end
+
+  def test_select_fields
+    assert_equal( [["a","b","c"],["d","","e"]],
+                  @data.select_fields("col1","col2","col3").map { |r| r.to_a })
+    assert_equal( [["c","a"],["e","d"]],
+                  @data.select_fields("col3","col1").map { |r| r.to_a } )
+  end
+          
 end

data/test/tc_engine.rb

@@ -1,21 +1,20 @@
-#tc_ruport.rb
+#tc_engine.rb
 #
 #  Created by Gregory Thomas Brown on 2005-08-09
 #  Copyright 2005 (Gregory Brown) All rights reserved.
 
 require "test/unit"
-require "lib/ruportlib"
+require "ruportlib"
 class TestEngine < Test::Unit::TestCase
-  
   def setup
-      @report = Report::FakeEngine.new( "DBI:mysql:ruport:localhost",
+      @engine = Report::FakeEngine.new( "DBI:mysql:ruport:localhost",
                                         "test", "123") 
-      @report.query_table = "ruport_queries"
+      @engine.query_table = "ruport_queries"
 
-      @report.fake_db = Report::FakeDB.new([ "DBI:mysql","ruport",
+      @engine.fake_db = Report::FakeDB.new([ "DBI:mysql","ruport",
                                      "localhost",  "test", "123"])
 
-      @report.fake_db["SELECT * FROM ruport_test"] = @data =
+      @engine.fake_db["SELECT * FROM ruport_test"] = @data =
         [ { "a" => "a column, row 1", "b" => "b column, row 1", 
             "c" => "c column, row 1", "d" => "d column, row 1" },
           { "a" => "a column, row 2", "b" => "b column, row 2",
@@ -23,7 +22,7 @@ class TestEngine < Test::Unit::TestCase
           { "a" => "a column, row 3", "b" => "b column, row 3",
             "c" => "c column, row 3", "d" => "d column, row 3" } ]
             
-       @report.fake_db[ "SELECT query FROM #{@report.query_table} " +
+       @engine.fake_db[ "SELECT query FROM #{@engine.query_table} " +
                         "WHERE label LIKE 'sql_stored_test';"] =
                         [ "query" => "SELECT * FROM ruport_test" ]
   end
@@ -32,19 +31,19 @@ class TestEngine < Test::Unit::TestCase
     contents = "SELECT * FROM ruport_test"
     
     #relative to working dir
-    assert_equal(contents, @report.load_file("test/test.sql"));
+    assert_equal(contents, @engine.load_file("test/test.sql"));
     
     #absolute path
     assert_equal(contents, 
-                 @report.load_file(File.expand_path("test/test.sql")))
+                 @engine.load_file(File.expand_path("test/test.sql")))
   end
   
   def test_sql_generation
-    sql = @report.fetch do
+    sql = @engine.fetch do
       from :ruport_test
     end
     assert_equal("SELECT * FROM ruport_test;", sql)
-    sql = @report.fetch do
+    sql = @engine.fetch do
       from :ruport_test
       condition :last_name, :"=", "Brown"
       order    :first_name
@@ -57,28 +56,47 @@ class TestEngine < Test::Unit::TestCase
     config_hash = { :name   => "Greg",
                     :friend => "Rob",
                     :job    => "Programmer" }
-    @report.load_yaml "test/test.yaml"
+    @engine.load_yaml "test/test.yaml"
     config_hash.each do |key, value|
-      assert_equal(value,@report.config[key])
+      assert_equal(value,@engine.config[key])
     end
   end
 
   def test_sql_file
-    @report.query("test/test.sql",:file) do |result|
+    @engine.query("test/test.sql",:file) do |result|
       assert_equal(@data,result)
     end
   end
 
   def test_sql_stored
-    @report.query("sql_stored_test",:db) do |result|
+    @engine.query("sql_stored_test",:db) do |result|
       assert_equal(@data,result)
     end
   end
 
   def test_query
-    @report.query("SELECT * FROM ruport_test") do |result|
+    @engine.query("SELECT * FROM ruport_test") do |result|
       assert_equal(@data,result)
     end
   end
+
+  def test_render
+    data = Report::DataSet.new
+    data.fields = %w[ col1 col2 col3]
+    data << %w[ a b c]
+    data << %w[ d e f]
+    assert_equal("col1,col2,col3\na,b,c\nd,e,f\n", 
+                 @engine.render(data) do |builder|
+                   builder.format = :csv
+                 end )
+
+    assert_equal("<table>\n  <tr>\n    <th>col1</th><th>col2</th>" +
+                 "<th>col3</th>\n  </tr>\n" +
+                 "  <tr>\n    <td>a</td><td>b</td><td>c</td>\n  </tr>\n" +
+                 "  <tr>\n    <td>d</td><td>e</td><td>f</td>\n  </tr>\n" +
+                 "</table>", @engine.render(data) do |builder|
+                   builder.format = :html
+                 end )  
+  end
   
 end  

data/test/test.sql

@@ -0,0 +1 @@
+SELECT * FROM ruport_test

data/test/test.yaml

@@ -0,0 +1,3 @@
+:name: Greg
+:friend: Rob
+:job: Programmer

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.10
 specification_version: 1
 name: ruport
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
-date: 2005-11-16 00:00:00 -06:00
+  version: 0.2.9
+date: 2005-11-28
 summary: A generalized Ruby report generation and templating engine.
 require_paths: 
   - lib
@@ -24,8 +24,6 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
   - Gregory Brown
 files: 
@@ -40,19 +38,26 @@ files:
   - lib/ruport/report/fake_mailer.rb
   - lib/ruport/report/mailer.rb
   - lib/ruport/report/sql.rb
+  - bin/ruport
+  - AUTHORS
+  - CHANGELOG
+  - COPYING
+  - LICENSE
+  - Rakefile
+  - README
+  - TODO
+  - test/addressbook.csv
+  - test/data.csv
   - test/tc_builder.rb
   - test/tc_data_row.rb
   - test/tc_data_set.rb
   - test/tc_engine.rb
   - test/tc_mailer.rb
+  - test/test.sql
+  - test/test.yaml
+  - test/ts_all.rb
+test_files: 
   - test/ts_all.rb
-  - Rakefile
-  - README
-  - LICENSE
-  - TODO
-  - AUTHORS
-  - CHANGELOG
-test_files: []
 rdoc_options: 
   - "--title"
   - Ruport Documentation
@@ -68,4 +73,14 @@ executables:
   - ruport
 extensions: []
 requirements: []
-dependencies: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: fastercsv
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.1.0
+      version: