neo4j 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be3813d47f9381c0d48f05745ec55c4c34fb24f
-  data.tar.gz: ff011cb5224a4a44bb7d6debd3fc0e31682e0bbe
+  metadata.gz: 158a55b23a8fd93af668549d93b6ae70c78de131
+  data.tar.gz: bf51075fa56f939a0f1121cf31f42358edf60ec5
 SHA512:
-  metadata.gz: f82b6f082d4ff9242ee2902fbe9b82d7fee8bffa8164d12eb6fd6c59e87c4bc911c202f807612853f49f83083665364c762f2a4884f1a1a18437509b9be289c9
-  data.tar.gz: 074e0f957b1e73fb8e9a250de36dbcc17b3a54308c5b8a6df88303e69c0139082960457cbaf380f1f98e3fa901e89693696dd19f43666e8fb53acaaf5174240e
+  metadata.gz: 12bf440770240a70cef138bb2760a97399f476b6d76f5a1bf03ea08184d421771d1152ecfae0d5791debd10c2f040f115a81761ad6b12936d366807caffef487
+  data.tar.gz: c3bd8351338be1ab5e5d5f503a61338d88edab6b9dd4ec418347bb56935f09fa37b0f8d1c7a98b75e80335fca4d13b325ae6d36c8daec5ff45f3eca5a5f87c42

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [5.2.2] - 09-06-2015
+
+### Fixed
+- Fixed setting of association(_id|_ids) on .create
+
 ## [5.2.1] - 09-04-2015
 
 ### Fixed

data/lib/neo4j/active_node/property.rb

@@ -15,16 +15,33 @@ module Neo4j::ActiveNode
       def extract_association_attributes!(attributes)
         return unless contains_association?(attributes)
         attributes.each_with_object({}) do |(key, _), result|
-          result[key] = attributes.delete(key) if self.association?(key)
+          result[key] = attributes.delete(key) if self.association_key?(key)
         end
       end
 
+      def association_key?(key)
+        association_method_keys.include?(key.to_sym)
+      end
+
       private
 
       def contains_association?(attributes)
         return false unless attributes
-        attributes.each_key { |key| return true if associations_keys.include?(key) }
-        false
+
+        attributes.each_key.any?(&method(:association_key?))
+      end
+
+      # All keys which could be association setter methods (including _id/_ids)
+      def association_method_keys
+        @association_method_keys ||=
+          associations_keys.map(&:to_sym) +
+          associations.values.map do |association|
+            if association.type == :has_one
+              "#{association.name}_id"
+            elsif association.type == :has_many
+              "#{association.name.to_s.singularize}_ids"
+            end.to_sym
+          end
       end
     end
   end

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -200,7 +200,7 @@ module Neo4j
 
         def _nodeify!(*args)
           other_nodes = [args].flatten!.map! do |arg|
-            (arg.is_a?(Integer) || arg.is_a?(String)) ? @model.find_by(@model.id_property_name => arg) : arg
+            (arg.is_a?(Integer) || arg.is_a?(String)) ? @model.find_by(id: arg) : arg
           end.compact
 
           if @model && other_nodes.any? { |other_node| !other_node.class.mapped_label_names.include?(@model.mapped_label_name) }

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.2.1'
+  VERSION = '5.2.2'
 end

metadata

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