flextures 4.2.8 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf2d34b2424a6a16564ed647a928edb9192b5b1182605393cceba57b1c097972
-  data.tar.gz: 27c93837bf4afb4ab4dfacd5a7f1dadb85491c0b7093287525a012bd899705fd
+  metadata.gz: cd48603044fc6a0a8f6ff646aece2804e0df83414adbe259febd21fb0f929776
+  data.tar.gz: 611df504022d691e7b2e09c0c5291e6ca843862e648d292f117879ded165aff0
 SHA512:
-  metadata.gz: ee0c12d7492320c6664273390d730e9729df0af8ef02e28a06a3dbdd51ce22124c55555e9f372d0b8d6d2efb471a9659b535d59e168501c4d90086c4a0768ab0
-  data.tar.gz: 5f63de4503c68eaac01dc6a3c9142af82f78b5748ec9c9073b25597080bd52014959d61080fa9294c690f472ef1f504ded820ee8b086eb98587afc38482b4a97
+  metadata.gz: 39e81189895c1a872b33db9c5670e61f64bd2f8f26f534b49252e5b96abaf29f08ef18c69d8979427f667084a92ad12252d1cd3781ad2f75b9b53113223a1642
+  data.tar.gz: adcbad6bedf954ad1ada25dcaa4a57bd1f9708c9c97eaab24852729f18e1cfb8e8db0c1c84616ae75343fae24760876dad34b888e75c2ab8fd972b502591f507

data/Gemfile

@@ -1,11 +1,12 @@
 source 'https://rubygems.org'
 
-ruby ">= 2.1.0"
+ruby ">= 2.3.0"
 
 # Specify your gem's dependencies in flextures.gemspec
 gemspec
 
 gem "minitest", "5.4.0"
+gem "smarter_csv"
 
 group :test do
   gem "minitest-line", "0.6.2"

data/Gemfile.lock

@@ -1,27 +1,28 @@
 PATH
   remote: .
   specs:
-    flextures (4.2.8)
+    flextures (4.3.0)
       activerecord
       activesupport
+      smarter_csv
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.0)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    concurrent-ruby (1.0.5)
-    i18n (1.0.1)
+    concurrent-ruby (1.1.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.4.0)
     minitest-bang (0.1.1)
@@ -35,6 +36,7 @@ GEM
       power_assert
     power_assert (0.2.2)
     rake (0.9.2.2)
+    smarter_csv (1.2.6)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
@@ -51,9 +53,10 @@ DEPENDENCIES
   minitest-line (= 0.6.2)
   minitest-power_assert (= 0.0.3)
   rake
+  smarter_csv
 
 RUBY VERSION
-   ruby 2.2.3p173
+   ruby 2.6.0p-1
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/flextures.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord"
   spec.add_dependency "activesupport"
+  spec.add_dependency "smarter_csv"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/flextures/flextures_loader.rb

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'csv'
 require 'erb'
+require 'smarter_csv'
 
 require 'active_record'
 
@@ -240,25 +241,18 @@ module Flextures
 
     def self.load_csv(format, klass, filter, file_name)
       file = self.load_file(format, file_name)
-      CSV.open(file) do |csv|
-        self.load_csv_row(csv, format, klass, filter, file_name)
-      end
-      file_name
-    end
-
-    def self.load_csv_row(csv, format, klass, filter, file_name)
       attributes = klass.columns.map(&:name)
-      keys = csv.shift # active record column names
-
-      warning("CSV", attributes, keys) unless format[:silent]
-
       ActiveRecord::Base.transaction do
-        csv.each do |values|
-          h = values.to_hash(keys)
+        csv = SmarterCSV.process(file.path)
+        keys = csv.first.keys.map(&:to_s)
+        warning("CSV", attributes, keys) unless format[:silent]
+        csv.each do |row|
+          h = row.reduce({}){ |h,(k,v)| h[k.to_s]=v; h }
           o = filter.call(h)
           o.save(validate: false)
         end
       end
+      file_name
     end
 
     def self.load_yml(format, klass, filter, file_name)
@@ -377,7 +371,7 @@ module Flextures
       translaters = column_hash.reduce({}){ |h,(k,col)| h[k] = col.translater(klass); h }
       strict_filter = ->(o,h){
         # if value is not 'nil', value translate suitable form
-        h.each{ |k,v| v.nil? || o[k] = translaters[k]&.call(v) }
+        h.each { |k,v| v.nil? || o[k] = translaters[k]&.call(v) }
         # call FactoryFilter
         factory.call(*[o, filename, ext][0, factory.arity]) if factory and !options[:unfilter]
         o

data/lib/flextures/version.rb

@@ -1,3 +1,3 @@
 module Flextures
-  VERSION="4.2.8".freeze
+  VERSION="4.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 4.2.8
+  version: 4.3.0
 platform: ruby
 authors:
 - baban
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: smarter_csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: load and dump fixtures.