From 50d055c2f241ef08a28fb5d361fb7717689e5845 Mon Sep 17 00:00:00 2001
From: Igor Fedoronchuk <igor.f@didww.com>
Date: Mon, 19 Jan 2015 14:10:49 +0200
Subject: [PATCH] win1251 specs

---
 lib/active_admin_import/model.rb               | 13 ++++++++++---
 .../files/authors_win1251_win_endline.csv      |  3 +++
 spec/import_spec.rb                            | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/files/authors_win1251_win_endline.csv

diff --git a/lib/active_admin_import/model.rb b/lib/active_admin_import/model.rb
index 1057e38..a5f173f 100644
--- a/lib/active_admin_import/model.rb
+++ b/lib/active_admin_import/model.rb
@@ -132,9 +132,16 @@ def define_methods_for(attr_name)
     end
 
     def encode(data)
-      data.encode(force_encoding, "binary",
-                  invalid: :replace, undef: :replace,  replace: "").
-          sub("\xEF\xBB\xBF", "")
+      data = data.force_encoding("UTF-8")
+      unless data.valid_encoding?
+        data = data.encode(force_encoding,
+                           invalid: :replace, undef: :replace, replace: "")
+      end
+      begin
+        data.sub("\xEF\xBB\xBF", "")   # bom
+      rescue ArgumentError => _
+        data
+      end
     end
 
     class <<self
diff --git a/spec/fixtures/files/authors_win1251_win_endline.csv b/spec/fixtures/files/authors_win1251_win_endline.csv
new file mode 100644
index 0000000..4c16d28
--- /dev/null
+++ b/spec/fixtures/files/authors_win1251_win_endline.csv
@@ -0,0 +1,3 @@
+Name,Last name,Birthday
+Алексей,Панкратов,1986-05-01
+Jane,Roe,1988-11-16
diff --git a/spec/import_spec.rb b/spec/import_spec.rb
index 88641ee..5088a35 100644
--- a/spec/import_spec.rb
+++ b/spec/import_spec.rb
@@ -112,6 +112,24 @@ def upload_file!(name, ext='csv')
         end
       end
 
+      context "Win1251" do
+
+        before do
+          upload_file!(:authors_win1251_win_endline)
+        end
+
+        it "should import file with many records" do
+          expect(page).to have_content "Successfully imported 2 authors"
+          expect(Author.count).to eq(2)
+          Author.all.each do |author|
+            expect(author).to be_valid
+            expect(author.name).to be_present
+            expect(author.last_name).to be_present
+          end
+        end
+
+      end
+
       context "BOM" do
 
         it "should import file with many records" do