flextures 2.0.3 → 2.0.4

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem "activerecord"
+
 group :development, :test do
   gem "bundler", "1.2.0"
   gem "jeweler", "1.8.3"

data/Gemfile.lock

@@ -1,9 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.3)
     git (1.2.5)
     i18n (0.6.0)
     jeweler (1.8.3)
@@ -22,11 +32,13 @@ GEM
     shoulda-context (1.0.0)
     shoulda-matchers (1.2.0)
       activesupport (>= 3.0.0)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
   bundler (= 1.2.0)
   jeweler (= 1.8.3)
   shoulda

data/README.ja.rdoc

@@ -55,7 +55,7 @@ Usersモデルのfixture(users.csvか　users.yml)をロードする
  MODEL : モデル名を指定してロード。モデル名はカンマ区切りで複数指定が可能
  DIR : フィクスチャをロード＆ダンプするディレクトリを指定する
  FIXTURES : ロード、ダンプをするファイル名をRails標準以外のもので直接指定(Userモデルのusers.csv以外を指定)
- FORMAT : yml,yaml 等の文字列を指定するとロード、ダンプをするフォーマットを変更できる(ymlload,ymldumpと同じ)
+ FILE : ロード、ダンプをするファイル名をRails標準以外のもので直接指定(Userモデルのusers.csv以外を指定)
  T : TABLEのエイリアス
  M : モデル名指定のエイリアス
  D : ディレクトリ指定のエイリアス

data/README.rdoc

@@ -56,7 +56,7 @@ Other options...
  MODEL : set model name
  DIR : set directory name
  FIXTURES : set fixture file name
- FORMAT : dumping format change csv to yaml (aka. ymlload, ymldump command)
+ FILE : set fixture file name
  T : alias TABLE option
  M : alias MODEL option
  D : alias DIR option

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flextures"
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = "2012-09-23"
+  s.date = "2012-10-03"
   s.description = "load and dump fixtures"
   s.email = "babanba.n@gmail.com"
   s.extra_rdoc_files = [
@@ -60,13 +60,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["= 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["= 1.8.3"])
     else
+      s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<bundler>, ["= 1.2.0"])
       s.add_dependency(%q<jeweler>, ["= 1.8.3"])
     end
   else
+    s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<bundler>, ["= 1.2.0"])
     s.add_dependency(%q<jeweler>, ["= 1.8.3"])
   end

data/lib/flextures/flextures.rb

@@ -89,7 +89,7 @@ module Flextures
     end
   end
 
-  # 引数解析
+  # parse arguments functions
   module ARGS
     # 書き出し 、読み込み すべきファイルとオプションを書きだす
     def self.parse option={}
@@ -104,9 +104,9 @@ module Flextures
         end
       end
 
-      table_names = Flextures::deletable_tables.map{ |table| { table: table } } if table_names.empty?
+      table_names = Flextures::deletable_tables.map{ |name| { table: name, file: name } } if table_names.empty?
 
-      # ENV["FIXTURES"]の中身を解析
+      # parse ENV["FIXTURES"] paameter
       fixtures_args_parser =->(s){
         names = s.split(',')
         if ENV["TABLE"] or ENV["T"] or ENV["MODEL"] or ENV["M"]
@@ -115,7 +115,7 @@ module Flextures
           names.map{ |name| { table: name, file: name } }
         end
       }
-      # ファイル名を調整
+      # parse filename define parameters
       table_names = fixtures_args_parser.call ENV["FIXTURES"] if ENV["FIXTURES"]
       table_names = fixtures_args_parser.call ENV["FILE"]     if ENV["FILE"]
       table_names = fixtures_args_parser.call ENV["F"]        if ENV["F"]
@@ -127,7 +127,7 @@ module Flextures
       table_names
     end
 
-    # 存在しているファイルで絞り込む
+    # check exist filename block
     def self.exist
       return->(name){ File.exists?("#{LOAD_DIR}#{name}.csv") or File.exists?("#{LOAD_DIR}#{name}.yml") }
     end

data/lib/flextures/flextures_loader.rb

@@ -120,11 +120,12 @@ module Flextures
       fixtures = Flextures::deletable_tables if fixtures.size== 1 and :all == fixtures.first
 
       last_hash = {}
-      last_hash = fixtures.pop if fixtures.last.is_a? 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 } }
+      load_hash = load_hash.map { |k,v| { table: k, file: v, loader: :fun } }
+      [load_hash, options]
     end
 
     # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する
@@ -138,11 +139,12 @@ module Flextures
     #
     # @params [Hash] 読み込むテーブルとファイル名のペア
     def self.flextures *fixtures
-      parse_flextures_options(*fixtures).each{ |option| Loader::load option }
+      loas_hash, options = parse_flextures_options(*fixtures)
+      load_hash.each{ |params| Loader::load params }
     end
 
     # csv 優先で存在している fixtures をロード
-    def self.load format
+    def self.load format, option
       table_name, file_name, method = file_exist format
       if method
         send(method, format)
@@ -153,9 +155,11 @@ module Flextures
     end
 
     # CSVのデータをロードする
-    def self.csv format
+    def self.csv format, options={}
       table_name, file_name, ext = file_exist format, [:csv]
 
+      # キャッシュ利用可能ならそれをそのまま使う
+      return if options[:cache] and @@table_cache[table_name.to_sym] and @@table_cache[table_name.to_sym] == file_name
       @@table_cache[table_name.to_sym] = file_name
 
       print "try loading #{file_name}.csv\n" unless [:fun].include? format[:loader]
@@ -166,6 +170,7 @@ module Flextures
       filter = create_filter klass, LoadFilter[table_name], file_name, :csv
       # rails3_acts_as_paranoid がdelete_allで物理削除しないことの対策
       klass.send( klass.respond_to?(:delete_all!) ? :delete_all! : :delete_all )
+
       CSV.open( "#{file_name}.csv" ) do |csv|
         keys = csv.shift # keyの設定
         warning "CSV", attributes, keys
@@ -179,9 +184,11 @@ module Flextures
     end
 
     # YAML形式でデータをロードする
-    def self.yml format
+    def self.yml format, option={}
       table_name, file_name, ext = file_exist format, [:yml]
 
+      # キャッシュ利用可能ならそれをそのまま使う
+      return if options[:cache] and @@table_cache[table_name.to_sym] and @@table_cache[table_name.to_sym] == file_name
       @@table_cache[table_name.to_sym] = file_name
 
       print "try loading #{file_name}.yml\n" unless [:fun].include? format[:loader]

data/lib/flextures/version.rb

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

data/lib/flextures.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'flextures/version'
 require 'flextures/flextures_base_config'
 require 'flextures/flextures_extension_modules'
 require 'flextures/flextures'

data/test/unit/test_flextures_hooks.rb

@@ -5,7 +5,7 @@ class FlexturesHookTest < Test::Unit::TestCase
     context ".parse_flextures_options" do
       context "通常動作" do
         setup do
-          @ret = Flextures::Loader.parse_flextures_options(:users)
+          @ret, @options = Flextures::Loader.parse_flextures_options(:users)
         end
         should "指定したテーブル分だけハッシュが返されている" do
           assert_equal 1, @ret.size
@@ -17,7 +17,7 @@ class FlexturesHookTest < Test::Unit::TestCase
       end
       context "違うファイルをロードした時" do
         setup do
-          @ret = Flextures::Loader.parse_flextures_options( :users => :users_another3 )
+          @ret, @options = Flextures::Loader.parse_flextures_options( :users => :users_another3 )
         end
         should "指定したテーブル分だけハッシュが返されている" do
           assert_equal 1, @ret.size
@@ -27,8 +27,15 @@ class FlexturesHookTest < Test::Unit::TestCase
           assert_equal h, @ret.first
         end
       end
+      context "オプション指定があった時" do
+        setup do
+          @ret, @options = Flextures::Loader.parse_flextures_options({ cache: true }, :users)
+        end
+        should "オプションを取り出している" do
+          assert_equal true, @options[:cache]
+        end
+      end
     end
-
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -159357549
+      hash: -204193459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: