flextures 1.9.2 → 1.9.4

data/VERSION

@@ -1,2 +1,2 @@
-1.9.2
+1.9.4
 

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flextures}
-  s.version = "1.9.2"
+  s.version = "1.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = %q{2012-02-20}
+  s.date = %q{2012-03-05}
   s.description = %q{load and dump fixtures}
   s.email = %q{babanba.n@gmail.com}
   s.extra_rdoc_files = [

data/lib/flextures/flextures.rb

@@ -13,17 +13,24 @@ module Flextures
 
   # テーブルモデルの作成
   def self.create_model table_name
-    a = proc {
+    # Factoryにオプションで指定があった時
+    a = ->{
+      f = Factory::FACTORIES[table_name.to_sym]
+      f && f[:model]
+    }
+    # テーブル名からモデル名が推測できるとき
+    b = ->{
       begin
         table_name.singularize.camelize.constantize
       rescue => e
         nil
       end
     }
-    b = proc { 
+    # モデル名推測不可能なとき
+    c = ->{ 
       Class.new(ActiveRecord::Base){ |o| o.table_name=table_name }
     }
-    a.call || b.call
+    a.call || b.call || c.call
   end
 
   # 設定ファイルが存在すればロード

data/lib/flextures/flextures_base_config.rb

@@ -6,6 +6,7 @@ module Flextures
     @@configs={
       fixture_load_directory: "spec/fixtures/",
       fixture_dump_directory: "spec/fixtures/",
+      init_all_tables: true,  # 実行後に全テーブルの初期化を行うか？falseにするとそのぶん高速化できる
     }
     # ハッシュをsetter、getterに変換
     class<< self

data/lib/flextures/flextures_factory.rb

@@ -3,15 +3,29 @@
 module Flextures
   # ロードするデータを必要に応じて加工する
   class Factory
+    # 設置ファイルから取得した Factoryの一覧を取得
     FACTORIES={}
+
     # Factory を定義
-    def self.define table_name, &block
-      FACTORIES[table_name.to_sym]=block
+    # @params table_name
+    # @params options
+    # @params block
+    # @return Flextures::Factory
+    def self.define table_name, *options, &block
+      h={ block: block }
+      options.each do |o|
+        begin
+          h[:model] = o if o.new.is_a? ActiveRecord::Base
+        rescue
+        end
+      end
+      FACTORIES[table_name.to_sym]=h
     end
 
     # Factoryを取得
     def self.get table_name
-      FACTORIES[table_name.to_sym]
+      f = FACTORIES[table_name.to_sym]
+      f && f[:block]
     end
     def self.[](table_name); self.get(table_name); end
   end

data/lib/flextures/rspec_flextures_support.rb

@@ -9,20 +9,22 @@ module RSpec
       end
     end
   end
+end
 
-  module Rails
-    module FlextureSupport
-      @@configs={ load_count: 0 }
-      def self.included(m)
-        # 一番外側のdescribeにだけ追加
-        m.before { Flextures::init_load; Flextures::init_tables } if @@configs[:load_count]==0
-        @@configs[:load_count] += 1
-      end
+# 既存のsetup_fixturesの機能を上書きする必要があったのでこちらを作成
+module ActiveRecord
+  module TestFixtures
+    alias :flextures_backup_setup_fixtures :setup_fixtures
+    def setup_fixtures
+      flextures_backup_setup_fixtures
+      Flextures::init_load
     end
-  end
 
-  RSpec.configure do |c|
-    c.include RSpec::Rails::FlextureSupport
+    alias :flextures_backup_teardown_fixtures :teardown_fixtures
+    def teardown_fixtures
+      flextures_backup_teardown_fixtures
+      Flextures::init_tables if Flextures::Config.init_all_tables
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 +09:00
+date: 2012-03-05 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78755580 !ruby/object:Gem::Requirement
+  requirement: &86528270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *78755580
+  version_requirements: *86528270
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78755310 !ruby/object:Gem::Requirement
+  requirement: &86527970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *78755310
+  version_requirements: *86527970
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &78755040 !ruby/object:Gem::Requirement
+  requirement: &86527720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78755040
+  version_requirements: *86527720
 description: load and dump fixtures
 email: babanba.n@gmail.com
 executables: []
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -33878253
+      hash: -1060100081
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: