row_boat 0.1.0.alpha.2 → 0.1.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52e0cc320cec32723d8004c8664b20db8b2f08c
-  data.tar.gz: 44976205d05e7290b9cc520e4af0a2b8bb864928
+  metadata.gz: 5341bb8c702726b4d6dd4ed105339121815f41ab
+  data.tar.gz: 8bc96cb40cc2f160df283acc73d6e9b767212cad
 SHA512:
-  metadata.gz: d0cd75d81d723f853a42d8dd4eeee8a9a03bc783b46778457d6b01db3006b3e276531237f57dec9fb26d36447f14d95b9b138b710bab8e7485caf6f761b03c6c
-  data.tar.gz: 2dce2747abf8ba12b093a393c6db92a06c7e35a61892184c8c85c4dda557ddec75b9a59446bb38d987e9ca67598111a6972da54c7e11accc124addfa6db962d6
+  metadata.gz: 4c75ea55754040da725c9919e70f4d84efecb261db688d9f00142d454d3931bb8e81f8c99903297029349a75f627d68b2d9847ed32663f97901334f00f1baccf
+  data.tar.gz: f12351b6332d266d841ad07941fe415c0a5a9d23a35cc1e54996cafda6c91cd5ef4c629ea7fffb48419122fa38137cbe16cd2d0711a76222218b8b8dad29d9bc

data/lib/row_boat/base.rb

@@ -27,10 +27,8 @@ module RowBoat
         end
       end
 
-      import_results.each_with_object(invalid_records: [], total_inserted: 0, inserted_ids: []) do |import_result, total_results|
-        total_results[:invalid_records] += import_result.failed_instances
-        total_results[:total_inserted] += import_result.num_inserts
-        total_results[:inserted_ids] += import_result.ids
+      process_import_results(import_results).tap do |total_results|
+        handle_failed_rows(total_results[:invalid_records])
       end
     end
 
@@ -47,22 +45,65 @@ module RowBoat
     end
 
     def import_rows(rows)
-      import_options = ::RowBoat::Helpers.extract_import_options(options)
-      preprocessed_rows = rows.map { |row| preprocess_row(row) }
+      import_options = ::RowBoat::Helpers.extract_import_options(merged_options)
+      preprocessed_rows = preprocess_rows(rows)
       import_into.import(preprocessed_rows, import_options)
     end
 
+    def preprocess_rows(rows)
+      rows.each_with_object([]) do |row, preprocessed_rows|
+        preprocessed_row = preprocess_row(row)
+        preprocessed_rows << preprocessed_row unless preprocessed_row.nil?
+      end
+    end
+
     def options
+      {}
+    end
+
+    def default_options
       {
         chunk_size: 500,
         key_mapping: column_mapping,
         recursive: true,
         remove_unmapped_keys: true,
         validate: true,
+        value_converters: csv_value_converters,
         wrap_in_transaction: true
       }
     end
 
+    def merged_options
+      default_options.merge(options)
+    end
+
+    def handle_failed_row(row)
+      row
+    end
+
+    def handle_failed_rows(rows)
+      rows.each { |row| handle_failed_row(row) }
+    end
+
+    def value_converters
+      {}
+    end
+
+    def csv_value_converters
+      value_converters.each_with_object({}) do |(key, potential_converter), converters_hash|
+        case potential_converter
+        when Proc
+          converters_hash[key] = ::RowBoat::ValueConverter.new(&potential_converter)
+        when Symbol
+          converters_hash[key] = ::RowBoat::ValueConverter.new { |value| public_send(potential_converter, value) }
+        when nil
+          next
+        else
+          converters_hash[key] = potential_converter
+        end
+      end
+    end
+
     private
 
     def not_implemented_error_message(method_name)
@@ -70,12 +111,24 @@ module RowBoat
     end
 
     def parse_rows(&block)
-      csv_options = ::RowBoat::Helpers.extract_csv_options(options)
+      csv_options = ::RowBoat::Helpers.extract_csv_options(merged_options)
       ::SmarterCSV.process(csv_source, csv_options, &block)
     end
 
     def transaction_if_needed(&block)
-      options[:wrap_in_transaction] ? import_into.transaction(&block) : yield
+      merged_options[:wrap_in_transaction] ? import_into.transaction(&block) : yield
+    end
+
+    def process_import_results(import_results)
+      import_results.each_with_object(
+        invalid_records: [],
+        total_inserted: 0,
+        inserted_ids: []
+      ) do |import_result, total_results|
+        total_results[:invalid_records] += import_result.failed_instances
+        total_results[:total_inserted] += import_result.num_inserts
+        total_results[:inserted_ids] += import_result.ids
+      end
     end
   end
 end

data/lib/row_boat/value_converter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RowBoat
+  class ValueConverter
+    attr_reader :converter
+
+    def initialize(&block)
+      @converter = block
+    end
+
+    def convert(value)
+      converter.call(value)
+    end
+  end
+end

data/lib/row_boat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RowBoat
-  VERSION = "0.1.0.alpha.2"
+  VERSION = "0.1.0.alpha.3"
 end

data/lib/row_boat.rb

@@ -2,6 +2,7 @@
 
 require "row_boat/version"
 require "row_boat/helpers"
+require "row_boat/value_converter"
 require "row_boat/base"
 
 module RowBoat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: row_boat
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.2
+  version: 0.1.0.alpha.3
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -231,6 +231,7 @@ files:
 - lib/row_boat.rb
 - lib/row_boat/base.rb
 - lib/row_boat/helpers.rb
+- lib/row_boat/value_converter.rb
 - lib/row_boat/version.rb
 - row_boat.gemspec
 homepage: https://github.com/devmynd/row_boat