deferred_associations 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eb06150c83e5fbcc9784e59d4ac930a78549d31
-  data.tar.gz: c55f5ec4758ae4bed1cce95a3250f0380c5e6a64
+  metadata.gz: f9b5f99b0963214fda3ba967f00208785fc8732e
+  data.tar.gz: f0617535e1cd7d2ecd07be537bdb90e19bf75a38
 SHA512:
-  metadata.gz: 6458c1ce77f68884da941359b25925d70fec9e1b054ad9902b2dcab7f989d688f0e1ec1a78ba33cb2d7d1300b0c87e96bd608d8f0b0711587cbe651e3fa130f5
-  data.tar.gz: fbed599d94b0139b531a951684a3fbc6e50349a58ea790f48dc7dba7f28b69607846197714c90ed962058b7f285fe5a555f9404309d098bd22dd0680787c3db7
+  metadata.gz: 18e808f2555625e6cf6a6a25b3e8966a056c71fac0814475ed4a2745574822ce9c5635b65c9283407da093eac6de784f650cc4ee49ec57a6c5d7fb6e5936662d
+  data.tar.gz: 0d0801311814c39772939b09f28936bebd89e6b115c59d0dfbf3b47d2fd6f7c34ce70f0b6a9af5b851e289d565c393935968949feda58dead0743af97c7d259f

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.6.5
+=====
+* ensure compatibility with Rails 5.1.4
+
 0.6.4
 =====
 * the after_save action on has_and_belongs_to_many associations is only done, if the association was loaded

data/Readme.markdown

@@ -46,7 +46,7 @@ end
 Compatibility
 =============
 
-Tested with Rails 2.3.18, 3.2.22, 4.1.14, 4.2.6 on Ruby 1.9.3, 2.2.4, 2.3.1 and JRuby 1.7, JRuby 9.1.1.0
+Tested with Rails 2.3.18, 3.2.22, 4.1.16, 4.2.20, 5.1.4 on Ruby 1.9.3, 2.2.8, 2.3.5 and JRuby 1.7, JRuby 9.1.9.0
 
 Note, that Rails 3.2.14 associations are partly broken under JRuby cause of https://github.com/rails/rails/issues/11595
 You'll need to upgrade activerecord-jdbc-adapter to >= 1.3.0.beta1, if you want to use this combination.
@@ -94,6 +94,22 @@ methods are not working:
    room.updated_at # => got touched!
    ```
 
+4. If you use the ID getter, you get a copy of the IDs of the objects. So changing the entries in the array won't change
+   the IDs for real.
+   Rails 5 acts a little bit different - it lets you change the entry, but also doesn't save it.
+   deferred_associations will act the same way as in Rails 3&4.
+
+   ```ruby
+   room = Room.find(...)
+   room.people_ids # [1]
+   room.people_ids << 2
+   room.people_ids # Rails 4: [1]
+   room.people_ids # Rails 5: [1, 2], but with deferred associations, it stays at [1]
+   room.save!
+   room.reload
+   room.people_ids # Rails 4&5: [1] # even Rails 5 doesn't save the changed array
+   ```
+
 Bugs
 ====
 

data/deferred_associations.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = 'deferred_associations'
-  s.version = '0.6.4'
+  s.version = '0.6.5'
 
   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 = '2016-05-23'
+  s.date = '2017-12-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.licenses = 'MIT'

data/lib/array_to_association_wrapper.rb

@@ -20,7 +20,8 @@ class ArrayToAssociationWrapper < Array
     end
   end
 
-  alias_method_chain :include?, 'deferred_save'
+  alias_method(:include_without_deferred_save?, :include?)
+  alias_method(:include?, :include_with_deferred_save?)
 
   def find_with_deferred_save(*args)
     if @association_owner.present?
@@ -30,7 +31,8 @@ class ArrayToAssociationWrapper < Array
     end
   end
 
-  alias_method_chain :find, :deferred_save
+  alias_method(:find_without_deferred_save, :find)
+  alias_method(:find, :find_with_deferred_save)
 
   def first_with_deferred_save(*args)
     if @association_owner.present?
@@ -40,7 +42,8 @@ class ArrayToAssociationWrapper < Array
     end
   end
 
-  alias_method_chain :first, :deferred_save
+  alias_method(:first_without_deferred_save, :first)
+  alias_method(:first, :first_with_deferred_save)
 
   def last_with_deferred_save(*args)
     if @association_owner.present?
@@ -50,7 +53,8 @@ class ArrayToAssociationWrapper < Array
     end
   end
 
-  alias_method_chain :last, :deferred_save
+  alias_method(:last_without_deferred_save, :last)
+  alias_method(:last, :last_with_deferred_save)
 
   define_method :method_missing do |method, *args|
     # puts "#{self.class}.method_missing(#{method}) (#{collection_without_deferred_save.inspect})"

data/lib/has_and_belongs_to_many_with_deferred_save.rb

@@ -41,8 +41,10 @@ module ActiveRecord
           end
         end
 
-        alias_method_chain :"#{collection_name}=", 'deferred_save'
-        alias_method_chain :"#{collection_name}", 'deferred_save'
+        alias_method(:"#{collection_name}_without_deferred_save=", :"#{collection_name}=")
+        alias_method(:"#{collection_name}=", :"#{collection_name}_with_deferred_save=")
+        alias_method(:"#{collection_name}_without_deferred_save", :"#{collection_name}")
+        alias_method(:"#{collection_name}", :"#{collection_name}_with_deferred_save")
 
         define_method "#{collection_singular_ids}_with_deferred_save" do |*method_args|
           if send("use_original_collection_reader_behavior_for_#{collection_name}")
@@ -53,7 +55,8 @@ module ActiveRecord
           end
         end
 
-        alias_method_chain :"#{collection_singular_ids}", 'deferred_save'
+        alias_method(:"#{collection_singular_ids}_without_deferred_save", :"#{collection_singular_ids}")
+        alias_method(:"#{collection_singular_ids}", :"#{collection_singular_ids}_with_deferred_save")
 
         # only needed for ActiveRecord >= 3.0
         if ActiveRecord::VERSION::STRING >= '3'
@@ -63,7 +66,9 @@ module ActiveRecord
             new_values = reflection_wrapper.klass.find(ids)
             send("#{collection_name}=", new_values)
           end
-          alias_method_chain :"#{collection_singular_ids}=", 'deferred_save'
+
+          alias_method(:"#{collection_singular_ids}_without_deferred_save=", :"#{collection_singular_ids}=")
+          alias_method(:"#{collection_singular_ids}=", :"#{collection_singular_ids}_with_deferred_save=")
         end
 
         define_method "do_#{collection_name}_save!" do
@@ -87,7 +92,7 @@ module ActiveRecord
           end
           true
         end
-        after_save "do_#{collection_name}_save!"
+        after_save :"do_#{collection_name}_save!"
 
         define_method "reload_with_deferred_save_for_#{collection_name}" do |*method_args|
           # Reload from the *database*, discarding any unsaved changes.
@@ -97,7 +102,9 @@ module ActiveRecord
             # unsaved_collection that it had before the reload.
           end
         end
-        alias_method_chain :reload, "deferred_save_for_#{collection_name}"
+
+        alias_method(:"reload_without_deferred_save_for_#{collection_name}", :reload)
+        alias_method(:reload, :"reload_with_deferred_save_for_#{collection_name}")
 
         define_method "initialize_unsaved_#{collection_name}" do |*method_args|
           elements = send("#{collection_name}_without_deferred_save", *method_args)

data/lib/has_many_with_deferred_save.rb

@@ -13,7 +13,7 @@ module ActiveRecord
           logger.warn "You are using the option :through on #{name}##{collection_name}. This was not tested very much with has_many_with_deferred_save. Please write many tests for your functionality!"
         end
 
-        after_save "hmwds_update_#{collection_name}"
+        after_save :"hmwds_update_#{collection_name}"
 
         define_obj_setter    collection_name
         define_obj_getter    collection_name
@@ -30,8 +30,8 @@ module ActiveRecord
           attribute_will_change!(collection_name) if objs != send("#{collection_name}_without_deferred_save")
         end
 
-        method_name = "#{collection_name}="
-        alias_method_chain method_name, :deferred_save
+        alias_method(:"#{collection_name}_without_deferred_save=", :"#{collection_name}=")
+        alias_method(:"#{collection_name}=", :"#{collection_name}_with_deferred_save=")
       end
 
       def define_obj_getter(collection_name)
@@ -55,7 +55,8 @@ module ActiveRecord
           result
         end
 
-        alias_method_chain collection_name, :deferred_save
+        alias_method(:"#{collection_name}_without_deferred_save", :"#{collection_name}")
+        alias_method(:"#{collection_name}", :"#{collection_name}_with_deferred_save")
       end
 
       def define_id_setter(collection_name, collection_singular_ids)
@@ -66,7 +67,9 @@ module ActiveRecord
             new_values = send("#{collection_name}_without_deferred_save").klass.find(ids)
             send("#{collection_name}=", new_values)
           end
-          alias_method_chain :"#{collection_singular_ids}=", 'deferred_save'
+
+          alias_method(:"#{collection_singular_ids}_without_deferred_save=", :"#{collection_singular_ids}=")
+          alias_method(:"#{collection_singular_ids}=", :"#{collection_singular_ids}_with_deferred_save=")
         end
       end
 
@@ -74,7 +77,8 @@ module ActiveRecord
         define_method "#{collection_singular_ids}_with_deferred_save" do
           send(collection_name).map { |e| e[:id] }
         end
-        alias_method_chain :"#{collection_singular_ids}", 'deferred_save'
+        alias_method(:"#{collection_singular_ids}_without_deferred_save", :"#{collection_singular_ids}")
+        alias_method(:"#{collection_singular_ids}", :"#{collection_singular_ids}_with_deferred_save")
       end
 
       def define_update_method(collection_name)
@@ -100,7 +104,8 @@ module ActiveRecord
             instance_variable_set "@hmwds_temp_#{collection_name}", nil
           end
         end
-        alias_method_chain :reload, "deferred_save_for_#{collection_name}"
+        alias_method(:"reload_without_deferred_save_for_#{collection_name}", :reload)
+        alias_method(:reload, :"reload_with_deferred_save_for_#{collection_name}")
       end
     end
   end

data/spec/habtm_ar4_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'has_and_belongs_to_many_with_deferred_save'
 
-if ar4?
-  describe 'ActiveRecord4 specials' do
+if ar4_or_more?
+  describe 'ActiveRecord4/5 specials' do
     before :all do
       #ActiveRecord::Base.logger = Logger.new(STDOUT) # uncomment for debugging statements
       @people = []
@@ -64,21 +64,21 @@ if ar4?
       end
 
       it 'should preload with non-deferred association' do
-        rooms = Room.where(id: [@room1.id, @room2.id, @room3.id]).preload(:people2)
+        rooms = Room.where(id: [@room1.id, @room2.id, @room3.id]).preload(:people_without_deferring)
         rooms = rooms.to_a # execute original query, together with preloading the association
         room1 = rooms.first
         room2 = rooms.second
         room3 = rooms.third
         # association is autoloaded
-        expect(room1.people2.loaded?).to be true
-        expect(room2.people2.loaded?).to be true
-        expect(room3.people2.loaded?).to be true
+        expect(room1.people_without_deferring.loaded?).to be true
+        expect(room2.people_without_deferring.loaded?).to be true
+        expect(room3.people_without_deferring.loaded?).to be true
 
         expect(ActiveRecord::Base).not_to receive(:connection)
 
-        expect(room1.people2.map(&:name)).to match_array(%w(Miguel Rainer))
-        expect(room2.people2.map(&:name)).to match_array(%w(Filbert Miguel))
-        expect(room3.people2.map(&:name)).to match_array(%w())
+        expect(room1.people_without_deferring.map(&:name)).to match_array(%w(Miguel Rainer))
+        expect(room2.people_without_deferring.map(&:name)).to match_array(%w(Filbert Miguel))
+        expect(room3.people_without_deferring.map(&:name)).to match_array(%w())
       end
     end
   end

data/spec/has_and_belongs_to_many_with_deferred_save_spec.rb

@@ -113,14 +113,14 @@ describe 'has_and_belongs_to_many_with_deferred_save' do
     end
 
     it 'still lets you do find' do
-      if ar4?
-        expect(@room.people2.where(name: 'Filbert').first).to eq(@people[0])
+      if ar4_or_more?
+        expect(@room.people_without_deferring.where(name: 'Filbert').first).to eq(@people[0])
         expect(@room.people_without_deferred_save.where(name: 'Filbert').first).to eq(@people[0])
         expect(@room.people.where(name: 'Filbert').first).to eq(@people[0])
       else
-        expect(@room.people2.                     find(:first, conditions: { name: 'Filbert' })).to eq(@people[0])
+        expect(@room.people_without_deferring.                     find(:first, conditions: { name: 'Filbert' })).to eq(@people[0])
         expect(@room.people_without_deferred_save.find(:first, conditions: { name: 'Filbert' })).to eq(@people[0])
-        expect(@room.people2.first(conditions: { name: 'Filbert' })).to eq(@people[0])
+        expect(@room.people_without_deferring.first(conditions: { name: 'Filbert' })).to eq(@people[0])
         expect(@room.people_without_deferred_save.first(conditions: { name: 'Filbert' })).to eq(@people[0])
 
         expect(@room.people.find(:first, conditions: { name: 'Filbert' })).to eq(@people[0])
@@ -163,15 +163,31 @@ describe 'has_and_belongs_to_many_with_deferred_save' do
       @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
-      expect(@room.people2_ids).to eq([@people[0].id]) # ID array manipulation is ignored
+      @room.people_without_deferring_ids << @people[1].id
+
+      if ar5_or_more?
+        # In Rails 5, ID array manipulation is taken into account, but only temporarily,
+        # therefore deferred_association doesn't mimic this behavior
+        expect(@room.people_without_deferring_ids).to eq([@people[0].id, @people[1].id])
+      else
+        # ID array manipulation is ignored
+        expect(@room.people_without_deferring_ids).to eq([@people[0].id])
+      end
 
       expect(@room.person_ids.size).to eq(1)
       @room.person_ids << @people[1].id
+
+      # deferred_association doesn't remember the additional ID, no matter, which AR version
+      # we are in
       expect(@room.person_ids).to eq([@people[0].id])
       expect(Room.find(@room.id).person_ids).to eq([@people[0].id])
       expect(@room.save).to be true
-      expect(Room.find(@room.id).person_ids).to eq([@people[0].id]) # ID array manipulation is ignored, too
+
+      # Original association didn't save the temporarily saved changes,
+      # the deferred association also looses the change on reload
+      @room = Room.find(@room.id)
+      expect(@room.people_without_deferring_ids).to eq([@people[0].id])
+      expect(@room.person_ids).to eq([@people[0].id])
     end
 
     it 'should work with id setters' do

data/spec/has_many_with_deferred_save_spec.rb

@@ -84,7 +84,7 @@ describe 'has_many_with_deferred_save' do
 
     it 'should defer association methods' do
       expect(@room.chairs.first).to eq(@chair1)
-      if ar4?
+      if ar4_or_more?
         expect(@room.chairs.where(name: 'First')).to eq([@chair1])
       else
         expect(@room.chairs.find(:all, conditions: { name: 'First' })).to eq([@chair1])

data/spec/models/room.rb

@@ -7,9 +7,13 @@ 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 :people_without_deferring, class_name: 'Person'
   has_and_belongs_to_many_with_deferred_save :doors
 
+  if ar5_or_more?
+    # without it, AR5 would throw a deprecation warning
+    attribute :tables
+  end
   has_many_with_deferred_save :tables
   has_many_with_deferred_save :chairs, through: :tables # TODO: test compatibility with through associations
 

data/spec/spec_helper.rb

@@ -18,8 +18,6 @@ ActiveRecord::Base.establish_connection(: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.raise_errors_for_deprecations!
 
@@ -44,6 +42,12 @@ def ar2?
   ActiveRecord::VERSION::STRING < '3'
 end
 
-def ar4?
+def ar4_or_more?
   ActiveRecord::VERSION::STRING >= '4'
 end
+
+def ar5_or_more?
+  ActiveRecord::VERSION::STRING >= '5'
+end
+
+Dir["#{plugin_test_dir}/models/*.rb"].each { |file| require file }

metadata

@@ -1,40 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: deferred_associations
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Martin Koerner
 - Tyler Rick
 - Alessio Caiazza
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: activerecord
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -76,7 +76,7 @@ homepage: http://github.com/MartinKoerner/deferred_associations
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -91,9 +91,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 3
 summary: Makes ActiveRecord defer/postpone habtm or has_many associations
 test_files: []