flextures 4.2.7 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec25de01a43e9290997564492a3d9e7130bdab30d9fc3d336fb217e43e9a832
-  data.tar.gz: b69afe1a47cefcc14e34e7bfa0bc1b388cf5215bcfb490dd111fb03a1f5a9a04
+  metadata.gz: 5a90f13f3dcd22f411ae7cd083c447f519c4e83f7bc12d668f66b332d00743bf
+  data.tar.gz: 10841a7d58ab0315c64e79cffb8747d4aac6ca831b18f509a54ded94a5630047
 SHA512:
-  metadata.gz: 43add46684a60b6214936b9fe40824db473bccd44984940ba02b0769074e027eb28ef927f46c7621584a0532d48c2ed8be93fb633ee5ea7f45935905f9dff476
-  data.tar.gz: 6033adcd80cd7bc9ed63c4f045c9a5893b849a58722d633c2158bf7983416dd1300019d84e5dcbcc9e0e681ef48fd0443d1a2bae603ec978ad134461ad0c57b4
+  metadata.gz: b975ba3a7c920dd434dc452d4a58984b2073cf56b99156223ece80bb147a9e248986d6f3b0a6c558bf5931db828ae5b51c0d6003660cebcd32a1092626671dea
+  data.tar.gz: 7de4861baec635cb9f4a736c59d7d7bb23d66a9067796687f1eb5e689a24b52b6f54a268b4934dc4857846d95bd9c2479924575e2407c7148b010d3fde32dbbc

data/Gemfile

@@ -1,15 +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 "minitest"
+gem "smarter_csv"
 
 group :test do
-  gem "minitest-line", "0.6.2"
-  gem "minitest-bang", "0.1.1"              # let文を使えるようにする
-  gem "minitest-implicit-subject", "1.4.0"  # subject関数を追加する
-  gem "minitest-power_assert", "0.0.3"      # power assertを有効にする
 end

data/Gemfile.lock

@@ -1,59 +1,45 @@
 PATH
   remote: .
   specs:
-    flextures (4.2.7)
+    flextures (4.3.1)
       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)
-      arel (>= 9.0)
-    activesupport (5.2.0)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
       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)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    concurrent-ruby (1.1.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     minitest (5.4.0)
-    minitest-bang (0.1.1)
-      minitest (>= 4.7.5, <= 5.4.0)
-    minitest-implicit-subject (1.4.0)
-      minitest
-    minitest-line (0.6.2)
-      minitest (~> 5.0)
-    minitest-power_assert (0.0.3)
-      minitest
-      power_assert
-    power_assert (0.2.2)
-    rake (0.9.2.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    rake (13.0.1)
+    smarter_csv (1.2.6)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.6)
+  bundler (> 1.6)
   flextures!
-  minitest (= 5.4.0)
-  minitest-bang (= 0.1.1)
-  minitest-implicit-subject (= 1.4.0)
-  minitest-line (= 0.6.2)
-  minitest-power_assert (= 0.0.3)
+  minitest
   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

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{load and dump fixtures.}
   spec.homepage      = "http://github.com/baban/flextures"
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -19,7 +20,8 @@ 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 "bundler", "> 1.6"
   spec.add_development_dependency "rake"
 end

data/lib/flextures/flextures_dumper.rb

@@ -146,6 +146,12 @@ module Flextures
           [proc { |d| d.to_s }]
         self.translate_creater d, procs
       },
+      enum:->( d, format ){
+        procs = (format == :yml) ?
+          [:blankstr, :nullstr, :ymlspecialstr] :
+          [:null, proc{ |s| s.to_s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") } ]
+        self.translate_creater d, procs
+      },
       # use null only value
       null:->( d, format ){
         format==:yml ? "null" : ""
@@ -158,8 +164,8 @@ module Flextures
     # @params [Symbol] format data type (:yml or :csv)
     # @return translated value
     def self.trans(v, type, format)
-      trans = TRANSLATER[type]
-      return trans.call(v, format) if trans
+      translater = TRANSLATER[type]
+      return translater.call(v, format) if translater
       v
     end
 
@@ -168,7 +174,10 @@ module Flextures
     # @params [Hash] options dump options
     # @return [Array] columns format information
     def self.dump_attributes(klass, options)
-      columns = klass.columns.map { |column| { name: column.name, type: column.type } }
+      columns = klass.columns.map do |column|
+        type_name = klass.defined_enums[column.name.to_s] ? :enum : column.type
+        { name: column.name, type: type_name }
+      end
       # option[:minus] colum is delete columns
       columns.reject! { |column| options[:minus].include?(column[:name]) } if options[:minus]
       # option[:plus] colum is new columns
@@ -183,10 +192,10 @@ module Flextures
     # @params [Hash] options options
     # @params [Symbol] type format type (:yml or :csv)
     # @return [Proc] filter function
-    def self.create_filter(attr_type, format, type)
+    def self.create_filter(attr_types, format, type)
       filter = DumpFilter[format[:table].to_s.to_sym] || {}
       ->(row) {
-        attr_type.map do |h|
+        attr_types.map do |h|
           v = filter[h[:name].to_sym] ? filter[h[:name].to_sym].call(row[h[:name]]) : trans(row[h[:name]], h[:type], type)
           [h[:name],v]
         end
@@ -198,13 +207,13 @@ module Flextures
     # @params [Hash] options dump format options
     def self.csv(format)
       klass = PARENT.create_model(format[:table])
-      attr_type = self.dump_attributes klass, format
-      filter = self.create_filter attr_type, format, :csv
-      self.dump_csv klass, attr_type, filter, format
+      attr_types = self.dump_attributes klass, format
+      filter = self.create_filter attr_types, format, :csv
+      self.dump_csv klass, attr_types, filter, format
     end
 
     # dump csv format data
-    def self.dump_csv(klass, attr_type, values_filter, format)
+    def self.dump_csv(klass, attr_types, values_filter, format)
       # TODO: 拡張子は指定してもしなくても良いようにする
       file_name = format[:file] || format[:table]
       dir_name = File.join(Flextures::Configuration.dump_directory, format[:dir].to_s)
@@ -212,7 +221,7 @@ module Flextures
       outfile = File.join(dir_name, "#{file_name}.csv")
       CSV.open(outfile,'w') do |csv|
         # dump column names
-        csv<< attr_type.map { |h| h[:name].to_s }
+        csv<< attr_types.map { |h| h[:name].to_s }
         # dump column datas
         klass.all.each do |row|
           csv<< values_filter.call(row).map(&:last)
@@ -226,8 +235,8 @@ module Flextures
     # @params [Hash] options dump format options
     def self.yml(format)
       klass = PARENT::create_model(format[:table])
-      attr_type = self.dump_attributes klass, format
-      filter = self.create_filter attr_type, format, :yml
+      attr_types = self.dump_attributes klass, format
+      filter = self.create_filter attr_types, format, :yml
       self.dump_yml(klass, filter, format)
     end
 

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.7".freeze
+  VERSION="4.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 4.2.7
+  version: 4.3.1
 platform: ruby
 authors:
 - baban
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2022-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,18 +38,32 @@ 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
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -116,15 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: load and dump fixtures.