flextures 1.9.4 → 1.9.5

data/VERSION

@@ -1,2 +1,2 @@
-1.9.4
+1.9.5
 

data/flextures.gemspec

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

data/lib/flextures/flextures.rb

@@ -47,7 +47,13 @@ module Flextures
   def self.init_tables
     tables = ActiveRecord::Base.connection.tables
     tables.delete "schema_migrations"
-    tables.each{ |name| Class.new(ActiveRecord::Base){ |o| o.table_name=name }.delete_all }
+    tables.each{ |name|
+      # テーブルではなくviewを拾って止まる場合があるのでrescueしてしまう
+      begin
+        Class.new(ActiveRecord::Base){ |o| o.table_name= name }.delete_all
+      rescue => e
+      end
+    }
   end
 
   # 引数解析
@@ -152,7 +158,7 @@ module Flextures
       time:->{ DateTime.now },
       timestamp:->{ DateTime.now },
     }
-    
+
     # 型の変換を行う
     TRANSLATER = {
       binary:->(d){ d.to_i },
@@ -204,6 +210,7 @@ module Flextures
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
       filter = create_filter klass, Factory[table_name]
+      klass.delete_all
       CSV.open( inpfile ) do |csv|
         keys = csv.shift # keyの設定
         warning "CSV", attributes, keys
@@ -233,7 +240,7 @@ module Flextures
         o.save
       end
     end
-    
+
     # 欠けたカラムを検知してメッセージを出しておく
     def self.warning format, attributes, keys
       (attributes-keys).each { |name| print "Warning: #{format} colum is missing! [#{name}]\n" }

data/lib/flextures/flextures_base_config.rb

@@ -3,6 +3,7 @@
 # 基本設定を記述する
 module Flextures
   module Config
+    READ_ONLYS=[]
     @@configs={
       fixture_load_directory: "spec/fixtures/",
       fixture_dump_directory: "spec/fixtures/",
@@ -11,8 +12,8 @@ module Flextures
     # ハッシュをsetter、getterに変換
     class<< self
       @@configs.each do |setting_key, setting_value|
-        define_method setting_key do @@configs[setting_key] end
-        define_method "#{setting_key}=" do |arg| @@configs[setting_key]=arg end
+        define_method(setting_key){ @@configs[setting_key] } unless READ_ONLYS.include?(setting_key)
+        define_method("#{setting_key}="){ |arg| @@configs[setting_key]=arg }
       end
     end
   end

data/lib/flextures/rspec_flextures_support.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 +09:00
+date: 2012-03-10 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &86528270 !ruby/object:Gem::Requirement
+  requirement: &90050990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *86528270
+  version_requirements: *90050990
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &86527970 !ruby/object:Gem::Requirement
+  requirement: &90050690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *86527970
+  version_requirements: *90050690
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &86527720 !ruby/object:Gem::Requirement
+  requirement: &90050440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86527720
+  version_requirements: *90050440
 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: -1060100081
+      hash: -67127249
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: