rails_admin_import 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7926c16cbb6726c90f684e87620b811157065162
-  data.tar.gz: 99dbbe4c5a95dc163a870ceeff25bcba0801e97d
+  metadata.gz: 8a37478fcdb96c3cddb93ac6f85dc1fa43329f32
+  data.tar.gz: 8b36ca27a1b441bebd19a6cb3a80865063975160
 SHA512:
-  metadata.gz: 620e0bf33570d47b6b93ea5b8b41f96524153d57b302bd08af316733cb936869f92cb64013009bdb228317b2478961a48a05e4ce90a15bcc729fe2e74b1dff7a
-  data.tar.gz: bd7a26c0ee8300e915ba4cf95146220e24b6b56998b4c43bb19b8d68a5237561ebfb78551059ba10a156571972f69bb809c47b5a50e1ff34723015508289fafb
+  metadata.gz: 037159e831272b29da9d07093f43fdb7e212ce92f4a28c02c7bc836b634239d4285e04f6fe102a6f402203644d4d81bc67388e7b75c1518674d63fb26eda6b49
+  data.tar.gz: c323b72bfd8d3980e11e06eadf83b34c184fcf3fd04d8ed73880dc45741d518b0d37cd0dcc37f698df1d64055e634e94c67db4797e81a652af84f428f7bc754a

data/CHANGELOG.md

@@ -1,6 +1,26 @@
-Version: 0.1.9
-Released: 5.22.2014
-* Updated/corrected README
-* Merged ImportLogger work
-* Merged modifications to import view
-* Merged post save hook on models 
+# Change Log
+
+## [1.1.0] - 2015-08-04
+### Changed
+- `csv_options` config added. Thanks Maksim Burnin!
+
+## [1.0.0] - 2015-06-09
+### Changed
+
+Major rework of the gem by new maintainer.
+
+- Support for Mongoid
+- Changed model import hooks to take 1 hash argument
+- Use Rails Admin abstract model instead of ActiveRecord reflection for better compatibility with custom associations
+- Support CSV and JSON
+- Update styling for Bootstrap 3
+- Added tests
+
+
+## [0.1.9] - 2014-05-22
+### Changed
+
+- Updated/corrected README
+- Merged ImportLogger work
+- Merged modifications to import view
+- Merged post save hook on models

data/README.md

@@ -85,6 +85,8 @@ The file must be an array or an object with a root key the same name as the plur
 
 * __header_converter__ (default `nil`): a lambda to convert each CSV header text string to a model attribute name. The default header converter converts to lowercase and replaces spaces with underscores.
 
+* __csv_options__ (default `{}`): a hash of options that will be passed to a new [CSV](http://ruby-doc.org/stdlib-2.0.0/libdoc/csv/rdoc/CSV.html) instance
+
 ### Model-specific configuration
 
 Use [standard RailsAdmin DSL](https://github.com/sferik/rails_admin/wiki/Railsadmin-DSL) to add or remove fields.
@@ -150,11 +152,11 @@ Define instance methods on your models to be hooked into the import process, if
 # some model
 class User < ActiveRecord::Base
   def before_import_save(record)
-    # Your custom special sauce          
+    # Your custom special sauce
   end
 
   def after_import_save(record)
-    # Your custom special sauce          
+    # Your custom special sauce
   end
 end
 ```
@@ -190,10 +192,10 @@ Support for Mongoid is early, so if you can suggest improvements (especially aro
 1. Clone the repository to your machine
 
     git clone https://github.com/stephskardal/rails_admin_import
-    
+
 2. Run `bundle install`
 3. Run `rspec`
-  
+
 The structure of the tests is taken from the Rails Admin gem.
 
 ## Authors

data/lib/rails_admin_import/config.rb

@@ -7,6 +7,7 @@ module RailsAdminImport
       attr_accessor :line_item_limit
       attr_accessor :rollback_on_error
       attr_accessor :header_converter
+      attr_accessor :csv_options
 
       def model(model_name, &block)
         unless @deprecation_shown
@@ -26,6 +27,7 @@ module RailsAdminImport
         @line_item_limit = 1000
         @rollback_on_error = false
         @header_converter = nil
+        @csv_options = {}
       end
     end
 

data/lib/rails_admin_import/formats/csv_importer.rb

@@ -27,15 +27,17 @@ module RailsAdminImport
       private
 
       def csv_options
-        {
+        defaults = RailsAdminImport.config.csv_options
+        options = {
           headers: true,
-          header_converters: @header_converter
-        }.tap do |options|
-          add_encoding!(options)
-        end
+          header_converters: @header_converter,
+          encoding: encoding,
+        }
+
+        defaults.merge(options)
       end
 
-      def add_encoding!(options)
+      def encoding
         from_encoding =
           if !@encoding.blank?
             @encoding
@@ -44,8 +46,11 @@ module RailsAdminImport
           end
 
         to_encoding = import_model.abstract_model.encoding
+
         if from_encoding && from_encoding != to_encoding
-          options[:encoding] = "#{from_encoding}:#{to_encoding}"
+          "#{from_encoding}:#{to_encoding}"
+        else
+          nil
         end
       end
 

data/lib/rails_admin_import/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminImport
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_import
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Steph Skardal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,3 +124,4 @@ signing_key:
 specification_version: 4
 summary: Import functionality for Rails Admin
 test_files: []
+has_rdoc: