deferred_associations 0.5.3 → 0.5.4

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+*.db
+.idea

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.3
+ - jruby-18mode
+ - jruby-19mode
+
+script: "bundle exec rspec"
+
+gemfile:
+  - gemfiles/ar2.3.14.gemfile
+  - gemfiles/ar3.2.3.gemfile

data/Readme.markdown

@@ -1,6 +1,8 @@
 Make 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.
 
+[![Build Status](https://secure.travis-ci.org/MartinKoerner/deferred_associations.png?branch=master)](http://travis-ci.org/MartinKoerner/deferred_associations) [![Dependency Status](https://gemnasium.com/MartinKoerner/deferred_associations.png?travis)](https://gemnasium.com/MartinKoerner/deferred_associations)
+
 How to install
 ==============
 
@@ -26,7 +28,7 @@ Usage
         # Neither people nor tables are saved to the database, if a validation error is added
       end
 
-      def check_usage
+      def check_change
         # you can check, if there were changes to the association
         if people != people_without_deferred_save
           self.updated_at = Time.now.utc
@@ -37,7 +39,7 @@ Usage
 Compatibility
 =============
 
-Tested with Rails 2.3.14, 3.2.2
+Tested with Rails 2.3.14, 3.2.3 on Ruby 1.8.7, 1.9.3 and JRuby 1.6.6
 
 Gotchas
 =======
@@ -45,10 +47,19 @@ Gotchas
 Be aware, that the habtm association objects sometimes asks the database instead of giving you the data directly from the array. So you can get something
 like
 
-    room = Room.new
+    room = Room.create
     room.people << Person.create
     room.people.first # => nil, since the DB doesn't have the association saved yet
 
+
+Also it is good to know, that the array you set to an association is stored there directly, so after setting a list, the typical association
+methods are not working:
+
+    room = Room.create
+    room.people.klass   # => Person
+    room.people = [Person.first]
+    room.people.klass   # => undefined method klass for #Array:0x007fa3b9efc2c0`
+
 Bugs
 ====
 

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/deferred_associations.gemspec

@@ -1,44 +1,62 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "deferred_associations"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koerner", "Tyler Rick", "Alessio Caiazza"]
-  s.date = "2012-03-19"
+  s.date = "2012-04-23"
   s.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."
   s.email = "martin.koerner@objectfab.de"
   s.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/.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"
+    ".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"
   ]
   s.homepage = "http://github.com/MartinKoerner/deferred_associations"
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.15"
   s.summary = "Makes ActiveRecord defer/postpone habtm or has_many associations"
+  s.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"
+  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -55,4 +73,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
-

data/gemfiles/ar2.3.14.gemfile

@@ -0,0 +1,12 @@
+
+source 'https://rubygems.org'
+
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform=>:ruby
+
+gem 'activerecord', '=2.3.14'
+
+gem 'rspec-rails', '=1.2.9'
+
+gemspec :path=>"../"

data/gemfiles/ar2.3.14.gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: /home/martin/Projekte/has_and_belongs_to_many_with_deferred_save
+  specs:
+    deferred_associations (0.5.3)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcsqlite3-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-sqlite3 (~> 3.7.2)
+    activesupport (2.3.14)
+    bouncy-castle-java (1.5.0146.1)
+    diff-lcs (1.1.3)
+    jdbc-sqlite3 (3.7.2)
+    jruby-openssl (0.7.6.1)
+      bouncy-castle-java (>= 1.5.0146.1)
+    rack (1.4.1)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (1.2.9)
+      rack (>= 1.0.0)
+      rspec (>= 1.2.9)
+    sqlite3 (1.3.5)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.14)
+  activerecord-jdbcsqlite3-adapter
+  deferred_associations!
+  jruby-openssl
+  rspec
+  rspec-rails (= 1.2.9)
+  sqlite3

data/gemfiles/ar3.2.3.gemfile

@@ -0,0 +1,12 @@
+
+source 'https://rubygems.org'
+
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform=>:ruby
+
+gem 'activerecord', '=3.2.3'
+
+gem 'rspec-rails'
+
+gemspec :path=>"../"

data/gemfiles/ar3.2.3.gemfile.lock

@@ -0,0 +1,96 @@
+PATH
+  remote: /home/martin/Projekte/has_and_belongs_to_many_with_deferred_save
+  specs:
+    deferred_associations (0.5.3)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcsqlite3-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-sqlite3 (~> 3.7.2)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jdbc-sqlite3 (3.7.2)
+    journey (1.0.3)
+    jruby-openssl (0.7.6.1)
+      bouncy-castle-java (>= 1.5.0146.1)
+    json (1.6.6-java)
+    multi_json (1.3.2)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.9.0)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord (= 3.2.3)
+  activerecord-jdbcsqlite3-adapter
+  deferred_associations!
+  jruby-openssl
+  rspec
+  rspec-rails
+  sqlite3

data/lib/has_and_belongs_to_many_with_deferred_save.rb

@@ -61,7 +61,8 @@ module ActiveRecord
         if ActiveRecord::VERSION::STRING >= "3"
           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)
+            reflection_wrapper = self.send("#{collection_name}_without_deferred_save")
+            new_values = reflection_wrapper.klass.find(ids)
             self.send("#{collection_name}=", new_values)
           end
           alias_method_chain :"#{collection_singular_ids}=", 'deferred_save'

data/spec/has_and_belongs_to_many_with_deferred_save_spec.rb

@@ -100,15 +100,7 @@ describe "has_and_belongs_to_many_with_deferred_save" do
       @people[2].reload.rooms.size.should == 0
 
       obj = @people[2]
-      def obj.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
-      obj.class.send(:validate, :extra_validation)
+      obj.do_extra_validation = true
 
       @people[2].rooms << @room
       @people[2].rooms.size.should == 1
@@ -151,7 +143,7 @@ describe "has_and_belongs_to_many_with_deferred_save" do
 
       @room.bs_diff_before_module.should be_true
       @room.bs_diff_after_module.should  be_true
-      if ActiveRecord::VERSION::STRING >= "3"
+      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
@@ -186,6 +178,30 @@ describe "has_and_belongs_to_many_with_deferred_save" do
       @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
@@ -211,4 +227,8 @@ describe "has_and_belongs_to_many_with_deferred_save" do
     end
   end
 
+  def ar3?
+    ActiveRecord::VERSION::STRING >= "3"
+  end
+
 end

data/spec/models/person.rb

@@ -1,3 +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

data/spec/spec_helper.rb

@@ -1,16 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 plugin_test_dir = File.dirname(__FILE__)
 
-require 'rubygems'
-USE_AR_3 = true
 
-if defined?(USE_AR_3) && USE_AR_3
-  gem 'activerecord', '=3.2.2'
+require 'active_record'
+if ActiveRecord::VERSION::STRING >= "3"
   require 'logger'
-  require 'active_record'
 else
- gem 'activerecord', '=2.3.14'
- require 'active_record'
  # Workaround for https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
  ActiveRecord::ActiveRecordError
 end

metadata

@@ -1,52 +1,41 @@
 --- !ruby/object:Gem::Specification 
 name: deferred_associations
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
-- Martin Koerner
-- Tyler Rick
-- Alessio Caiazza
+  - Martin Koerner
+  - Tyler Rick
+  - Alessio Caiazza
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-03-19 00:00:00 Z
+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 
-        hash: 3
-        segments: 
-        - 0
-        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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
+  - !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
@@ -59,53 +48,53 @@ extensions: []
 extra_rdoc_files: []
 
 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/.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
+  - .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
 homepage: http://github.com/MartinKoerner/deferred_associations
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -113,5 +102,13 @@ rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Makes ActiveRecord defer/postpone habtm or has_many associations
-test_files: []
-
+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