smarter_csv 1.0.6 → 1.0.7

data/README.md

@@ -151,6 +151,7 @@ The options and the block are optional.
      | :headers_in_file            |   true   | Whether or not the file contains headers as the first line.                          |
      |                             |          | Important if the file does not contain headers,                                      |
      |                             |          | otherwise you would lose the first line of data.                                     |
+     | :file_encoding              |   utf-8  | Set the file encoding eg.: 'windows-1252' or 'iso-8859-1'                            |
 
 
 #### NOTES about CSV Headers:
@@ -196,6 +197,12 @@ Or install it yourself as:
 
 ## Changes
 
+#### 1.0.7 (2013-05-20)
+
+ * allowing process to work with objects with a 'readline' method (thanks to taq)
+ * added options:
+    * :file_encoding : defaults to utf8  (thanks to MrTin, Paxa)
+
 #### 1.0.6 (2013-05-19)
 
  * bugfix : quoted fields are now correctly parsed

data/lib/smarter_csv/smarter_csv.rb

@@ -3,11 +3,11 @@ module SmarterCSV
   class HeaderSizeMismatch < Exception
   end
 
-  def SmarterCSV.process(filename, options={}, &block)
+  def SmarterCSV.process(input, options={}, &block)   # first parameter: filename or input object with readline method
     default_options = {:col_sep => ',' , :row_sep => $/ , :quote_char => '"',
       :remove_empty_values => true, :remove_zero_values => false , :remove_values_matching => nil , :remove_empty_hashes => true , :strip_whitespace => true, 
       :convert_values_to_numeric => true, :strip_chars_from_headers => nil , :user_provided_headers => nil , :headers_in_file => true,
-      :comment_regexp => /^#/, :chunk_size => nil , :key_mapping_hash => nil , :downcase_header => true, :strings_as_keys => false 
+      :comment_regexp => /^#/, :chunk_size => nil , :key_mapping_hash => nil , :downcase_header => true, :strings_as_keys => false, :file_encoding => 'utf-8'
     }
     options = default_options.merge(options)
     headerA = []
@@ -15,7 +15,7 @@ module SmarterCSV
     old_row_sep = $/
     begin
       $/ = options[:row_sep]
-      f = File.open(filename, "r")
+      f = input.respond_to?(:readline) ? input : File.open(input, "r:#{options[:file_encoding]}")
 
       if options[:headers_in_file]        # extract the header line
         # process the header line in the CSV file..
@@ -38,7 +38,7 @@ module SmarterCSV
         headerA = options[:user_provided_headers]
         if defined?(file_header_size) && ! file_header_size.nil?
           if headerA.size != file_header_size
-            raise SmarterCSV::HeaderSizeMismatch , "ERROR [smarter_csv]: :user_provided_headers defines #{headerA.size} headers !=  CSV-file #{filename} has #{file_header_size} headers" 
+            raise SmarterCSV::HeaderSizeMismatch , "ERROR [smarter_csv]: :user_provided_headers defines #{headerA.size} headers !=  CSV-file #{input} has #{file_header_size} headers" 
           else
             # we could print out the mapping of file_headerA to headerA here
           end

data/lib/smarter_csv/version.rb

@@ -1,3 +1,3 @@
 module SmarterCSV
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smarter_csv
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors: