active_admin_import 2.1.0.rc3 → 2.1.0.rc4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmUzYjk0YmUwZTc5ZDZiYzc3NjBiZDM2OWNmMWE4N2EzYjY3NjIyZg==
+    YWMyOTEwMzdiMDIyMjE5ZDMwNmIwZGFjMmVlOGYwYTFiNTllMzgyYw==
   data.tar.gz: !binary |-
-    MmZlZTlhZjIyMGY2NjU3Y2Q4NDg0YTg0NzgyNjBkMTk5ZjUyZGQwZQ==
+    M2NkMjcwMjZiYjhhNmIwNzRhMWUyN2QxYjJmNGM3ZDc0MGIxZjAxYg==
 SHA512:
   metadata.gz: !binary |-
-    ZDUyOWU1YzZjODZlY2MzMDAxNGE5ODI0MjBlODljNzMzYzc0NjBhNTU1ZTg5
-    NTk3MmU0MzU1N2UwMTgxOGMzNGNlMjQ1NjY3YjFkYWE4Nzg0YzFiNzE0Y2Vh
-    YjU4MmJiOWM0ZTJmMzdjZDg3ZDAyZTBiZWY4YmJkOTJiODFiNDQ=
+    ZjZhYTM0NjE2ZmM3ODkwMjU2MzBjNTliZmRiM2IzN2Y3YWNkOTRhZjg4YTJh
+    YTI5NjJkM2NmYzYwMzU1YjYzMzhmNGMxOWQxYWUyZjU3N2E5YTYzZWM2ZGVj
+    MWM3OGZmNTgxODBhODA1MjFmYzEwN2RkZjJmZjlhMjUyNmYwNWQ=
   data.tar.gz: !binary |-
-    MDZjZDUzZjAyOThjNGNhYWY1ZjFmYjg0MWY5ZTNkN2MxMmUyMDliYTBjOWZl
-    MDEwYTdkNDU2MGFmYWNlNTUyYjg1ZGFkMTExNGE1YWU1MDQyODU2OGE1NDA2
-    NDg2YzdmNzE5ODgxN2YxNTQ2ZGZiODU0NGYzMDY3MWI0ZWE5NTk=
+    NjRlNDE4NzhmMGUwNGI5NjNiNzY4M2VmNzUxMTI1YzNmNzMyNGRmNDE4ZTVi
+    NWRkNzEyZGZkMTUwNzMwOGIzYWU5NzNkZGQxNzBiNzRhMWNlYjk2ZGE5OTJm
+    OWUwZmQ4N2NlZTMzNjE4YmIyNDg5YmQ0NTE0M2RmOWUyM2QwYmU=

data/README.md

@@ -3,14 +3,16 @@ The most fastest and efficient CSV import for Active Admin (based on activerecor
 with support of validations and bulk inserts 
 
 
-Current master works with AA 0-6-stable branch
+Important! Current master works and tested with with AA 0-6-stable branch
 
 
-## Installation
+#Installation
 
 Add this line to your application's Gemfile:
 
-	gem "active_admin_import" , '2.1.0.rc3'
+```ruby
+gem "active_admin_import" , '2.1.0.rc4'
+```
 	
 And then execute:
 
@@ -18,7 +20,7 @@ And then execute:
 
 
 
-#Why yet another import for ActiveAdmin ? Now with activerecord-import ....
+Why yet another import for ActiveAdmin ? Now with activerecord-import ....
 
     "Because plain-vanilla, out-of-the-box ActiveRecord doesn’t provide support for inserting large amounts of data efficiently"
 
@@ -28,7 +30,7 @@ cool features of activerecord-import
     activerecord-import can perform on duplicate key updates (requires mysql)
 
 
-#So active_admin_import features
+So active_admin_import features
 
     Encoding handling
     Support importing with ZIP file
@@ -38,9 +40,10 @@ cool features of activerecord-import
     Bulk import (activerecord-import)
     Ability to customize template 
     Callbacks support
+    Zip files import
     and more ....
 
-#Options
+Options
 
     # +back+:: resource action to redirect after processing
     # +csv_options+:: hash with column separator, row separator, etc 
@@ -63,8 +66,9 @@ cool features of activerecord-import
 
 
 
-#Default options values
-    
+Default options values
+
+```ruby    
     back: {action: :import},
     csv_options: {},
     template: "admin/import",
@@ -72,10 +76,11 @@ cool features of activerecord-import
     resource_class: config.resource_class,
     resource_label:  config.resource_label,
     plural_resource_label: config.plural_resource_label,
-    
+```    
 
-#Example1 
-  
+Example1 
+
+```ruby  
     ActiveAdmin.register Post  do
        active_admin_import :validate => false,
                             :csv_options => {:col_sep => ";" },
@@ -84,13 +89,14 @@ cool features of activerecord-import
     
     
     end
+```
 
 
-
-#Example2 Importing to mediate table with insert select operation after import completion
+Example2 Importing to mediate table with insert select operation after import completion
 
 This config allows to replace data without downtime
 
+```ruby
     ActiveAdmin.register Post  do
         active_admin_import :validate => false,
             :csv_options => {:col_sep => ";" },
@@ -104,11 +110,12 @@ This config allows to replace data without downtime
             },
             :back => proc { config.namespace.resource_for(Post).route_collection_path } # redirect to post index
     end
+```
 
 
+Example3 Importing file without headers, but we always know file format, so we can predefine it
 
-#Example3 Importing file without headers, but we always know file format, so we can predefine it
-
+```ruby
     ActiveAdmin.register Post  do
         active_admin_import :validate => true,
             :template_object => ActiveAdminImport::Model.new(
@@ -116,10 +123,12 @@ This config allows to replace data without downtime
                 :csv_headers => ["body","title","author"] 
             )
     end
-
+```
  
-#Example4 Importing without forcing to UTF-8 and disallow archives
+Example4 Importing without forcing to UTF-8 and disallow archives
+
 
+```ruby
     ActiveAdmin.register Post  do
         active_admin_import :validate => true,
             :template_object => ActiveAdminImport::Model.new(
@@ -128,11 +137,13 @@ This config allows to replace data without downtime
                 :allow_archive => false  
             )
     end
+```
 
 
+Example5 Callbacks for each bulk insert iteration
 
-#Example5 Callbacks for each bulk insert iteration
 
+```ruby
     ActiveAdmin.register Post  do
         active_admin_import :validate => true,
         :before_batch_import => proc { |import|
@@ -145,18 +156,19 @@ This config allows to replace data without downtime
            import.model #template_object instance
         },
         :before_batch_import => proc{ |import|
-        
+           #the same
         }
     end
+```    
     
-    
-#Example6 dynamic CSV options, template overriding
+Example6 dynamic CSV options, template overriding
 
 1) put overrided template to app/views/import.html.erb
 
+```erb
 
     <p>
-      <small> <%= raw(@active_admin_import_model.hint) %> </small>
+       <%= raw(@active_admin_import_model.hint) %> 
     </p>
     <%= semantic_form_for @active_admin_import_model, url: {action: :do_import}, html: {multipart: true} do |f| %>
         <%= f.inputs do %>
@@ -175,10 +187,11 @@ This config allows to replace data without downtime
         <% end %>
     <% end %>
     
-
+```
 
 2) call method with following parameters
 
+```ruby
     ActiveAdmin.register Post  do
         active_admin_import :validate => false,
                           :template => 'import' ,
@@ -187,7 +200,7 @@ This config allows to replace data without downtime
                               :csv_options => {:col_sep => ";", :row_sep => nil, :quote_char => nil} 
                           )
     end                      
-
+```
 
 #Links
 https://github.com/gregbell/active_admin

data/active_admin_import.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.name = "active_admin_import"
   gem.require_paths = ["lib"]
-  gem.version = ActiveAdminImport::VERSION << '.rc3'
+  gem.version = ActiveAdminImport::VERSION << '.rc4'
 
   gem.add_runtime_dependency 'activerecord-import',  '~> 0.4', '>= 0.4.1'
   gem.add_runtime_dependency 'activeadmin', '~> 0.6', '>= 0.6.0'

data/lib/active_admin_import.rb

@@ -1,4 +1,5 @@
 require 'activerecord-import'
+require 'active_admin'
 require 'active_admin_import/version'
 require 'active_admin_import/engine'
 require 'active_admin_import/dsl'

data/lib/active_admin_import/dsl.rb

@@ -27,14 +27,13 @@ module ActiveAdminImport
           back: {action: :import},
           csv_options: {},
           template: "admin/import",
-          fetch_extra_options_from_params: [],
           resource_class: config.resource_class,
-          resource_label:  config.resource_label,
+          resource_label: config.resource_label,
           plural_resource_label: config.plural_resource_label,
           headers_rewrites: {}
       }
       options = default_options.deep_merge(options)
-      options[:template_object] =  ActiveAdminImport::Model.new if options[:template_object].blank?
+      options[:template_object] = ActiveAdminImport::Model.new if options[:template_object].blank?
       params_key = ActiveModel::Naming.param_key(options[:template_object])
 
       collection_action :import, method: :get do
@@ -48,29 +47,34 @@ module ActiveAdminImport
 
       collection_action :do_import, method: :post do
 
-        @active_admin_import_model =  options[:template_object]
+        @active_admin_import_model = options[:template_object]
         @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
         )
-        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
+        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
+        end
 
-        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
 
         redirect_to options[:back]
       end

data/lib/active_admin_import/locales/en.yml

@@ -3,6 +3,7 @@ en:
     import: "Import"
   active_admin_import:
     file_format_error: "You can import only valid csv file"
+    file_empty_error: "You can't import empty file"
     no_file_error: "Please, select file to import"
     imported:
       one: "Successfully imported 1 %{model}"

data/lib/active_admin_import/locales/it.yml

@@ -4,6 +4,7 @@ it:
   active_admin_import:
     file_format_error: "Puoi importare solo CSV conformi"
     no_file_error: "Per favore, seleziona un file da importare"
+    file_empty_error: "Non è possibile importare file vuoto"
     imported:
       one: "Importato 1 %{model} con successo"
       other: "Importati %{count} %{plural_model} con successo"

data/lib/active_admin_import/model.rb

@@ -9,6 +9,8 @@ module ActiveAdminImport
               unless: proc { |me| me.new_record? }
 
     validate :correct_content_type
+    validate :file_contents_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? }
@@ -112,8 +114,16 @@ module ActiveAdminImport
       end
     end
 
+    def file_contents_present
+      errors.add(:file, I18n.t('active_admin_import.file_empty_error')) if File.zero?(file_path)
+    end
+
     def file_type
-      file.try(:content_type).try(:chomp)
+      if file.is_a? ActionDispatch::Http::UploadedFile
+        file.content_type.chomp
+      else
+        ''
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc3
+  version: 2.1.0.rc4
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import