csv_import_magic 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 321553d3e5ebc854442c46e438052d35af9cf4aba2c72bc67d5c2ff069b3c2d8
-  data.tar.gz: 70fe60e1e926b292ce24c19457267e1af09eee964e3d1d72a47c11bd65c3f535
+SHA1:
+  metadata.gz: 3d5b5f8669105bb8d7983048f511abb334ef9d73
+  data.tar.gz: f2ebee5e087ef16940f41c4292b2762a59837e81
 SHA512:
-  metadata.gz: d98f4090b1882c8cb792f4c1241f0cfdab81216a2843398539b1629d5e9cc6bf19707ac06a77acfd1e5cbb0f8d392aa302095ad483c054dc80978cf98c21b7f3
-  data.tar.gz: 691276d8559981402e222835d516d18980f245314e4e535c8fcf8e1eed8a45e4d97c7be1996c2087641a8b282d8fcedd57ddc9a830e4b64ee8645e59660df183
+  metadata.gz: 8266950fffe4d6d37b60884b491d8402311fc7a5c30f22f1ca7070378a4060355e8c80417d8dfad5054a9eac03cf51a90a2f2c8f9d366aa77f3efee832443836
+  data.tar.gz: 5563a6ce0f18183364f3ecdd25b13503c0502cb2591a3ebee8aae78a6a293a76317b7702acb1db4622278377d6e79115030bb0ce5235c6733c71cb850e5c2570

data/app/models/importer.rb

@@ -33,6 +33,10 @@ class Importer < ActiveRecord::Base
     source_klass.columns_names(name_of_parser.to_sym)
   end
 
+  def human_attribute_name(column, options = {})
+    I18n.translate(:"activemodel.attributes.#{source_klass.model_name.i18n_key}.csv_import_magic.#{column}", options.merge(default: source_klass.human_attribute_name(column)))
+  end
+
   private
 
   def set_parser
@@ -53,7 +57,7 @@ class Importer < ActiveRecord::Base
     return if columns_to_translate.blank?
 
     transalated_name_of_columns = columns_to_translate.map do |column|
-      source_klass.human_attribute_name(column)
+      human_attribute_name(column)
     end.to_sentence
 
     errors.add(:columns, I18n.t('errors.messages.missing', count: columns_to_translate.size, columns: transalated_name_of_columns))
@@ -70,7 +74,7 @@ class Importer < ActiveRecord::Base
 
     headers_to_translate = duplicate_headers.uniq
     headers_transalated = headers_to_translate.map do |header|
-      source_klass.human_attribute_name(header)
+      human_attribute_name(header)
     end.to_sentence
 
     errors.add(:columns, I18n.t('errors.messages.uniq', count: headers_to_translate.size, columns: headers_transalated))

data/app/services/csv_import_magic/importer.rb

@@ -17,7 +17,7 @@ module CsvImportMagic
     end
 
     def column_separator
-      header = content.lines("\r")[0].gsub(/[^,;\t]/, '_')
+      header = content.lines[0].gsub(/[^,;\t]/, '_')
       header.scan(/[,;\t]/).first
     end
 

data/app/views/csv_import_magic/importers/edit.html.erb

@@ -1,4 +1,4 @@
-<% columns = @importer.importable_columns(@importer.parser).map { |column| [@importer.source_klass.human_attribute_name(column), column] }.unshift([t('csv_import_magic.views.importers.edit.ignore_column_label'), :ignore]) %>
+<% columns = @importer.importable_columns(@importer.parser).map { |column| [@importer.human_attribute_name(column), column] }.unshift([t('csv_import_magic.views.importers.edit.ignore_column_label'), :ignore]) %>
 
 <h3 class='page-title'>
   <%= t('csv_import_magic.views.importers.edit.title') %>
@@ -17,7 +17,7 @@
           </header>
 
           <% selected = columns.find { |c| c.join(' ').match(/#{header}/i) }.try(:last).presence || :ignore %>
-          <%= f.input "columns][", as: :select, collection: columns, label: false, hint: t('csv_import_magic.views.importers.edit.hint'), include_blank: false, selected: f.object.columns[i] || selected %>
+          <%= f.input "columns[]", as: :select, collection: columns, label: false, hint: t('csv_import_magic.views.importers.edit.hint'), include_blank: false, selected: f.object.columns[i] || selected %>
 
           <header class="examples"><%= t('csv_import_magic.views.importers.edit.example_of_values') %></header>
           <table>

data/lib/csv_import_magic/version.rb

@@ -1,3 +1,3 @@
 module CsvImportMagic
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

data/spec/lib/generators/csv_import_magic/views_generator_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe CsvImportMagic::Generators::ViewsGenerator, type: :generator do
 
   specify 'check structure of edit view' do
     edit_content = <<-EOF
-<% columns = @importer.importable_columns(@importer.parser).map { |column| [@importer.source_klass.human_attribute_name(column), column] }.unshift([t('csv_import_magic.views.importers.edit.ignore_column_label'), :ignore]) %>
+<% columns = @importer.importable_columns(@importer.parser).map { |column| [@importer.human_attribute_name(column), column] }.unshift([t('csv_import_magic.views.importers.edit.ignore_column_label'), :ignore]) %>
 
 <h3 class='page-title'>
   <%= t('csv_import_magic.views.importers.edit.title') %>
@@ -83,7 +83,7 @@ RSpec.describe CsvImportMagic::Generators::ViewsGenerator, type: :generator do
           </header>
 
           <% selected = columns.find { |c| c.join(' ').match(/#\{header\}/i) }.try(:last).presence || :ignore %>
-          <%= f.input "columns][", as: :select, collection: columns, label: false, hint: t('csv_import_magic.views.importers.edit.hint'), include_blank: false, selected: f.object.columns[i] || selected %>
+          <%= f.input "columns[]", as: :select, collection: columns, label: false, hint: t('csv_import_magic.views.importers.edit.hint'), include_blank: false, selected: f.object.columns[i] || selected %>
 
           <header class="examples"><%= t('csv_import_magic.views.importers.edit.example_of_values') %></header>
           <table>

data/spec/models/importer_spec.rb

@@ -79,4 +79,22 @@ RSpec.describe Importer, type: :model do
     let(:importer) { create(:importer, source: 'company') }
     it { expect(importer.importable_columns).to match_array([:name, :street, :number, :neighborhood, :city, :state, :country]) }
   end
+
+  context '#human_attribute_name' do
+    let(:importer) { create(:importer, source: 'company') }
+    column = 'name'
+    context 'without a translation set' do
+      it 'defaults to source_klass human_attribute_name' do
+        expect(importer.human_attribute_name(column)).to eq(importer.source_klass.human_attribute_name(column))
+      end
+    end
+
+    context 'with a translation set' do
+      it 'returns scoped translation' do
+        allow(I18n).to receive(:translate)
+        allow(I18n).to receive(:translate).with(:"activemodel.attributes.company.csv_import_magic.name", default: importer.source_klass.human_attribute_name(column)).and_return('scoped transalation')
+        expect(importer.human_attribute_name(column)).to eq('scoped transalation')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_import_magic
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Saulo Santiago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -479,7 +479,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Engine for import CSV dynamically by model