deferring 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0807e9de82ca4e5593921580b87eaa83bc6ed3b5
-  data.tar.gz: cba881489e3cbb1e43a6b87e617eb4a28a3f83ef
+  metadata.gz: 063adf3aca91473f0ca98264db2447d2e1811bdf
+  data.tar.gz: 2ad2362263132b43e35bdf4c64abc8e15b109821
 SHA512:
-  metadata.gz: 3250b185fc57e85c66a1b25b84ad111a1d98b31a76fa434e6587c16a52551d0cc9b43a2ea2abd4b7f963ad723edfe8cbb1807e12e10010d5f37865b8e9d1b198
-  data.tar.gz: 137c400ee0f8270e69951d5e49c6c61ee5849285983c8121a0dd1fa2aba9692a84d340bd063719445630ed92144268c4ab1fd782b4777306bed47af8618da1cb
+  metadata.gz: e4e49d6d106f758823de3516ce6fc5e3f93511f9e5c0161174a4bd8573eb1ae508570449490267a4e4e7aee49d9da0d8734f632ba1d03b9c5e965600a54c0ab6
+  data.tar.gz: 03dcc4ef9d7c2f4ed0cc0bb156dea1c4cb7b5551bfc70b6c0bb1a8756f5d792458942d375c7c363072968d138ab63e74c1d3b7c1d790577ef3538cb3d2f9094f

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 1.9.3
   - 2.0.0
@@ -8,8 +9,11 @@ rvm:
   - ruby-head
   - jruby-head
 
+sudo: false
+
 matrix:
   allow_failures:
+    - rvm: rbx-2
     - rvm: jruby-19mode
     - rvm: ruby-head
     - rvm: jruby-head

data/gemfiles/rails_30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.1.2)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.1.2)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.1.2)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_41.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.1.0)
+    deferring (0.1.2)
       activerecord (> 3.0)
 
 GEM

data/lib/deferring/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Deferring
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/deferring.rb

@@ -31,7 +31,7 @@ module Deferring
   def deferred_has_many(*args)
     options = args.extract_options!
     listeners = create_callback_listeners!(options)
-    inverse_association_name = options.fetch(:as, self.name.underscore.to_sym)
+    inverse_association_name = options[:as] || options[:inverse_of] || self.name.underscore.to_sym
     autosave = options.fetch(:autosave, true)
     validate = options.fetch(:validate, true)
 
@@ -213,8 +213,9 @@ module Deferring
       # Do not perform validations when validate: false.
       return true if validate == false
 
-      all_records_valid = send(:"deferred_#{association_name}").objects.all? do |record|
-        unless valid = record.valid?
+      all_records_valid = send(:"deferred_#{association_name}").objects.inject(true) do |valid, record|
+        unless record.valid?
+          valid = false
           if autosave
             record.errors.each do |attribute, message|
               attribute = "#{association_name}.#{attribute}"
@@ -227,9 +228,9 @@ module Deferring
         end
         valid
       end
-      return false unless all_records_valid
+      return true if all_records_valid
 
-      true
+      false
     end
 
     #  the save after the parent object has been saved
@@ -242,24 +243,24 @@ module Deferring
       send(:"original_#{association_name}=", send(:"deferred_#{association_name}").objects)
 
       # Store the new value of the association into our delegated association.
-      save_deferred_association(association_name, listeners, inverse_association_name)
+      update_deferred_association(association_name, listeners, inverse_association_name)
     end
 
     define_method :"reload_with_deferred_#{association_name}" do |*args|
       find_or_create_deferred_association(association_name, listeners, inverse_association_name)
 
       send(:"reload_without_deferred_#{association_name}", *args).tap do
-        save_deferred_association(association_name, listeners, inverse_association_name)
+        update_deferred_association(association_name, listeners, inverse_association_name)
       end
     end
     alias_method_chain :reload, :"deferred_#{association_name}"
 
-    generate_save_deferred_assocation_method
+    generate_update_deferred_assocation_method
     generate_find_or_create_deferred_association_method
   end
 
-  def generate_save_deferred_assocation_method
-    define_method :save_deferred_association do |name, listeners, inverse_association_name|
+  def generate_update_deferred_assocation_method
+    define_method :update_deferred_association do |name, listeners, inverse_association_name|
       klass = self.class.reflect_on_association(:"#{name}").klass
       send(
         :"deferred_#{name}=",
@@ -274,7 +275,7 @@ module Deferring
   def generate_find_or_create_deferred_association_method
     define_method :find_or_create_deferred_association do |name, listeners, inverse_association_name|
       if send(:"deferred_#{name}").nil?
-        save_deferred_association(name, listeners, inverse_association_name)
+        update_deferred_association(name, listeners, inverse_association_name)
       end
     end
   end

data/spec/lib/deferring_has_many_spec.rb

@@ -321,7 +321,7 @@ RSpec.describe 'deferred has_many associations' do
       end
 
       it 'should have loaded the association when joining' do
-        people = Person.includes(:issues).all
+        people = Person.includes(:issues).to_a
         expect(people[1].issues.loaded?).to be_truthy
         expect(people[1].issue_ids).to eq [printer_issue.id, db_issue.id]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -168,4 +168,3 @@ test_files:
 - spec/support/models/person.rb
 - spec/support/models/team.rb
 - spec/support/rails_versions.rb
-has_rdoc: