neo4j 5.2.3 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6857fc3946f80bb498ef99f5e77ad04aae7780d2
-  data.tar.gz: 4544f2e9fe135d5d7c53d1122c13d14250d1ff32
+  metadata.gz: 662aa756b654f9c55878f640b07a1df6438c1b59
+  data.tar.gz: 7b88ef87ef0ba7e99722f1f398ea3b9efdc1a141
 SHA512:
-  metadata.gz: 4aae1286a0007a42f95f55f0828cfc1e3ca9981510689df6d86f352c1aefea12a894c056631383367545be5aaf8e39e1c27d8dc2dc40e065d9020472283492e3
-  data.tar.gz: b495f1ae8518b65121f2c99a8bd2725a50ca7ea0fc60e416a84ef464b579ab9dce979aca5273f6fb758d1897d04ffeb0fbb211cacdba82f2f3f11b7d59ffce35
+  metadata.gz: 1c6664caf99d0bd2434668c0429583b16fba18565be3289d8f2e92161eff21784ad124cf716570e910493c23bfb7306e1ad5604a64504d047ccad30d9d01b6c9
+  data.tar.gz: a87e1bf6c26ebb37891e7210e4c37a2c14a848eb1257bec1aa5791d302ebffc9e846074c892dd3d12917277938568c9e3a956dde023bc7dbf04374d83e511bfd

data/CHANGELOG.md

@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [5.2.5] - 09-11-2015
+
+### Fixed
+
+- Regression in last release caused properties to revert to default on update if not present in the properties for update
+
+## [5.2.4] - 09-11-2015
+
+### Fixed
+- Use `debug` log level for query logging
+- `updated_at` properties were not being added up `update` events, only updated.
+- Default values of Boolean properties were not being set when `default: false`
+- `props_for_update` was using String keys instead of Symbols, like `props_for_update`
+- `props_for_create` and `props_for_update` were not adding default property values to the hash.
+- ActiveNode's `merge` and `find_or_create` methods were not setting default values of declared properties when `ON CREATE` was triggered. The code now uses `props_for_create`.
+
 ## [5.2.3] - 09-07-2015
 
 Added bugfixes from 5.1.4 and 5.1.5 that were missed in earlier 5.2.x releases:
@@ -30,6 +46,10 @@ Added bugfixes from 5.1.4 and 5.1.5 that were missed in earlier 5.2.x releases:
 - Added `record_timestamps` configuration do default all `ActiveNode` and `ActiveRel` models to have `created_at` and `updated_at` timestamps (from #939, thanks @rebecca-eakins)
 - Added `timestamp_type` configuration to specify how timestamps should be stored (from #939, thanks @rebecca-eakins)
 
+### Changed
+- Methods related to basic node and rel persistence (`save`, `create_model`, `_create_node`, others) were refactored to make the processes simpler, clearer, and slightly faster.
+- Unit test directory structure was rearranged to mirror the `lib` directory.
+
 ## [5.1.3] - 08-23-2015
 
 ### Fixed

data/lib/neo4j/active_node/persistence.rb

@@ -63,6 +63,11 @@ module Neo4j::ActiveNode
       self.class.neo4j_session.create_node(node_props, labels)
     end
 
+    # As the name suggests, this inserts the primary key (id property) into the properties hash.
+    # The method called here, `default_property_values`, is a holdover from an earlier version of the gem. It does NOT
+    # contain the default values of properties, it contains the Default Property, which we now refer to as the ID Property.
+    # It will be deprecated and renamed in a coming refactor.
+    # @param [Hash] converted_props A hash of properties post-typeconversion, ready for insertion into the DB.
     def inject_primary_key!(converted_props)
       self.class.default_property_values(self).tap do |destination_props|
         destination_props.merge!(converted_props) if converted_props.is_a?(Hash)
@@ -148,29 +153,11 @@ module Neo4j::ActiveNode
       private
 
       def on_create_props(find_attributes)
-        {id_property_name => id_prop_val(find_attributes)}.tap do |props|
-          now = DateTime.now.to_i
-          set_props_timestamp!('created_at', props, now)
-          set_props_timestamp!('updated_at', props, now)
-        end
-      end
-
-      # The process of creating custom id_property values is different from auto uuids. This adapts to that, calls the appropriate method,
-      # and raises an error if it fails.
-      def id_prop_val(find_attributes)
-        custom_uuid_method = id_property_info[:type][:on]
-        id_prop_val = custom_uuid_method ? self.new(find_attributes).send(custom_uuid_method) : default_properties[id_property_name].call
-        fail 'Unable to create custom id property' if id_prop_val.nil?
-        id_prop_val
+        find_attributes.merge(self.new(find_attributes).props_for_create)
       end
 
       def on_match_props
-        set_props_timestamp!('updated_at')
-      end
-
-      def set_props_timestamp!(key_name, props = {}, stamp = DateTime.now.to_i)
-        props[key_name.to_sym] = stamp if attributes_nil_hash.key?(key_name)
-        props
+        {}.tap { |props| props[:updated_at] = DateTime.now.to_i if attributes_nil_hash.key?('updated_at'.freeze) }
       end
     end
   end

data/lib/neo4j/active_node/property.rb

@@ -27,8 +27,8 @@ module Neo4j::ActiveNode
 
       def contains_association?(attributes)
         return false unless attributes
-
-        attributes.each_key.any?(&method(:association_key?))
+        attributes.each_key { |k| return true if association_key?(k) }
+        false
       end
 
       # All keys which could be association setter methods (including _id/_ids)

data/lib/neo4j/railtie.rb

@@ -79,7 +79,7 @@ module Neo4j
       Neo4j::Core::Query.pretty_cypher = Neo4j::Config[:pretty_logged_cypher_queries]
 
       Neo4j::Server::CypherSession.log_with do |message|
-        (Neo4j::Config[:logger] || Rails.logger).info message
+        (Neo4j::Config[:logger] || Rails.logger).debug message
       end
 
       @neo4j_cypher_logging_registered = true

data/lib/neo4j/shared/declared_property_manager.rb

@@ -24,7 +24,7 @@ module Neo4j::Shared
       @_attributes_string_map = nil
       registered_properties[property.name] = property
       register_magic_typecaster(property) if property.magic_typecaster
-      declared_property_defaults[property.name] = property.default_value if property.default_value
+      declared_property_defaults[property.name] = property.default_value if !property.default_value.nil?
     end
 
     # The :default option in Neo4j::ActiveNode#property class method allows for setting a default value instead of

data/lib/neo4j/shared/persistence.rb

@@ -27,6 +27,7 @@ module Neo4j::Shared
       inject_timestamps!
       converted_props = props_for_db(props)
       inject_classname!(converted_props)
+      inject_defaults!(converted_props)
       return converted_props unless self.class.respond_to?(:default_property_values)
       inject_primary_key!(converted_props)
     end
@@ -35,7 +36,9 @@ module Neo4j::Shared
     def props_for_update
       update_magic_properties
       changed_props = attributes.select { |k, _| changed_attributes.include?(k) }
+      changed_props.symbolize_keys!
       props_for_db(changed_props)
+      inject_defaults!(changed_props)
     end
 
     # Convenience method to set attribute and #save at the same time
@@ -193,7 +196,7 @@ module Neo4j::Shared
     end
 
     def update_magic_properties
-      self.updated_at = DateTime.now if respond_to?(:updated_at=) && changed? && !updated_at_changed?
+      self.updated_at = DateTime.now if respond_to?(:updated_at=) && (updated_at.nil? || (changed? && !updated_at_changed?))
     end
 
     # Inserts the _classname property into an object's properties during object creation.
@@ -213,6 +216,13 @@ module Neo4j::Shared
       self.updated_at ||= now if respond_to?(:updated_at=)
     end
 
+    def inject_defaults!(properties)
+      self.class.declared_property_manager.declared_property_defaults.each_pair do |k, v|
+        properties[k.to_sym] = v if send(k).nil?
+      end
+      properties
+    end
+
     def set_timestamps
       warning = 'This method has been replaced with `inject_timestamps!` and will be removed in a future version'.freeze
       ActiveSupport::Deprecation.warn warning, caller

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.2.3'
+  VERSION = '5.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.5
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter