deferred_associations 0.5.4 → 0.5.5

data/spec/has_many_with_deferred_save_spec.rb

@@ -14,10 +14,23 @@ describe 'has_many_with_deferred_save' do
     @room.tables.should == [@table1]
     @room.tables = [@table1, @table2]
     Room.find(@room.id).tables.should == [@table1] # not saved yet
+    @room.tables.should == [@table1, @table2]
+    @room.table_ids.should == [@table1.id, @table2.id]
     @room.save.should be_true
     Room.find(@room.id).tables.should == [@table1, @table2]
   end
 
+  it 'should work with tables obj setter/getter, used twice' do
+      @room.tables.should == [@table1]
+      @room.tables = [@table1]
+      @room.tables = [@table1, @table2]
+      Room.find(@room.id).tables.should == [@table1] # not saved yet
+      @room.table_ids.should == [@table1.id, @table2.id]
+      @room.tables.should == [@table1, @table2]
+      @room.save.should be_true
+      Room.find(@room.id).tables.should == [@table1, @table2]
+    end
+
   it 'should work with tables id setter/getter' do
     @room.table_ids.should == [@table1.id]
     @room.table_ids = [@table1.id, @table2.id]
@@ -26,6 +39,15 @@ describe 'has_many_with_deferred_save' do
     Room.find(@room.id).table_ids.should == [@table1.id, @table2.id]
   end
 
+  it 'should work with tables id setter/getter, used twice' do
+      @room.table_ids.should == [@table1.id]
+      @room.table_ids = [@table1.id]
+      @room.table_ids = [@table1.id, @table2.id]
+      Room.find(@room.id).table_ids.should == [@table1.id] # not saved yet
+      @room.save.should be_true
+      Room.find(@room.id).table_ids.should == [@table1.id, @table2.id]
+    end
+
   it 'should work with array methods' do
     @room.tables.should == [@table1]
     @room.tables << @table2
@@ -63,7 +85,12 @@ describe 'has_many_with_deferred_save' do
 
     it 'should defer association methods' do
       @room.chairs.first.should == @chair1
-      @room.chairs.find(:all, :conditions => {:name => "First"}).should == [@chair1]
+      if ar4?
+        @room.chairs.where(:name => "First").should == [@chair1]
+      else
+        @room.chairs.find(:all, :conditions => {:name => "First"}).should == [@chair1]
+      end
+
       lambda {
         @room.chairs.create(:name => "New one")
       }.should raise_error(ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection)

data/spec/models/door.rb

@@ -1,3 +1,3 @@
-class Door < ActiveRecord::Base
-  has_and_belongs_to_many_with_deferred_save :rooms
-end
+class Door < ActiveRecord::Base
+  has_and_belongs_to_many_with_deferred_save :rooms
+end

data/spec/models/person.rb

@@ -1,15 +1,15 @@
-class Person < ActiveRecord::Base
-  has_and_belongs_to_many_with_deferred_save :rooms, :validate => true
-
-  attr     :do_extra_validation, true
-  validate :extra_validation, :if => :do_extra_validation
-
-  def extra_validation
-    rooms.each do |room|
-      this_room_unsaved = rooms_without_deferred_save.include?(room) ? 0 : 1
-      if room.people.size + this_room_unsaved > room.maximum_occupancy
-        errors.add :rooms, "This room has reached its maximum occupancy"
-      end
-    end
-  end
-end
+class Person < ActiveRecord::Base
+  has_and_belongs_to_many_with_deferred_save :rooms, :validate => true
+
+  attr_accessor :do_extra_validation
+  validate      :extra_validation, :if => :do_extra_validation
+
+  def extra_validation
+    rooms.each do |room|
+      this_room_unsaved = rooms_without_deferred_save.include?(room) ? 0 : 1
+      if room.people.size + this_room_unsaved > room.maximum_occupancy
+        errors.add :rooms, "This room has reached its maximum occupancy"
+      end
+    end
+  end
+end

data/spec/models/room.rb

@@ -1,51 +1,51 @@
-class Room < ActiveRecord::Base
-
-  attr :bs_diff_before_module, true
-  attr :bs_diff_after_module, true
-  attr :bs_diff_method, true
-
-  before_save :diff_before_module
-
-  has_and_belongs_to_many_with_deferred_save :people, :before_add => :before_adding_person
-  has_and_belongs_to_many :people2, :class_name => 'Person'
-  has_and_belongs_to_many_with_deferred_save :doors
-
-  has_many_with_deferred_save :tables
-  has_many_with_deferred_save :chairs, :through => :tables #TODO test compatibility with through associations
-
-  before_save :diff_after_module
-
-  validate :people_count
-
-  def people_count
-    if people.size > maximum_occupancy
-      errors.add :people, "This room has reached its maximum occupancy"
-    end
-  end
-
-  # Just in case they try to bypass our new accessor and call people_without_deferred_save directly...
-  # (This should never be necessary; it is for demonstration purposes only...)
-  def before_adding_person(person)
-    if self.people_without_deferred_save.size + [person].size > maximum_occupancy
-      raise "There are too many people in this room"
-    end
-  end
-
-  def diff_before_module
-    #should detect the changes
-    self.bs_diff_before_module = (people.size - people_without_deferred_save.size) != 0
-    true
-  end
-
-  def diff_after_module
-    # should not detect the changes
-    self.bs_diff_after_module = (people.size - people_without_deferred_save.size) != 0
-    true
-  end
-
-  def before_save
-    # old_style, should not detect the changes
-    self.bs_diff_method = (people.size - people_without_deferred_save.size) != 0
-    true
-  end
-end
+class Room < ActiveRecord::Base
+
+  attr_accessor :bs_diff_before_module
+  attr_accessor :bs_diff_after_module
+  attr_accessor :bs_diff_method
+
+  before_save :diff_before_module
+
+  has_and_belongs_to_many_with_deferred_save :people, :before_add => :before_adding_person
+  has_and_belongs_to_many :people2, :class_name => 'Person'
+  has_and_belongs_to_many_with_deferred_save :doors
+
+  has_many_with_deferred_save :tables
+  has_many_with_deferred_save :chairs, :through => :tables #TODO test compatibility with through associations
+
+  before_save :diff_after_module
+
+  validate :people_count
+
+  def people_count
+    if people.size > maximum_occupancy
+      errors.add :people, "This room has reached its maximum occupancy"
+    end
+  end
+
+  # Just in case they try to bypass our new accessor and call people_without_deferred_save directly...
+  # (This should never be necessary; it is for demonstration purposes only...)
+  def before_adding_person(person)
+    if self.people_without_deferred_save.size + [person].size > maximum_occupancy
+      raise "There are too many people in this room"
+    end
+  end
+
+  def diff_before_module
+    #should detect the changes
+    self.bs_diff_before_module = (people.size - people_without_deferred_save.size) != 0
+    true
+  end
+
+  def diff_after_module
+    # should not detect the changes
+    self.bs_diff_after_module = (people.size - people_without_deferred_save.size) != 0
+    true
+  end
+
+  def before_save
+    # old_style, should not detect the changes
+    self.bs_diff_method = (people.size - people_without_deferred_save.size) != 0
+    true
+  end
+end

data/spec/spec_helper.rb

@@ -1,39 +1,47 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-plugin_test_dir = File.dirname(__FILE__)
-
-
-require 'active_record'
-if ActiveRecord::VERSION::STRING >= "3"
-  require 'logger'
-else
- # Workaround for https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
- ActiveRecord::ActiveRecordError
-end
-
-require plugin_test_dir + '/../init.rb'
-
-ActiveRecord::Base.logger = Logger.new(plugin_test_dir + "/test.log")
-
-ActiveRecord::Base.configurations = YAML::load(IO.read(plugin_test_dir + "/db/database.yml"))
-ActiveRecord::Base.establish_connection(ENV["DB"] || "sqlite3mem")
-ActiveRecord::Migration.verbose = false
-load(File.join(plugin_test_dir, "db", "schema.rb"))
-
-Dir["#{plugin_test_dir}/models/*.rb"].each {|file| require file }
-
-RSpec.configure do |config|
-  config.before do
-  end
-end
-
-class ActiveRecord::Base
-
-  # Compatibility method for AR 2.3.x and AR 3.2.x
-  def get_error attr
-    if errors.respond_to?(:on)
-      errors.on(attr)
-    else
-      errors[attr].try(:first)
-    end
-  end
-end
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+plugin_test_dir = File.dirname(__FILE__)
+
+
+require 'active_record'
+if ActiveRecord::VERSION::STRING >= "3"
+  require 'logger'
+else
+ # Workaround for https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
+ ActiveRecord::ActiveRecordError
+end
+
+require plugin_test_dir + '/../init.rb'
+
+ActiveRecord::Base.logger = Logger.new(plugin_test_dir + "/test.log")
+
+ActiveRecord::Base.configurations = YAML::load(IO.read(plugin_test_dir + "/db/database.yml"))
+ActiveRecord::Base.establish_connection(ENV["DB"] || "sqlite3mem")
+ActiveRecord::Migration.verbose = false
+load(File.join(plugin_test_dir, "db", "schema.rb"))
+
+Dir["#{plugin_test_dir}/models/*.rb"].each {|file| require file }
+
+RSpec.configure do |config|
+  config.before do
+  end
+end
+
+class ActiveRecord::Base
+
+  # Compatibility method for AR 2.3.x and AR 3.2.x
+  def get_error attr
+    if errors.respond_to?(:on)
+      errors.on(attr)
+    else
+      errors[attr].try(:first)
+    end
+  end
+end
+
+def ar2?
+  ActiveRecord::VERSION::STRING < "3"
+end
+
+def ar4?
+  ActiveRecord::VERSION::STRING >= "4"
+end

metadata

@@ -1,114 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deferred_associations
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.5
   prerelease: 
-  version: 0.5.4
 platform: ruby
-authors: 
-  - Martin Koerner
-  - Tyler Rick
-  - Alessio Caiazza
+authors:
+- Martin Koerner
+- Tyler Rick
+- Alessio Caiazza
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-23 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: activerecord
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :development
-    version_requirements: *id002
-description: |-
-  Makes ActiveRecord defer/postpone saving the records you add to an habtm (has_and_belongs_to_many) or has_many
-                         association until you call model.save, allowing validation in the style of normal attributes. Additionally you
-                         can check inside before_save filters, if the association was altered.
+date: 2013-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "Makes ActiveRecord defer/postpone saving the records you add to an
+  habtm (has_and_belongs_to_many) or has_many\n                       association
+  until you call model.save, allowing validation in the style of normal attributes.
+  Additionally you\n                       can check inside before_save filters, if
+  the association was altered."
 email: martin.koerner@objectfab.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - .travis.yml
-  - CHANGELOG
-  - Rakefile
-  - Readme.markdown
-  - VERSION
-  - deferred_associations.gemspec
-  - gemfiles/ar2.3.14.gemfile
-  - gemfiles/ar2.3.14.gemfile.lock
-  - gemfiles/ar3.2.3.gemfile
-  - gemfiles/ar3.2.3.gemfile.lock
-  - init.rb
-  - lib/array_to_association_wrapper.rb
-  - lib/deferred_associations.rb
-  - lib/has_and_belongs_to_many_with_deferred_save.rb
-  - lib/has_many_with_deferred_save.rb
-  - spec/.gitignore
-  - spec/db/database.yml
-  - spec/db/schema.rb
-  - spec/has_and_belongs_to_many_with_deferred_save_spec.rb
-  - spec/has_many_with_deferred_save_spec.rb
-  - spec/models/chair.rb
-  - spec/models/door.rb
-  - spec/models/person.rb
-  - spec/models/room.rb
-  - spec/models/table.rb
-  - spec/spec_helper.rb
+extra_rdoc_files:
+- CHANGELOG
+- Readme.markdown
+files:
+- CHANGELOG
+- Rakefile
+- Readme.markdown
+- VERSION
+- deferred_associations.gemspec
+- init.rb
+- lib/array_to_association_wrapper.rb
+- lib/deferred_associations.rb
+- lib/has_and_belongs_to_many_with_deferred_save.rb
+- lib/has_many_with_deferred_save.rb
+- spec/db/database.yml
+- spec/db/schema.rb
+- spec/has_and_belongs_to_many_with_deferred_save_spec.rb
+- spec/has_many_with_deferred_save_spec.rb
+- spec/models/chair.rb
+- spec/models/door.rb
+- spec/models/person.rb
+- spec/models/room.rb
+- spec/models/table.rb
+- spec/spec_helper.rb
 homepage: http://github.com/MartinKoerner/deferred_associations
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-  - --charset=UTF-8
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Makes ActiveRecord defer/postpone habtm or has_many associations
-test_files: 
-  - spec/has_and_belongs_to_many_with_deferred_save_spec.rb
-  - spec/has_many_with_deferred_save_spec.rb
-  - spec/spec_helper.rb
-  - spec/db/schema.rb
-  - spec/models/chair.rb
-  - spec/models/door.rb
-  - spec/models/person.rb
-  - spec/models/room.rb
-  - spec/models/table.rb
+test_files: []