deferred_associations 0.5.4 → 0.5.5

data/lib/has_many_with_deferred_save.rb

@@ -16,6 +16,7 @@ module ActiveRecord
         define_obj_setter    collection_name
         define_obj_getter    collection_name
         define_id_setter     collection_name
+        define_id_getter     collection_name
 
         define_update_method collection_name
         define_reload_method collection_name
@@ -63,13 +64,21 @@ module ActiveRecord
           collection_singular_ids = "#{collection_name.singularize}_ids"
           define_method "#{collection_singular_ids}_with_deferred_save=" do |ids|
             ids = Array.wrap(ids).reject { |id| id.blank? }
-            new_values = self.send("#{collection_name}").klass.find(ids)
+            new_values = self.send("#{collection_name}_without_deferred_save").klass.find(ids)
             self.send("#{collection_name}=", new_values)
           end
           alias_method_chain :"#{collection_singular_ids}=", 'deferred_save'
         end
       end
 
+      def define_id_getter collection_name
+        collection_singular_ids = "#{collection_name.singularize}_ids"
+        define_method "#{collection_singular_ids}_with_deferred_save" do
+          self.send(collection_name).map { |e| e[:id] }
+        end
+        alias_method_chain :"#{collection_singular_ids}", 'deferred_save'
+      end
+
       def define_update_method collection_name
 
         define_method "hmwds_update_#{collection_name}" do

data/spec/db/database.yml

@@ -1,21 +1,21 @@
-sqlite3:
-  adapter: sqlite3
-  database: test.sqlite3.db
-
-sqlite3mem:
-  adapter: sqlite3
-  database: ":memory:"
-
-postgresql:
-  adapter: postgresql
-  username: postgres
-  password: postgres
-  database: has_and_belongs_to_many_with_deferred_save_test
-  min_messages: ERROR
-
-mysql:
-  adapter: mysql
-  host: localhost
-  username: root
-  password:
-  database: has_and_belongs_to_many_with_deferred_save_test
+sqlite3:
+  adapter: sqlite3
+  database: test.sqlite3.db
+
+sqlite3mem:
+  adapter: sqlite3
+  database: ":memory:"
+
+postgresql:
+  adapter: postgresql
+  username: postgres
+  password: postgres
+  database: has_and_belongs_to_many_with_deferred_save_test
+  min_messages: ERROR
+
+mysql:
+  adapter: mysql
+  host: localhost
+  username: root
+  password:
+  database: has_and_belongs_to_many_with_deferred_save_test

data/spec/db/schema.rb

@@ -1,40 +1,40 @@
-# This file is autogenerated. Instead of editing this file, please use the
-# migrations feature of ActiveRecord to incrementally modify your database, and
-# then regenerate this schema definition.
-
-ActiveRecord::Schema.define(:version => 1) do
-
-  create_table "people", :force => true do |t|
-    t.column "name", :string
-  end
-
-  create_table "people_rooms", :id => false, :force => true do |t|
-    t.column "person_id", :integer
-    t.column "room_id",   :integer
-  end
-
-  create_table "rooms", :force => true do |t|
-    t.column "name",              :string
-    t.column "maximum_occupancy", :integer
-  end
-
-  create_table "doors_rooms", :id => false, :force => true do |t|
-    t.column "door_id",   :integer
-    t.column "room_id",   :integer
-  end
-
-  create_table "doors", :force => true do |t|
-    t.column "name",              :string
-  end
-
-  create_table "tables", :force => true do |t|
-    t.column "name", :string
-    t.column "room_id", :integer
-  end
-
-  create_table "chairs", :force => true do |t|
-    t.column "name", :string
-    t.column "table_id", :integer
-  end
-
-end
+# This file is autogenerated. Instead of editing this file, please use the
+# migrations feature of ActiveRecord to incrementally modify your database, and
+# then regenerate this schema definition.
+
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table "people", :force => true do |t|
+    t.column "name", :string
+  end
+
+  create_table "people_rooms", :id => false, :force => true do |t|
+    t.column "person_id", :integer
+    t.column "room_id",   :integer
+  end
+
+  create_table "rooms", :force => true do |t|
+    t.column "name",              :string
+    t.column "maximum_occupancy", :integer
+  end
+
+  create_table "doors_rooms", :id => false, :force => true do |t|
+    t.column "door_id",   :integer
+    t.column "room_id",   :integer
+  end
+
+  create_table "doors", :force => true do |t|
+    t.column "name",              :string
+  end
+
+  create_table "tables", :force => true do |t|
+    t.column "name", :string
+    t.column "room_id", :integer
+  end
+
+  create_table "chairs", :force => true do |t|
+    t.column "name", :string
+    t.column "table_id", :integer
+  end
+
+end

data/spec/has_and_belongs_to_many_with_deferred_save_spec.rb

@@ -1,234 +1,236 @@
-require "spec_helper"
-require 'has_and_belongs_to_many_with_deferred_save'
-
-describe "has_and_belongs_to_many_with_deferred_save" do
-  describe "room maximum_occupancy" do
-    before :all do
-      @people = []
-      @people << Person.create(:name => 'Filbert')
-      @people << Person.create(:name => 'Miguel')
-      @people << Person.create(:name => 'Rainer')
-      @room = Room.new(:maximum_occupancy => 2)
-    end
-    after :all do
-      Person.delete_all
-      Room.delete_all
-    end
-
-    it "passes initial checks" do
-      Room  .count.should == 0
-      Person.count.should == 3
-
-      @room.people.should == []
-      @room.people_without_deferred_save.should == []
-      @room.people_without_deferred_save.object_id.should_not ==
-        @room.unsaved_people.object_id
-    end
-
-    it "after adding people to room, it should not have saved anything to the database" do
-      @room.people << @people[0]
-      @room.people << @people[1]
-
-      # Still not saved to the association table!
-      Room.count_by_sql("select count(*) from people_rooms").should == 0
-      @room.people_without_deferred_save.size.               should == 0
-    end
-
-    it "but room.people.size should still report the current size of 2" do
-      @room.people.size.should == 2        # 2 because this looks at unsaved_people and not at the database
-    end
-
-    it "after saving the model, the association should be saved in the join table" do
-      @room.save    # Only here is it actually saved to the association table!
-      @room.errors.full_messages.should == []
-      Room.count_by_sql("select count(*) from people_rooms").should == 2
-      @room.people.size.                                     should == 2
-      @room.people_without_deferred_save.size.               should == 2
-    end
-
-    it "when we try to add a 3rd person, it should add a validation error to the errors object like any other validation error" do
-      lambda { @room.people << @people[2] }.should_not raise_error
-      @room.people.size.       should == 3
-
-      Room.count_by_sql("select count(*) from people_rooms").should == 2
-      @room.valid?
-      @room.get_error(:people).should == "This room has reached its maximum occupancy"
-      @room.people.size.       should == 3 # Just like with normal attributes that fail validation... the attribute still contains the invalid data but we refuse to save until it is changed to something that is *valid*.
-    end
-
-    it "when we try to save, it should fail, because room.people is still invalid" do
-      @room.save.should == false
-      Room.count_by_sql("select count(*) from people_rooms").should == 2 # It's still not there, because it didn't pass the validation.
-      @room.get_error(:people).should == "This room has reached its maximum occupancy"
-      @room.people.size.       should == 3
-      @people.map {|p| p.reload; p.rooms.size}.should == [1, 1, 0]
-    end
-
-    it "when we reload, it should go back to only having 2 people in the room" do
-      @room.reload
-      @room.people.size.                                     should == 2
-      @room.people_without_deferred_save.size.               should == 2
-      @people.map {|p| p.reload; p.rooms.size}.                        should == [1, 1, 0]
-    end
-
-    it "if they try to go around our accessors and use the original accessors, then (and only then) will the exception be raised in before_adding_person..." do
-      lambda do
-        @room.people_without_deferred_save << @people[2]
-      end.should raise_error(RuntimeError)
-    end
-
-    it "lets you bypass the validation on Room if we add the association from the other side (person.rooms <<)?" do
-      @people[2].rooms << @room
-      @people[2].rooms.size.should == 1
-
-      # Adding it from one direction does not add it to the other object's association (@room.people), so the validation passes.
-      @room.reload.people.size.should == 2
-      @people[2].valid?
-      @people[2].errors.full_messages.should == []
-      @people[2].save.should == true
-
-      # It is only after reloading that @room.people has this 3rd object, causing it to be invalid, and by then it's too late to do anything about it.
-      @room.reload.people.size.should == 3
-      @room.valid?.should == false
-    end
-
-    it "only if you add the validation to both sides, can you ensure that the size of the association does not exceed some limit" do
-      @room.reload.people.size.should == 3
-      @room.people.delete(@people[2])
-      @room.save.should == true
-      @room.reload.people.size.should == 2
-      @people[2].reload.rooms.size.should == 0
-
-      obj = @people[2]
-      obj.do_extra_validation = true
-
-      @people[2].rooms << @room
-      @people[2].rooms.size.should == 1
-
-      @room.reload.people.size.should == 2
-      @people[2].valid?.should be_false
-      @people[2].get_error(:rooms).should == "This room has reached its maximum occupancy"
-      @room.reload.people.size.should == 2
-    end
-
-    it "still lets you do find" do
-      @room.people2.                     find(:first, :conditions => {:name => 'Filbert'}).should == @people[0]
-      @room.people_without_deferred_save.find(:first, :conditions => {:name => 'Filbert'}).should == @people[0]
-      @room.people2.first(:conditions                      => {:name => 'Filbert'}).should == @people[0]
-      @room.people_without_deferred_save.first(:conditions => {:name => 'Filbert'}).should == @people[0]
-      @room.people_without_deferred_save.find_by_name('Filbert').should == @people[0]
-
-      @room.people.find(:first, :conditions => {:name => 'Filbert'}).should == @people[0]
-      @room.people.first(:conditions => {:name => 'Filbert'}).       should == @people[0]
-      @room.people.last(:conditions => {:name => 'Filbert'}).        should == @people[0]
-      @room.people.first.                                            should == @people[0]
-      @room.people.last.                                             should == @people[1] # @people[2] was removed before
-      @room.people.find_by_name('Filbert').                          should == @people[0]
-    end
-
-    it "should be dumpable with Marshal" do
-      lambda { Marshal.dump(@room.people) }.should_not raise_exception
-      lambda { Marshal.dump(Room.new.people) }.should_not raise_exception
-    end
-
-    it "should detect difference in association" do
-      @room = Room.find(@room.id)
-      @room.bs_diff_before_module.should be_nil
-      @room.bs_diff_after_module.should  be_nil
-      @room.bs_diff_method.should        be_nil
-
-      @room.people.size.should == 2
-      @room.people = [@room.people[0]]
-      @room.save.should be_true
-
-      @room.bs_diff_before_module.should be_true
-      @room.bs_diff_after_module.should  be_true
-      if ar3?
-        @room.bs_diff_method.should      be_nil # Rails 3.2: nil (before_save filter is not supported)
-      else
-        @room.bs_diff_method.should      be_true
-      end
-    end
-
-    it "should act like original habtm when using ID array with array manipulation" do
-      @room = Room.find(@room.id)
-      @room.people = [@people[0]]
-      @room.save
-      @room = Room.find(@room.id) # we don't want to let id and object setters interfere with each other
-      @room.people2_ids << @people[1].id
-      @room.people2_ids.should == [@people[0].id] # ID array manipulation is ignored
-
-      @room.person_ids.size.should == 1
-      @room.person_ids << @people[1].id
-      @room.person_ids.should == [@people[0].id]
-      Room.find(@room.id).person_ids.should == [@people[0].id]
-      @room.save.should be_true
-      Room.find(@room.id).person_ids.should == [@people[0].id] # ID array manipulation is ignored, too
-    end
-
-    it "should work with id setters" do
-      @room = Room.find(@room.id)
-      @room.people = [@people[0], @people[1]]
-      @room.save
-      @room = Room.find(@room.id)
-      @room.person_ids.should == [@people[0].id, @people[1].id]
-      @room.person_ids = [@people[1].id]
-      @room.person_ids.should == [@people[1].id]
-      Room.find(@room.id).person_ids.should == [@people[0].id,@people[1].id]
-      @room.save.should be_true
-      Room.find(@room.id).person_ids.should == [@people[1].id]
-    end
-
-    it "should work with multiple id setters and object setters" do
-      @room = Room.find(@room.id)
-      @room.people     = [@people[0]]
-      @room.person_ids = [@people[0].id, @people[1].id]
-      @room.people     = [@people[1]]
-      @room.person_ids = [@people[0].id, @people[1].id]
-      @room.people     = [@people[1]]
-      @room.save
-      @room = Room.find(@room.id)
-      @room.people.should == [@people[1]]
-    end
-
-    it "should give klass in AR 3" do
-      if ar3?
-        @room.people.klass.should == Person
-      end
-    end
-
-    it "should give aliased_table_name in AR 2.3" do
-      unless ar3?
-        @room.people.aliased_table_name.should == "people"
-      end
-    end
-  end
-
-  describe "doors" do
-    before :all do
-      @rooms = []
-      @rooms << Room.create(:name => 'Kitchen',     :maximum_occupancy => 1)
-      @rooms << Room.create(:name => 'Dining room', :maximum_occupancy => 10)
-      @door =   Door.new(:name => 'Kitchen-Dining-room door')
-    end
-
-    it "passes initial checks" do
-      Room.count.should == 2
-      Door.count.should == 0
-
-      @door.rooms.should == []
-      @door.rooms_without_deferred_save.should == []
-    end
-
-    it "the association has an include? method" do
-      @door.rooms << @rooms[0]
-      @door.rooms.include?(@rooms[0]).should be_true
-      @door.rooms.include?(@rooms[1]).should be_false
-    end
-  end
-
-  def ar3?
-    ActiveRecord::VERSION::STRING >= "3"
-  end
-
-end
+require "spec_helper"
+require 'has_and_belongs_to_many_with_deferred_save'
+
+describe "has_and_belongs_to_many_with_deferred_save" do
+  describe "room maximum_occupancy" do
+    before :all do
+      @people = []
+      @people << Person.create(:name => 'Filbert')
+      @people << Person.create(:name => 'Miguel')
+      @people << Person.create(:name => 'Rainer')
+      @room = Room.new(:maximum_occupancy => 2)
+    end
+    after :all do
+      Person.delete_all
+      Room.delete_all
+    end
+
+    it "passes initial checks" do
+      Room  .count.should == 0
+      Person.count.should == 3
+
+      @room.people.should == []
+      @room.people_without_deferred_save.should == []
+      @room.people_without_deferred_save.object_id.should_not ==
+        @room.unsaved_people.object_id
+    end
+
+    it "after adding people to room, it should not have saved anything to the database" do
+      @room.people << @people[0]
+      @room.people << @people[1]
+
+      # Still not saved to the association table!
+      Room.count_by_sql("select count(*) from people_rooms").should == 0
+      @room.people_without_deferred_save.size.               should == 0
+    end
+
+    it "but room.people.size should still report the current size of 2" do
+      @room.people.size.should == 2        # 2 because this looks at unsaved_people and not at the database
+    end
+
+    it "after saving the model, the association should be saved in the join table" do
+      @room.save    # Only here is it actually saved to the association table!
+      @room.errors.full_messages.should == []
+      Room.count_by_sql("select count(*) from people_rooms").should == 2
+      @room.people.size.                                     should == 2
+      @room.people_without_deferred_save.size.               should == 2
+    end
+
+    it "when we try to add a 3rd person, it should add a validation error to the errors object like any other validation error" do
+      lambda { @room.people << @people[2] }.should_not raise_error
+      @room.people.size.       should == 3
+
+      Room.count_by_sql("select count(*) from people_rooms").should == 2
+      @room.valid?
+      @room.get_error(:people).should == "This room has reached its maximum occupancy"
+      @room.people.size.       should == 3 # Just like with normal attributes that fail validation... the attribute still contains the invalid data but we refuse to save until it is changed to something that is *valid*.
+    end
+
+    it "when we try to save, it should fail, because room.people is still invalid" do
+      @room.save.should == false
+      Room.count_by_sql("select count(*) from people_rooms").should == 2 # It's still not there, because it didn't pass the validation.
+      @room.get_error(:people).should == "This room has reached its maximum occupancy"
+      @room.people.size.       should == 3
+      @people.map {|p| p.reload; p.rooms.size}.should == [1, 1, 0]
+    end
+
+    it "when we reload, it should go back to only having 2 people in the room" do
+      @room.reload
+      @room.people.size.                                     should == 2
+      @room.people_without_deferred_save.size.               should == 2
+      @people.map {|p| p.reload; p.rooms.size}.                        should == [1, 1, 0]
+    end
+
+    it "if they try to go around our accessors and use the original accessors, then (and only then) will the exception be raised in before_adding_person..." do
+      lambda do
+        @room.people_without_deferred_save << @people[2]
+      end.should raise_error(RuntimeError)
+    end
+
+    it "lets you bypass the validation on Room if we add the association from the other side (person.rooms <<)?" do
+      @people[2].rooms << @room
+      @people[2].rooms.size.should == 1
+
+      # Adding it from one direction does not add it to the other object's association (@room.people), so the validation passes.
+      @room.reload.people.size.should == 2
+      @people[2].valid?
+      @people[2].errors.full_messages.should == []
+      @people[2].save.should == true
+
+      # It is only after reloading that @room.people has this 3rd object, causing it to be invalid, and by then it's too late to do anything about it.
+      @room.reload.people.size.should == 3
+      @room.valid?.should == false
+    end
+
+    it "only if you add the validation to both sides, can you ensure that the size of the association does not exceed some limit" do
+      @room.reload.people.size.should == 3
+      @room.people.delete(@people[2])
+      @room.save.should == true
+      @room.reload.people.size.should == 2
+      @people[2].reload.rooms.size.should == 0
+
+      obj = @people[2]
+      obj.do_extra_validation = true
+
+      @people[2].rooms << @room
+      @people[2].rooms.size.should == 1
+
+      @room.reload.people.size.should == 2
+      @people[2].valid?.should be_false
+      @people[2].get_error(:rooms).should == "This room has reached its maximum occupancy"
+      @room.reload.people.size.should == 2
+    end
+
+    it "still lets you do find" do
+      if ar4?
+        @room.people2.where(:name => 'Filbert').first.should == @people[0]
+        @room.people_without_deferred_save.where(:name => 'Filbert').first.should == @people[0]
+        @room.people.where(:name => 'Filbert').first.should == @people[0]
+      else
+        @room.people2.                     find(:first, :conditions => {:name => 'Filbert'}).should == @people[0]
+        @room.people_without_deferred_save.find(:first, :conditions => {:name => 'Filbert'}).should == @people[0]
+        @room.people2.first(:conditions                      => {:name => 'Filbert'}).should == @people[0]
+        @room.people_without_deferred_save.first(:conditions => {:name => 'Filbert'}).should == @people[0]
+
+        @room.people.find(:first, :conditions => {:name => 'Filbert'}).should == @people[0]
+        @room.people.first(:conditions => {:name => 'Filbert'}).       should == @people[0]
+        @room.people.last(:conditions => {:name => 'Filbert'}).        should == @people[0]
+      end
+
+      @room.people.first.                                        should == @people[0]
+      @room.people.last.                                         should == @people[1] # @people[2] was removed before
+      @room.people.find_by_name('Filbert').                      should == @people[0]
+      @room.people_without_deferred_save.find_by_name('Filbert').should == @people[0]
+    end
+
+    it "should be dumpable with Marshal" do
+      lambda { Marshal.dump(@room.people) }.should_not raise_exception
+      lambda { Marshal.dump(Room.new.people) }.should_not raise_exception
+    end
+
+    it "should detect difference in association" do
+      @room = Room.find(@room.id)
+      @room.bs_diff_before_module.should be_nil
+      @room.bs_diff_after_module.should  be_nil
+      @room.bs_diff_method.should        be_nil
+
+      @room.people.size.should == 2
+      @room.people = [@room.people[0]]
+      @room.save.should be_true
+
+      @room.bs_diff_before_module.should be_true
+      @room.bs_diff_after_module.should  be_true
+      if ar2?
+        @room.bs_diff_method.should      be_true
+      else
+        @room.bs_diff_method.should      be_nil # Rails 3.2: nil (before_save filter is not supported)
+      end
+    end
+
+    it "should act like original habtm when using ID array with array manipulation" do
+      @room = Room.find(@room.id)
+      @room.people = [@people[0]]
+      @room.save
+      @room = Room.find(@room.id) # we don't want to let id and object setters interfere with each other
+      @room.people2_ids << @people[1].id
+      @room.people2_ids.should == [@people[0].id] # ID array manipulation is ignored
+
+      @room.person_ids.size.should == 1
+      @room.person_ids << @people[1].id
+      @room.person_ids.should == [@people[0].id]
+      Room.find(@room.id).person_ids.should == [@people[0].id]
+      @room.save.should be_true
+      Room.find(@room.id).person_ids.should == [@people[0].id] # ID array manipulation is ignored, too
+    end
+
+    it "should work with id setters" do
+      @room = Room.find(@room.id)
+      @room.people = [@people[0], @people[1]]
+      @room.save
+      @room = Room.find(@room.id)
+      @room.person_ids.should == [@people[0].id, @people[1].id]
+      @room.person_ids = [@people[1].id]
+      @room.person_ids.should == [@people[1].id]
+      Room.find(@room.id).person_ids.should == [@people[0].id,@people[1].id]
+      @room.save.should be_true
+      Room.find(@room.id).person_ids.should == [@people[1].id]
+    end
+
+    it "should work with multiple id setters and object setters" do
+      @room = Room.find(@room.id)
+      @room.people     = [@people[0]]
+      @room.person_ids = [@people[0].id, @people[1].id]
+      @room.people     = [@people[1]]
+      @room.person_ids = [@people[0].id, @people[1].id]
+      @room.people     = [@people[1]]
+      @room.save
+      @room = Room.find(@room.id)
+      @room.people.should == [@people[1]]
+    end
+
+    it "should give klass in AR 3/4" do
+      unless ar2?
+        @room.people.klass.should == Person
+      end
+    end
+
+    it "should give aliased_table_name in AR 2.3" do
+      if ar2?
+        @room.people.aliased_table_name.should == "people"
+      end
+    end
+  end
+
+  describe "doors" do
+    before :all do
+      @rooms = []
+      @rooms << Room.create(:name => 'Kitchen',     :maximum_occupancy => 1)
+      @rooms << Room.create(:name => 'Dining room', :maximum_occupancy => 10)
+      @door =   Door.new(:name => 'Kitchen-Dining-room door')
+    end
+
+    it "passes initial checks" do
+      Room.count.should == 2
+      Door.count.should == 0
+
+      @door.rooms.should == []
+      @door.rooms_without_deferred_save.should == []
+    end
+
+    it "the association has an include? method" do
+      @door.rooms << @rooms[0]
+      @door.rooms.include?(@rooms[0]).should be_true
+      @door.rooms.include?(@rooms[1]).should be_false
+    end
+  end
+end