flextures 4.2.7 → 4.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec25de01a43e9290997564492a3d9e7130bdab30d9fc3d336fb217e43e9a832
-  data.tar.gz: b69afe1a47cefcc14e34e7bfa0bc1b388cf5215bcfb490dd111fb03a1f5a9a04
+  metadata.gz: cf2d34b2424a6a16564ed647a928edb9192b5b1182605393cceba57b1c097972
+  data.tar.gz: 27c93837bf4afb4ab4dfacd5a7f1dadb85491c0b7093287525a012bd899705fd
 SHA512:
-  metadata.gz: 43add46684a60b6214936b9fe40824db473bccd44984940ba02b0769074e027eb28ef927f46c7621584a0532d48c2ed8be93fb633ee5ea7f45935905f9dff476
-  data.tar.gz: 6033adcd80cd7bc9ed63c4f045c9a5893b849a58722d633c2158bf7983416dd1300019d84e5dcbcc9e0e681ef48fd0443d1a2bae603ec978ad134461ad0c57b4
+  metadata.gz: ee0c12d7492320c6664273390d730e9729df0af8ef02e28a06a3dbdd51ce22124c55555e9f372d0b8d6d2efb471a9659b535d59e168501c4d90086c4a0768ab0
+  data.tar.gz: 5f63de4503c68eaac01dc6a3c9142af82f78b5748ec9c9073b25597080bd52014959d61080fa9294c690f472ef1f504ded820ee8b086eb98587afc38482b4a97

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flextures (4.2.7)
+    flextures (4.2.8)
       activerecord
       activesupport
 

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 4.2.7
+  version: 4.2.8
 platform: ruby
 authors:
 - baban
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord