flextures 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flextures}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = %q{2011-11-07}
+  s.date = %q{2011-11-08}
   s.description = %q{load and dump fixtures}
   s.email = %q{babanba.n@gmail.com}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/flextures/flextures_factory.rb",
     "lib/flextures/flextures_railtie.rb",
     "lib/flextures/rspec_flextures_support.rb",
+    "lib/flextures/testunit_flextures_support.rb",
     "test/helper.rb",
     "test/test_flextures.rb"
   ]

data/lib/flextures/flextures.rb

@@ -11,13 +11,27 @@ module Flextures
   LOAD_DIR = Config.fixture_load_directory
   DUMP_DIR = Config.fixture_dump_directory
 
+  # テーブルモデルの作成
+  def self.create_model table_name
+    klass = Class.new ActiveRecord::Base
+    klass.table_name=table_name
+    klass
+  end
+  
+  def self.init_load
+    if defined?(Rails) and Rails.root
+      [
+        "#{Rails.root.to_path}/config/flextures.config.rb",
+        "#{Rails.root.to_path}/config/flextures.factory.rb",
+      ].each { |fn| load(fn) if File.exist?(fn) }
+    end
+  end
+
   # 引数解析
   module ARGS
     # 書き出し 、読み込み すべきファイルとオプションを書きだす
     def self.parse option={}
-      load "#{Rails.root.to_path}/config/flextures.config.rb"  if defined?(Rails) and Rails.root
-      load "#{Rails.root.to_path}/config/flextures.factory.rb" if defined?(Rails) and Rails.root
-      
+      Flextures::init_load
       table_names = ""
       table_names = ENV["TABLE"].split(",") if ENV["TABLE"]
       table_names = ENV["T"].split(",") if ENV["T"]
@@ -39,13 +53,6 @@ module Flextures
     end
   end
   
-  # テーブルモデルの作成
-  def self.create_model table_name
-    klass = Class.new ActiveRecord::Base
-    klass.table_name=table_name
-    klass
-  end
-  
   module Dumper
     PARENT = Flextures
 
@@ -141,12 +148,13 @@ module Flextures
 
     # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する    
     def self.flextures *fixtures
-       # :allですべてのfixtureを反映
+      PARENT::init_load
+      # :allですべてのfixtureを反映
       fixtures = ActiveRecord::Base.connection.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| Flextures::Loader::load table: table_name }
-      fixtures_hash.each{ |k,v| Flextures::Loader::load table: k, file: v } if fixtures_hash
+      fixtures.each{ |table_name| Loader::load table: table_name }
+      fixtures_hash.each{ |k,v| Loader::load table: k, file: v } if fixtures_hash
       fixtures
     end
 

data/lib/flextures/testunit_flextures_support.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+# shouda等へのfixture拡張
+module Test::Unit::TestCase  
+  def flextures *args
+    Flextures::Loader::flextures *args
+  end
+end
+

data/lib/flextures.rb

@@ -6,3 +6,5 @@ require 'flextures/flextures'
 require 'flextures/flextures_factory'
 require 'flextures/flextures_railtie' if defined? Rails
 require 'flextures/rspec_flextures_support'
+require 'flextures/testunit_flextures_support'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000 +09:00
+date: 2011-11-08 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &80353760 !ruby/object:Gem::Requirement
+  requirement: &77137930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80353760
+  version_requirements: *77137930
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80353520 !ruby/object:Gem::Requirement
+  requirement: &77137690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *80353520
+  version_requirements: *77137690
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &80353280 !ruby/object:Gem::Requirement
+  requirement: &77137450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *80353280
+  version_requirements: *77137450
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &80353040 !ruby/object:Gem::Requirement
+  requirement: &77137210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80353040
+  version_requirements: *77137210
 description: load and dump fixtures
 email: babanba.n@gmail.com
 executables: []
@@ -82,6 +82,7 @@ files:
 - lib/flextures/flextures_factory.rb
 - lib/flextures/flextures_railtie.rb
 - lib/flextures/rspec_flextures_support.rb
+- lib/flextures/testunit_flextures_support.rb
 - test/helper.rb
 - test/test_flextures.rb
 has_rdoc: true
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -410806225
+      hash: 13889423
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: