rails_spreadsheet_reader 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2Y1MmFmMGEyMmQzYWY3OGE0ZDM3ZjkzNmI5YmViMzhhMDYxM2FjYg==
+    ODY3Y2JmNGUwZWQzMTdiMjEyZTFkMDBiNDVmNTEzY2VmZjdlNTUxNg==
   data.tar.gz: !binary |-
-    NTJlNzBjZDE0NzMxY2JkMTc5Y2FhODdmZjk1OGI1NWM5MjAwMThkYg==
+    MDlkZjk2ODI0NmQ2NzkwMTU4YmNlMjk5NGI4MTE2YzlmN2E3NWFhNw==
 SHA512:
   metadata.gz: !binary |-
-    NzgxMzg5NDdlMTY4N2ZmYThiZTVjYWYwNDY0YTc4ODA1MzM1NzBjODNhNWEz
-    MDUwMTE5ZDg0OWNhM2FhYmZjZTI0MDI4NGUxN2UyOGNkNmY0ZGU0ZWI3Njc4
-    ZjQ0YmE3NTViYjUxZGFhZjg5ZjM2N2U1NjQ5MDY1M2UwZGU0Yjg=
+    YTNlMThjMGMxNWNkN2Y2NzNmY2I1YTEyMjJiYjdjNDI4ZThhMTdkMTQxOGM2
+    N2Q2YTVhYjQyNTg4MWNmMDhiZGZjYmRiNDNiYmMzYTM1ZDhiZmZlNzU3ZjNj
+    NGEyNTE3MmY5YjNmMmZmNWJkM2I2ZDBlN2JlMWUyZDNlMTg0YWM=
   data.tar.gz: !binary |-
-    ZDk1M2YxMTc5YmNmYjhiYTQwYTY2YmM3ODU0NjVlZGEyMTQ0NGM4MDFhZDNm
-    YWQzNmRkYjk3MGYwNmU1Yzc1Yzc4YThkYmU0NDZkZGIzNjM1ZTk1ODE4YzFj
-    Yjk0YTI4MzYwMWUxMjkxMzY0ZTAyOGI4Y2QwMzJmMDI5Y2MwOTc=
+    ZmY4YzExZDIxNWQ2MjUzZmIwMGQ5N2M1NWU3MGRiNDY0Mjc0MTY2N2QzNGQ3
+    MzIxMmNjMzRiMjM5ZjAwNTY1OGVkYmIzOTZlNDNjMzY1ODAxNDQxMWU4MTEw
+    OTc0NTQ1MTJkZTRiN2FiYzhhZDM5ZmI2MzhhN2M2OWI5M2JlN2U=

data/lib/generators/rails/templates/spreadsheet.rb

@@ -20,7 +20,7 @@ class <%= @spreadsheet_name %>Spreadsheet < RailsSpreadsheetReader::Base
 
   # Returns 1 or more ActiveRecord classes where data will be saved
   def self.models
-    <%= @models.count == 1 ? @models.first : @models.join(', ') %>
+    [<%= @models.count == 1 ? @models.first : @models.join(', ') %>]
   end
 
   # Map a spreadsheet instance to model parameters
@@ -31,8 +31,8 @@ class <%= @spreadsheet_name %>Spreadsheet < RailsSpreadsheetReader::Base
   <% end %>
 
   # Persist
-  #def persist
-    # Create or save your record. By default, it will use your methods
+  #def persist!!
+    # create! or save! your records. By default, it will use your methods
     # defined above (<%= @models.map{|m| m.downcase}.join(', ') %>)
   #end
 

data/lib/rails_spreadsheet_reader/base.rb

@@ -37,14 +37,14 @@ module RailsSpreadsheetReader
       @last_record = record
     end
 
-    def models
+    def self.models
       fail(
           MethodNotImplementedError,
           'Please implement this method in your class.'
       )
     end
 
-    def persist
+    def persist!
       models = self.class.models.is_a?(Array) ? self.class.models : [self.class.models]
       models.each do |model|
         method_name = model.model_name.human.downcase
@@ -153,14 +153,16 @@ module RailsSpreadsheetReader
             # If any of validations fail ActiveRecord::RecordInvalid gets raised.
             # If any of the before_* callbacks return false the action is cancelled and save! raises ActiveRecord::RecordNotSaved.
             begin
-              row.persist
+              row.persist!
             rescue ActiveRecord::RecordInvalid => e
               row.record_with_error = e.record
               collection.invalid_row = row
+              row.check_record_with_error
               rollback
             rescue ActiveRecord::RecordNotSaved => e
               row.model_with_error = e.record
               collection.invalid_row = row
+              row.check_record_with_error
               rollback
             end
           end
@@ -169,7 +171,11 @@ module RailsSpreadsheetReader
     end
 
     def self.open(spreadsheet_file)
-      Roo::Spreadsheet.open(spreadsheet_file)
+      if spreadsheet_file.respond_to?(:original_filename)
+        Roo::Spreadsheet.open(spreadsheet_file.path, extension: File.extname(spreadsheet_file.original_filename).delete('.'))
+      else
+        Roo::Spreadsheet.open(spreadsheet_file)
+      end
     end
 
     # Read and validates the given #spreadsheet_file. Persistence is triggered

data/lib/rails_spreadsheet_reader/row_collection.rb

@@ -12,16 +12,12 @@ module RailsSpreadsheetReader
       self.rows << row
     end
 
+    def invalid_rows
+      rows.reject(&:valid?)
+    end
+
     def valid?
-      valid = true
-      rows.each do |row|
-        if row.invalid?
-          self.invalid_row = row
-          valid = false
-          break
-        end
-      end
-      valid
+      invalid_rows.empty?
     end
 
     def invalid?
@@ -29,7 +25,7 @@ module RailsSpreadsheetReader
     end
 
     def errors
-      invalid? ? self.invalid_row.errors : []
+      invalid? ? invalid_rows.map(&:errors).flatten : []
     end
 
     def each(&block)

data/lib/rails_spreadsheet_reader/version.rb

@@ -1,3 +1,3 @@
 module RailsSpreadsheetReader
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/base_spec.rb

@@ -65,8 +65,8 @@ describe RailsSpreadsheetReader::Base do
     file = test_file 'users_invalid', :csv
     row_collection = UserSpreadsheet.read(file)
     expect(row_collection.valid?).to eq(false)
-    expect(row_collection.invalid_row.row_number).to eq(2)
-    expect(row_collection.errors.full_messages).to eq(["Email can't be blank"])
+    expect(row_collection.invalid_rows.first.row_number).to eq(2)
+    expect(row_collection.errors.first.full_messages).to eq(["Email can't be blank"])
   end
 
   it 'A row with an invalid record should be invalid' do
@@ -82,7 +82,7 @@ describe RailsSpreadsheetReader::Base do
     params.delete('id')
     expect(User.exists?(params)).to eq(false)
     row = UserSpreadsheet.new(params)
-    row.persist
+    row.persist!
     expect(User.exists?(params)).to eq(true)
   end
 
@@ -92,7 +92,7 @@ describe RailsSpreadsheetReader::Base do
     UserSpreadsheet.headers
     UserSpreadsheet.models
     row = UserSpreadsheet.new(params)
-    expect { row.persist }.to raise_error(ActiveRecord::RecordInvalid)
+    expect { row.persist! }.to raise_error(ActiveRecord::RecordInvalid)
   end
 
   it 'Should not save records to database when failing' do
@@ -131,7 +131,7 @@ describe RailsSpreadsheetReader::Base do
     file = test_file 'users_invalid', :csv
     result = UserInvalidSpreadsheet.read(file)
     expect(result.valid?).to eq(false)
-    expect(result.invalid_row.errors[:username]).to eq(["Username already defined in excel at row 4"])
+    expect(result.invalid_rows.first.errors[:username]).to eq(["Username already defined in excel at row 4"])
   end
 
 end

data/spec/spreadsheets/custom_persist_spreadsheet.rb

@@ -19,7 +19,7 @@ class CustomPersistSpreadsheet < RailsSpreadsheetReader::Base
     { name: enterprise_name }
   end
 
-  def persist
+  def persist!
     enterprise = Enterprise.find_or_create_by(name: enterprise_name)
     Employee.create!(name: enterprise_name, enterprise: enterprise)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_spreadsheet_reader
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - muzk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler