active_admin_import 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTA3MGRlYzRhODQwNmRiM2U2ZWJmYmIzOWJhYWU5OWUzMTQxYTIxOA==
+    ZmIxYjFiOTVhMjUxYzVmZGEyZDdkM2I5ZTM4MTdiNTgyOTA1YzZjYQ==
   data.tar.gz: !binary |-
-    YzE2ZWQ2YmU0ZmU4NWVmNzZlOTM5OWRmNDU0MTljMzhlNmIyYzAyYQ==
+    OWU1MDI1YjMwNjM1MmIxOWU4MTQ5NDlkNGMzODQ1OGM5YWM4OGQ4NQ==
 SHA512:
   metadata.gz: !binary |-
-    YzRjM2M1OGYzZjMwYzZlZTk1MDgyMTZjMWE3NWI5MzQyNGMyN2FlYTNhMGNh
-    MzdmZmM3YTdiZDA2MzA1YTExYWZkN2QyZjhkNDI2OTlhYjYzNmMwYTM2YWZj
-    Mzg2MzFiM2FmY2MzNjBmMzUwMzRhYWU5ZWEyMjg1NzNhOGUwZTg=
+    YWE2ZjlmODU1ZTlkMDA1ZmZmODFhYzRhN2VhNjBjM2RlZTEzZTFiZWM4NzY4
+    MTBjNDI2OGE1YWM4MTJlYjUwNmM2Y2NlZWIxM2EwNDAwZTUzNzU2YjljZGRj
+    MjI4ODU3ZTVlYjA5MzMwMWJjZWEyOGFmOTkyYWM2OGY0NjIyZmY=
   data.tar.gz: !binary |-
-    YzJiYzM5NzQwODE3NTFhZTMxOTMwM2JlMGEzYmVmODAxZTA1YjQ5OWYyYzUz
-    OWQ3NjM1YTdhMzUwM2E1OGJlMDUzM2I5OWEzMTcyOGYwNzU3N2JiMjkzZDJm
-    ZDM3YzA2ODIyOTExMDk1NGVhZWNmOGE4ZTc5NGZmYmJlMWZlMDY=
+    YzA1ZTY1NjVjYzUwOTYwZGQ4MWMzMTdlOTg0Y2FjZmMyZjc3NGUyNGIzNmVl
+    YjFkZmM1NDMwMDFlNDJhZDQ1N2YyNjVjMGJmYmQ2NjQ1NjQwOTdjODY4Mjlk
+    YWU2ZWZjNzRjMjYxOTg3Mjg2MmMzMTE3ODlkOGI0MWI1NDliNjQ=

data/app/views/admin/import.html.erb

@@ -6,6 +6,6 @@
         <%= f.input :file, as: :file %>
     <% end %>
     <%= f.actions do %>
-        <%= f.action :submit, label: t("active_admin_import.import_btn"), button_html: {disable_with: t("active_admin_import.import_btn_disabled")} %>
+        <%= f.action :submit, label: t("active_admin_import.import_btn"), button_html: {data: {disable_with: t("active_admin_import.import_btn_disabled")}} %>
     <% end %>
 <% end %>

data/lib/active_admin_import.rb

@@ -7,11 +7,3 @@ require 'active_admin_import/importer'
 require 'active_admin_import/model'
 ::ActiveAdmin::DSL.send(:include, ActiveAdminImport::DSL)
 
-module ActiveAdminImport
-    class Railtie < ::Rails::Railtie
-    config.after_initialize do
-      require 'active_support/i18n'
-      I18n.load_path.unshift *Dir[File.expand_path('../active_admin_import/locales/*.yml', __FILE__)]
-    end
-  end
-end

data/lib/active_admin_import/dsl.rb

@@ -22,7 +22,7 @@ module ActiveAdminImport
     # +resource_label+:: resource label value (default config.resource_label)
     # +plural_resource_label+:: plaralized resource label value (default config.plural_resource_label)
     #
-    def active_admin_import options = {}
+    def active_admin_import options = {}, &block
       default_options = {
           back: {action: :import},
           csv_options: {},
@@ -51,31 +51,24 @@ module ActiveAdminImport
         @active_admin_import_model.assign_attributes(params[params_key].try(:deep_symbolize_keys) || {})
         #go back to form
         return render template: options[:template] unless @active_admin_import_model.valid?
-
-        importer = Importer.new(options[:resource_class],
-                                @active_admin_import_model,
-                                options
-        )
+        @importer = Importer.new(options[:resource_class], @active_admin_import_model, options)
         begin
-          result = importer.import
-          model_name = options[:resource_label].downcase
-          plural_model_name = options[:resource_label].downcase
-          flash[:notice] = I18n.t('active_admin_import.imported',
-                                  count: result[:imported].to_i,
-                                  model: model_name,
-                                  plural_model: plural_model_name
-          ) if result[:imported].to_i > 0
-
-          flash[:error] = I18n.t('active_admin_import.failed',
-                                 count: result[:failed].count,
-                                 model: model_name,
-                                 plural_model: plural_model_name
-          ) if  result[:failed].count > 0
-        rescue ActiveRecord::Import::MissingColumnError => e
-           flash[:error] = e.message
+          @importer.import
+          if block_given?
+            instance_eval &block
+          else
+            model_name = options[:resource_label].downcase
+            plural_model_name = options[:resource_label].downcase
+            if @importer.result[:imported].to_i > 0
+              flash[:notice] = I18n.t('active_admin_import.imported', count: @importer.result[:imported].to_i, model: model_name, plural_model: plural_model_name)
+            end
+            if  @importer.result[:failed].count > 0
+              flash[:error] = I18n.t('active_admin_import.failed', count: @importer.result[:failed].count, model: model_name, plural_model: plural_model_name)
+            end
+          end
+        rescue ActiveRecord::Import::MissingColumnError, NoMethodError => e
+          flash[:error] = e.message
         end
-
-
         redirect_to options[:back]
       end
 

data/lib/active_admin_import/engine.rb

@@ -1,7 +1,7 @@
 require 'rails'
 
 module ActiveAdminImport
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
 
     config.mount_at = '/'
 

data/lib/active_admin_import/importer.rb

@@ -62,6 +62,7 @@ module ActiveAdminImport
         # capture headers if not exist
         prepare_headers(headers.any? ? headers : CSV.parse(f.readline, @csv_options).first)
         f.each_line do |line|
+          next if line.blank?
           lines << line
           if lines.size == batch_size || f.eof?
             cycle lines

data/lib/active_admin_import/model.rb

@@ -8,8 +8,8 @@ module ActiveAdminImport
     validates :file, presence: {message: Proc.new { I18n.t('active_admin_import.no_file_error') }},
               unless: proc { |me| me.new_record? }
 
-    validate :correct_content_type
-    validate :file_contents_present
+    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?  }

data/lib/active_admin_import/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminImport
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -78,12 +78,12 @@ files:
 - Rakefile
 - active_admin_import.gemspec
 - app/views/admin/import.html.erb
+- config/locales/en.yml
+- config/locales/it.yml
 - lib/active_admin_import.rb
 - lib/active_admin_import/dsl.rb
 - lib/active_admin_import/engine.rb
 - lib/active_admin_import/importer.rb
-- lib/active_admin_import/locales/en.yml
-- lib/active_admin_import/locales/it.yml
 - lib/active_admin_import/model.rb
 - lib/active_admin_import/version.rb
 homepage: http://github.com/Fivell/active_admin_import