active_admin_import 2.1.1 → 2.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmIxYjFiOTVhMjUxYzVmZGEyZDdkM2I5ZTM4MTdiNTgyOTA1YzZjYQ==
-  data.tar.gz: !binary |-
-    OWU1MDI1YjMwNjM1MmIxOWU4MTQ5NDlkNGMzODQ1OGM5YWM4OGQ4NQ==
+SHA1:
+  metadata.gz: b8f417cc9a85210d9b683c9153e081542a882820
+  data.tar.gz: d91324749b99737df1100043f3d33aeeb1b81e25
 SHA512:
-  metadata.gz: !binary |-
-    YWE2ZjlmODU1ZTlkMDA1ZmZmODFhYzRhN2VhNjBjM2RlZTEzZTFiZWM4NzY4
-    MTBjNDI2OGE1YWM4MTJlYjUwNmM2Y2NlZWIxM2EwNDAwZTUzNzU2YjljZGRj
-    MjI4ODU3ZTVlYjA5MzMwMWJjZWEyOGFmOTkyYWM2OGY0NjIyZmY=
-  data.tar.gz: !binary |-
-    YzA1ZTY1NjVjYzUwOTYwZGQ4MWMzMTdlOTg0Y2FjZmMyZjc3NGUyNGIzNmVl
-    YjFkZmM1NDMwMDFlNDJhZDQ1N2YyNjVjMGJmYmQ2NjQ1NjQwOTdjODY4Mjlk
-    YWU2ZWZjNzRjMjYxOTg3Mjg2MmMzMTE3ODlkOGI0MWI1NDliNjQ=
+  metadata.gz: afe63356cf3a67b25940824541b1e2dc4c7ae752fa7f93ac9d1e4a2403f2f963c0c4f081cc91d1cdf69e3c7e796e7ce4165dee9e8b6f31d762ed18209f45beba
+  data.tar.gz: a3bd48e057590d3c85c01738f2399ae578153fdd2661eaba3f6124e3b5c87cbbab6ca2dbd50743cbdc377cb2b6a1aebc313d3a8cd0456db086e34a036b8b2f1d

data/README.md

@@ -11,7 +11,7 @@ Should work with both AA 0.6 and 1.0.0
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "active_admin_import" , '2.1.0'
+gem "active_admin_import" , '2.1.1'
 ```
 	
 And then execute:
@@ -154,7 +154,7 @@ Example5 Callbacks for each bulk insert iteration
            import.csv_lines #lines to import
            import.model #template_object instance
         },
-        :before_batch_import => proc{ |import|
+        :after_batch_import => proc{ |import|
            #the same
         }
     end
@@ -207,5 +207,8 @@ https://github.com/gregbell/active_admin
 https://github.com/zdennis/activerecord-import
 
 #Source Doc
-http://rubydoc.info/gems/active_admin_import/2.1.0/
+http://rubydoc.info/gems/active_admin_import/2.1.1/
+
+
+
 

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

@@ -1,5 +1,5 @@
-<p>
-  <small> <%= raw(@active_admin_import_model.hint) %> </small>
+<p class="active_admin_import_hint">
+   <%= 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 %>

data/lib/active_admin_import.rb

@@ -5,5 +5,6 @@ require 'active_admin_import/engine'
 require 'active_admin_import/dsl'
 require 'active_admin_import/importer'
 require 'active_admin_import/model'
+require 'active_admin_import/authorization'
 ::ActiveAdmin::DSL.send(:include, ActiveAdminImport::DSL)
 

data/lib/active_admin_import/authorization.rb

@@ -0,0 +1,8 @@
+module ActiveAdminImport
+  # Default Authorization permission for ActiveAdminImport
+  module Authorization
+    IMPORT = :import
+  end
+
+  Auth = Authorization
+end

data/lib/active_admin_import/dsl.rb

@@ -33,21 +33,25 @@ module ActiveAdminImport
           headers_rewrites: {}
       }
       options = default_options.deep_merge(options)
-      options[:template_object] = ActiveAdminImport::Model.new if options[:template_object].blank?
-      params_key = ActiveModel::Naming.param_key(options[:template_object])
+      params_key = ActiveModel::Naming.param_key(options[:template_object] || ActiveAdminImport::Model.new)
 
       collection_action :import, method: :get do
-        @active_admin_import_model = options[:template_object]
+        authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
+
+        @active_admin_import_model = options[:template_object] || ActiveAdminImport::Model.new
         render template: options[:template]
       end
 
-      action_item only: :index do
-        link_to(I18n.t('active_admin_import.import_model', model: options[:resource_label]), action: 'import')
+      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', model: options[:resource_label]), action: 'import')
+        end
       end
 
       collection_action :do_import, method: :post do
+        authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
 
-        @active_admin_import_model = options[:template_object]
+        @active_admin_import_model = options[:template_object] || ActiveAdminImport::Model.new
         @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?
@@ -58,7 +62,7 @@ module ActiveAdminImport
             instance_eval &block
           else
             model_name = options[:resource_label].downcase
-            plural_model_name = options[:resource_label].downcase
+            plural_model_name = options[:plural_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

data/lib/active_admin_import/version.rb

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

metadata

@@ -1,67 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: The most efficient way to import for Active Admin
@@ -71,7 +71,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -81,6 +81,7 @@ files:
 - config/locales/en.yml
 - config/locales/it.yml
 - lib/active_admin_import.rb
+- lib/active_admin_import/authorization.rb
 - lib/active_admin_import/dsl.rb
 - lib/active_admin_import/engine.rb
 - lib/active_admin_import/importer.rb
@@ -96,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.