Merge branch 'ifyouseewendy-feature/add_failed_message'

Author: Fivell

config/locales/en.yml

@@ -12,8 +12,8 @@ en:
       one: "Successfully imported 1 %{model}"
       other: "Successfully imported %{count} %{plural_model}"
     failed:
-      one:   "Failed to import 1 %{model}"
-      other: "Failed to import %{count} %{plural_model}"
+      one:   "Failed to import 1 %{model}: %{message}"
+      other: "Failed to import %{count} %{plural_model}: %{message}"
     import_model: "Import %{plural_model}"
     import_btn: "Import"
     import_btn_disabled: "Wait..."

lib/active_admin_import/dsl.rb

@@ -37,7 +37,7 @@ module DSL
           return if options[:batch_transaction]
         end
         if result.has_imported?
-          flash[:notice] = I18n.t('active_admin_import.imported', count: result.imported_qty, model: model_name, plural_model: plural_model_name)
+          flash[:error] = I18n.t('active_admin_import.failed', count: result.failed.count, model: model_name, plural_model: plural_model_name, message: result.failed_message(limit: 5))
         end
       end
     end

lib/active_admin_import/import_result.rb

@@ -8,18 +8,18 @@ def initialize
     end
 
     def add(result, qty)
-       @failed += result.failed_instances
-       @total+=qty
+      @failed += result.failed_instances
+      @total  += qty
     end
-        
+
     def imported_qty
       total - failed.count
-    end 
-    
+    end
+
     def has_imported?
       imported_qty > 0
     end
-    
+
     def has_failed?
       @failed.any?
     end
@@ -28,5 +28,12 @@ def empty?
       total == 0
     end
 
+    def failed_message(options = {})
+      limit = options.fetch(:limit, failed.count)
+      failed.first(limit).map{|record|
+        errors = record.errors
+        (errors.full_messages.zip errors.keys.map{|k| record.send k}).map{|ms| ms.join(' - ')}.join(', ')
+      }.join(" ; ")
+    end
   end
-end
+end

spec/import_result_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe ActiveAdminImport::ImportResult do
+  context "failed_message" do
+    let(:import_result) { ActiveAdminImport::ImportResult.new }
+
+    before do
+      Author.create(name: 'John', last_name: 'Doe')
+      Author.create(name: 'Jane', last_name: 'Roe')
+
+      @result = double \
+        failed_instances: [
+          Author.create(name: 'Jim', last_name: "Doe"), # {:last_name=>["has already been taken"]}
+          Author.create(name: nil,   last_name: 'Doe')  # {:name=>["can't be blank"], :last_name=>["has already been taken"]}
+        ]
+    end
+
+    it "should work without any failed instances" do
+      expect(import_result.failed_message).to eq("")
+    end
+
+    it "should work" do
+      import_result.add(@result, 4)
+      expect(import_result.failed_message).to eq("Last name has already been taken - Doe ; Name can't be blank - , Last name has already been taken - Doe")
+    end
+
+    it "should work on limit param" do
+      import_result.add(@result, 4)
+      expect(import_result.failed_message(limit: 1)).to eq("Last name has already been taken - Doe")
+    end
+  end
+end