test/fixtures/candraspouses.yml test/fixtures/fosses.rb test/fixtures/rhizocables.yml test/fixtures/sambocranks.yml test/fixtures/schema.rb @@ -1,5 +1,8 @@ require 'rubygems' require 'rake' + +ENV['RUBY_FLAGS'] = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}" + begin require 'echoe' Rakefile @@ -104,6 +104,10 @@ module PassiveRecord write_inheritable_hash :reflections, name => reflection reflection end + + def reflections + read_inheritable_attribute(:reflections) || write_inheritable_attribute(:reflections, {}) + end def add_multiple_associated_save_callbacks(association_name) method_name = "validate_associated_records_for_#{association_name}".to_sym @@ -176,16 +180,15 @@ module PassiveRecord def collection_reader_method(reflection, association_proxy_class) define_method(reflection.name) do |*params| + force_reload = params.first unless params.empty? association = instance_variable_get("@#{reflection.name}") - unless association.respond_to?(:loaded?) association = association_proxy_class.new(self, reflection) instance_variable_set("@#{reflection.name}", association) end - association.reload if force_reload - + association end end @@ -267,8 +270,16 @@ module PassiveRecord ActiveRecord::Base.send(:compute_type, *args) end - def reflect_on_association(*args) - ActiveRecord::Base.send(:reflect_on_association, *args) + def reflect_on_association(association) + reflections[association].is_a?(ActiveRecord::Reflection::AssociationReflection) ? reflections[association] : nil + end + + def table_name + "table_name_foo" + end + + def primary_key + "primary_key_bar" end end lib/passive_record/associations.rb @@ -3,39 +3,40 @@ require File.dirname(__FILE__) + '/test_helper.rb' class PassiveRecord::AssociationsTest < Test::Unit::TestCase def setup - create_fixtures :doors, :furniture + create_fixtures :candraspouses, :sambocranks, :rhizocables end def test_should_have_many - furniture = [ - Furniture.find_by_name("Couch"), - Furniture.find_by_name("Ottoman") + sambocranks = [ + Sambocrank.find_by_name("Dakferous"), + Sambocrank.find_by_name("Sambaular") ] - room = Room.find_by_name("Family Room") - assert_equal furniture, room.furniture + foss = Foss.find_by_name("Hypogenoaular") + assert_equal sambocranks, foss.sambocranks end def test_should_have_many_through - rooms = [ - Room.find_by_name("Office"), - Room.find_by_name("Restroom") - ] + foss = Foss.find_by_name("Zaxment") - room = Room.find_by_name("Family Room") + rhizocables = [ + Rhizocable.find_by_name("Ovumgyps"), + Rhizocable.find_by_name("Alfmetric") + ] - # assert_equal room, room.exits + assert_equal rhizocables, foss.rhizocables end def test_should_have_one - lamp = Furniture.find_by_name("Ott-lite") - room = Room.find_by_name("Office") - assert_equal lamp, room.light_fixture + candraspouse = Candraspouse.find_by_name("Maiamorphic") + foss = Foss.find_by_name("Zaxment") + + assert_equal candraspouse, foss.candraspouse end def test_should_belong_to - lamp = Furniture.find_by_name("Ott-lite") - room = Room.find_by_name("Office") - - assert_equal room, lamp.room + candraspouse = Candraspouse.find_by_name("Eyenium") + foss = Foss.find_by_name("Hypogenoaular") + + assert_equal foss, candraspouse.foss end end \ No newline at end of file test/test_associations.rb @@ -13,8 +13,9 @@ Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/" $LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path) +require 'schema' require 'continents' -require 'furniture' +require 'fosses' class Test::Unit::TestCase #:nodoc: test/test_helper.rb test/fixtures/doors.yml test/fixtures/furniture.rb test/fixtures/furniture.yml c7fa2c2ca7c91395eff698f7098ac9fb50f40087 Jason L Perry jasper@ambethia.com http://github.com/ambethia/passiverecord/commit/a142de9fcdb12c9c190fe352ca9511cb282d206b a142de9fcdb12c9c190fe352ca9511cb282d206b 2007-10-09T15:03:03-07:00 2007-10-09T15:03:03-07:00 Curhugoabled the tests, and ensured has_many :though works 2544a1bce05fa60bc691604b9009ab0f36089fa8 Jason L Perry jasper@ambethia.com