smarter_csv 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 48d8c593c902730176cc44664a1504ae041e984b
-  data.tar.gz: df04a687fb895502d6cebcc748a931dc060de4a7
+  metadata.gz: c8d2d18557f4dbffe6711681fa15d783f6521362
+  data.tar.gz: 1a9e8f007ccbd329d77d6f990f77e0073a66026d
 SHA512: 
-  metadata.gz: 01582b2515dcad6d402ea6130ffafb5cadbbf04bc2bc13d8d57b73573642ad46fa8c5e3ca1b4d3b831a6bf1c46133fcba1149bce1635ad8d643af5aac1a83a86
-  data.tar.gz: d7c1b27060c6a8b1768b37f2fbad22e62cdc99d8c2deaff28753960a8bf5d31da7609d06bc7d799e3dbc940127672cf28d718362058564d997e4d020c0b01df0
+  metadata.gz: 8450de646c3573ec1fc87001dedbbf6ef5b062fd7bf2ab7dc91ef3973821f21dda1e5a8a613f8912faae3e632b9da1d97c29a7708172784dd8c50c075c31a5a9
+  data.tar.gz: 77b632311d95dc2e4a4bac5f7a28c6702be0c72fc6686e90c169851ae8a8ff60e962918fdbe48acf8f3d87ac323a37826f72000c59a3c8e60d08a206d65b210c

data/README.md

@@ -200,6 +200,9 @@ Or install it yourself as:
 
 ## Changes
 
+#### 1.0.10 (2013-06-26)
+ * bugfix : fixed issue #14 - passing options along to CSV.parse (thank to Marcos Zimmermann)
+
 #### 1.0.9 (2013-06-19)
  * bugfix : fixed issue #13 with negative integers and floats not being correctly converted (thanks to Graham Wetzler)
 
@@ -278,6 +281,7 @@ And a special thanks to those who contributed pull requests:
  * [Pavel](http://github.com/paxa) 
  * [Félix Bellanger](https://github.com/Keeguon)
  * [Graham Wetzler](https://github.com/grahamwetzler)
+ * [Marcos G. Zimmermann](https://github.com/marcosgz)
 
 
 ## Contributing

data/lib/smarter_csv/smarter_csv.rb

@@ -5,11 +5,12 @@ module SmarterCSV
 
   def SmarterCSV.process(input, options={}, &block)   # first parameter: filename or input object with readline method
     default_options = {:col_sep => ',' , :row_sep => $/ , :quote_char => '"', :force_simple_split => false , :verbose => false ,
-      :remove_empty_values => true, :remove_zero_values => false , :remove_values_matching => nil , :remove_empty_hashes => true , :strip_whitespace => true, 
+      :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, :file_encoding => 'utf-8'
     }
     options = default_options.merge(options)
+    csv_options = options.select{|k,v| [:col_sep, :row_sep, :quote_char].include?(k)} # options.slice(:col_sep, :row_sep, :quote_char)
     headerA = []
     result = []
     old_row_sep = $/
@@ -25,7 +26,7 @@ module SmarterCSV
         line_count += 1
         header = header.gsub(options[:strip_chars_from_headers], '') if options[:strip_chars_from_headers]
         if (header =~ %r{#{options[:quote_char]}}) and (! options[:force_simple_split])
-          file_headerA = CSV.parse( header ).flatten.collect!{|x| x.nil? ? '' : x} # to deal with nil values from CSV.parse
+          file_headerA = CSV.parse( header, csv_options ).flatten.collect!{|x| x.nil? ? '' : x} # to deal with nil values from CSV.parse
         else
           file_headerA =  header.split(options[:col_sep])
         end
@@ -36,11 +37,11 @@ module SmarterCSV
         file_header_size = file_headerA.size
       end
       if options[:user_provided_headers] && options[:user_provided_headers].class == Array && ! options[:user_provided_headers].empty?
-        # use user-provided headers 
+        # use user-provided headers
         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 #{input} 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
@@ -49,10 +50,10 @@ module SmarterCSV
         headerA = file_headerA
       end
       headerA.map!{|x| x.to_sym } unless options[:strings_as_keys]
-      
-      unless options[:user_provided_headers] # wouldn't make sense to re-map user provided headers 
+
+      unless options[:user_provided_headers] # wouldn't make sense to re-map user provided headers
         key_mappingH = options[:key_mapping]
-      
+
         # do some key mapping on the keys in the file header
         #   if you want to completely delete a key, then map it to nil or to ''
         if ! key_mappingH.nil? && key_mappingH.class == Hash && key_mappingH.keys.size > 0
@@ -79,7 +80,7 @@ module SmarterCSV
         line.chomp!    # will use $/ which is set to options[:col_sep]
 
         if (line =~ %r{#{options[:quote_char]}}) and (! options[:force_simple_split])
-          dataA = CSV.parse( line ).flatten.collect!{|x| x.nil? ? '' : x} # to deal with nil values from CSV.parse
+          dataA = CSV.parse( line, csv_options ).flatten.collect!{|x| x.nil? ? '' : x} # to deal with nil values from CSV.parse
         else
           dataA =  line.split(options[:col_sep])
         end
@@ -102,7 +103,7 @@ module SmarterCSV
             when /^[+-]?\d+\.\d+$/
               hash[k] = v.to_f
             when /^[+-]?\d+$/
-              hash[k] = v.to_i 
+              hash[k] = v.to_i
             end
           end
         end
@@ -110,7 +111,7 @@ module SmarterCSV
 
         if use_chunks
           chunk << hash  # append temp result to chunk
-          
+
           if chunk.size >= chunk_size || f.eof?   # if chunk if full, or EOF reached
             # do something with the chunk
             if block_given?
@@ -122,7 +123,7 @@ module SmarterCSV
             chunk = []  # initialize for next chunk of data
           end
           # while a chunk is being filled up we don't need to do anything else here
-          
+
         else # no chunk handling
           if block_given?
             yield [hash]  # do something with the hash in the block (better to use chunking here)

data/lib/smarter_csv/version.rb

@@ -1,3 +1,3 @@
 module SmarterCSV
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smarter_csv
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors: 
 - |
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-19 00:00:00 Z
+date: 2013-06-26 00:00:00 Z
 dependencies: []
 
 description: Ruby Gem for smarter importing of CSV Files as Array(s) of Hashes, with optional features for processing large files in parallel, embedded comments, unusual field- and record-separators, flexible mapping of CSV-headers to Hash-keys