active_importer 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6daa340c010143c7efa4f1f94cb5cb1778c13bf
-  data.tar.gz: a45ede6787d0fee8563973292bd2456133b61ae8
+  metadata.gz: bbe08145a2cb895fe8b9c4bf50be71e493cb7a47
+  data.tar.gz: 1d2dc2cb3a6c77f0166b798dbc88c1c44083fbeb
 SHA512:
-  metadata.gz: 974291103c95864dc5409fa19544fd135ff1485b559193f779a7243e6abd42185ff80d602a6d868b9cc625b7d265a6e06e2e2cf5984e395645e7e4b845631931
-  data.tar.gz: 608cf19443e5e470d600cb41f0e966cacc53c563a5b68ebaa3e6d93ad4116982e9fb5273fba199ae414fbf43211c7b25894459ce83b55b040da0b689e7d0b0a5
+  metadata.gz: 3be7f4e8af60bbb860b5e2954bfcda2ca440d919398bb7acbf9640a3a93580ff7fcd63e1132d591bc3b4c5674d9b2708b2a5e63d1a215e5bd041721c17d60802
+  data.tar.gz: a7db2afe6f9bc1b76a90fece19733318d61f231151b3a0ad121eb8b806f0ad6b7774f1398d48e07a37d3775dc3ccc446d7961b6e39f81cb28ee1feb74d7b239a

data/active_importer.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["gnapse@gmail.com"]
   spec.description   = %q{Import tabular data from spreadsheets or similar sources into data models}
   spec.summary       = %q{Import tabular data into data models}
-  spec.homepage      = ""
+  spec.homepage      = "http://continuum.github.io/active_importer/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 2.14"
 
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "activerecord"

data/lib/active_importer/base.rb

@@ -243,9 +243,21 @@ module ActiveImporter
       self.class.columns
     end
 
+    def self.skip_row_blocks
+      @skip_row_blocks ||= begin
+                             klass = self
+                             result = []
+                             while klass < ActiveImporter::Base
+                               block = klass.skip_rows_block
+                               result << block if block
+                               klass = klass.superclass
+                             end
+                             result
+                           end
+    end
+
     def skip_row?
-      block = self.class.skip_rows_block
-      block && self.instance_exec(&block)
+      self.class.skip_row_blocks.any? { |block| self.instance_exec(&block) }
     end
 
     def load_sheet
@@ -268,7 +280,7 @@ module ActiveImporter
     def load_header
       @header_index = find_header_index
       if @header_index
-        @header = @book.row(@header_index).map(&:strip)
+        @header = @book.row(@header_index).map(&:to_s).map(&:strip)
       else
         raise 'Spreadsheet does not contain all the expected columns'
       end
@@ -278,7 +290,7 @@ module ActiveImporter
       begin
         @model = fetch_model
         build_model
-        model.save! unless aborted?
+        save_model unless aborted?
       rescue => e
         @row_errors << { row_index: row_index, error_message: e.message }
         fire_event :row_error, e
@@ -291,6 +303,10 @@ module ActiveImporter
       fire_event :row_processed
     end
 
+    def save_model
+      model.save! if model.new_record? || model.changed?
+    end
+
     def build_model
       row.each_pair do |key, value|
         column_def = columns[key]

data/lib/active_importer/version.rb

@@ -1,3 +1,3 @@
 module ActiveImporter
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/active_importer/base_spec.rb

@@ -246,17 +246,18 @@ describe ActiveImporter::Base do
         [' Name ', 'Birth Date', 'Department', 'Manager'],
         ['Skip', '2013-10-25', 'IT'],
         ['John Doe', '2013-10-25', 'IT'],
+        ['BaseSkip', '2013-10-25', 'IT'],
         ['Jane Doe', '2013-10-26', 'Sales'],
       ]
     end
 
-    it 'skips processing the current row' do
+    it 'allows the user to define conditions under which rows should be skipped' do
       expect { EmployeeImporter.import('/dummy/file') }.to change(Employee, :count).by(2)
     end
 
     it 'invokes event :row_skipped for each skipped row' do
       expect(EmployeeImporter).to receive(:new).once.and_return(importer)
-      expect(importer).to receive(:row_skipped).once
+      expect(importer).to receive(:row_skipped).twice
       EmployeeImporter.import('/dummy/file')
     end
   end

data/spec/support/employee_importer.rb

@@ -1,6 +1,10 @@
 class EmployeeBaseImporter < ActiveImporter::Base
   on(:import_finished) { base_import_finished }
 
+  skip_rows_if do
+    row['Name'] == 'BaseSkip'
+  end
+
   private
 
   def base_import_finished

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_importer
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ernesto Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ files:
 - spec/support/active_record/schema.rb
 - spec/support/employee_importer.rb
 - spec/support/spreadsheet.rb
-homepage: ''
+homepage: http://continuum.github.io/active_importer/
 licenses:
 - MIT
 metadata: {}
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Import tabular data into data models
@@ -148,3 +148,4 @@ test_files:
 - spec/support/active_record/schema.rb
 - spec/support/employee_importer.rb
 - spec/support/spreadsheet.rb
+has_rdoc: