fastercsv 0.1.6 → 0.1.8

data/AUTHORS

@@ -0,0 +1 @@
+<b>James Edward Gray II</b>::  {james@grayproductions.net}[mailto:james@grayproductions.net]

data/CHANGELOG

@@ -2,6 +2,15 @@
 
 Below is a complete listing of changes for each revision of FasterCSV.
 
+== 0.1.8
+
+* Converted FasterCSV.filter() to use ARGF for input.
+* Made FasterCSV.<<() aware of FasterCSV::Row objects.
+* Switched header rows to include the unconverted headers as fields.
+* Rescued IOError when trying to auto detect a line-ending on an output stream
+  and used the default system line-ending.
+* Added FasterCSV::Row.header_row?() and FasterCSV::Row.field_row?().
+
 == 0.1.6
 
 * Began using a forked development/stable versioning system.

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

@@ -9,7 +9,8 @@ Welcome to FasterCSV.
 FasterCSV is intended as a replacement to Ruby's standard CSV library.  It was designed to address concerns users of that library had and it has three primary goals:
 
 1.  Be significantly faster than CSV while remaining a pure Ruby library.
-2.  Use a smaller and easier to maintain code base.
+2.  Use a smaller and easier to maintain code base.  (We're about even now,
+    but not if you compare the features!)
 3.  Improve on the CSV interface.
 
 Obviously, the last one is subjective.  If you love CSV's interface, odds are

data/Rakefile

@@ -44,19 +44,20 @@ end
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "fastercsv"
-	spec.version = "0.1.6"
+	spec.version = "0.1.8"
 	spec.platform = Gem::Platform::RUBY
 	spec.summary = "FasterCSV is CSV, but faster, smaller, and cleaner."
 
-	spec.files = Dir.glob("{lib,test}/**/*.rb").
+	spec.files = Dir.glob("{lib,test,examples}/**/*.rb").
 	                 reject { |item| item.include?(".svn") } +
-	             Dir.glob("test/**/*.csv").
+	             Dir.glob("{test,examples}/**/*.csv").
 	                 reject { |item| item.include?(".svn") } +
 	                 ["Rakefile", "setup.rb"]
 	spec.test_suite_file = "test/ts_all.rb"
 
 	spec.has_rdoc = true
-	spec.extra_rdoc_files = %w{README INSTALL TODO CHANGELOG LICENSE}
+	spec.extra_rdoc_files = %w{ AUTHORS COPYING README INSTALL TODO CHANGELOG
+	                            LICENSE }
 	spec.rdoc_options << "--title" << "FasterCSV Documentation" <<
 	                     "--main"  << "README"
 

data/examples/csv_filter.rb

@@ -0,0 +1,15 @@
+#!/usr/local/bin/ruby -w
+
+require "faster_csv"
+
+running_total = 0
+FasterCSV.filter( :headers           => true,
+                  :return_headers    => true,
+                  :header_converters => :symbol,
+                  :converters        => :numeric ) do |row|
+  if row.header_row?
+    row << "Running Total"
+  else
+    row << (running_total += row[:quantity] * row[:price])
+  end
+end

data/examples/purchase.csv

@@ -0,0 +1,3 @@
+Quantity,Product Description,Price
+1,Text Editor,25.00
+2,MacBook Pros,2499.00

data/lib/faster_csv.rb

@@ -7,10 +7,11 @@
 # 
 # See FasterCSV for documentation.
 
-require "stringio"
 require "forwardable"
+require "english"
 require "enumerator"
 require "date"
+require "stringio"
 
 # 
 # This class provides a complete interface to CSV files and data.  It offers
@@ -81,7 +82,13 @@ class FasterCSV
     # expected to be Arrays.  If one Array is shorter than the other, it will be
     # padded with +nil+ objects.
     # 
-    def initialize( headers, fields )
+    # The optional +header_row+ parameter can be set to +true+ to indicate, via
+    # FasterCSV::Row.header_row?() and FasterCSV::Row.field_row?(), that this is
+    # a header row.  Otherwise, the row is assumes to be a field row.
+    # 
+    def initialize( headers, fields, header_row = false )
+      @header_row = header_row
+      
       # handle extra headers or fields
       @row = if headers.size > fields.size
         headers.zip(fields)
@@ -90,6 +97,16 @@ class FasterCSV
       end
     end
     
+    # Returns +true+ if this is a header row.
+    def header_row?
+      @header_row
+    end
+    
+    # Returns +true+ if this is a field row.
+    def field_row?
+      not header_row?
+    end
+    
     # Returns the headers of this row.
     def headers
       @row.map { |pair| pair.first }
@@ -392,38 +409,41 @@ class FasterCSV
   # 
   # This method is a convenience for building Unix-like filters for CSV data.
   # Each row is yielded to the provided block which can alter it as needed.  
-  # After the block returns, the row is appended to _output_ altered or not.
+  # After the block returns, the row is appended to +output+ altered or not.
   # 
-  # The _input_ and _output_ arguments can be anything FasterCSV::new() accepts
+  # The +input+ and +output+ arguments can be anything FasterCSV::new() accepts
   # (generally String or IO objects).  If not given, they default to 
-  # <tt>$stdin</tt> and <tt>$stdout</tt>.
+  # <tt>ARGF</tt> and <tt>STDOUT</tt>.
   # 
-  # The _options_ parameter is also filtered down to FasterCSV::new() after some
+  # The +options+ parameter is also filtered down to FasterCSV::new() after some
   # clever key parsing.  Any key beginning with <tt>:in_</tt> or 
   # <tt>:input_</tt> will have that leading identifier stripped and will only
-  # be used in the _options_ Hash for the _input_ object.  Keys starting with
-  # <tt>:out_</tt> or <tt>:output_</tt> affect only _output_.  All other keys 
+  # be used in the +options+ Hash for the +input+ object.  Keys starting with
+  # <tt>:out_</tt> or <tt>:output_</tt> affect only +output+.  All other keys 
   # are assigned to both objects.
   # 
+  # The <tt>:output_row_sep</tt> +option+ defaults to
+  # <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
+  # 
   def self.filter( *args )
     # parse options for input, output, or both
-    input_options, output_options = Hash.new, Hash.new
+    in_options, out_options = Hash.new, {:row_sep => $INPUT_RECORD_SEPARATOR}
     if args.last.is_a? Hash
       args.pop.each do |key, value|
         case key.to_s
         when /\Ain(?:put)?_(.+)\Z/
-          input_options[$1.to_sym] = value
+          in_options[$1.to_sym] = value
         when /\Aout(?:put)?_(.+)\Z/
-          output_options[$1.to_sym] = value
+          out_options[$1.to_sym] = value
         else
-          input_options[key]  = value
-          output_options[key] = value
+          in_options[key]  = value
+          out_options[key] = value
         end
       end
     end
     # build input and output wrappers
-    input   = FasterCSV.new(args.shift || $stdin,  input_options)
-    output  = FasterCSV.new(args.shift || $stdout, output_options)
+    input   = FasterCSV.new(args.shift || ARGF,   in_options)
+    output  = FasterCSV.new(args.shift || STDOUT, out_options)
     
     # read, yield, write
     input.each do |row|
@@ -480,7 +500,11 @@ class FasterCSV
   # 
   # The +options+ parameter can be anthing FasterCSV::new() understands.
   # 
+  # The <tt>:row_sep</tt> +option+ defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>
+  # (<tt>$/</tt>) when calling this method.
+  # 
   def self.generate_line( row, options = Hash.new )
+    options = {:row_sep => $INPUT_RECORD_SEPARATOR}.merge(options)
     (new("", options) << row).string
   end
   
@@ -626,8 +650,13 @@ class FasterCSV
   #                                       even if it occurs in a quoted field,
   #                                       assuming that you would have the same
   #                                       line endings there.  If none of those
-  #                                       sequences is found, the default
-  #                                       <tt>$/</tt> is used.  Obviously,
+  #                                       sequences is found, +data+ is
+  #                                       <tt>ARGF</tt>, <tt>STDIN</tt>,
+  #                                       <tt>STDOUT</tt>, or <tt>STDERR</tt>,
+  #                                       or the stream is only available for
+  #                                       output, the default
+  #                                       <tt>$INPUT_RECORD_SEPARATOR</tt>
+  #                                       (<tt>$/</tt>) is used.  Obviously,
   #                                       discovery takes a little time.  Set
   #                                       manually if speed is important.
   # <b><tt>:converters</tt></b>::         An Array of names from the Converters
@@ -645,7 +674,8 @@ class FasterCSV
   #                                       swallowed.  If set to +true+, header
   #                                       rows are returned in a FasterCSV::Row
   #                                       object with identical headers and
-  #                                       fields.
+  #                                       fields (save that the fields do not go
+  #                                       through the converters).
   # <b><tt>:header_converters</tt></b>::  Identical in functionality to
   #                                       <tt>:converters</tt> save that the
   #                                       conversions are only made to header
@@ -685,12 +715,17 @@ class FasterCSV
   ### End Delegation ###
   
   # 
-  # The primary write method for wrapped Strings and IOs, +row+ (an Array) is
-  # converted to CSV and appended to the data source.
+  # The primary write method for wrapped Strings and IOs, +row+ (an Array or
+  # FasterCSV::Row) is converted to CSV and appended to the data source.  When a
+  # FasterCSV::Row is passed, only the row's fields() are appended to the
+  # output.
   # 
   # The data source must be open for writing.
   # 
   def <<( row )
+    # handle FasterCSV::Row objects
+    row = row.fields if row.is_a? self.class::Row
+    
     @io << row.map do |field|
       if field.nil?  # reverse +nil+ fields as empty unquoted fields
         ""
@@ -839,12 +874,10 @@ class FasterCSV
 
       # if parse is empty?(), we found all the fields on the line...
       if parse.empty?
-        # convert headers or fields if needed...
-        csv = convert_fields(csv) if ( header_row? and
-                                       not @header_converters.empty? ) or
-                                     not @converters.empty?
+        # convert fields if needed...
+        csv = convert_fields(csv) unless header_row? or @converters.empty?
         # parse out header rows and handle FasterCSV::Row conversions...
-        csv = parse_headers(csv)  if @use_headers
+        csv = parse_headers(csv)  if     @use_headers
         # return the results
         break csv
       end
@@ -862,7 +895,10 @@ class FasterCSV
   # Stores the indicated separators for later use.
   # 
   # If auto-discovery was requested for <tt>@row_sep</tt>, this method will read
-  # ahead in the <tt>@io</tt> and try to find one.
+  # ahead in the <tt>@io</tt> and try to find one.  <tt>ARGF</tt>,
+  # <tt>STDIN</tt>, <tt>STDOUT</tt>, <tt>STDERR</tt> and any stream open for
+  # output only with a default <tt>@row_sep</tt> of
+  # <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
   # 
   def init_separators( options )
     # store the selected separators
@@ -870,28 +906,38 @@ class FasterCSV
     @row_sep = options.delete(:row_sep)
     
     # automatically discover row separator when requested
-    saved_pos = @io.pos  # remember where we were
-    while @row_sep == :auto
-      # 
-      # if we run out of data, it's probably a single line 
-      # (use a sensible default)
-      # 
-      if @io.eof?
-        @row_sep = $/
-        break
-      end
+    if @row_sep == :auto
+      if [ARGF, STDIN, STDOUT, STDERR].include? @io
+        @row_sep = $INPUT_RECORD_SEPARATOR
+      else
+        begin
+          saved_pos = @io.pos  # remember where we were
+          while @row_sep == :auto
+            # 
+            # if we run out of data, it's probably a single line 
+            # (use a sensible default)
+            # 
+            if @io.eof?
+              @row_sep = $INPUT_RECORD_SEPARATOR
+              break
+            end
       
-      # read ahead a bit
-      sample =  @io.read(1024)
-      sample += @io.read(1) if sample[-1..-1] == "\r" and not @io.eof?
+            # read ahead a bit
+            sample =  @io.read(1024)
+            sample += @io.read(1) if sample[-1..-1] == "\r" and not @io.eof?
       
-      # try to find a standard separator
-      if sample =~ /\r\n?|\n/
-        @row_sep = $&
-        break
+            # try to find a standard separator
+            if sample =~ /\r\n?|\n/
+              @row_sep = $&
+              break
+            end
+          end
+          @io.seek(saved_pos)  # reset back to the remembered position 
+        rescue IOError  # stream not opened for reading
+          @row_sep = $INPUT_RECORD_SEPARATOR
+        end
       end
     end
-    @io.seek(saved_pos)  # reset back to the remembered position 
   end
   
   # Pre-compiles parsers and stores them by name for access during reads.
@@ -981,10 +1027,11 @@ class FasterCSV
   end
   
   # 
-  # Processes +fields+ with <tt>@converters</tt>, returning the converted field
-  # set.  Any converter that changes the field into something other than a
-  # String halts the pipeline of conversion for that field.  This is primarily
-  # an efficiency shortcut.
+  # Processes +fields+ with <tt>@converters</tt>, or <tt>@header_converters</tt>
+  # if this is a header_row?(), returning the converted field set.  Any
+  # converter that changes the field into something other than a String halts
+  # the pipeline of conversion for that field.  This is primarily an efficiency
+  # shortcut.
   # 
   def convert_fields( fields )
     converters = if header_row?  # see if we are converting headers or fields
@@ -1009,14 +1056,15 @@ class FasterCSV
   # 
   # This methods is used to turn a finished +row+ into a FasterCSV::Row.  Header
   # rows are also dealt with here, either by returning a FasterCSV::Row with
-  # identical headers and fields or by reading past them to return a field row.
-  # Headers are also saved in <tt>@headers</tt> for use in future rows.
+  # identical headers and fields (save that the fields do not go through the
+  # converters) or by reading past them to return a field row. Headers are also
+  # saved in <tt>@headers</tt> for use in future rows.
   # 
   def parse_headers( row )
     if @headers.nil?  # header row
-      @headers = row  # save
+      @headers = convert_fields(row)  # save
       if @return_headers  # return the headers
-        FasterCSV::Row.new(@headers, @headers)
+        FasterCSV::Row.new(@headers, row, true)
       else                # skip to next field row
         shift
       end

data/test/tc_features.rb

@@ -59,6 +59,8 @@ class TestFasterCSVFeatures < Test::Unit::TestCase
     assert_equal("\n", FasterCSV.new("\n\r\n\r").instance_eval { @row_sep })
     
     assert_equal($/, FasterCSV.new("").instance_eval { @row_sep })
+    
+    assert_equal($/, FasterCSV.new(STDERR).instance_eval { @row_sep })
   end
   
   def test_unknown_options

data/test/tc_headers.rb

@@ -56,18 +56,24 @@ class TestFasterCSVHeaders < Test::Unit::TestCase
     assert_instance_of(FasterCSV::Row, row)
     assert_equal( [%w{first first}, %w{second second}, %w{third third}],
                   row.to_a )
+    assert(row.header_row?)
+    assert(!row.field_row?)
 
     # first data row - skipping headers
     row = csv.shift
     assert_not_nil(row)
     assert_instance_of(FasterCSV::Row, row)
     assert_equal([%w{first A}, %w{second B}, %w{third C}], row.to_a)
+    assert(!row.header_row?)
+    assert(row.field_row?)
 
     # second data row
     row = csv.shift
     assert_not_nil(row)
     assert_instance_of(FasterCSV::Row, row)
     assert_equal([%w{first 1}, %w{second 2}, %w{third 3}], row.to_a)
+    assert(!row.header_row?)
+    assert(row.field_row?)
 
     # empty
     assert_nil(csv.shift)
@@ -95,7 +101,7 @@ class TestFasterCSVHeaders < Test::Unit::TestCase
                                    :converters        => :numeric,
                                    :header_converters => :symbol )
     end
-    assert_equal([[:"1", :"1"], [:"2", :"2"], [:"3", :"3"]], csv.shift.to_a)
+    assert_equal([[:"1", "1"], [:"2", "2"], [:"3", "3"]], csv.shift.to_a)
     assert_equal([[:"1", 1], [:"2", 2], [:"3", 3]], csv.shift.to_a)
     assert_nil(csv.shift)
   end

data/test/tc_interface.rb

@@ -137,6 +137,15 @@ class TestFasterCSVInterface < Test::Unit::TestCase
     end
 
     test_shift
+
+    # same thing using FasterCSV::Row objects
+    File.unlink(@path)
+    
+    FasterCSV.open(@path, "w", :col_sep => "\t", :row_sep => "\r\n") do |csv|
+      @expected.each { |row| csv << FasterCSV::Row.new(Array.new, row) }
+    end
+
+    test_shift
   end
   
   ### Test Read and Write Interface ###

data/test/tc_row.rb

@@ -34,6 +34,21 @@ class TestFasterCSVRow < Test::Unit::TestCase
     assert_equal([["A", 1], ["B", 2], ["C", nil]], row.to_a)
   end
   
+  def test_row_type
+    # field rows
+    row = FasterCSV::Row.new(%w{A B C}, [1, 2, 3])         # implicit
+    assert(!row.header_row?)
+    assert(row.field_row?)
+    row = FasterCSV::Row.new(%w{A B C}, [1, 2, 3], false)  # explicit
+    assert(!row.header_row?)
+    assert(row.field_row?)
+
+    # header row
+    row = FasterCSV::Row.new(%w{A B C}, [1, 2, 3], true)
+    assert(row.header_row?)
+    assert(!row.field_row?)
+  end
+  
   def test_headers
     assert_equal(%w{A B C A A}, @row.headers)
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: fastercsv
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
-date: 2006-02-25 00:00:00 -06:00
+  version: 0.1.8
+date: 2006-02-27 00:00:00 -06:00
 summary: FasterCSV is CSV, but faster, smaller, and cleaner.
 require_paths: 
 - lib
@@ -38,9 +38,13 @@ files:
 - test/tc_row.rb
 - test/tc_speed.rb
 - test/ts_all.rb
+- examples/csv_filter.rb
 - test/test_data.csv
+- examples/purchase.csv
 - Rakefile
 - setup.rb
+- AUTHORS
+- COPYING
 - README
 - INSTALL
 - TODO
@@ -54,6 +58,8 @@ rdoc_options:
 - --main
 - README
 extra_rdoc_files: 
+- AUTHORS
+- COPYING
 - README
 - INSTALL
 - TODO