active_admin_csv_import 1.0.2 → 1.1.0

data/app/assets/javascripts/active_admin_csv_import/import_csv.js

@@ -19,11 +19,17 @@ $(document).ready(function() {
     // Reset input so .change will be triggered if we load the same file again.
     $($file).wrap('<form>').closest('form').get(0).reset();
     $($file).unwrap();
+
+    var progress = $("#csv-import-progress");
+    progress.text("");
   };
 
   // listen for the file to be submitted
   $($file).change(function(e) {
 
+    var progress = $("#csv-import-progress");
+    progress.text("Loading...");
+
     // create the dataset in the usual way but specifying file attribute
     var dataset = new recline.Model.Dataset({
       file: $file.files[0],
@@ -38,6 +44,8 @@ $(document).ready(function() {
         return;
       }
 
+      // Re-query to get all records. Otherwise recline.js defaults to just 100.
+      dataset.query({size: dataset.recordCount});
 
       // Check whether the CSV's columns match up with our data model.
       // import_csv_fields is passed in from Rails in import_csv.html.erb
@@ -58,37 +66,49 @@ $(document).ready(function() {
       } else {
         // Import!
 
-        var progress = $("#csv-import-progress");
         var total = data.recordCount;
         var loaded = 0;
         var succeeded = 0;
+        var i = 0;
 
         _.each(data.records.models, function(record) {
 
-          // Filter only the attributes we want, and normalise column names.
-          var record_data = {};
-          record_data[import_csv_resource_name] = {};
-
-          _.each(_.pairs(record.attributes), function(attr) {
-            var underscored_name = _.underscored(attr[0]);
-            if (_.contains(wanted_columns, underscored_name)) {
-              record_data[import_csv_resource_name][underscored_name] = attr[1];
-            }
-          });
-
-          $.post(
-          import_csv_path,
-          record_data,
-          function(data) {
-            succeeded = succeeded + 1;
-          }).done(function() {
-            loaded = loaded + 1;
-            progress.text("Progress " + toString(Math.round((total / loaded))) + "%");
-
-            if (loaded == total) {
-              progress.text("Done. Imported " + total + " records, " + succeeded + " succeeded.");
-            }
-          });
+          // Add a gap between each post to give the server
+          // room to breathe
+          setTimeout(function () {
+
+            // Filter only the attributes we want, and normalise column names.
+            var record_data = {};
+            record_data[import_csv_resource_name] = {};
+
+            _.each(_.pairs(record.attributes), function(attr) {
+              var underscored_name = _.underscored(attr[0]);
+              if (_.contains(wanted_columns, underscored_name)) {
+                record_data[import_csv_resource_name][underscored_name] = attr[1];
+              }
+            });
+
+            $.post(
+            import_csv_path,
+            record_data,
+            function(data) {
+              succeeded = succeeded + 1;
+            }).always(function() {
+              loaded = loaded + 1;
+              progress.text("Progress: " + loaded + " of " + total);
+
+              if (loaded == total) {
+                progress.html("Done. Imported " + total + " records, " + succeeded + " succeeded.");
+                if (redirect_path) {
+                  progress.html(progress.text() + " <a href='"+redirect_path +"'>Click to continue.</a>");
+                }
+              }
+            });
+
+          }, 100 * i);
+
+          i++;
+
         });
       }
 

data/app/views/admin/csv/import_csv.html.erb

@@ -3,7 +3,7 @@
 <h3>Import <%= active_admin_config.resource_name.pluralize.humanize %> from a CSV File<h3>
 <ul>
   <li>Save a CSV as 'Windows Comma Separated' from Excel.</li>
-  <li>Your CSV should have the following column headings: <%= @fields.map(&:humanize).to_sentence %>. The order doesn't matter.</li>
+  <li>Your CSV should have the following column headings: <%= @fields.map(&:to_s).map(&:humanize).to_sentence %>. The order doesn't matter.</li>
   <li>If a record already exists a duplicate will be created.</li>
 </ul>
 <input id="csv-file-input" type="file">
@@ -12,6 +12,7 @@
 
 <script type="text/javascript">
   var import_csv_fields = <%= @fields.to_json.html_safe %>;
-  var import_csv_path = <%= collection_path.to_json.html_safe %>;
+  var import_csv_path = <%= @post_path.to_json.html_safe %>;
   var import_csv_resource_name = <%= active_admin_config.resource_name.underscore.to_json.html_safe %>;
+  var redirect_path = <%= @redirect_path.to_json.html_safe %>;
 </script>

data/lib/active_admin_csv_import/dsl.rb

@@ -1,19 +1,23 @@
 module ActiveAdminCsvImport
   module DSL
 
-    def csv_importable
+    def csv_importable(options={})
       action_item :only => :index do
         link_to "Import #{active_admin_config.resource_name.to_s.pluralize}", :action => 'import_csv'
       end
 
       collection_action :import_csv do
-        @fields = active_admin_config.resource_class.columns.map(&:name) - ["id", "updated_at", "created_at"]
+        @fields     = options[:columns] ||= active_admin_config.resource_class.columns.map(&:name) - ["id", "updated_at", "created_at"]
+
+        @post_path  = options[:path].try(:call)
+        @post_path ||= collection_path
+
+        @redirect_path = options[:redirect_path].try(:call)
+        @redirect_path ||= collection_path
+
         render "admin/csv/import_csv"
       end
 
-      collection_action :create_or_update_batch, :method => :post do
-        # Create or update from posted data.
-      end
     end
 
   end

data/lib/active_admin_csv_import/railtie.rb

@@ -2,5 +2,7 @@ class Railtie < ::Rails::Railtie
   initializer "active_admin_csv_import.setup_vendor", :after => "active_admin_csv_import.setup", :group => :all do |app|
     vendor_path = File.expand_path("../../vendor/assets", __FILE__)
     app.config.assets.paths.push(vendor_path.to_s)
+
+    app.config.assets.precompile += %w( active_admin_csv_import/import_csv.js )
   end
 end

data/lib/active_admin_csv_import/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminCsvImport
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_csv_import
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70124567784560 !ruby/object:Gem::Requirement
+  requirement: &70194897983060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70124567784560
+  version_requirements: *70194897983060
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70124567783480 !ruby/object:Gem::Requirement
+  requirement: &70194897981980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70124567783480
+  version_requirements: *70194897981980
 description: CSV import for Active Admin capable of handling CSV files too large to
   import via direct file upload to Heroku
 email: