Merge pull request #31 from Fivell/cleanup

refactoring

Author: Fivell

lib/active_admin_import/dsl.rb

@@ -45,24 +45,20 @@ def active_admin_import(options = {}, &block)
       options.assert_valid_keys(*Options::VALID_OPTIONS)
 
       options = Options.options_for(config, options)
-      params_key = ActiveModel::Naming.param_key(options[:template_object] || ActiveAdminImport::Model.new)
+      params_key = ActiveModel::Naming.param_key(options[:template_object])
 
       collection_action :import, method: :get do
-
         authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
-
-        @active_admin_import_model = options[:template_object] || ActiveAdminImport::Model.new
+        @active_admin_import_model = options[:template_object]
         render template: options[:template]
       end
 
-
       action_item :import, only: :index do
         if authorized?(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
           link_to(I18n.t('active_admin_import.import_model', plural_model: options[:plural_resource_label]), action: :import)
         end
       end
 
-
       collection_action :do_import, method: :post do
         authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
 

lib/active_admin_import/import_result.rb

@@ -9,7 +9,7 @@ def initialize
 
     def add(result, qty)
        @failed += result.failed_instances
-       @total+=qty 
+       @total+=qty
     end
 
     def imported_qty

lib/active_admin_import/importer.rb

@@ -2,10 +2,8 @@
 module ActiveAdminImport
   class Importer
 
-
     attr_reader :resource, :options, :result, :headers, :csv_lines, :model
 
-
     OPTIONS = [
         :validate,
         :on_duplicate_key_update,
@@ -20,7 +18,6 @@ class Importer
         :csv_options
     ].freeze
 
-
     def initialize(resource, model, options)
       @resource = resource
       @model = model
@@ -43,32 +40,35 @@ def cycle(lines)
 
     def import
       run_callback(:before_import)
-      lines = []
-      batch_size = options[:batch_size].to_i
+      process_file
+      run_callback(:after_import)
+      import_result
+    end
+
+    def import_options
+      @import_options ||= options.slice(:validate, :on_duplicate_key_update, :ignore, :timestamps)
+    end
+
+    protected
+
+    def process_file
+      lines, batch_size = [], options[:batch_size].to_i
       File.open(file.path) do |f|
         # capture headers if not exist
-        prepare_headers(headers.any? ? headers : CSV.parse(f.readline, @csv_options).first)
+        prepare_headers{ CSV.parse(f.readline, @csv_options).first }
         f.each_line do |line|
-          next if line.blank?
-          lines << line
+          lines << line if line.present?
           if lines.size == batch_size || f.eof?
             cycle(lines)
             lines = []
           end
         end
       end
       cycle(lines) unless lines.blank?
-      run_callback(:after_import)
-      import_result
     end
 
-    def import_options
-      @import_options ||= options.slice(:validate, :on_duplicate_key_update, :ignore, :timestamps)
-    end
-
-    protected
-
-    def prepare_headers(headers)
+    def prepare_headers
+      headers = self.headers.present? ? self.headers : yield
       @headers = Hash[headers.zip(headers.map { |el| el.underscore.gsub(/\s+/, '_') })].with_indifferent_access
       @headers.merge!(options[:headers_rewrites])
       @headers
@@ -87,9 +87,6 @@ def batch_import
       end
     end
 
-
-    private
-
     def assign_options(options)
       @options = {batch_size: 1000, validate: true}.merge(options.slice(*OPTIONS))
       detect_csv_options

lib/active_admin_import/model.rb

@@ -16,7 +16,6 @@ class Model
     validate :correct_content_type, if: proc { |me| me.file.present? }
     validate :file_contents_present, if: proc { |me| me.file.present? }
 
-
     before_validation :uncompress_file, if: proc { |me| me.archive? && me.allow_archive? }
     before_validation :encode_file, if: proc { |me| me.force_encoding? && me.file.present? }
 
@@ -45,19 +44,15 @@ def default_attributes
     end
 
     def allow_archive?
-      !!@attributes[:allow_archive]
+      !!attributes[:allow_archive]
     end
 
     def new_record?
       !!@new_record
     end
 
     def force_encoding?
-      !!@attributes[:force_encoding]
-    end
-
-    def to_hash
-      @attributes
+      !!attributes[:force_encoding]
     end
 
     def persisted?
@@ -68,6 +63,8 @@ def archive?
       file_type == 'application/zip'
     end
 
+    alias :to_hash :attributes
+
     protected
 
     def file_path