win1251 real specs

Author: Fivell

lib/active_admin_import/model.rb

@@ -85,7 +85,7 @@ def encode_file
 
     def uncompress_file
       Zip::File.open(file_path) do |zip_file|
-        self.file = Tempfile.new("active-admin-import-unzipped")
+        self.file = Tempfile.new('active-admin-import-unzipped')
         data = zip_file.entries.select { |f| f.file? }.first.get_input_stream.read
         self.file << data
         self.file.close
@@ -132,14 +132,12 @@ def define_methods_for(attr_name)
     end
 
     def encode(data)
-      data = data.force_encoding("UTF-8")
-      unless data.valid_encoding?
-        data = data.encode(force_encoding,
-                           invalid: :replace, undef: :replace, replace: "")
-      end
+      data = data.force_encoding(force_encoding) if force_encoding?
+      data = data.encode('UTF-8',
+                         invalid: :replace, undef: :replace)
       begin
-        data.sub("\xEF\xBB\xBF", "")   # bom
-      rescue ArgumentError => _
+        data.sub("\xEF\xBB\xBF", '')  # bom
+      rescue StandardError => _
         data
       end
     end

spec/fixtures/files/authors_win1251_win_endline.csv

@@ -1,3 +1,3 @@
 Name,Last name,Birthday
-Алексей,Панкратов,1986-05-01
+�������,���������,1986-05-01
 Jane,Roe,1988-11-16

spec/import_spec.rb

@@ -96,7 +96,6 @@ def upload_file!(name, ext='csv')
       [:empty, :only_headers].each do |file|
         context "when #{file} file" do
           it "should render warning" do
-
             upload_file!(file)
             expect(page).to have_content I18n.t('active_admin_import.file_empty_error')
             expect(Author.count).to eq(0)
@@ -113,6 +112,10 @@ def upload_file!(name, ext='csv')
       end
 
       context "Win1251" do
+        let(:options) do
+          attributes = { force_encoding: "Windows-1251" }
+          { template_object: ActiveAdminImport::Model.new(attributes) }
+        end
 
         before do
           upload_file!(:authors_win1251_win_endline)
@@ -153,20 +156,24 @@ def upload_file!(name, ext='csv')
           expect(page).to have_content "Successfully imported 1 author"
           expect(Author.count).to eq(1)
         end
+
       end
 
 
       context "without headers" do
         context "with known csv headers" do
-          let(:options) {
-            {template_object: ActiveAdminImport::Model.new(csv_headers: ['Name', 'Last name', 'Birthday'])}
-          }
+
+          let(:options) do
+            attributes = { csv_headers: ['Name', 'Last name', 'Birthday'] }
+            { template_object: ActiveAdminImport::Model.new(attributes) }
+          end
 
           it "should import file" do
             upload_file!(:authors_no_headers)
             expect(page).to have_content "Successfully imported 2 authors"
             expect(Author.count).to eq(2)
           end
+
         end
 
         context "with unknown csv headers" do
@@ -224,10 +231,10 @@ def upload_file!(name, ext='csv')
         end
 
         context "when not allowed" do
-          let(:options) { {
-              template_object: ActiveAdminImport::Model.new(allow_archive: false)
-          } }
-
+          let(:options) do
+            attributes = { allow_archive: false }
+            { template_object: ActiveAdminImport::Model.new(attributes) }
+          end
           it "should render error" do
             with_zipped_csv(:authors) do
               upload_file!(:authors, :zip)
@@ -240,11 +247,9 @@ def upload_file!(name, ext='csv')
 
       context "with different header attribute names" do
 
-        let(:options) {
-          {
-              headers_rewrites: {:'Second name' => :last_name}
-          }
-        }
+        let(:options) do
+          { headers_rewrites: { :'Second name' => :last_name } }
+        end
 
         it "should import file" do
           upload_file!(:author_broken_header)
@@ -254,9 +259,12 @@ def upload_file!(name, ext='csv')
       end
 
       context "with semicolons separator" do
-        let(:options) {
-          {template_object: ActiveAdminImport::Model.new(csv_options: {col_sep: ";"})}
-        }
+
+        let(:options) do
+          attributes = { csv_options: { col_sep: ";" } }
+          { template_object: ActiveAdminImport::Model.new(attributes) }
+        end
+
         it "should import file" do
           upload_file!(:authors_with_semicolons)
           expect(page).to have_content "Successfully imported 2 authors"
@@ -268,12 +276,14 @@ def upload_file!(name, ext='csv')
 
 
     context "with callback procs options" do
-      let(:options) { {
-          before_import: proc { |_|},
-          after_import: proc { |_|},
-          before_batch_import: proc { |_|},
-          after_batch_import: proc { |_|}
-      } }
+      let(:options) do
+        {
+          before_import: proc { |_| },
+          after_import: proc { |_| },
+          before_batch_import: proc { |_| },
+          after_batch_import: proc { |_| }
+        }
+      end
 
 
       it "should call each callback" do