flextures 4.2.6 → 4.2.7

data/lib/flextures/active_record_test_fixtures.rb

@@ -1,138 +1,138 @@
-# override setup_fixtures function
-module ActiveRecord
-  module TestFixtures
-    PARENT = self
-    @@flextures_loader = Flextures::Loader.new
-    @@all_cached_flextures = {}
-    @@already_loaded_flextures = {}
-
-    alias :setup_fixtures_bkup :setup_fixtures
-    def setup_fixtures
-      Flextures::load_configurations
-      setup_fixtures_bkup
-    end
-
-    alias :teardown_fixtures_bkup :teardown_fixtures
-    def teardown_fixtures
-      teardown_fixtures_bkup
-    end
-
-    # load initial fixtures
-    # There is fixtures load before start rspec
-    def self.init_load_should_cache_fixtures(table_load_settings)
-      table_load_settings.each do |load_setting|
-        if should_cache_setting?(load_setting) and !cached_table?(load_setting)
-          @@flextures_loader.load(load_setting)
-          set_cached_settng_list(load_setting)
-        end
-      end
-    end
-
-    # Usually, fixture is cached when is exist under "spec/fixture/" directly.
-    def self.should_cache_setting?(load_setting)
-      load_setting.keys.sort == %i[table file loader].sort &&
-      load_setting[:file].to_s == load_setting[:table].to_s &&
-      load_setting[:loader] == :fun
-    end
-
-    # check: same data is exist in DB.
-    def self.cached_table?(load_setting)
-      flextures_cached?(load_setting) || fixture_cached?(load_setting)
-    end
-
-    def self.flextures_cached?(load_setting)
-      config = @@all_cached_flextures[load_setting[:table]]
-      config && config == load_setting
-    end
-
-    # flextures check fixture function already loaded data.
-    def self.fixture_cached?(load_setting)
-      default_file_path = File.join(Flextures::Configuration.load_directory, "#{load_setting[:table]}.yml")
-
-      load_setting[:file] == default_file_path &&
-      yml_fixture_cached?(load_setting[:table])
-    end
-
-    def self.yml_fixture_cached?(table_name)
-      connection = ActiveRecord::Base.connection
-      !!ActiveRecord::FixtureSet.fixture_is_cached?(connection, table_name)
-    end
-
-    def self.set_cached_settng_list(load_setting)
-      @@all_cached_flextures[load_setting[:table]] = load_setting
-    end
-
-    def load_not_cached_fixtures(table_load_settings)
-      table_load_settings.each do |load_setting|
-        if PARENT.cached_table?(load_setting) and load_setting[:cache] != false
-          next
-        else
-          @@flextures_loader.load(load_setting)
-        end
-      end
-    end
-
-    def load_all_fixtures(table_load_settings)
-      table_load_settings.each do |load_setting|
-        @@flextures_loader.load(load_setting)
-      end
-    end
-
-    module ClassMethods
-      def get_or_initialize_flextures_loader_options
-        @flextures_loader_options ||= {}
-      end
-
-      def flextures_loader_options
-        get_or_initialize_flextures_loader_options
-      end
-
-      def flextures_loader
-        PARENT.class_variable_get(:@@flextures_loader)
-      end
-
-      def flextures(*fixtures)
-        loads_use_cache_fixtures(*fixtures)
-      end
-
-      def loads_use_cache_fixtures(*fixtures)
-        table_load_settings = Flextures::Loader.parse_flextures_options(flextures_loader_options, *fixtures)
-
-        if (respond_to?(:use_transactional_fixtures) && use_transactional_fixtures) || (respond_to?(:use_transactional_tests) && use_transactional_tests)
-          PARENT.init_load_should_cache_fixtures(table_load_settings)
-          before do
-            load_not_cached_fixtures(table_load_settings)
-          end
-        else
-          before do
-            load_all_fixtures(table_load_settings)
-          end
-        end
-      end
-
-      # delete table data
-      # @params [Array] _ table names
-      def flextures_delete(*_)
-        before do
-          if _.empty?
-            Flextures::init_tables
-          else
-            Flextures::delete_tables(*_)
-          end
-        end
-      end
-
-      def flextures_set_options(options)
-        get_or_initialize_flextures_loader_options.merge!(options)
-      end
-
-      def flextures_instance
-        self
-      end
-
-      def flextures_options
-        @flextures_loader_options
-      end
-    end
-  end
-end
+# override setup_fixtures function
+module ActiveRecord
+  module TestFixtures
+    PARENT = self
+    @@flextures_loader = Flextures::Loader.new
+    @@all_cached_flextures = {}
+    @@already_loaded_flextures = {}
+
+    alias :setup_fixtures_bkup :setup_fixtures
+    def setup_fixtures
+      Flextures::load_configurations
+      setup_fixtures_bkup
+    end
+
+    alias :teardown_fixtures_bkup :teardown_fixtures
+    def teardown_fixtures
+      teardown_fixtures_bkup
+    end
+
+    # load initial fixtures
+    # There is fixtures load before start rspec
+    def self.init_load_should_cache_fixtures(table_load_settings)
+      table_load_settings.each do |load_setting|
+        if should_cache_setting?(load_setting) and !cached_table?(load_setting)
+          @@flextures_loader.load(load_setting)
+          set_cached_settng_list(load_setting)
+        end
+      end
+    end
+
+    # Usually, fixture is cached when is exist under "spec/fixture/" directly.
+    def self.should_cache_setting?(load_setting)
+      load_setting.keys.sort == %i[table file loader].sort &&
+      load_setting[:file].to_s == load_setting[:table].to_s &&
+      load_setting[:loader] == :fun
+    end
+
+    # check: same data is exist in DB.
+    def self.cached_table?(load_setting)
+      flextures_cached?(load_setting) || fixture_cached?(load_setting)
+    end
+
+    def self.flextures_cached?(load_setting)
+      config = @@all_cached_flextures[load_setting[:table]]
+      config && config == load_setting
+    end
+
+    # flextures check fixture function already loaded data.
+    def self.fixture_cached?(load_setting)
+      default_file_path = File.join(Flextures::Configuration.load_directory, "#{load_setting[:table]}.yml")
+
+      load_setting[:file] == default_file_path &&
+      yml_fixture_cached?(load_setting[:table])
+    end
+
+    def self.yml_fixture_cached?(table_name)
+      connection = ActiveRecord::Base.connection
+      !!ActiveRecord::FixtureSet.fixture_is_cached?(connection, table_name)
+    end
+
+    def self.set_cached_settng_list(load_setting)
+      @@all_cached_flextures[load_setting[:table]] = load_setting
+    end
+
+    def load_not_cached_fixtures(table_load_settings)
+      table_load_settings.each do |load_setting|
+        if PARENT.cached_table?(load_setting) and load_setting[:cache] != false
+          next
+        else
+          @@flextures_loader.load(load_setting)
+        end
+      end
+    end
+
+    def load_all_fixtures(table_load_settings)
+      table_load_settings.each do |load_setting|
+        @@flextures_loader.load(load_setting)
+      end
+    end
+
+    module ClassMethods
+      def get_or_initialize_flextures_loader_options
+        @flextures_loader_options ||= {}
+      end
+
+      def flextures_loader_options
+        get_or_initialize_flextures_loader_options
+      end
+
+      def flextures_loader
+        PARENT.class_variable_get(:@@flextures_loader)
+      end
+
+      def flextures(*fixtures)
+        loads_use_cache_fixtures(*fixtures)
+      end
+
+      def loads_use_cache_fixtures(*fixtures)
+        table_load_settings = Flextures::Loader.parse_flextures_options(flextures_loader_options, *fixtures)
+
+        if (respond_to?(:use_transactional_fixtures) && use_transactional_fixtures) || (respond_to?(:use_transactional_tests) && use_transactional_tests)
+          PARENT.init_load_should_cache_fixtures(table_load_settings)
+          before do
+            load_not_cached_fixtures(table_load_settings)
+          end
+        else
+          before do
+            load_all_fixtures(table_load_settings)
+          end
+        end
+      end
+
+      # delete table data
+      # @params [Array] _ table names
+      def flextures_delete(*_)
+        before do
+          if _.empty?
+            Flextures::init_tables
+          else
+            Flextures::delete_tables(*_)
+          end
+        end
+      end
+
+      def flextures_set_options(options)
+        get_or_initialize_flextures_loader_options.merge!(options)
+      end
+
+      def flextures_instance
+        self
+      end
+
+      def flextures_options
+        @flextures_loader_options
+      end
+    end
+  end
+end

data/lib/flextures/flextures.rake

@@ -1,20 +1,20 @@
-require 'flextures/flextures'
-
-namespace :db do
-  namespace :flextures do
-    desc "Dump data to csv format"
-    task :dump => :environment do
-      Flextures::Rake::Command::dump
-    end
-
-    desc "load fixture data csv format"
-    task :load => :environment do
-      Flextures::Rake::Command::load
-    end
-
-    desc "load and dump file (replace) new data file"
-    task :generate => :environment do
-      Flextures::Rake::Command::generate
-    end
-  end
-end
+require 'flextures/flextures'
+
+namespace :db do
+  namespace :flextures do
+    desc "Dump data to csv format"
+    task :dump => :environment do
+      Flextures::Rake::Command::dump
+    end
+
+    desc "load fixture data csv format"
+    task :load => :environment do
+      Flextures::Rake::Command::load
+    end
+
+    desc "load and dump file (replace) new data file"
+    task :generate => :environment do
+      Flextures::Rake::Command::generate
+    end
+  end
+end

data/lib/flextures/flextures_loader.rb

@@ -25,6 +25,21 @@ module Flextures
     end
     using ArrayEx
 
+    module TableColumnEx
+      refine ActiveRecord::ConnectionAdapters::Column do
+        def translater(klass)
+          type_name = klass.defined_enums[name.to_s] ? :enum : type
+          TRANSLATER[type_name]
+        end
+
+        def completer(klass)
+          type_name = klass.defined_enums[name.to_s] ? :enum : type
+          COMPLETER[type_name]
+        end
+      end
+    end
+    using TableColumnEx
+
     PARENT = Flextures
     FORMATS = [ %i[csv erb], %i[erb csv], %i[csv], %i[yml erb], %i[erb yml], %i[yml] ]
 
@@ -93,6 +108,10 @@ module Flextures
         return nil if d==""
         DateTime.parse(d.to_s)
       },
+      enum:->(v){
+        return v.to_i if v.match(/^\d+$/)
+        v
+      }
     }
 
     def initialize(*_)
@@ -353,18 +372,23 @@ module Flextures
     # @return [Proc] translate filter
     def self.create_filter(klass, factory, filename, ext, options)
       columns = klass.columns
-      # data translat array to hash
+      # data translate array to hash
       column_hash = columns.reduce({}) { |h,col| h[col.name] = col; h }
-      lack_columns = columns.reject { |c| c.null and c.default }.map{ |o| o.name.to_sym }
-      # default value shound not be null columns
-      not_nullable_columns = columns.reject(&:null).map(&:name)
+      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] = (TRANSLATER[column_hash[k].type] && TRANSLATER[column_hash[k].type].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
       }
+
+      return strict_filter if options[:strict]==true
+
+      lack_columns = columns.reject { |c| c.null and c.default }.map{ |o| o.name.to_sym }
+      # default value shound not be null columns
+      not_nullable_columns = columns.reject(&:null).map(&:name)
+      completers = column_hash.reduce({}){ |h,(k,col)| h[k] = col.completer(klass); h }
       # receives hased data and translate ActiveRecord Model data
       # loose filter correct error values
       # strict filter don't correct errora values and raise error
@@ -374,12 +398,11 @@ module Flextures
         h.select! { |k,v| column_hash[k] }
         strict_filter.call(o,h)
         # set default value if value is 'nil'
-        not_nullable_columns.each { |k| o[k].nil? && o[k] = (column_hash[k] && COMPLETER[column_hash[k].type] && COMPLETER[column_hash[k].type].call) }
+        not_nullable_columns.each { |k| o[k].nil? && o[k] = completers[k]&.call }
         # fill span values if column is not exist
-        lack_columns.each { |k| o[k].nil? && o[k] = (column_hash[k] && COMPLETER[column_hash[k].type] && COMPLETER[column_hash[k].type].call) }
+        lack_columns.each { |k| o[k].nil? && o[k] = completers[k]&.call }
         o
       }
-      (options[:strict]==true) ? strict_filter : loose_filter
     end
   end
 end

data/lib/flextures/version.rb

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

data/lib/generators/flextures/initializer_generator.rb

@@ -1,17 +1,17 @@
-module Flextures
-  module Generators
-    class InitializerGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
-
-      def create_initializer_file
-        copy_file "flextures.rb", "config/initializers/flextures.rb"
-        copy_file "flextures.factory.rb", "config/flextures.factory.rb"
-      end
-
-      desc <<-MSG
-Description:
-  Creates flextures configuration files.
-      MSG
-    end
-  end
-end
+module Flextures
+  module Generators
+    class InitializerGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_initializer_file
+        copy_file "flextures.rb", "config/initializers/flextures.rb"
+        copy_file "flextures.factory.rb", "config/flextures.factory.rb"
+      end
+
+      desc <<-MSG
+Description:
+  Creates flextures configuration files.
+      MSG
+    end
+  end
+end

data/lib/generators/flextures/templates/flextures.factory.rb

@@ -1,8 +1,8 @@
-# Flextures::Factory.define :users do |f|
-#   f.password = "hogehoge"
-#   f
-# end
-
-# Flextures::DumpFilter.define :users, {
-#   :encrypted_password => lambda { |v| Base64.encode64(v) }
-# }
+# Flextures::Factory.define :users do |f|
+#   f.password = "hogehoge"
+#   f
+# end
+
+# Flextures::DumpFilter.define :users, {
+#   :encrypted_password => lambda { |v| Base64.encode64(v) }
+# }