Merge branch '3.0.0' of https://github.com/Fivell/active_admin_import into 3.0.0

Author: Fivell

README.md

@@ -25,53 +25,63 @@ 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"
+ <p>Because plain-vanilla, out-of-the-box ActiveRecord doesn’t provide support for inserting large amounts of data efficiently</p>
 
-cool features of activerecord-import
+Features of activerecord-import
 
-    activerecord-import can perform validations (fast)
-    activerecord-import can perform on duplicate key updates (requires mysql)
-
-
-So active_admin_import features
-
-    Encoding handling
-    Two step importing (see example2)
-    CSV options
-    Ability to prepend CSV headers automatically
-    Bulk import (activerecord-import)
-    Ability to customize template 
-    Callbacks support
-    Zip files import
-    and more ....
-
-Options
-
-    # +back+:: resource action to redirect after processing
-    # +csv_options+:: hash with column separator, row separator, etc 
-    # +validate+:: true|false, means perform validations or not
-    # +batch_size+:: integer value of max  record count inserted by 1 query/transaction
-    # +before_import+:: proc for before import action, hook called with  importer object
-    # +after_import+:: proc for after import action, hook called with  importer object
-    # +before_batch_import+:: proc for before each batch action, called with  importer object
-    # +after_batch_import+:: proc for after each batch action, called with  importer object
-    # +on_duplicate_key_update+:: an Array or Hash, tells activerecord-import to use MySQL's ON DUPLICATE KEY UPDATE ability.
-    # +timestamps+::  true|false, tells activerecord-import to not add timestamps (if false) even if record timestamps is disabled in ActiveRecord::Base
-    # +ignore+::  true|false, tells activerecord-import toto use MySQL's INSERT IGNORE ability
-    # +params_keys+:: params values available in callbacks
-    # +template+:: custom template rendering
-    # +template_object+:: object passing to view
-    # +locals+:: local variables for template
-    # +resource_class+:: resource class name
-    # +resource_label+:: resource label value
-    # +plural_resource_label+:: pluralized resource label value (default config.plural_resource_label)
-    # +headers_rewrites+:: hash with key (csv header) - value (db column name) rows mapping
+<ol>
+  <li>activerecord-import can perform validations (fast)</li>
+  <li>activerecord-import can perform on duplicate key updates (requires mysql)</li>
+</ol>
 
+    
+    
 
 
-Default options values
+# active_admin_import features
+<ol>
+  <li>Encoding handling</li>
+  <li>Preview before importing (Example 2)</li>
+  <li> CSV options</li>
+  <li> Ability to prepend CSV headers automatically</li>
+  <li>Bulk import (activerecord-import)</li>
+  <li>Callbacks</li>
+  <li>Zip files</li>
+  <li>more...</li>
+</ol>
+
+   
+
+
+#### Options
+
+   <table>
+<tr><td>name</td><td>description</td></tr>
+<tr><td>:back</td><td>resource action to redirect after processing</td></tr>
+<tr><td>:csv_options</td><td>hash with column separator, row separator, etc </td></tr>
+<tr><td>:validate</td><td>true|false, means perform validations or not</td></tr>
+<tr><td>:batch_size</td><td>integer value of max  record count inserted by 1 query/transaction</td></tr>
+<tr><td>:before_import</td><td>proc for before import action, hook called with  importer object</td></tr>
+<tr><td>:after_import</td><td>proc for after import action, hook called with  importer object</td></tr>
+<tr><td>:before_batch_import</td><td>proc for before each batch action, called with  importer object</td></tr>
+<tr><td>:after_batch_import</td><td>proc for after each batch action, called with  importer object</td></tr>
+<tr><td>:on_duplicate_key_update</td><td>an Array or Hash, tells activerecord-import to use MySQL's ON DUPLICATE KEY UPDATE ability.</td></tr>
+<tr><td>:timestamps</td><td>true|false, tells activerecord-import to not add timestamps (if false) even if record timestamps is disabled in ActiveRecord::Base</td></tr>
+<tr><td>:ignore</td><td>true|false, tells activerecord-import toto use MySQL's INSERT IGNORE ability</td></tr>
+<tr><td>:template</td><td>custom template rendering</td></tr>
+<tr><td>:template_object</td><td>object passing to view</td></tr>
+<tr><td>:locals</td><td>more variables for template</td></tr>
+<tr><td>:resource_class</td><td>resource class name</td></tr>
+<tr><td>:resource_label</td><td>resource label value</td></tr>
+<tr><td>:plural_resource_label</td><td>pluralized resource label value (default config.plural_resource_label)</td></tr>
+<tr><td>:headers_rewrites</td><td>hash with key (csv header) - value (db column name) rows mapping</td></tr>
+</table>
+
+
+
+#### Default options values
 
 ```ruby    
     back: {action: :import},
@@ -83,7 +93,7 @@ Default options values
     plural_resource_label: config.plural_resource_label,
 ```    
 
-Example1 
+#### Example1 
 
 ```ruby  
     ActiveAdmin.register Post  do
@@ -97,9 +107,9 @@ Example1
 ```
 
 
-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
+<p> This config allows to replace data in 1 sql query with callback </p>
 
 ```ruby
     ActiveAdmin.register Post  do
@@ -110,15 +120,15 @@ This config allows to replace data without downtime
             after_import: proc{
                 Post.transaction do
                     Post.delete_all
-                    Post.connection.execute("INSERT INTO posts (SELECT * FROM import_posts)")
+                    Post.connection.execute("INSERT INTO posts (SELECT * FROM imported_posts)")
                 end
             },
             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
@@ -130,7 +140,7 @@ Example3 Importing file without headers, but we always know file format, so we c
     end
 ```
 
-Example4 Importing without forcing to UTF-8 and disallow archives
+#### Example4 Importing without forcing to UTF-8 and disallow archives
 
 
 ```ruby
@@ -145,7 +155,7 @@ Example4 Importing without forcing to UTF-8 and disallow archives
 ```
 
 
-Example5 Callbacks for each bulk insert iteration
+#### Example5 Callbacks for each bulk insert iteration
 
 
 ```ruby
@@ -166,9 +176,9 @@ Example5 Callbacks for each bulk insert iteration
     end
 ```    
 
-Example6 dynamic CSV options, template overriding
+#### Example6 dynamic CSV options, template overriding
 
-1) put overrided template to app/views/import.html.erb
+ -  put overrided template to ```app/views/import.html.erb```
 
 ```erb
 
@@ -194,7 +204,7 @@ Example6 dynamic CSV options, template overriding
     
 ```
 
-2) call method with following parameters
+ - call method with following parameters
 
 ```ruby
     ActiveAdmin.register Post  do
@@ -212,8 +222,7 @@ https://github.com/gregbell/active_admin
 
 https://github.com/zdennis/activerecord-import
 
-#Source Doc
-http://rubydoc.info/gems/active_admin_import/2.1.1/
+