neo4j 9.2.1 → 9.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed812d32cd486f6e304bccea02d2a17685f79da4
-  data.tar.gz: 0616013941019bcc60f521317099908829732f3b
+  metadata.gz: 86f90dd15e03e5ac8d95b34b7366326afc53ceff
+  data.tar.gz: cce9e3dc22ed0865a39a1ade1513957b163bae77
 SHA512:
-  metadata.gz: 34da0e1129e009f65a828b70604542243bbb759ef6c90769eadc0d3082260cf53c76339e0ab4f93d776e3aa44ba3e5e2af0c6f5a6b57586c224ea698efef7867
-  data.tar.gz: 4428c77bd82200b118925452c26dbe0b5423bb43daedd4d2495fda4dea03258414b311c19ccf4751303453a7a43e7cee3ebc220508ba924be1aceea601e027da
+  metadata.gz: 515a2af0acd7c6aa3b4e74ddd869125ea46f33e8708a7eced151e059d21e09fb9aca31be415e87b95cfdd42cf1f0d435f95a4836371b436c70ed0411042051e0
+  data.tar.gz: 6957713e7f1f7657507c8415cf5856b7a02febee4b6ce9eb563aa20583b7cc80c3db5340043f3b9bea10cb45864c2039d7dad7cd00179f5990256ad8b2f2d2b8

data/CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [9.2.2] 2018-04-19
+
+## Fixed
+
+- Introduced a fix to account for the fact that `ActiveModel` now returns a frozen `Hash` for `changed_attributes` (thanks @anamba and subvertallchris / see #1496 and #1499)
+
 ## [9.2.1] 2018-04-01
 
 ## Fixed

data/Gemfile

@@ -23,6 +23,9 @@ end
 
 gem 'listen', '< 3.1'
 
+active_model_version = ENV['ACTIVE_MODEL_VERSION']
+gem 'activemodel', "~> #{active_model_version}" if active_model_version
+
 if RUBY_VERSION.to_f < 2.2
   gem 'activemodel', '~> 4.2'
   gem 'activesupport', '~> 4.2'

data/lib/neo4j/active_node/initialize.rb

@@ -10,7 +10,7 @@ module Neo4j::ActiveNode::Initialize
   def init_on_load(persisted_node, properties)
     self.class.extract_association_attributes!(properties)
     @_persisted_obj = persisted_node
-    changed_attributes && changed_attributes.clear
+    changed_attributes_clear!
     @attributes = convert_and_assign_attributes(properties)
   end
 

data/lib/neo4j/active_rel/initialize.rb

@@ -11,7 +11,7 @@ module Neo4j::ActiveRel
     def init_on_load(persisted_rel, from_node_id, to_node_id, type)
       @rel_type = type
       @_persisted_obj = persisted_rel
-      changed_attributes && changed_attributes.clear
+      changed_attributes_clear!
       @attributes = convert_and_assign_attributes(persisted_rel.props)
       load_nodes(from_node_id, to_node_id)
     end

data/lib/neo4j/shared/initialize.rb

@@ -24,5 +24,31 @@ module Neo4j::Shared
         attr[key.freeze] = v
       end
     end
+
+    # We should be using #clear_changes_information
+    # but right now we don't use `ActiveModel` attributes correctly and so it doesn't work
+    def changed_attributes_clear!
+      return if changed_attributes.nil?
+
+      # changed_attributes is frozen starting with ActiveModel 5.2.0
+      # Not a good long term solution
+      if changed_attributes.frozen?
+        @attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new
+      else
+        changed_attributes && changed_attributes.clear
+      end
+    end
+
+    def changed_attributes_selective_clear!(hash_to_clear)
+      # changed_attributes is frozen starting with ActiveModel 5.2.0
+      # Not a good long term solution
+      if changed_attributes.frozen?
+        attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new(changed_attributes)
+        hash_to_clear.keys.each { |k| attributes_changed_by_setter.delete(k) }
+        @attributes_changed_by_setter = attributes_changed_by_setter
+      else
+        hash_to_clear.each_key { |k| changed_attributes.delete(k) }
+      end
+    end
   end
 end

data/lib/neo4j/shared/persistence.rb

@@ -14,7 +14,7 @@ module Neo4j::Shared
       props = props_for_update
       neo4j_query(query_as(:n).set(n: props))
       _persisted_obj.props.merge!(props)
-      changed_attributes.clear
+      changed_attributes_clear!
     end
 
     def skip_update?
@@ -164,7 +164,7 @@ module Neo4j::Shared
     def reload
       return self if new_record?
       association_proxy_cache.clear if respond_to?(:association_proxy_cache)
-      changed_attributes && changed_attributes.clear
+      changed_attributes_clear!
       unless reload_from_database
         @_deleted = true
         freeze
@@ -202,7 +202,7 @@ module Neo4j::Shared
         neo4j_query(query_as(:n).set(n: db_values))
         db_values.each_pair { |k, v| self.public_send(:"#{k}=", v) }
         _persisted_obj.props.merge!(db_values)
-        db_values.each_key { |k| changed_attributes.delete(k) }
+        changed_attributes_selective_clear!(db_values)
         true
       end
     end
@@ -242,7 +242,7 @@ module Neo4j::Shared
                                  .pluck("#{element_name}.`#{attribute}`").first
       return false unless new_attribute
       self[attribute] = new_attribute
-      changed_attributes.delete(attribute)
+      set_attribute_was(attribute, new_attribute)
       true
     end
 

data/lib/neo4j/shared/property.rb

@@ -11,6 +11,10 @@ module Neo4j::Shared
 
     attr_reader :_persisted_obj
 
+    def mutations_from_database
+      ActiveModel::NullMutationTracker.instance
+    end
+
     def inspect
       attribute_descriptions = inspect_attributes.map do |key, value|
         "#{Neo4j::ANSI::CYAN}#{key}: #{Neo4j::ANSI::CLEAR}#{value.inspect}"

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '9.2.1'
+  VERSION = '9.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.2.2
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-01 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel