csv-importer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfff4468934d3d7fd8e13b81d618bd2691f3fac7
-  data.tar.gz: f8980b3710130e74d400c9f649da525da7d46145
+  metadata.gz: f6449a2ee619cee70575daee4f274e70e8e03a57
+  data.tar.gz: f4b8243bc34a4e65383838536b012c6ad631ed6e
 SHA512:
-  metadata.gz: cd7068f3d2a32f40b58234fc0805883891e5212aeed10dab1c42c1b3198475080e18a88107fd095d02cda7002740b05c1d1436ec0a6e034899d9c0b0a12c93dc
-  data.tar.gz: aa78cf760944b7db3204e746b480e01a161ab4a834ddb79aae65a4d33d7b41f8b03a34d68e898add41a7b209d033c3613b06f264fdfcbb380d092ce69e89ea7d
+  metadata.gz: b6928796fdba7eff29eb46f83d1c7de1c6fa70786602792d5cf08c24f94452e5f02844c56645339c861e07870b71fd1c913ab5bb2f8e82509863a98ea6d7a331
+  data.tar.gz: 5f0bfae5115d6a8a494a94e80872ac542a4deb6d29b81aef396e2bf5f6ea07fe7139e875637419f5f3b3308dc38943f2d6fa1e760b365450da586840113d6f53

data/CHANGELOG.md

@@ -2,11 +2,40 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.5.0] - 2018-01-13
+
+### Added
+
+* after_save supports block with arity of 2 for access to raw
+  attributes. [#68][] by [@macfanatic][].
+
+```ruby
+class Importer
+  model Task
+
+  column :assignee, to: ->(name) { User.active.find_by(name: name) }
+
+  after_save do |task, attributes|
+    if task.errors[:assignee].present? && attributes['Assignee'].present?
+      task.errors.add(:assignee, "'#{ attributes['Assignee'] }' is not part of this project."
+    end
+  end
+end
+```
+
+* support Proc identifiers. [#69][] by [@danielweinmann][]
+
+```ruby
+class Importer
+  identifier ->(user) { user.email.present? ? :email : [:company_id, :employee_id] }
+end
+```
+
 ## [0.4.0] - 2017-08-10
 
 ### Added
 
-* Rows are now aware of their line number.
+* Rows are now aware of their line number. [#63][] by [@paulodeleo][]
 
 ```ruby
 import.report.invalid_rows.map { |row| [row.line_number, row.model.email, row.errors] }
@@ -127,7 +156,13 @@ report object instead of raising an exception.
 [#38]: https://github.com/BrewhouseTeam/csv-importer/issues/38
 [#47]: https://github.com/BrewhouseTeam/csv-importer/issues/47
 [#52]: https://github.com/BrewhouseTeam/csv-importer/issues/52
+[#63]: https://github.com/BrewhouseTeam/csv-importer/issues/63
+[#68]: https://github.com/BrewhouseTeam/csv-importer/issues/68
+[#69]: https://github.com/BrewhouseTeam/csv-importer/issues/69
+[@danielweinmann]: https://github.com/danielweinmann
 [@egg-chicken]: https://github.com/egg-chicken
-[@pnomolos]: https://github.com/pnomolos
 [@fxgallego]: https://github.com/fxgallego
-[@shvetsovdm]: https://github.com/shvetsovdm
+[@macfanatic]: https://github.com/macfanatic
+[@paulodeleo]: https://github.com/paulodeleo
+[@pnomolos]: https://github.com/pnomolos
+[@shvetsovdm]: https://github.com/shvetsovdm

data/README.md

@@ -224,6 +224,14 @@ You can also define a composite identifier:
   identifier :company_id, :employee_id
 ```
 
+Or a Proc:
+
+```ruby
+  # Update records with email if email is present
+  # Update records matching company_id AND employee_id if email is not present
+  identifier ->(user) { user.email.empty? ? [:company_id, :employee_id] : :email }
+```
+
 ### Skip or Abort on error
 
 By default, we skip invalid records and report errors back to the user.

data/csv-importer.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["pcreux@gmail.com"]
 
   spec.summary       = %q{CSV Import for humans}
-  spec.homepage      = "https://github.com/BrewhouseTeam/csv-importer"
+  spec.homepage      = "https://github.com/pcreux/csv-importer"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/lib/csv_importer/config.rb

@@ -5,7 +5,7 @@ module CSVImporter
 
     attribute :model
     attribute :column_definitions, Array[ColumnDefinition], default: proc { [] }
-    attribute :identifiers, Array[Symbol], default: []
+    attribute :identifiers # Array[Symbol] or Proc
     attribute :when_invalid, Symbol, default: proc { :skip }
     attribute :after_build_blocks, Array[Proc], default: []
     attribute :after_save_blocks, Array[Proc], default: []
@@ -27,4 +27,3 @@ module CSVImporter
     end
   end
 end
-

data/lib/csv_importer/dsl.rb

@@ -10,8 +10,8 @@ module CSVImporter
       config.column_definitions << options.merge(name: name)
     end
 
-    def identifier(*identifiers)
-      config.identifiers = identifiers
+    def identifier(*params)
+      config.identifiers = params.first.is_a?(Proc) ? params.first : params
     end
 
     alias_method :identifiers, :identifier

data/lib/csv_importer/row.rb

@@ -10,7 +10,7 @@ module CSVImporter
     attribute :line_number, Integer
     attribute :row_array, Array[String]
     attribute :model_klass
-    attribute :identifiers, Array[Symbol]
+    attribute :identifiers # Array[Symbol] or Proc
     attribute :after_build_blocks, Array[Proc], default: []
     attribute :skip, Boolean, default: false
 
@@ -89,10 +89,14 @@ module CSVImporter
     end
 
     def find_model
-      return nil if identifiers.empty?
+      return nil if identifiers.nil?
 
       model = build_model
       set_attributes(model)
+
+      identifiers = model_identifiers(model)
+      return nil if identifiers.empty?
+
       query = Hash[
         identifiers.map { |identifier| [ identifier, model.public_send(identifier) ] }
       ]
@@ -106,5 +110,15 @@ module CSVImporter
     def skip!
       self.skip = true
     end
+
+    private
+
+    def model_identifiers(model)
+      if identifiers.is_a?(Proc)
+        [identifiers.call(model)].flatten
+      else
+        identifiers
+      end
+    end
   end
 end

data/lib/csv_importer/runner.rb

@@ -63,7 +63,16 @@ module CSVImporter
           end
 
           add_to_report(row, tags)
-          after_save_blocks.each { |block| block.call(row.model) }
+
+          after_save_blocks.each do |block|
+            case block.arity
+            when 0 then block.call
+            when 1 then block.call(row.model)
+            when 2 then block.call(row.model, row.csv_attributes)
+            else
+              raise ArgumentError, "after_save block of arity #{ block.arity } is not supported"
+            end
+          end
         end
       end
     end

data/lib/csv_importer/version.rb

@@ -1,3 +1,3 @@
 module CSVImporter
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv-importer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Philippe Creux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -85,7 +85,7 @@ files:
 - lib/csv_importer/row.rb
 - lib/csv_importer/runner.rb
 - lib/csv_importer/version.rb
-homepage: https://github.com/BrewhouseTeam/csv-importer
+homepage: https://github.com/pcreux/csv-importer
 licenses:
 - MIT
 metadata: {}
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: CSV Import for humans