fixture_dependencies 1.2.5 → 1.2.6

data/lib/fixture_dependencies/webrat/merb.rb

@@ -0,0 +1,11 @@
+module Merb
+  module Test
+    module World
+      class Webrat
+        def load(*args)
+          FixtureDependencies.load(*args)
+        end
+      end
+    end
+  end
+end

data/lib/fixture_dependencies.rb

@@ -141,7 +141,7 @@ class << FixtureDependencies
     model = model_name.camelize.constantize
     unless loaded[model_name.to_sym]
       puts "#{spaces}loading #{model.table_name}.yml" if verbose > 0
-      load_yaml(model_name) 
+      load_yaml(model_name)
     end
     mtype = model_type(model)
     model_method(:raise_model_error, mtype, "Couldn't use fixture #{record.inspect}") unless attributes = fixtures[model_name.to_sym][name.to_sym]
@@ -151,7 +151,8 @@ class << FixtureDependencies
       loading.pop
       return existing_obj
     end
-    obj = model.new
+    obj = model.respond_to?(:sti_key) ? attributes[model.sti_key].to_s.camelize.constantize.new : model.new
+    puts "#{spaces}#{model} STI plugin detected, initializing instance of #{obj}" if (verbose > 1 && model.sti_dataset)
     many_associations = []
     attributes.each do |attr, value|
       if reflection = model_method(:reflection, mtype, model, attr.to_sym)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fixture_dependencies
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -07:00
+date: 2011-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -26,10 +26,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
+- MIT-LICENSE
 files: 
 - README
-- LICENSE
+- MIT-LICENSE
 - lib/fixture_dependencies.rb
 - lib/fixture_dependencies_test_help.rb
 - lib/fixture_dependencies/sequel.rb
@@ -38,6 +38,7 @@ files:
 - lib/fixture_dependencies/test_unit/rails.rb
 - lib/fixture_dependencies/test_unit/sequel.rb
 - lib/fixture_dependencies/rspec/sequel.rb
+- lib/fixture_dependencies/webrat/merb.rb
 has_rdoc: true
 homepage: 
 licenses: []