flextures 2.0.2 → 2.0.3

data/Gemfile

@@ -1,9 +1,8 @@
 source "http://rubygems.org"
 
 group :development, :test do
-  gem "bundler", "1.1.3"
+  gem "bundler", "1.2.0"
   gem "jeweler", "1.8.3"
-  #gem "rcov", ">= 0"
 end
 
 group :text do

data/Gemfile.lock

@@ -27,6 +27,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 1.1.3)
+  bundler (= 1.2.0)
   jeweler (= 1.8.3)
   shoulda

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flextures"
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = "2012-09-20"
+  s.date = "2012-09-23"
   s.description = "load and dump fixtures"
   s.email = "babanba.n@gmail.com"
   s.extra_rdoc_files = [
@@ -44,7 +44,10 @@ Gem::Specification.new do |s|
     "lib/flextures/version.rb",
     "test/test_helper.rb",
     "test/unit/test_flextures.rb",
+    "test/unit/test_flextures_args.rb",
     "test/unit/test_flextures_dumper.rb",
+    "test/unit/test_flextures_hooks.rb",
+    "test/unit/test_flextures_loader.rb",
     "test/unit/test_simple.rb"
   ]
   s.homepage = "http://github.com/baban/flextures"
@@ -57,14 +60,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["= 1.1.3"])
+      s.add_development_dependency(%q<bundler>, ["= 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["= 1.8.3"])
     else
-      s.add_dependency(%q<bundler>, ["= 1.1.3"])
+      s.add_dependency(%q<bundler>, ["= 1.2.0"])
       s.add_dependency(%q<jeweler>, ["= 1.8.3"])
     end
   else
-    s.add_dependency(%q<bundler>, ["= 1.1.3"])
+    s.add_dependency(%q<bundler>, ["= 1.2.0"])
     s.add_dependency(%q<jeweler>, ["= 1.8.3"])
   end
 end

data/lib/flextures.rb

@@ -10,4 +10,3 @@ 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.rb

@@ -95,24 +95,33 @@ module Flextures
     def self.parse option={}
       table_names = []
       if ENV["T"] or ENV["TABLE"]
-        table_names = (ENV["T"] or ENV["TABLE"]).split(',').map{ |name| { table: name } }
+        table_names = (ENV["T"] or ENV["TABLE"]).split(',').map{ |name| { table: name, file: name } }
       end
       if ENV["M"] or ENV["MODEL"]
-        table_names = (ENV["M"] or ENV["MODEL"]).split(',').map{ |name| { table: name.constantize.table_name } }
-      end
-      if table_names.empty?
-        table_names = Flextures::deletable_tables.map{ |table| { table: table }  }
+        table_names = (ENV["M"] or ENV["MODEL"]).split(',').map do |name|
+          name = name.constantize.table_name
+          { table: name, file: name }
+        end
       end
+
+      table_names = Flextures::deletable_tables.map{ |table| { table: table } } if table_names.empty?
+
       # ENV["FIXTURES"]の中身を解析
       fixtures_args_parser =->(s){
         names = s.split(',')
-        ( names.size==1 and ENV.values_at("M", "MODEL", "T", "TABLE").first ) ?
-          [ table_names.first.merge( file: names.first ) ] :
+        if ENV["TABLE"] or ENV["T"] or ENV["MODEL"] or ENV["M"]
+          [ table_names.first.merge( file: names.first ) ]
+        else
           names.map{ |name| { table: name, file: name } }
+        end
       }
+      # ファイル名を調整
       table_names = fixtures_args_parser.call ENV["FIXTURES"] if ENV["FIXTURES"]
-      table_names = fixtures_args_parser.call ENV["F"] if ENV["F"]
+      table_names = fixtures_args_parser.call ENV["FILE"]     if ENV["FILE"]
+      table_names = fixtures_args_parser.call ENV["F"]        if ENV["F"]
+
       table_names = table_names.map{ |option| option.merge dir: ENV["DIR"] } if ENV["DIR"]
+      table_names = table_names.map{ |option| option.merge dir: ENV["D"]   } if ENV["D"]
       # read mode だとcsvもyaml存在しないファイルは返さない
       table_names.select! &exist if option[:mode] && option[:mode] == 'read'
       table_names

data/lib/flextures/flextures_loader.rb

@@ -15,7 +15,7 @@ module Flextures
 
     @@table_cache = {}
 
-    # 型に応じて勝手にdefault値を設定する
+    # column set default value
     COMPLETER = {
       binary:->{ 0 },
       boolean:->{ false },
@@ -30,7 +30,7 @@ module Flextures
       timestamp:->{ DateTime.now },
     }
 
-    # 型の変換を行う
+    # colum data translate
     TRANSLATER = {
       binary:->(d){
         return d if d.nil?
@@ -106,25 +106,39 @@ module Flextures
 
       [table_name, "#{dir_name}#{file_name}",ext]
     end
+    
+    # flextures関数の引数をパースして
+    # 単純な読み込み向け形式に変換します
+    #
+    # @params [Hash] 読み込むテーブルとファイル名のペア
+    # @return [Array] 読み込テーブルごとに切り分けられた設定のハッシュを格納
+    def self.parse_flextures_options *fixtures
+      options = {}
+      options = fixtures.shift if fixtures.size > 1 and fixtures.first.is_a?(Hash)
+
+      # :allですべてのfixtureを反映
+      fixtures = Flextures::deletable_tables if fixtures.size== 1 and :all == fixtures.first
+
+      last_hash = {}
+      last_hash = fixtures.pop if fixtures.last.is_a? Hash # ハッシュ取り出し
+
+      load_hash = fixtures.inject({}){ |h,name| h[name.to_sym] = name; h }
+      load_hash.merge!(last_hash)
+      load_hash.map { |k,v| { table: k, file: v, loader: :fun } }
+    end
 
     # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する
     #
     # 全テーブルが対象
-    # fixtures :all
+    # flextures :all
     # テーブル名で一覧する
-    # fixtures :users, :items
+    # flextures :users, :items
     # ハッシュで指定
-    # fixtures :users => :users2
+    # flextures :users => :users2
+    #
+    # @params [Hash] 読み込むテーブルとファイル名のペア
     def self.flextures *fixtures
-      options = {}
-      options = fixtures.shift if fixtures.size > 1 and fixtures.first.is_a?(Hash)
-
-      # :allですべてのfixtureを反映
-      fixtures = Flextures::deletable_tables if fixtures.size== 1 and :all == fixtures.first
-      fixtures_hash = fixtures.pop if fixtures.last and fixtures.last.is_a? Hash # ハッシュ取り出し
-      fixtures.each{ |table_name| Loader::load table: table_name, loader: :fun }
-      fixtures_hash.each{ |k,v| Loader::load table: k, file: v,   loader: :fun } if fixtures_hash
-      fixtures
+      parse_flextures_options(*fixtures).each{ |option| Loader::load option }
     end
 
     # csv 優先で存在している fixtures をロード

data/lib/flextures/version.rb

@@ -1,4 +1,4 @@
 module Flextures
-  VERSION="2.0.2"
+  VERSION="2.0.3"
 end
 

data/test/unit/test_flextures_args.rb

@@ -0,0 +1,94 @@
+# encoding: utf-8
+
+class FlexturesArgsTest < Test::Unit::TestCase
+  context Flextures::ARGS do
+    context " TABLE=テーブル名 を設定している場合 " do
+      setup do
+        ENV["TABLE"] = "users"
+        @format = Flextures::ARGS.parse
+      end
+      should "テーブル名を指定できている" do
+        assert_equal "users", @format.first[:table]
+      end
+      should "ファイル名はテーブル名と同じ" do
+        assert_equal "users", @format.first[:file]
+      end
+      teardown do
+        ENV.delete("TABLE")
+      end
+    end
+    context " T=テーブル名を設定している場合 " do
+      setup do
+        ENV["T"] = "s_user"
+        @format = Flextures::ARGS.parse
+      end
+      should "テーブル名を指定できている" do
+        assert_equal "s_user", @format.first[:table]
+      end
+      should "ファイル名はテーブル名と同じ" do
+        assert_equal "s_user", @format.first[:file]
+      end
+      teardown do
+        ENV.delete("T")
+      end
+    end
+    context " DIR=でダンプするディレクトリを変更できる " do
+      setup do
+        ENV["T"] = "users"
+        ENV["DIR"] = "test/fixtures/"
+        @format = Flextures::ARGS.parse
+      end
+      should "ディレクトリ名を取得できる" do
+        assert_equal "test/fixtures/", @format.first[:dir]
+      end
+      should "テーブル名を指定できている" do
+        assert_equal "users", @format.first[:table]
+      end
+      should "ファイル名はテーブル名と同じ" do
+        assert_equal "users", @format.first[:file]
+      end
+      teardown do
+        ENV.delete("T")
+        ENV.delete("DIR")
+      end
+    end
+    context " D=でもダンプするディレクトリを変更できる " do
+      setup do
+        ENV["T"] = "users"
+        ENV["D"] = "test/fixtures/"
+        @format = Flextures::ARGS.parse
+      end
+      should "ディレクトリ名を取得できる" do
+        assert_equal "test/fixtures/", @format.first[:dir]
+      end
+      should "テーブル名を指定できている" do
+        assert_equal "users", @format.first[:table]
+      end
+      should "ファイル名はテーブル名と同じ" do
+        assert_equal "users", @format.first[:file]
+      end
+      teardown do
+        ENV.delete("T")
+        ENV.delete("D")
+      end
+    end
+    context " FIXTURES=でもダンプするファイルを変更できる " do
+      setup do
+        ENV["T"] = "users"
+        ENV["FIXTURES"] = "user_another"
+        @format = Flextures::ARGS.parse
+      end
+      should "テーブル名は指定したもの" do
+        assert_equal "users", @format.first[:table]
+      end
+      should "ファイル名はテーブル名と違う指定したものに変わっている" do
+        assert_equal "user_another", @format.first[:file]
+      end
+      teardown do
+        ENV.delete("T")
+        ENV.delete("FIXTURES")
+      end
+    end
+  end
+end
+

data/test/unit/test_flextures_dumper.rb

@@ -157,13 +157,9 @@ class FlexturesDumperTest < Test::Unit::TestCase
             assert_equal false, @trans.call( false, :yml )
           end
           should "「true」は「true」" do
-            assert_equal false, @trans.call( false, :yml )
+            assert_equal true, @trans.call( true, :yml )
           end
         end
-        context :csv do
-        end
-      end
-      context :text do
       end
     end
   end

data/test/unit/test_flextures_hooks.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+class FlexturesHookTest < Test::Unit::TestCase
+  context Flextures::Loader do
+    context ".parse_flextures_options" do
+      context "通常動作" do
+        setup do
+          @ret = Flextures::Loader.parse_flextures_options(:users)
+        end
+        should "指定したテーブル分だけハッシュが返されている" do
+          assert_equal 1, @ret.size
+        end
+        should "ハッシュの中身は読み込み設定のハッシュ" do
+          h = { table: :users, file: :users, loader: :fun }
+          assert_equal h, @ret.first
+        end
+      end
+      context "違うファイルをロードした時" do
+        setup do
+          @ret = Flextures::Loader.parse_flextures_options( :users => :users_another3 )
+        end
+        should "指定したテーブル分だけハッシュが返されている" do
+          assert_equal 1, @ret.size
+        end
+        should "ハッシュの中身は読み込み設定のハッシュ" do
+          h = { table: :users, file: :users_another3, loader: :fun }
+          assert_equal h, @ret.first
+        end
+      end
+    end
+
+  end
+end
+

data/test/unit/test_flextures_loader.rb

@@ -0,0 +1,179 @@
+# encoding: utf-8
+
+# ruby -I"lib:lib:test" -I"/Users/matsubaramasanao/.rvm/gems/ruby-1.9.3-p0/gems/rake-0.9.2.2/lib" "/Users/matsubaramasanao/.rvm/gems/ruby-1.9.3-p0/gems/rake-0.9.2.2/lib/rake/rake_test_loader.rb" test/**/test_*.rb
+# ruby -I"lib:lib:test" "/Users/matsubaramasanao/.rvm/gems/ruby-1.9.3-p0/gems/rake-0.9.2.2/lib/rake/rake_test_loader.rb" test/**/test_*.rb
+
+class FlexturesLoaderTest < Test::Unit::TestCase
+  context Flextures::Loader do
+    context "TRANSLATER" do
+      context :binary do
+        should "nil" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:binary].call(nil)
+        end
+      end
+      context :boolean do
+        should "nilはそのまま" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:boolean].call(nil)
+        end
+        should "trueもそのまま" do
+          assert_equal true, Flextures::Loader::TRANSLATER[:boolean].call(true)
+        end
+        should "falseもそのまま" do
+          assert_equal false, Flextures::Loader::TRANSLATER[:boolean].call(false)
+        end
+        should "0" do
+          assert_equal false, Flextures::Loader::TRANSLATER[:boolean].call(0)
+        end
+        should "1" do
+          assert_equal true, Flextures::Loader::TRANSLATER[:boolean].call(1)
+        end
+        should "-1" do
+          assert_equal true, Flextures::Loader::TRANSLATER[:boolean].call(-1)
+        end
+        should "空白文字" do
+          assert_equal false, Flextures::Loader::TRANSLATER[:boolean].call("")
+        end
+        should "文字" do
+          assert_equal true, Flextures::Loader::TRANSLATER[:boolean].call("Hello")
+        end
+      end
+      context :date do
+        should "正常値の文字列" do
+          assert_equal "2011/11/21", Flextures::Loader::TRANSLATER[:date].call("2011/11/21").strftime("%Y/%m/%d")
+        end
+        should "Timeオブジェクト" do
+          now = Time.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:date].call(now).strftime("%Y/%m/%d")
+        end
+        should "DateTimeオブジェクト" do
+          now = DateTime.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:date].call(now).strftime("%Y/%m/%d")
+        end
+        should "日付っぽい数字" do
+          now = "20111121"
+          assert_equal true, Flextures::Loader::TRANSLATER[:date].call(now).is_a?(Date)
+        end
+        should "nil" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:date].call(nil)
+        end
+        should "空文字" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:date].call("")
+        end
+      end
+      context :datetime do
+        should "正常値の文字列" do
+          assert_equal "2011/11/21", Flextures::Loader::TRANSLATER[:date].call("2011/11/21").strftime("%Y/%m/%d")
+        end
+        should "Timeオブジェクト" do
+          now = Time.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:date].call(now).strftime("%Y/%m/%d")
+        end
+        should "DateTimeオブジェクト" do
+          now = DateTime.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:date].call(now).strftime("%Y/%m/%d")
+        end
+        should "日付っぽい数字" do
+          now = "20111121"
+          assert_equal true, Flextures::Loader::TRANSLATER[:date].call(now).is_a?(Date)
+        end
+        should "nil" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:date].call(nil)
+        end
+        should "空文字" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:date].call("")
+        end
+      end
+      context :decimal do
+        should "null" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:decimal].call(nil)
+        end
+      end
+      context :float do
+        should "null" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:float].call(nil)
+        end
+      end
+      context :integer do
+        should "null" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:integer].call(nil)
+        end
+      end
+      context :string do
+        should "null" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:string].call(nil)
+        end
+        should "空文字" do
+          assert_equal "", Flextures::Loader::TRANSLATER[:string].call("")
+        end
+        should "タブ混じり" do
+          s="\taaaaa"
+          assert_equal s, Flextures::Loader::TRANSLATER[:string].call(s)
+        end
+        should "改行混じり" do
+          s="aa\naaa"
+          assert_equal s, Flextures::Loader::TRANSLATER[:string].call(s)
+        end
+        should "スペース混じり" do
+          s="aa aaa"
+          assert_equal s, Flextures::Loader::TRANSLATER[:string].call(s)
+        end
+        # "@#%{}|[]&:`'>?~"
+      end
+      context :text do
+        should "null" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:text].call(nil)
+        end
+        should "空文字" do
+          assert_equal "", Flextures::Loader::TRANSLATER[:text].call("")
+        end
+      end
+      context :time do
+        should "正常値の文字列" do
+          assert_equal "2011/11/21", Flextures::Loader::TRANSLATER[:time].call("2011/11/21").strftime("%Y/%m/%d")
+        end
+        should "Timeオブジェクト" do
+          now = Time.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:time].call(now).strftime("%Y/%m/%d")
+        end
+        should "DateTimeオブジェクト" do
+          now = DateTime.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:time].call(now).strftime("%Y/%m/%d")
+        end
+        should "日付っぽい数字はDateTime型" do
+          now = "20111121"
+          assert_equal true, Flextures::Loader::TRANSLATER[:time].call(now).is_a?(DateTime)
+        end
+        should "nilはnilのまま" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:time].call(nil)
+        end
+        should "空文字はnil" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:time].call("")
+        end
+      end
+      context :timestamp do
+        should "正常値の文字列はDateTimeに変換" do
+          assert_equal "2011/11/21", Flextures::Loader::TRANSLATER[:timestamp].call("2011/11/21").strftime("%Y/%m/%d")
+        end
+        should "Timeオブジェクト" do
+          now = Time.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:timestamp].call(now).strftime("%Y/%m/%d")
+        end
+        should "DateTimeオブジェクトはDateTime" do
+          now = DateTime.now
+          assert_equal now.strftime("%Y/%m/%d"), Flextures::Loader::TRANSLATER[:timestamp].call(now).strftime("%Y/%m/%d")
+        end
+        should "日付っぽい数字はDateTime" do
+          now = "20111121"
+          assert_equal true, Flextures::Loader::TRANSLATER[:timestamp].call(now).is_a?(DateTime)
+        end
+        should "nilからnil" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:timestamp].call(nil)
+        end
+        should "空文字はnil" do
+          assert_equal nil, Flextures::Loader::TRANSLATER[:timestamp].call("")
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,10 @@ files:
 - lib/flextures/version.rb
 - test/test_helper.rb
 - test/unit/test_flextures.rb
+- test/unit/test_flextures_args.rb
 - test/unit/test_flextures_dumper.rb
+- test/unit/test_flextures_hooks.rb
+- test/unit/test_flextures_loader.rb
 - test/unit/test_simple.rb
 homepage: http://github.com/baban/flextures
 licenses:
@@ -95,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -729505073
+      hash: -159357549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: