sunstone 5.0.0.8 → 5.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e625be1b21ec0433b462e4e6c3d625763d7b9cd0
-  data.tar.gz: f4899f01b57055453a433b693e35e946cdd63d54
+  metadata.gz: 49ec91e7217f1050f6ca55bc4cdf7346244f7886
+  data.tar.gz: f184988c933bc517712d638916b4b4b17f5861b8
 SHA512:
-  metadata.gz: 732274fec9d832b6acec66c3d926922078487f969d5b9886b46d5785fc63d965d1c369209f9783319744b63a20a1a0b1dbe8f535659b3a6dc0726a68c1ce3aa0
-  data.tar.gz: c96b7fc36364bb188ff6a3d0c0c1f24075fa8bff1bfe749cb658c48187476c7c7e1f2a003dddc4be9a67605d10c4d4d18637f73c577b3108f9827977de146261
+  metadata.gz: a2a8515d5e3ba1297b180e1b56ba243584e8d92f0d61ef86c2807e3cbacad13908380c4421e12a31e482808d041259692b3718b9b915663d63bf22d31243c83d
+  data.tar.gz: a342d7f74b6a8792828861893d53a6caac544fb0d22a62cb3c440f67ea08e8ff69c6fc0b1d93cfd44b2b030501685f6d30b619f0012a269d7be740c16ddac4ea

data/.travis.yml

@@ -2,11 +2,12 @@ language: ruby
 
 rvm:
   - 2.3.1
+  - 2.4.0
 
 env:
   - RAILS_VERSION=v5.0.0
   - RAILS_VERSION=v5.0.0.1
-  - RAILS_VERSION=v5.0.1.rc2
+  - RAILS_VERSION=v5.0.1
 
 cache:
   bundler: true

data/ext/active_record/associations/collection_association.rb

@@ -8,31 +8,30 @@ module ActiveRecord
 
         if owner.new_record?
           replace_records(other_array, original_target)
-        elsif owner.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter) && owner.instance_variable_defined?(:@updating) && owner.instance_variable_get(:@updating)
+        else
           replace_common_records_in_memory(other_array, original_target)
+          if owner.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter) && owner.instance_variable_defined?(:@updating) && owner.instance_variable_get(:@updating)
+            # Remove from target
+            (original_target - other_array).each { |record| callback(:before_remove, record) }
+            (original_target - other_array).each { |record| target.delete(record) }
+            (original_target - other_array).each { |record| callback(:after_remove, record) }
 
-          # Remove from target
-          (original_target - other_array).each { |record| callback(:before_remove, record) }
-          (original_target - other_array).each { |record| target.delete(record) }
-          (original_target - other_array).each { |record| callback(:after_remove, record) }
-
-          # Add to target
-          (other_array - original_target).each do |record|
-            add_to_target(record)
-          end
+            # Add to target
+            (other_array - original_target).each do |record|
+              add_to_target(record)
+            end
 
-          other_array
-        else
-          replace_common_records_in_memory(other_array, original_target)
-          if other_array != original_target
-            transaction { replace_records(other_array, original_target) }
-          else
             other_array
+          else
+            if other_array != original_target
+              transaction { replace_records(other_array, original_target) }
+            else
+              other_array
+            end
           end
         end
       end
 
-
     end
 
     class HasManyAssociation

data/ext/active_record/relation/calculations.rb

@@ -3,14 +3,14 @@ module ActiveRecord
     
     def pluck(*column_names)
       if loaded? && (column_names.map(&:to_s) - @klass.attribute_names - @klass.attribute_aliases.keys).empty?
-        return @records.pluck(*column_names)
+        return records.pluck(*column_names)
       end
 
       if has_include?(column_names.first)
         construct_relation_for_association_calculations.pluck(*column_names)
       elsif klass.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
         load
-        return @records.pluck(*column_names.map{|n| n.sub(/^#{klass.table_name}\./, "")})
+        return records.pluck(*column_names.map{|n| n.sub(/^#{klass.table_name}\./, "")})
       else
         relation = spawn
         relation.select_values = column_names.map { |cn|

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.0.0.8'
+  VERSION = '5.0.1.0'
 end

data/sunstone.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
   s.add_runtime_dependency 'arel', '~> 7.0'
-  s.add_runtime_dependency 'activerecord', '~> 5.0.0'
+  s.add_runtime_dependency 'activerecord', '~> 5.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.0.0.8
+  version: 5.0.1.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.1
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs