active_record_importer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0c2019e863558605d2703fb80890c8ba209192
-  data.tar.gz: 480be20d7fc0440427e4107f7b50e7e19572ad81
+  metadata.gz: 71fdf968e3955c0ad63d10e6bab1f97ca4554aea
+  data.tar.gz: 891b854bfd76d3ea41c2596a03af4a4494e2c470
 SHA512:
-  metadata.gz: f9191b603ceb3e77bff828ac70ad0a9301b854a1956cc1ef218e00177c2f8d5b20b0722e98bcc99cb9f99663126e29e53d3b57eebe60d14c88eb248008092441
-  data.tar.gz: 4be44dcf15fcd9a9981ff0942c63a1a1e6d21691cf27832cb3d3755a78636f4fe79193fbe26eb5bb4ccc437cbd0e6c0ab5583d73e37f25e67e78b1a8d7d53265
+  metadata.gz: bbd93f935866c4ba427e942ca90fe0d2012df09cf7d064ad44642cfb981cb22f9c03cc541a0a16b71a0c0d64ecef3705e61c056e34e501a963689ce07e25a123
+  data.tar.gz: 8235e2a1afb32b3d4cf689c08afbeb478b88034dcd14a90cff9ecd437451493b40a38f6c672ad266a141f6f922d55b78377ddf0374a1a486e31df14587c676e0

data/README.md

@@ -25,9 +25,10 @@ Or install it yourself as:
     $ gem install active_record_importer
 
 ## Usage
-### For version 0.3.0
+### For version 0.4.0
 
-For the newest version (0.3.0), you don't have to create Import table/model and controller.
+For the newest version (0.4.0), you don't have to create Import table/model and controller.
+I already fixed the errors when there's no Import table/model on version 0.3.0.
 You just need to add the `acts_as_importable` in your model you want to be importable, and you may now run:
 
 ```ruby

data/active_record_importer.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['kapitan_03@yahoo.com']
 
   spec.summary       = 'Active Record Importer'
-  spec.description   = 'Smart gem for importing rails models'
+  spec.description   = 'Smart gem for importing CSV files to ActiveRecord models'
   spec.homepage      = 'https://github.com/michaelnera/active_record_importer'
   spec.license       = 'MIT'
 

data/lib/active_record_importer/batch_importer.rb

@@ -2,10 +2,9 @@ module ActiveRecordImporter
   class BatchImporter
     include Virtus.model
 
-    attribute :import, Import
     attribute :importable
+    attribute :import
     attribute :data, Array, default: []
-    attribute :failed_file, FailedFileBuilder, default: :initialize_failed_file
 
     def process!
       @imported_count, @failed_count = 0, 0
@@ -16,16 +15,10 @@ module ActiveRecordImporter
       end
 
       set_import_count
-      finalize_batch_import
     end
 
     private
 
-    def initialize_failed_file
-      return unless import
-      FailedFileBuilder.new(import)
-    end
-
     def process_row(row_attrs)
       processor =
         DataProcessor.new(
@@ -35,7 +28,7 @@ module ActiveRecordImporter
         )
       return @imported_count += 1 if processor.process
 
-      collect_failed_rows(row_attrs, processor.row_errors)
+      write_failed_row(row_attrs, processor.row_errors)
       @failed_count += 1
     end
 
@@ -46,14 +39,14 @@ module ActiveRecordImporter
       Import.update_counters(import.id, failed_rows: @failed_count)
     end
 
-    def collect_failed_rows(row_attrs, errors)
-      return puts errors.inspect unless failed_file
-      @failed_file.failed_rows << row_attrs.merge(import_errors: errors)
+    def failed_file
+      return unless import.present? || import.respond_to?(:failed_file)
+      @failed_file ||= FailedFileBuilder.new(import)
     end
 
-    def finalize_batch_import
-      return unless failed_file
-      @failed_file.build
+    def write_failed_row(row_attrs, errors)
+      return puts errors.inspect unless failed_file
+      failed_file.write(row_attrs.merge(import_errors: errors))
     end
 
     delegate :importer_options, to: :importable

data/lib/active_record_importer/data_processor.rb

@@ -2,8 +2,8 @@ module ActiveRecordImporter
   class DataProcessor
     include Virtus.model
 
-    attribute :import, Import
     attribute :importable, Class
+    attribute :import
     attribute :insert_method, String, default: :set_insert_method
     attribute :row_attrs, Hash
     attribute :instance_attrs, Hash

data/lib/active_record_importer/dispatcher.rb

@@ -2,13 +2,14 @@ module ActiveRecordImporter
   class Dispatcher
     include Virtus.model
 
-    attribute :import, Import
     attribute :importable, Class
     attribute :execute, Boolean, default: true
+    attribute :import
     attribute :import_file
 
     def call
       divide_and_conquer
+      create_import_failed_file
     end
 
     private
@@ -19,6 +20,7 @@ module ActiveRecordImporter
           queue_or_execute(collection)
         end
       end
+
       true
     end
 
@@ -45,8 +47,36 @@ module ActiveRecordImporter
       ).process!
     end
 
-    def queue(collection)
+    def queue(_collection)
       # To follow
     end
+
+    def create_import_failed_file
+      return if import.nil? || !File.exists?(temp_failed_file_path)
+      File.open(temp_failed_file_path) do |file|
+        import.failed_file = file
+
+        # I forced to save it as 'text/csv' because
+        # the file is being saved as 'text/x-pascal'
+        # and I still have no idea why?!?
+
+        import.failed_file_content_type = 'text/csv'
+        import.save!
+      end
+
+      destroy_temp_failed_file
+    end
+
+    def destroy_temp_failed_file
+      FileUtils.rm(temp_failed_file_path)
+    end
+
+    def temp_failed_file_path
+      "/tmp/#{target_file_name}"
+    end
+
+    def target_file_name
+      "failed_file_#{import.id}.csv"
+    end
   end
 end

data/lib/active_record_importer/failed_file_builder.rb

@@ -5,74 +5,31 @@ module ActiveRecordImporter
 
     def initialize(import)
       @import = import
-      @failed_rows = []
     end
-  
-    def build
-      return if failed_rows.blank?
 
-      create_or_append_to_csv
-      create_import_failed_file
-      destroy_temp_file
-    end
-
-    private
+    def write(failed_row = {})
+      return if failed_row.blank?
 
-    def create_or_append_to_csv
-      if import.failed_file.present?
-        append_rows_to_file
+      if File.exists?(temp_failed_file_path)
+        File.open(temp_failed_file_path, 'a') do |file|
+          file.write failed_row.values.to_csv
+        end
       else
-        write_csv_file
-      end
-    end
-
-    def write_csv_file
-      CSV.open(temp_file_path, 'wb') do |csv|
-        csv << failed_rows.first.keys
-        insert_failed_rows(csv)
+        File.open(temp_failed_file_path, 'w') do |file|
+          file.write failed_row.keys
+          file.write failed_row.values.to_csv
+        end
       end
     end
 
-    def append_rows_to_file
-      return if import.failed_file.blank?
-      CSV.open(import.failed_file_path, 'a+') do |csv|
-        insert_failed_rows(csv)
-      end
-    end
-
-
-    def insert_failed_rows(csv)
-      failed_rows.each do |hash|
-        csv << hash.values
-      end
-    end
-
-    def destroy_temp_file
-      return unless File.exists?(temp_file_path)
-      FileUtils.rm(temp_file_path)
-    end
+    private
 
-    def temp_file_path
+    def temp_failed_file_path
       "/tmp/#{target_file_name}"
     end
 
     def target_file_name
       "failed_file_#{import.id}.csv"
     end
-
-    def create_import_failed_file
-      return if import.failed_file.present?
-      File.open(temp_file_path) do |file|
-        import.failed_file = file
-
-        # I forced to save it as 'text/csv' because
-        # the file is being saved as 'text/x-pascal'
-        # and I still have no idea why?!?
-
-        import.failed_file_content_type = 'text/csv'
-        import.save!
-      end
-
-    end
   end
 end

data/lib/active_record_importer/importable.rb

@@ -22,9 +22,9 @@ module ActiveRecordImporter
       ##
       def acts_as_importable(options = {})
         @@importer_options = OptionsBuilder.build(options.merge(allowed_columns_hash(options)))
-        ::IMPORTABLES << self.name unless ::IMPORTABLES.include?(self.name)
 
         include ActiveRecordImporter::Importable::InstanceMethods
+        extend ActiveRecordImporter::Importable::SingletonMethods
       end
 
       def importer_options
@@ -32,7 +32,7 @@ module ActiveRecordImporter
       end
 
       def importable?
-        ::IMPORTABLES.include?(self.name)
+        false
       end
 
       ##
@@ -121,5 +121,11 @@ module ActiveRecordImporter
         @importing ||= false
       end
     end
+
+    module SingletonMethods
+      def importable?
+        true
+      end
+    end
   end
 end

data/lib/active_record_importer/options_builder.rb

@@ -20,7 +20,7 @@ module ActiveRecordImporter
       attribute :remove_empty_values, Boolean, default: false
       attribute :comment_regexp, Regexp, default: Regexp.new(/^#=>/)
       attribute :force_utf8, Boolean, default: true
-      attribute :chunk_size, Integer, default: 500
+      attribute :chunk_size, Integer, default: nil
       attribute :col_sep, String, default: ','
     end
   end

data/lib/active_record_importer/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordImporter
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_importer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Nera
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,7 +132,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: Smart gem for importing rails models
+description: Smart gem for importing CSV files to ActiveRecord models
 email:
 - kapitan_03@yahoo.com
 executables: []
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Active Record Importer