rails-importer 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573081d673ea028ad52dedeb5b6492358a0e7e1e909b1f867e064bb01112ca9c
-  data.tar.gz: 83d313fdbd28f692b740e84c0ee2563f43f8ae2670489de0190da2db4e19bd5e
+  metadata.gz: 21fedbfaf0623b35213ec6e37dafab5d3a11040ffaae8add9613e726743b441c
+  data.tar.gz: 3ba9d86e6cdd1b2cd4217c52b9718ebc2e654ac128d1d14551165891c3501282
 SHA512:
-  metadata.gz: 3a5f67741c4dd49bde921f88451fac6cc275b2270d7137380915c0c7fcb2ce2b93528b70b5029048a6dffa2b5ba6787b17a7258f8f6f8b22a4fc6cf28f1ac157
-  data.tar.gz: f6cf858f4b81136dd9af761a00a882548f42d25658143cc522811ecdc1439918c9f47ec0d41adc31a62d887b55538b0c77a9b225e3ac0145aa77dcfd73e1a3b8
+  metadata.gz: dddecdf677d03410d18c8df7977be529c5b571ee550263f40aff43544face6b4ef8a9227ae6c5e3f940db62640f49b6f0f6a098707bea9afeb3f7fbd1cb32f76
+  data.tar.gz: d20d9a502f0943fe733b655af1c42342565ed04461a3e5c2a4c9d4c86048786e41a16e849aea12c85c6f5a20135afd0efcd4489d320bb771b3e40f9c05d9c5f2

data/README.md

@@ -40,6 +40,7 @@ class ExampleImporter < RailsImporter::Base
   end
   
   # importer :simple do
+  #   csv_params col_sep: ';'
   #   xml_structure :root, :row
   #   fields :name, :email, :age
   #   each_record do |record, params|

data/lib/generators/templates/generic_importer.erb

@@ -8,6 +8,7 @@ class <%= @importer_name %>Importer < RailsImporter::Base
   end
 
   # importer :simple do
+  #   csv_params col_sep: ';'
   #   xml_structure :root, :row
   #   fields :name, :email, :age
   #   each_record do |record, params|

data/lib/rails_importer/base.rb

@@ -43,7 +43,12 @@ module RailsImporter
       # end
 
       def importer(name = :default, &block)
-        (self.importers ||= {})[name] ||= {fields: [], xml_structure: [:records, :record], each_record: nil}
+        (self.importers ||= {})[name] ||= {
+          fields: [],
+          csv_params: {headers: false, col_sep: ',', force_quotes: true},
+          xml_structure: %i[records record],
+          each_record: nil
+        }
         @importer_name = name
         block.call if block_given?
         self.importers[name]
@@ -57,6 +62,13 @@ module RailsImporter
         importer_value(:xml_structure, attributes)
       end
 
+      def csv_params(*attributes)
+        options = importer_value(:csv_params)
+        params = attributes.first
+        options = options.merge(params) if params.is_a?(Hash)
+        importer_value(:csv_params, options)
+      end
+
       def each_record(&block)
         importer_value(:each_record, block)
       end
@@ -64,12 +76,15 @@ module RailsImporter
       private
       def import_from_csv(file, context = :default, custom_fields = :nil)
         records = []
-        line = 0
-        CSV.foreach(file.path, {:headers => false, :col_sep => ';', :force_quotes => true}) do |row|
-          if line > 0
-            records << object_values(row, context, custom_fields) unless array_blank?(row)
+        first_line = nil
+        options = self.importers[context][:csv_params]
+        CSV.foreach(file.path, options.merge(headers: false)) do |row|
+          # Skip headers
+          if first_line.nil?
+            first_line = row
+            next
           end
-          line += 1
+          records << object_values(row, context, custom_fields) unless array_blank?(row)
         end
         records
       end
@@ -128,16 +143,10 @@ module RailsImporter
         array.all?(&:blank?)
       end
 
-      def importer_value(key, attributes)
-        if attributes.present?
-          if key == :fields
-            self.importers[@importer_name][key] = normalize_fields(attributes)
-          else
-            self.importers[@importer_name][key] = attributes
-          end
-        else
-          self.importers[@importer_name][key]
-        end
+      def importer_value(key, attributes=nil)
+        return self.importers[@importer_name][key] if attributes.nil?
+        attributes = normalize_fields(attributes) if key == :fields
+        self.importers[@importer_name][key] = attributes
       end
 
       def normalize_fields(attributes)

data/lib/rails_importer/version.rb

@@ -1,3 +1,3 @@
 module RailsImporter
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-importer
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Bruno Porto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails