csv_party 0.0.1.pre → 0.0.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475350af4d86e4c6586ea1752a731a888ddb336d
-  data.tar.gz: 679da67bcacd832eb394f0bd93f483babcf44ecc
+  metadata.gz: c0ddb8c3205a36c4ed2b5dd97baf32e60d1da2bb
+  data.tar.gz: f7bd204ac0a1f74b0f7cd5e90df88fa36edc8e7c
 SHA512:
-  metadata.gz: 9c91fdd4277ba7e80b9561333879386c115dbaa58df621705cdbfae8d517ab7a74b2298efdc8f45e32be014f2718d1c2fa8fcaba3adbb17db13b0e38ffda934b
-  data.tar.gz: 58597567ec2ab2e1950bbc32a7526fe57ebe632437074661dcfc7c3390a90f570ce90ce203acfd622f84dea4aedea5e9d429206953bd21eb59621e986cfd596e
+  metadata.gz: d00c4e83bf4f3564f15c9abf6159e209652a1f04b99df349211a7040b47d8670804a6b4c38c77594e2d75fa1735581b706baa0fa45a1ff449180d5112881e474
+  data.tar.gz: 7778782ffea56a91250478b23fb8ad5634c5b17f1c94b0ef94910c6544e25d242f6c457cbc0f644316eaa1fc28d0827cfeb99d732ba72ea5b27182c8507f456f

data/lib/csv_party.rb

@@ -3,66 +3,76 @@ require 'bigdecimal'
 require 'ostruct'
 
 class CSVParty
-  def initialize(csv_path)
+  def initialize(csv_path, options = {})
+    options[:headers] = true
     @headers = CSV.new(File.open(csv_path)).shift
-    @csv = CSV.new(File.open(csv_path), headers: true)
+    @csv = CSV.new(File.open(csv_path), options)
+
     raise_unless_named_parsers_are_valid
     raise_unless_csv_has_all_headers
   end
 
   def import!
-    @csv.each do |row|
-      parsed_row = parse_row(row)
-      import_row(parsed_row)
+    loop do
+      begin
+        row = @csv.shift
+        break unless row
+        import_row(row)
+      rescue StandardError => error
+        process_error(error, @csv.lineno + 1)
+        next
+      end
     end
   end
 
   def parse_row(row)
+    unparsed_row = OpenStruct.new
     parsed_row = OpenStruct.new
-    parsed_row[:values] = OpenStruct.new
 
     columns.each do |name, options|
       header = options[:header]
+      unparsed_value = row[header]
       parser = options[:parser]
-      parsed_row[name] = instance_exec(row[header], &parser)
-      parsed_row[:values][name] = row[header]
+
+      unparsed_row[name] = unparsed_value
+      parsed_row[name] = instance_exec(unparsed_value, &parser)
     end
 
+    parsed_row['unparsed'] = unparsed_row
+    parsed_row['csv_string'] = row.to_csv
+
     return parsed_row
   end
 
-  def import_row(parsed_row)
-    importer.call(parsed_row)
+  def import_row(row)
+    parsed_row = parse_row(row)
+    instance_exec(parsed_row, &importer)
+  end
+
+  def process_error(error, line_number)
+    instance_exec(error, line_number, &error_handler)
   end
 
   def self.column(name, options, &block)
-    if columns.has_key?(name)
-      raise DuplicateColumnError, "A column named :#{name} has already been defined, choose a different name"
-    end
-    unless options.has_key?(:header)
-      raise MissingHeaderError, "A header must be specified for #{name}"
-    end
+    raise_if_duplicate_column(name)
+    raise_if_missing_header(name, options)
 
     if block_given?
       columns[name] = { header: options[:header], parser: block }
     else
-      if options.has_key?(:as)
-        parser_method = "#{options[:as]}_parser".to_sym
-      else
-        parser_method = :string_parser
-      end
+      parser_method = if options.has_key?(:as)
+                        "#{options[:as]}_parser".to_sym
+                      else
+                        :string_parser
+                      end
       columns[name] = {
         header: options[:header],
-        parser: Proc.new { |value| send(parser_method, value) },
+        parser: proc { |value| send(parser_method, value) },
         parser_method: parser_method
       }
     end
   end
 
-  def self.import(&block)
-    @importer = block
-  end
-
   def self.columns
     @columns ||= {}
   end
@@ -71,6 +81,10 @@ class CSVParty
     self.class.columns
   end
 
+  def self.import(&block)
+    @importer = block
+  end
+
   def self.importer
     @importer
   end
@@ -79,8 +93,32 @@ class CSVParty
     self.class.importer
   end
 
-  private
+  def self.error(&block)
+    @error = block
+  end
+
+  def self.error_handler
+    @error
+  end
+
+  def error_handler
+    self.class.error_handler
+  end
+
+  def self.raise_if_duplicate_column(name)
+    return unless columns.has_key?(name)
+
+    raise DuplicateColumnError, "A column named :#{name} has already been \
+            defined, choose a different name"
+  end
+
+  def self.raise_if_missing_header(name, options)
+    return if options.has_key?(:header)
+
+    raise MissingHeaderError, "A header must be specified for #{name}"
+  end
 
+  private
 
   def raw_parser(value)
     value
@@ -91,15 +129,16 @@ class CSVParty
   end
 
   def boolean_parser(value)
-    ['1', 't', 'true'].include? value.to_s.strip.downcase
+    %w[1 t true].include? value.to_s.strip.downcase
   end
 
   def integer_parser(value)
+    return nil if value.nil? || value.strip.empty?
     value.to_i
   end
 
   def decimal_parser(value)
-    cleaned_value = value.to_s.strip.gsub(/[^0-9.]/, "")
+    cleaned_value = value.to_s.strip.gsub(/[^0-9.]/, '')
     BigDecimal.new(cleaned_value)
   end
 
@@ -108,7 +147,7 @@ class CSVParty
   end
 
   def columns_with_named_parsers
-    columns.select { |name, options| options.has_key?(:parser_method) }
+    columns.select { |_name, options| options.has_key?(:parser_method) }
   end
 
   # This error has to be raised at runtime because, when the class body
@@ -117,22 +156,30 @@ class CSVParty
   def raise_unless_named_parsers_are_valid
     columns_with_named_parsers.each do |name, options|
       parser = options[:parser_method]
-      unless named_parsers.include? parser
-        raise UnknownParserError,
-          "You're trying to use the :#{parser.to_s.gsub('_parser', '')} parser for the :#{name} column, but it doesn't exist. Available parsers are: :#{named_parsers.map { |p| p.to_s.gsub('_parser', '') }.join(', :')}."
-      end
+      next if named_parsers.include? parser
+
+      parser = parser.to_s.gsub('_parser', '')
+      parsers = named_parsers
+                .map { |p| p.to_s.gsub('_parser', '') }
+                .join(', :')
+      raise UnknownParserError,
+            "You're trying to use the :#{parser} parser for the :#{name} \
+            column, but it doesn't exist. Available parsers are: :#{parsers}."
     end
   end
 
   def defined_headers
-    columns.map { |name, options| options[:header] }
+    columns.map { |_name, options| options[:header] }
   end
 
   def raise_unless_csv_has_all_headers
     missing_columns = defined_headers - @headers
-    unless missing_columns.empty?
-      raise MissingColumnError, "CSV file is missing column(s) with header(s) '#{missing_columns.join("', '")}'."
-    end
+    return if missing_columns.empty?
+
+    columns = missing_columns.join("', '")
+    raise MissingColumnError,
+          "CSV file is missing column(s) with header(s) '#{columns}'. \
+          File has these headers: #{@headers.join(', ')}."
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_party
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1.pre2
 platform: ruby
 authors:
 - Rico Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies: []
 description: A gem for making CSV imports a little more fun.
 email: rico@toasterlovin.com