flextures 3.1.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b662bba9471c429a21431597c9cf7e290c6e5f37
-  data.tar.gz: 82a85f274b963fb15a2cf7949b74c41622206607
+  metadata.gz: d86570ed0e33aace484782c2ec347b9050ec44e0
+  data.tar.gz: 721141b2188c3276035375feb64d48f822950cf3
 SHA512:
-  metadata.gz: b03024429c88c61ca34421ef1748b15ad2da6e801ffa912fce348c4dea133d15726a5241d81546e8e3102c3a46001739fa92ad4cc549195ef05588a1e35fda67
-  data.tar.gz: d2c304dfadec3dab3d33a61f33d82c32bcd300bdcafda9796313a9a514d0f7f67605e60abd8bf4810ae696e5862f9ee8438c72135de25f070a28333605bb06f3
+  metadata.gz: eaa221bf5422aa3e1b363419c4bb9e9e5a2e873304df89fca19c7a514459392243f6d57b53db8e445d544063d97a3c640205d6e8c04550b8996555d5ef9997c2
+  data.tar.gz: e57e6482831891e07f6596881f931bb7a0242249571211b67ed3889376b1de45c2d7378ba9b63786d1056bcaccda34822e180aeaabd3ecaa1d9e597a4dc8d6ca

data/Gemfile

@@ -3,6 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in flextures.gemspec
 gemspec
 
+gem "minitest", "5.4.0"
+
 group :test do
-  gem "shoulda", ">= 0"
+  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,23 +1,23 @@
 PATH
   remote: .
   specs:
-    flextures (3.1.3)
+    flextures (4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    i18n (0.6.0)
-    multi_json (1.3.6)
+    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)
-    shoulda (3.1.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.2)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.2.0)
-      activesupport (>= 3.0.0)
 
 PLATFORMS
   ruby
@@ -25,8 +25,12 @@ PLATFORMS
 DEPENDENCIES
   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)
   rake
-  shoulda
 
 BUNDLED WITH
    1.10.6

data/README.ja.md

@@ -1,6 +1,6 @@
 # flextures
 
-* [ENGLISH DOCUMENT](https://github.com/baban/flextures/blob/master/README.rdoc)
+* [ENGLISH DOCUMENT](https://github.com/baban/flextures/blob/master/README.md)
 
 ## Abstruct
 
@@ -10,8 +10,8 @@ Rails標準のfixtureの不満点を解消するために作成しました
 それぞれfixtureのロードとダンプを行います
 
 ```
- rake db:flextures:load
- rake db:flextures:dump
+rake db:flextures:load
+rake db:flextures:dump
 ```
 
 通常のfixtureとの主な違いは次の４点です
@@ -28,7 +28,6 @@ gem化されているので、bundlerで次のように記述して、普通にb
 
 ```
  gem "flextures"
-
 ```
 
 ちなみに開発環境はruby1.9以上のバージョン、rails3以上、もしくはPadrinoを想定しています
@@ -94,6 +93,7 @@ fixtureのロード機能を使えます
 ```ruby
 describe ItemShopController do
   flextures :users, :items
+end
 ```
 
 基本的な違いは、yamlよりcsvを優先する、カラムの変更点を検知して警告を出しながらもロードを行う等ですが
@@ -103,6 +103,7 @@ describe ItemShopController do
 ```ruby
 describe ItemShopController do
   flextures :items, :users => :users_for_itmshop # users_for_itemshop.csv をロードする
+end
 ```
 
 その他現在はShouldからの呼び出しや様々なオプションを載せていますが
@@ -112,8 +113,7 @@ describe ItemShopController do
 
 #### load filer
 
-Railsのプロジェクトに config/flextures.factory.rb というファイルを作成して、そこにフィルタを記述することによって
-(Padrinoでも設置場所は同じです)
+Railsのプロジェクトに `config/flextures.factory.rb` というファイルを作成して、そこにフィルタを記述することによって
 フィクスチャの読み込み時に、値を加工して読み込む事が可能になっています
 例えば、次の様に記述するとusersテーブルのlast_login_dateの値を、常に現在の時間として設定できます
 
@@ -142,7 +142,8 @@ end
 
 #### dump filer
 
-データのdump時に加工が必要になった時には、ダンプフィルターにテーブル名と、加工したい値をキーに、処理をラムダで渡してやることで可能です
+データのdump時に加工が必要になった時には、同じく`config/flextures.factory.rb`に
+テーブル名と、加工したい値をキーに、処理をラムダで渡してやることで可能です
 
 ```ruby
 Flextures::DumpFilter.define :users, {
@@ -154,14 +155,15 @@ Flextures::DumpFilter.define :users, {
 
 ### 設定ファイル
 
-config/flextures.config.rb　で設定ファイルを作成すると、データをロード＆ダンプするディレクトリなどの設定を変更できます
+`config/flextures.config.rb`　で設定ファイルを作成すると、データをロード＆ダンプするディレクトリなどの設定を変更できます
+
+
 
 ```ruby
-# config/flextures.config.rb
-module Flextures
-  # test/fixtures/ のフィクスチャを読み出したい場合は吐き出しディレクトリの値を上書きする
-  Config.fixture_load_directory = "test/fixtures/"
-  Config.fixture_dump_directory = "test/fixtures/"
+Flextures.configure do |config|
+  # Load and dump directory change "spec/fixtures/" to "test/fixtures/"
+  config.load_directory = "test/fixtures/"
+  config.dump_directory = "test/fixtures/"
 end
 ```
 

data/README.md

@@ -101,7 +101,8 @@ Please see [wiki](https://github.com/baban/flextures/wiki/Unittestsupport) ...
 
 #### load filter
 
-If you create filter file.(File name is "config/flextures.factory.rb")
+In `config/flextures.factory.rb`
+
 Factory filter translate fixture data and set database.
 
 For example, this code set current time to last_login_date column.
@@ -129,7 +130,9 @@ end
 if you need to convert table data into other data format, you use dump filter.
 (dump filter is same file as load filter)
 
-dump filter has hash argumtne, it is formatted colum name key and convert method, proc, lambda value
+dump filter has hash arguments, it is formatted colum name key and convert method, proc, lambda value
+
+file is `config/flextures.factory.rb`
 
 ```ruby
 Flextures::DumpFilter.define :users, {
@@ -141,15 +144,13 @@ Other options please see [wiki](https://github.com/baban/flextures/wiki/Factoryf
 
 ### Configuration file
 
-Configuration file can change load and dump directory
-(file is config/flextures.config.rb)
+In `config/initializers/flextures.rb`, configuration file can change load and dump directory
 
 ```ruby
-# config/flextures.config.rb
-module Flextures
+Flextures.configure do |config|
   # Load and dump directory change "spec/fixtures/" to "test/fixtures/"
-  Config.fixture_load_directory = "test/fixtures/"
-  Config.fixture_dump_directory = "test/fixtures/"
+  config.load_directory = "test/fixtures/"
+  config.dump_directory = "test/fixtures/"
 end
 ```
 

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end

data/flextures.gemspec

@@ -15,9 +15,11 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  #spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = ["test/unit/flextures_args_test.rb"]
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  #spec.add_development_dependency "minitest", "5.4.0"
 end

data/lib/flextures.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'flextures/version'
 require 'flextures/flextures_base_config'
 require 'flextures/flextures_extension_modules'
@@ -10,4 +8,3 @@ require 'flextures/flextures_dumper'
 require 'flextures/flextures_command'
 require 'flextures/flextures_railtie' if defined? Rails
 require 'flextures/rspec_flextures_support' if defined? RSpec
-require 'flextures/testunit_flextures_support' if defined? Test::Unit::TestCase

data/lib/flextures/flextures.rake

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'flextures/flextures'
 
 namespace :db do
@@ -9,53 +7,14 @@ namespace :db do
       Flextures::Rake::Command::dump
     end
 
-    desc "Dump data to prefer csv format"
-    task :csvdump => :environment do
-      puts "This command is deprecated"
-      # TODO: deprecated message
-      # please use 'FOAMRT=csv' option
-      ENV["FORMAT"]="csv"
-      Flextures::Rake::Command::dump
-    end
-
-    desc "Dump data to yaml format"
-    task :ymldump => :environment do
-      puts "This command is deprecated"
-      puts "please use 'rake db:flextures:dump FORMAT='yml''"
-      # TODO: deprecated message
-      # please use 'FOAMRT=yml' option
-      ENV["FORMAT"]="yml"
-      Flextures::Rake::Command::dump
-    end
-
     desc "load fixture data csv format"
     task :load => :environment do
       Flextures::Rake::Command::load
     end
 
-    desc "load fixture data only csv format files"
-    task :csvload => :environment do
-      puts "This command is deprecated"
-      puts "please use 'rake db:flextures:load FORMAT='csv''"
-      # TODO: deprecated message
-      # please use 'FOAMRT=csv' option
-      ENV["FORMAT"]="csv"
-      Flextures::Rake::Command::load
-    end
-
-    desc "load fixture files only yaml format"
-    task :ymlload => :environment do
-      # TODO: deprecated message
-      # please use 'FOAMRT=yml' option
-      ENV["FORMAT"]="yml"
-      puts "This command is deprecated"
-      puts "please use 'rake db:flextures:load FORMAT='yml''"
-      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
 end

data/lib/flextures/flextures.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'ostruct'
 require 'csv'
 require "flextures/flextures_base_config"
@@ -32,10 +30,9 @@ module Flextures
   end
 
   # load configuration file, if file is exist
-  def self.init_load
+  def self.load_configurations
     if defined?(Rails) and Rails.root
       [
-        File.join( Rails.root.to_path,"/config/flextures.config.rb" ),
         File.join( Rails.root.to_path,"/config/flextures.factory.rb" ),
       ].each { |fn| File.exist?(fn) && load(fn) }
     end
@@ -44,7 +41,7 @@ module Flextures
   # @return [Array] flextures useable table names
   def self.deletable_tables
     tables = ActiveRecord::Base.connection.tables
-    Flextures::Config.ignore_tables.each { |name| tables.delete( name.to_s ) }
+    Flextures::Configuration.ignore_tables.each { |name| tables.delete( name.to_s ) }
     tables
   end
 
@@ -133,8 +130,8 @@ module Flextures
 
     # check exist filename block
     def self.exist
-      return->(name){ File.exists?( File.join( Config.fixture_load_directory, "#{name}.csv") ) or
-                      File.exists?( File.join( Config.fixture_load_directory, "#{name}.yml") ) }
+      return->(name){ File.exists?( File.join(Flextures::Configuration.load_directory, "#{name}.csv") ) or
+                      File.exists?( File.join(Flextures::Configuration.load_directory, "#{name}.yml") ) }
     end
   end
 end

data/lib/flextures/flextures_base_config.rb

@@ -1,33 +1,22 @@
-# encoding: utf-8
-
 # base configurations
-# if you want to change setting, create 'config/flextures.config.rb', and overwrite setting
-#
-# example:
-# module Flextures
-#  # load and dump directroy setting change "spec/fixtures/" to "test/fixtures/"
-#  Config.fixture_load_directory = "test/fixtures/"
-#  Config.fixture_dump_directory = "test/fixtures/"
-# end
-#
 module Flextures
-  module Config
-    @@read_onlys=[]
-    @@configs={
-      use_transactional_fixtures: nil, # override activerecord base "use_transactional_fixtures" option if you  set value boolean value
-      ignore_tables: ["schema_migrations"], # 'ignore_tables' table data is not deleted by flextures delete_all method
-      fixture_load_directory: "spec/fixtures/", # base load directory
-      fixture_dump_directory: "spec/fixtures/", # dump load directory
-      init_all_tables: false,  # if this option is 'true', when start unit test, all table data is delete
-      options: {}, # options(example { unfilter: true })
-      table_load_order: [], # set load options
-    }
-    # hash key change to getter and setter
-    class<< self
-      @@configs.each do |setting_key, setting_value|
-        define_method(setting_key){ @@configs[setting_key] }
-        define_method("#{setting_key}="){ |arg| @@configs[setting_key]=arg } unless @@read_onlys.include?(setting_key)
-      end
+  class Configuration
+    include ActiveSupport::Configurable
+
+    config_accessor :ignore_tables do
+      ["schema_migrations"]
+    end
+
+    config_accessor :load_directory do
+      "spec/fixtures/"
+    end
+
+    config_accessor :dump_directory do
+      "spec/fixtures/"
+    end
+
+    config_accessor :init_all_tables do
+      true
     end
   end
 end

data/lib/flextures/flextures_command.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'ostruct'
 require 'csv'
 
@@ -12,7 +10,7 @@ module Flextures
   module Rake
     module Command
       def self.dump
-        Flextures::init_load
+        Flextures::load_configurations
         table_names = Flextures::ARGS.parse
         puts "dumping..."
         case ENV["FORMAT"].to_s.to_sym
@@ -26,7 +24,7 @@ module Flextures
       end
 
       def self.load
-        Flextures::init_load
+        Flextures::load_configurations
         table_names = Flextures::ARGS.parse
         Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
         file_format = ENV["FORMAT"]
@@ -43,7 +41,7 @@ module Flextures
 
       # load and dump data
       def self.generate
-        Flextures::init_load
+        Flextures::load_configurations
         table_names = Flextures::ARGS.parse
         Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
         file_format = ENV["FORMAT"]

data/lib/flextures/flextures_dumper.rb

@@ -1,30 +1,28 @@
-# encoding: utf-8
-
 require "fileutils"
 
 module Flextures
   # defined data dump methods
   module Dumper
-    PARENT = Flextures
-    # procに機能追加、関数合成のためのメソッドを追加する
-    class Proc < ::Proc
-      def *(other)
-        if self.lambda? and other.lambda?
-          lambda { |*x| other.call(self.call(*x)) }
-        elsif not self.lambda? and not other.lambda?
-          Proc.new {|*x| other.call(self.call(*x)) }
-        else
-          raise ArgumentError, "lambda/Proc type mismatch"
+    module ProcEx
+      refine Proc do
+        # compose function
+        def *(other)
+          if self.lambda? and other.lambda?
+            lambda { |*x| other.call(self.call(*x)) }
+          elsif not self.lambda? and not other.lambda?
+            Proc.new {|*x| other.call(self.call(*x)) }
+          else
+            raise ArgumentError, "lambda/Proc type mismatch"
+          end
         end
       end
     end
+    using ProcEx
 
-    def self.proc(&b)
-      Proc.new(&b)
-    end
+    PARENT = Flextures
 
     # create data translater
-    def self.translate_creater( val, rules )
+    def self.translate_creater(val, rules)
       rule_map = {
         nullstr: proc { |d|
           return "null" if d.nil?
@@ -102,7 +100,7 @@ module Flextures
       },
       datetime:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :blank2null, :false2nullstr, proc { |d| d.to_s }] :
+          [:nullstr, :blank2null, :false2nullstr, proc { |d| d.try(:strftime,"%F %T").to_s }] :
           [proc { |d| d.to_s }]
         self.translate_creater d, procs
       },
@@ -138,7 +136,7 @@ module Flextures
       },
       time:->( d, format ){
         procs = (format == :yml) ?
-          [:ymlnulltime, proc { |d| d.to_s }] :
+          [:ymlnulltime, proc { |d| d.try(:strftime,"%F %T").to_s }] :
           [proc { |d| d.to_s }]
         self.translate_creater d, procs
       },
@@ -159,9 +157,9 @@ module Flextures
     # @params [Symbol] type datatype
     # @params [Symbol] format data type (:yml or :csv)
     # @return translated value
-    def self.trans( v, type, format )
+    def self.trans(v, type, format)
       trans = TRANSLATER[type]
-      return trans.call( v, format ) if trans
+      return trans.call(v, format) if trans
       v
     end
 
@@ -169,7 +167,7 @@ module Flextures
     # @params klass dump table Model
     # @params [Hash] options dump options
     # @return [Array] columns format information
-    def self.dump_attributes( klass, options )
+    def self.dump_attributes(klass, options)
       columns = klass.columns.map { |column| { name: column.name, type: column.type } }
       # option[:minus] colum is delete columns
       columns.reject! { |column| options[:minus].include?(column[:name]) } if options[:minus]
@@ -185,7 +183,7 @@ 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_type, format, type)
       filter = DumpFilter[format[:table].to_s.to_sym] || {}
       ->(row) {
         attr_type.map do |h|
@@ -198,7 +196,7 @@ module Flextures
     # data dump to csv format
     # @params [Hash] format file format data
     # @params [Hash] options dump format options
-    def self.csv( format )
+    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
@@ -206,10 +204,10 @@ module Flextures
     end
 
     # dump csv format data
-    def self.dump_csv( klass, attr_type, values_filter, format )
+    def self.dump_csv(klass, attr_type, values_filter, format)
       # TODO: 拡張子は指定してもしなくても良いようにする
       file_name = format[:file] || format[:table]
-      dir_name = File.join( Flextures::Config.fixture_dump_directory, format[:dir].to_s )
+      dir_name = File.join(Flextures::Configuration.dump_directory, format[:dir].to_s)
       FileUtils.mkdir_p(dir_name)
       outfile = File.join(dir_name, "#{file_name}.csv")
       CSV.open(outfile,'w') do |csv|
@@ -226,19 +224,19 @@ module Flextures
     # data dump to yaml format
     # @params [Hash] format file format data
     # @params [Hash] options dump format options
-    def self.yml( format )
+    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
-      self.dump_yml( klass, filter, format )
+      self.dump_yml(klass, filter, format)
     end
 
     # dump yml format data
-    def self.dump_yml( klass, values_filter, format )
+    def self.dump_yml(klass, values_filter, format)
       # TODO: 拡張子は指定してもしなくても良いようにする
       table_name = format[:table]
       file_name = format[:file] || format[:table]
-      dir_name = File.join( Flextures::Config.fixture_dump_directory, format[:dir].to_s )
+      dir_name = File.join(Flextures::Configuration.dump_directory, format[:dir].to_s)
       FileUtils.mkdir_p(dir_name)
       outfile = File.join(dir_name, "#{file_name}.yml")
       File.open(outfile,"w") do |f|