fixture_dependencies 1.2.6 → 1.3.0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2010 Jeremy Evans
+Copyright (c) 2007-2011 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy 
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -7,7 +7,7 @@ the following features:
 - Fixtures specify association names instead of foreign keys
 - Support both Sequel and ActiveRecord
 - Supports many_to_one/belongs_to, one_to_many/has_many,
-  many_to_many/has_and_belongs_to_many, and has_one associations
+  many_to_many/has_and_belongs_to_many, and has_one/one_to_one associations
 - Loads a fixture's dependency graph in such a manner that foreign key
   constraints aren't violated
 - Has a very simple API (FixtureDependencies.load(:model__fixture))
@@ -128,7 +128,7 @@ using the following syntax:
   
 This would load just the jeremy fixture and its dependencies.  I find this is
 much better than loading all fixtures in most of my test suites.  Even better
-is loading just the fixtures you want instead every test method (see below).
+is loading just the fixtures you want inside every test method (see below).
 This leads to the most robust testing.
 
 == Loading fixtures inside test methods
@@ -244,6 +244,13 @@ test/test_helper.rb:
 This will give a verbose description of the loading and saving of fixtures for
 every test, including the recursive loading of the dependency graph.
 
+== Specs
+
+The specs for fixture dependencies and be run with Rake.  They require
+the sequel, activerecord, and sqlite3 gems installed.  The default rake task
+runs the specs.  You should run the spec_migrate task first to create the
+spec database.
+
 == Similar Ideas
 
 Rails now supports something similar by default.  Honestly, I'm not sure what
@@ -255,8 +262,8 @@ it doesn't support has_* associations.
 
 == License
 
-fixture_dependencies is released under the MIT License.  See the LICENSE file
-for details.
+fixture_dependencies is released under the MIT License.  See the MIT-LICENSE
+file for details.
 
 == Author
 

data/lib/fixture_dependencies.rb

@@ -76,7 +76,7 @@ class << FixtureDependencies
   def get(record)
     model_name, name = split_name(record)
     model = model_name.camelize.constantize
-    model_method(:model_find, model_type(model), model, fixtures[model_name.to_sym][name.to_sym][model.primary_key.to_sym])
+    model_method(:model_find, model_type(model), model, fixtures[model_name.to_sym][name.to_sym][fixture_pk(model)])
   end
   
   # Adds all fixtures in the yaml fixture file for the model to the fixtures
@@ -145,16 +145,19 @@ class << FixtureDependencies
     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]
+    fpk = fixture_pk(model)
+    cpk = fpk.is_a?(Array)
     # return if object has already been loaded into the database
-    if existing_obj = model_method(:model_find_by_pk, mtype, model, attributes[model.primary_key.to_sym])
-      puts "#{spaces}using #{record}: already in database" if verbose > 2
+    if existing_obj = model_method(:model_find_by_pk, mtype, model, fixture_pkv(attributes,fpk))
+      puts "#{spaces}using #{record}: already in database (pk: #{fixture_pkv(attributes,fpk).inspect})" if verbose > 2
       loading.pop
       return existing_obj
     end
     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)
+    puts "#{spaces}#{model} STI plugin detected, initializing instance of #{obj}" if (verbose > 1 && model.respond_to?(:sti_dataset))
     many_associations = []
     attributes.each do |attr, value|
+      next if attr.is_a?(Array)
       if reflection = model_method(:reflection, mtype, model, attr.to_sym)
         if [:belongs_to, :many_to_one].include?(model_method(:reflection_type, mtype, reflection))
           dep_name = "#{model_method(:reflection_class, mtype, reflection).name.underscore}__#{value}".to_sym
@@ -162,13 +165,20 @@ class << FixtureDependencies
             # Self referential record, use primary key
             puts "#{spaces}#{record}.#{attr}: belongs_to self-referential" if verbose > 1
             attr = model_method(:reflection_key, mtype, reflection)
-            value = attributes[model.primary_key.to_sym]
+            value = fixture_pkv(attributes,fpk)
+            if cpk
+              attr.zip(value).each do |k, v|
+                puts "#{spaces}#{record}.#{k} = #{v.inspect}" if verbose > 2
+                obj.send("#{k}=", v)
+              end
+              next
+            end
           elsif loading.include?(dep_name)
             # Association cycle detected, set foreign key for this model afterward using procs
             # This is will fail if the column is set to not null or validates_presence_of
             puts "#{spaces}#{record}.#{attr}: belongs-to cycle detected:#{dep_name}" if verbose > 1
             (procs[dep_name] ||= []) << Proc.new do |assoc|
-              m = model_method(:model_find, mtype, model, attributes[model.primary_key.to_sym])
+              m = model_method(:model_find, mtype, model, fixture_pkv(attributes,fpk))
               m.send("#{attr}=", assoc)
               model_method(:model_save, mtype, m)
             end
@@ -192,7 +202,7 @@ class << FixtureDependencies
 
     model_method(:model_save, mtype, obj)
     # after saving the model, we set the primary key within the fixture hash, in case it was not explicitly specified in the fixture and was generated by an auto_increment / serial field
-    fixtures[model_name.to_sym][name.to_sym][model.primary_key.to_sym] ||= obj[model.primary_key.to_sym]
+    fixtures[model_name.to_sym][name.to_sym][fpk] ||= fixture_pkv(obj,fpk)
 
     loading.pop
     # Update the circular references 
@@ -224,4 +234,22 @@ class << FixtureDependencies
     end
     obj
   end
+
+  def fixture_pk(model)
+    case pk = model.primary_key
+    when Symbol, Array
+      pk
+    else
+      pk.to_sym
+    end
+  end
+
+  def fixture_pkv(attributes, fpk)
+    case fpk
+    when Symbol
+      attributes[fpk]
+    else
+      fpk.map{|v| attributes[v]}
+    end
+  end
 end

data/lib/fixture_dependencies/active_record.rb

@@ -22,7 +22,7 @@ class << FixtureDependencies
   end
   
   def raise_model_error_AR(message)
-    ActiveRecord::RecordNotFound
+    raise ActiveRecord::RecordNotFound, message
   end
   
   def reflection_AR(model, attr)

data/lib/fixture_dependencies/sequel.rb

@@ -23,7 +23,7 @@ class << FixtureDependencies
   end
   
   def raise_model_error_S(message)
-    Sequel::Error
+    raise Sequel::Error, message
   end
   
   def reflection_S(model, attr)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fixture_dependencies
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 6
-  version: 1.2.6
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: []