rails_admin_import 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f4b64d5b102c3aaa1a7e40b526a4a44f7b1633
-  data.tar.gz: 188508962de1312370416f325deb729f7f3233e5
+  metadata.gz: 741d56674d36948aadddfa2951204d3fd3ece179
+  data.tar.gz: 4535fb361151b7f3dbb615c380a0d9eeb93a6478
 SHA512:
-  metadata.gz: 95db49681fed111f535b241775b64cd7e302f10ade105473fc5e930c194f180dcdfdd6e82b93ee817438d74e97da33edcef91b5c9e0d109099678a43d1900874
-  data.tar.gz: 830926cf365344e76ac1fb5bec2a77b6ab85bf03f318253372f52e152a53fc08da97055a76d1bb599a41382fe0c9cc3175c2c8d892921c747b168617c1cf6f7d
+  metadata.gz: f364e695d7e1eac68a4bc821cc08f34c1dc1ea340a8d8c26a317aba5fcbcff7aded642fc7c9657e6c4671e3306b4dc1522ab39ef4c9ae449850e5a53806b5ec8
+  data.tar.gz: dd57d2e866208dfeb6da5acf65d118902c87d650d0cf42828266a901e726734b8d1a159b4cde9569f36fd7260a952792b63d58aeec11bfa9ebff7960418b11c4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+# 2.0.0 / 2016-05-04
+
+- Pull in the encoding list from the Encoding module instead of RailsAdmin. Thanks @baldursson, @patricklewis and @lucasff
+
 # 1.4.0 / 2016-02-26
 
 - Implement row limit (default maximum is 1000 rows). Thanks @codealchemy!

data/README.md

@@ -267,8 +267,13 @@ For example, you could
 
 * Set an attribute on a Devise User model to skip checking for a password when importing a new model.
 
-* Download a file based on a URL from the import file and set a Paperclip file attribute on the model.
+* Import an image into Carrierwave via a URL provided in the CSV.
 
+```
+def before_import_save(record)
+  self.remote_image_url = record[:image] if record[:image].present?  
+end
+```
 
 ## ORM: ActiveRecord and Mongoid
 

data/app/views/rails_admin/main/import.html.haml

@@ -24,7 +24,7 @@
       %label.col-sm-2.control-label{for: "encoding"}= t("admin.import.encoding")
       .col-sm-10.controls
         = select_tag 'encoding',
-          options_for_select(RailsAdmin::CSVConverter::TARGET_ENCODINGS),
+          options_for_select(Encoding.name_list.sort),
           include_blank: true, data: { enumeration: true }
         %p.help-block= t('admin.import.help.encoding', name: 'UTF-8')
     .form-group.control-group
@@ -52,7 +52,7 @@
             = t("admin.import.mapping")
           .col-sm-10.controls
             = select_tag "associations[#{field.name}]",
-              options_for_select(@import_model.associated_model_fields(field).map(&:name),
+              options_for_select(@import_model.associated_model_fields(field),
               @import_model.associated_config(field).mapping_key.to_s), data: { enumeration: true }
 
   %br

data/lib/rails_admin_import/config/sections/import.rb

@@ -9,8 +9,12 @@ module RailsAdmin
           :name
         end
 
+        register_instance_option(:mapping_key_list) do
+          []
+        end
+
         register_instance_option(:default_excluded_fields) do
-          [:id, :_id, :created_at, :updated_at]
+          [:id, :_id, :created_at, :updated_at, :c_at, :u_at]
         end
       end
     end

data/lib/rails_admin_import/import_model.rb

@@ -63,7 +63,11 @@ module RailsAdminImport
     end
 
     def update_lookup_field_names
-      @update_lookup_field_names ||= model_fields.map(&:name) + belongs_to_fields.map(&:foreign_key)
+      if @config.mapping_key_list.present?
+        @update_lookup_field_names = @config.mapping_key_list
+      else
+        @update_lookup_field_names ||= model_fields.map(&:name) + belongs_to_fields.map(&:foreign_key)
+      end
     end
 
     def associated_object(field, mapping_field, value)
@@ -82,9 +86,13 @@ module RailsAdminImport
 
     def associated_model_fields(field)
       @associated_fields ||= {}
-      @associated_fields[field] ||= associated_config(field).visible_fields.select { |f|
-        !f.association?
-      }
+      if associated_config(field).mapping_key_list.present?
+        @associated_fields[field] ||= associated_config(field).mapping_key_list
+      else
+        @associated_fields[field] ||= associated_config(field).visible_fields.select { |f|
+          !f.association?
+        }.map(&:name)
+      end
     end
 
     def has_multiple_values?(field_name)

data/lib/rails_admin_import/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminImport
-  VERSION = "1.4.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_import
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Steph Skardal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails