csv_party 0.0.1.pre2 → 0.0.1.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ddb8c3205a36c4ed2b5dd97baf32e60d1da2bb
-  data.tar.gz: f7bd204ac0a1f74b0f7cd5e90df88fa36edc8e7c
+  metadata.gz: 1e5823d9eec07faf638ab898d7082be890c73373
+  data.tar.gz: f3b115f8fd4055e141629fc3fc92ac39278dbb2f
 SHA512:
-  metadata.gz: d00c4e83bf4f3564f15c9abf6159e209652a1f04b99df349211a7040b47d8670804a6b4c38c77594e2d75fa1735581b706baa0fa45a1ff449180d5112881e474
-  data.tar.gz: 7778782ffea56a91250478b23fb8ad5634c5b17f1c94b0ef94910c6544e25d242f6c457cbc0f644316eaa1fc28d0827cfeb99d732ba72ea5b27182c8507f456f
+  metadata.gz: 3c89169637d692dec361b79b87e5e392050224e43869f0d7a6f66decb3ca1edaed8e7dab777a288ac17c5557ef2964bc5f51a80a841f73601158e22021bf44e5
+  data.tar.gz: 4b677735ca562a25d30fd1a46b999d2803b4f73cf187db340f33f373c7acda071f96ffe1614dc6c51dbde7f2ceddc40c88a4738afb44f97ba40b3703f31accce

data/lib/csv_party.rb

@@ -35,7 +35,13 @@ class CSVParty
       parser = options[:parser]
 
       unparsed_row[name] = unparsed_value
-      parsed_row[name] = instance_exec(unparsed_value, &parser)
+      parsed_row[name] = if options[:blanks_as_nil] && is_blank?(unparsed_value)
+                           nil
+                         elsif parser.is_a? Symbol
+                           send(parser, unparsed_value)
+                         else
+                           instance_exec(unparsed_value, &parser)
+                         end
     end
 
     parsed_row['unparsed'] = unparsed_row
@@ -57,20 +63,22 @@ class CSVParty
     raise_if_duplicate_column(name)
     raise_if_missing_header(name, options)
 
-    if block_given?
-      columns[name] = { header: options[:header], parser: block }
-    else
-      parser_method = if options.has_key?(:as)
-                        "#{options[:as]}_parser".to_sym
-                      else
-                        :string_parser
-                      end
-      columns[name] = {
-        header: options[:header],
-        parser: proc { |value| send(parser_method, value) },
-        parser_method: parser_method
-      }
-    end
+    options = {
+      blanks_as_nil: (options[:as] == :raw ? false : true),
+      as: :string
+    }.merge(options)
+
+    parser = if block_given?
+               block
+             else
+               "#{options[:as]}_parser".to_sym
+             end
+
+    columns[name] = {
+      header: options[:header],
+      parser: parser,
+      blanks_as_nil: options[:blanks_as_nil]
+    }
   end
 
   def self.columns
@@ -120,6 +128,10 @@ class CSVParty
 
   private
 
+  def is_blank?(value)
+    value.nil? || value.strip.empty?
+  end
+
   def raw_parser(value)
     value
   end
@@ -133,7 +145,6 @@ class CSVParty
   end
 
   def integer_parser(value)
-    return nil if value.nil? || value.strip.empty?
     value.to_i
   end
 
@@ -147,7 +158,7 @@ class CSVParty
   end
 
   def columns_with_named_parsers
-    columns.select { |_name, options| options.has_key?(:parser_method) }
+    columns.select { |_name, options| options[:parser].is_a? Symbol }
   end
 
   # This error has to be raised at runtime because, when the class body
@@ -155,7 +166,7 @@ class CSVParty
   # they are defined above the column definitions in the class body
   def raise_unless_named_parsers_are_valid
     columns_with_named_parsers.each do |name, options|
-      parser = options[:parser_method]
+      parser = options[:parser]
       next if named_parsers.include? parser
 
       parser = parser.to_s.gsub('_parser', '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_party
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
+  version: 0.0.1.pre3
 platform: ruby
 authors:
 - Rico Jones
@@ -17,7 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/csv_party.rb
-homepage: http://rubygems.org/gems/csv_party
+homepage: https://github.com/toasterlovin/csv_party
 licenses:
 - MIT
 metadata: {}