jeremyevans-fixture_dependencies 1.1.2 → 1.2.0

data/README

@@ -12,9 +12,9 @@ the following features:
   constraints aren't violated
 - Has a very simple API (FixtureDependencies.load(:model__fixture))
 - Handles almost all cyclic dependencies
-- Includes Rails and Sequel test helpers for Test::Unit that load fixtures for
-  every test inside a transaction, so fixture data is never left in your
-  database
+- Includes Rails and Sequel test helpers for Test::Unit (and a Sequel test
+  helper for RSpec) that load fixtures for every test inside a transaction,
+  so fixture data is never left in your database
 
 == Installation
 
@@ -54,11 +54,18 @@ Make sure the test case classes use FixtureDependencies::SequelTestCase:
 
 This runs the test cases inside a Sequel transaction.
 
+=== With Sequel/RSpec:
+
+Somewhere before the test code is loaded:
+
+  require 'fixture_dependencies/rspec/sequel'
+  
+This runs each spec inside a separate Sequel transaction.
+
 === With other testing libraries:
 
 You can just use FixtureDependencies.load to handle the loading of fixtures.
-The use of transactions is up to you.  It's fairly easy to add support for
-running RSpec examples inside transactions.  One thing you must do if you are
+The use of transactions is up to you.  One thing you must do if you are
 not using the rails test helper is to set the fixture path for
 FixtureDependencies:
 
@@ -128,6 +135,12 @@ the loosest coupling possible.  Here's an example:
       # Test the employee
     end
     
+    def test_employees
+      # Load the fixtures and return two Employee objects
+      employee1, employee2 = load(:employees=>[:jeremy, :karl])
+      # Test the employees
+    end
+    
     def test_award_statistics
       #  Load all fixtures in both tables
       load(:employee_award__jeremy_first, :award__first)
@@ -206,8 +219,7 @@ The plugin is significantly slower than the default testing method, because it
 loads all fixtures inside of a transaction (one per test method), where Rails
 defaults to loading the fixtures once per test suite (outside of a
 transaction), and only deletes fixtures from a table when overwriting it with
-new fixtures.  Rails actually did something similar starting with r2714, but it
-was rolled back in r2730 due to speed issues.  See ticket #2404 on Rails' trac.
+new fixtures.  
 
 Instantiated fixtures are not available with this plugin.  Instead, you should
 use load(:model__fixture_name).

data/lib/fixture_dependencies.rb

@@ -10,11 +10,32 @@ class FixtureDependencies
   # to that model.  If multiple arguments are given, return a list of
   # model instances (for single fixture arguments) or list of model instances
   # (for model fixture arguments).  If no arguments, return the empty list.
+  # If any of the arguments is a hash, assume the key specifies the model
+  # and the values specify the fixture, and treat it as though individual
+  # symbols specifying both model and fixture were given.
+  # 
+  # Examples:
+  # * load(:posts) # All post fixtures, not recommended
+  # * load(:posts, :comments) # All post and comment fixtures, again not recommended
+  # * load(:post__post1) # Just the post fixture named post1
+  # * load(:post__post1, :post__post2) # Post fixtures named post1 and post2
+  # * load(:posts=>[:post1, :post2]) # Post fixtures named post1 and post2
+  # * load(:post__post1, :comment__comment2) # Post fixture named post1 and comment fixture named comment2
+  # * load({:posts=>[:post1, :post2]}, :comment__comment2) # Post fixtures named post1 and post2 and comment fixture named comment2
   #
   # This will load the data from the yaml files for each argument whose model
   # is not already in the fixture hash.
   def self.load(*records)
-    ret = records.collect do |record| 
+    ret = records.map do |record|
+      if record.is_a?(Hash)
+        record.map do |k, vals|
+          model = k.to_s.singularize
+          vals.map{|v| :"#{model}__#{v}"}
+        end
+      else
+        record
+      end
+    end.flatten.compact.map do |record| 
       model_name, name = split_name(record)
       if name
         use(record.to_sym)
@@ -24,10 +45,10 @@ class FixtureDependencies
           puts "loading #{model_name}.yml" if verbose > 0
           load_yaml(model_name) 
         end
-        fixtures[model_name.to_sym].keys.collect{|name| use("#{model_name}__#{name}".to_sym)}
+        fixtures[model_name.to_sym].keys.map{|name| use(:"#{model_name}__#{name}")}
       end
     end
-    records.length == 1 ? ret[0] : ret
+    ret.length == 1 ? ret[0] : ret
   end
 end
 

data/lib/fixture_dependencies/rspec/sequel.rb

@@ -0,0 +1,9 @@
+class Spec::Example::ExampleGroup
+  def execute(*args, &block)
+    Sequel::Model.db.transaction{super(*args, &block); raise Sequel::Error::Rollback}
+  end
+
+  def load(*args)
+    FixtureDependencies.load(*args)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremyevans-fixture_dependencies
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,7 @@ files:
 - lib/fixture_dependencies/test_unit.rb
 - lib/fixture_dependencies/test_unit/rails.rb
 - lib/fixture_dependencies/test_unit/sequel.rb
+- lib/fixture_dependencies/rspec/sequel.rb
 has_rdoc: true
 homepage: 
 post_install_message: