deferred_associations 0.5.7 → 0.5.8

data/spec/has_many_with_deferred_save_spec.rb

@@ -1,104 +1,103 @@
-require 'spec_helper'
-
-describe 'has_many_with_deferred_save' do
-
-  before :each do
-    @room    = Room.create(:maximum_occupancy => 2)
-    @table1  = Table.create(:room_id => @room.id)
-    @table2  = Table.create
-    @chair1  = Chair.create(:table_id => @table1.id, :name => "First")
-    @chair2  = Chair.create(:table_id => @table2.id, :name => "Second")
-  end
-
-  it 'should work with tables obj setter/getter' 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]
-    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 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
-    Room.find(@room.id).tables.should == [@table1] # not saved yet
-    @room.save.should be_true
-    Room.find(@room.id).tables.should == [@table1, @table2]
-    @room.tables -= [@table1]
-    Room.find(@room.id).tables.should == [@table1, @table2]
-    @room.save.should be_true
-    Room.find(@room.id).tables.should == [@table2]
-  end
-
-  it 'should reload temporary objects' do
-    @room.tables << @table2
-    @room.tables.should == [@table1, @table2]
-    @room.reload
-    @room.tables.should == [@table1]
-  end
-
-  it "should be dumpable with Marshal" do
-    lambda { Marshal.dump(@room.tables) }.should_not raise_exception
-    lambda { Marshal.dump(Room.new.tables) }.should_not raise_exception
-  end
-
-  describe 'with through option' do
-    it 'should have a correct list' do
-      # TODO these testcases need to be improved
-      @room.chairs.should == [@chair1] # through table1
-      @room.tables << @table2
-      @room.save.should be_true
-      @room.chairs.should == [@chair1] # association doesn't reload itself
-      @room.reload
-      @room.chairs.should == [@chair1, @chair2]
-    end
-
-    it 'should defer association methods' do
-      @room.chairs.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)
-    end
-
-    it "should be dumpable with Marshal" do
-      lambda { Marshal.dump(@room.chairs) }.should_not raise_exception
-      lambda { Marshal.dump(Room.new.chairs) }.should_not raise_exception
-    end
-  end
-end
+require 'spec_helper'
+
+describe 'has_many_with_deferred_save' do
+  before :each do
+    @room    = Room.create(maximum_occupancy: 2)
+    @table1  = Table.create(room_id: @room.id)
+    @table2  = Table.create
+    @chair1  = Chair.create(table_id: @table1.id, name: 'First')
+    @chair2  = Chair.create(table_id: @table2.id, name: 'Second')
+  end
+
+  it 'should work with tables obj setter/getter' do
+    expect(@room.tables).to eq [@table1]
+    @room.tables = [@table1, @table2]
+    expect(Room.find(@room.id).tables).to eq([@table1]) # not saved yet
+    expect(@room.tables).to eq([@table1, @table2])
+    expect(@room.table_ids).to eq([@table1.id, @table2.id])
+    expect(@room.save).to be true
+    expect(Room.find(@room.id).tables).to eq([@table1, @table2])
+  end
+
+  it 'should work with tables obj setter/getter, used twice' do
+    expect(@room.tables).to eq([@table1])
+    @room.tables = [@table1]
+    @room.tables = [@table1, @table2]
+    expect(Room.find(@room.id).tables).to eq([@table1]) # not saved yet
+    expect(@room.table_ids).to eq([@table1.id, @table2.id])
+    expect(@room.tables).to eq([@table1, @table2])
+    expect(@room.save).to be true
+    expect(Room.find(@room.id).tables).to eq([@table1, @table2])
+  end
+
+  it 'should work with tables id setter/getter' do
+    expect(@room.table_ids).to eq([@table1.id])
+    @room.table_ids = [@table1.id, @table2.id]
+    expect(Room.find(@room.id).table_ids).to eq([@table1.id]) # not saved yet
+    expect(@room.save).to be true
+    expect(Room.find(@room.id).table_ids).to eq([@table1.id, @table2.id])
+  end
+
+  it 'should work with tables id setter/getter, used twice' do
+    expect(@room.table_ids).to eq([@table1.id])
+    @room.table_ids = [@table1.id]
+    @room.table_ids = [@table1.id, @table2.id]
+    expect(Room.find(@room.id).table_ids).to eq([@table1.id]) # not saved yet
+    expect(@room.save).to be true
+    expect(Room.find(@room.id).table_ids).to eq([@table1.id, @table2.id])
+  end
+
+  it 'should work with array methods' do
+    expect(@room.tables).to eq([@table1])
+    @room.tables << @table2
+    expect(Room.find(@room.id).tables).to eq([@table1]) # not saved yet
+    expect(@room.save).to be true
+    expect(Room.find(@room.id).tables).to eq([@table1, @table2])
+    @room.tables -= [@table1]
+    expect(Room.find(@room.id).tables).to eq([@table1, @table2])
+    expect(@room.save).to be true
+    expect(Room.find(@room.id).tables).to eq([@table2])
+  end
+
+  it 'should reload temporary objects' do
+    @room.tables << @table2
+    expect(@room.tables).to eq([@table1, @table2])
+    @room.reload
+    expect(@room.tables).to eq([@table1])
+  end
+
+  it 'should be dumpable with Marshal' do
+    expect { Marshal.dump(@room.tables) }.not_to raise_exception
+    expect { Marshal.dump(Room.new.tables) }.not_to raise_exception
+  end
+
+  describe 'with through option' do
+    it 'should have a correct list' do
+      # TODO: these testcases need to be improved
+      expect(@room.chairs).to eq([@chair1]) # through table1
+      @room.tables << @table2
+      expect(@room.save).to be true
+      expect(@room.chairs).to eq([@chair1]) # association doesn't reload itself
+      @room.reload
+      expect(@room.chairs).to eq([@chair1, @chair2])
+    end
+
+    it 'should defer association methods' do
+      expect(@room.chairs.first).to eq(@chair1)
+      if ar4?
+        expect(@room.chairs.where(name: 'First')).to eq([@chair1])
+      else
+        expect(@room.chairs.find(:all, conditions: { name: 'First' })).to eq([@chair1])
+      end
+
+      expect do
+        @room.chairs.create(name: 'New one')
+      end.to raise_error(ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection)
+    end
+
+    it 'should be dumpable with Marshal' do
+      expect { Marshal.dump(@room.chairs) }.not_to raise_exception
+      expect { Marshal.dump(Room.new.chairs) }.not_to raise_exception
+    end
+  end
+end

data/spec/models/chair.rb

@@ -1,3 +1,5 @@
-class Chair < ActiveRecord::Base
-  belongs_to :table
-end
+class Chair < ActiveRecord::Base
+
+  belongs_to :table
+
+end

data/spec/models/door.rb

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

data/spec/models/person.rb

@@ -1,15 +1,17 @@
 class Person < ActiveRecord::Base
-  has_and_belongs_to_many_with_deferred_save :rooms, :validate => true
+
+  has_and_belongs_to_many_with_deferred_save :rooms, validate: true
 
   attr_accessor :do_extra_validation
-  validate      :extra_validation, :if => :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"
+        errors.add :rooms, 'This room has reached its maximum occupancy'
       end
     end
   end
+
 end

data/spec/models/room.rb

@@ -6,12 +6,12 @@ class Room < ActiveRecord::Base
 
   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 :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
+  has_many_with_deferred_save :chairs, through: :tables # TODO: test compatibility with through associations
 
   has_and_belongs_to_many_with_deferred_save :doors
   has_many_with_deferred_save :tables
@@ -21,21 +21,19 @@ class Room < ActiveRecord::Base
   validate :people_count
 
   def people_count
-    if people.size > maximum_occupancy
-      errors.add :people, "This room has reached its maximum occupancy"
-    end
+    errors.add :people, 'This room has reached its maximum occupancy' if people.size > maximum_occupancy
   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"
+    if 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
+    # should detect the changes
     self.bs_diff_before_module = (people.size - people_without_deferred_save.size) != 0
     true
   end
@@ -51,4 +49,5 @@ class Room < ActiveRecord::Base
     self.bs_diff_method = (people.size - people_without_deferred_save.size) != 0
     true
   end
+
 end

data/spec/models/table.rb

@@ -1,4 +1,6 @@
-class Table < ActiveRecord::Base
-  belongs_to :room
-  has_many_with_deferred_save :chairs
-end
+class Table < ActiveRecord::Base
+
+  belongs_to :room
+  has_many_with_deferred_save :chairs
+
+end

data/spec/spec_helper.rb

@@ -1,27 +1,28 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 plugin_test_dir = File.dirname(__FILE__)
 
-
 require 'active_record'
-if ActiveRecord::VERSION::STRING >= "3"
+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
+  # 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.logger = Logger.new(plugin_test_dir + '/test.log')
 
-ActiveRecord::Base.configurations = YAML::load(IO.read(plugin_test_dir + "/db/database.yml"))
+ActiveRecord::Base.configurations = YAML.load(IO.read(plugin_test_dir + '/db/database.yml'))
 ActiveRecord::Base.establish_connection(:sqlite3mem)
 ActiveRecord::Migration.verbose = false
-load(File.join(plugin_test_dir, "db", "schema.rb"))
+load(File.join(plugin_test_dir, 'db', 'schema.rb'))
 
-Dir["#{plugin_test_dir}/models/*.rb"].each {|file| require file }
+Dir["#{plugin_test_dir}/models/*.rb"].each { |file| require file }
 
 RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
+
   config.before do
   end
 end
@@ -29,19 +30,20 @@ end
 class ActiveRecord::Base
 
   # Compatibility method for AR 2.3.x and AR 3.2.x
-  def get_error attr
+  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"
+  ActiveRecord::VERSION::STRING < '3'
 end
 
 def ar4?
-  ActiveRecord::VERSION::STRING >= "4"
-end
+  ActiveRecord::VERSION::STRING >= '4'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deferred_associations
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Martin Koerner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,7 +52,6 @@ extra_rdoc_files:
 - Readme.markdown
 files:
 - CHANGELOG
-- Rakefile
 - Readme.markdown
 - VERSION
 - deferred_associations.gemspec
@@ -63,6 +62,7 @@ files:
 - lib/has_many_with_deferred_save.rb
 - spec/db/database.yml
 - spec/db/schema.rb
+- spec/habtm_ar4_spec.rb
 - spec/has_and_belongs_to_many_with_deferred_save_spec.rb
 - spec/has_many_with_deferred_save_spec.rb
 - spec/models/chair.rb
@@ -72,7 +72,8 @@ files:
 - spec/models/table.rb
 - spec/spec_helper.rb
 homepage: http://github.com/MartinKoerner/deferred_associations
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: Makes ActiveRecord defer/postpone habtm or has_many associations

data/Rakefile

@@ -1,27 +0,0 @@
-task :default do |t|
-  options = "--colour"
-  files = FileList['spec/**/*_spec.rb'].map{|f| f.sub(%r{^spec/},'') }
-  exit system("cd spec && spec #{options} #{files}") ? 0 : 1
-end
-
-begin
-  require 'jeweler'
-  project_name = 'deferred_associations'
-  Jeweler::Tasks.new do |gem|
-    gem.name = project_name
-    gem.summary = "Makes ActiveRecord defer/postpone habtm or has_many associations"
-    gem.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."
-    gem.homepage = "http://github.com/MartinKoerner/deferred_associations"
-    gem.email   = "martin.koerner@objectfab.de"
-    gem.authors = ["Martin Koerner", "Tyler Rick", "Alessio Caiazza"]
-    gem.add_dependency('activerecord')
-    gem.add_development_dependency('rspec')
-    gem.files.exclude 'gemfiles/*', '.travis.yml'
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end