neo4j 7.0.9 → 7.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 532f0d8e1f5a6d684b45075eab7d476d25880151
-  data.tar.gz: 40946691bba97d4363c71d621d3035248637fcb0
+  metadata.gz: ef009c057d36a788a10a49c2879e59a4ee57016a
+  data.tar.gz: 50b2b6437ad96458f9ea23905f573a5c07bdff98
 SHA512:
-  metadata.gz: 701f7337c59bbaf7f37b49cff159b9ccaaeeaca50cb26fba3924ad66978f89f57cad8c169bcf5f87575a177244063e3d411dd088a26f2569a6f313608dd91287
-  data.tar.gz: 4b26c825000b47ce613c8eb1619f57117d38b1c032cf1cbb030d93bd0f411966bdb5497eb908a64bed76bb167d40e9cbcc9a7828ba1641b6a2b2f3232fb7f16c
+  metadata.gz: 5d6568b27eab7758049ef41a8c2eeeaed7aa11f1da5cf7217ffa97a1ee3685e63c0e7a2a07b16f51e62bee812d33a37a923f8f2fee2171cfec15b7ea4247749a
+  data.tar.gz: fc0bf2a7c8f30f09746a4a8af37e9827c5920d3b6f94e0d02f22e0621944b987cdf39d6a4a94680d2252f0f19aa7c3278649a65f9e2d0cf7b97e0b66109ca34f

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/).
 
+## [7.0.10] - 06-07-2016
+
+### Fixed
+
+- Calling `.create` on associations shouldn't involve extra queries (thanks for the report from rahulmeena13 / see #1216)
+
 ## [7.0.9] - 05-30-2016
 
 ### Fixed

data/lib/neo4j/active_node/has_n.rb

@@ -8,11 +8,11 @@ module Neo4j::ActiveNode
     # It uses a QueryProxy to get results
     # But also caches results and can have results cached on it
     class AssociationProxy
-      def initialize(query_proxy, deferred_objects = [], cached_result = nil)
+      def initialize(query_proxy, deferred_objects = [], result_cache_proc = nil)
         @query_proxy = query_proxy
         @deferred_objects = deferred_objects
 
-        cache_result(cached_result)
+        @result_cache_proc = result_cache_proc
 
         # Represents the thing which can be enumerated
         # default to @query_proxy, but will be set to
@@ -88,7 +88,11 @@ module Neo4j::ActiveNode
       end
 
       def cache_query_proxy_result
-        @query_proxy.to_a.tap { |result| cache_result(result) }
+        (result_cache_proc_cache || @query_proxy).to_a.tap { |result| cache_result(result) }
+      end
+
+      def result_cache_proc_cache
+        @result_cache_proc_cache ||= @result_cache_proc.call if @result_cache_proc
       end
 
       def clear_cache_result
@@ -105,7 +109,7 @@ module Neo4j::ActiveNode
         @query_proxy.public_send(:replace_with, *args)
       end
 
-      QUERY_PROXY_METHODS = [:<<, :delete]
+      QUERY_PROXY_METHODS = [:<<, :delete, :create]
       CACHED_RESULT_METHODS = []
 
       def method_missing(method_name, *args, &block)
@@ -171,10 +175,10 @@ module Neo4j::ActiveNode
       hash = association_proxy_hash(name, options)
       association_proxy_cache_fetch(hash) do
         if result_cache = self.instance_variable_get('@source_proxy_result_cache')
-          result_by_previous_id = previous_proxy_results_by_previous_id(result_cache, name)
-
+          cache = nil
           result_cache.inject(nil) do |proxy_to_return, object|
-            proxy = fresh_association_proxy(name, options.merge(start_object: object), result_by_previous_id[object.neo_id])
+            proxy = fresh_association_proxy(name, options.merge(start_object: object),
+                                            proc { (cache ||= previous_proxy_results_by_previous_id(result_cache, name))[object.neo_id] })
 
             object.association_proxy_cache[hash] = proxy
 
@@ -188,8 +192,8 @@ module Neo4j::ActiveNode
 
     private
 
-    def fresh_association_proxy(name, options = {}, cached_result = nil)
-      AssociationProxy.new(association_query_proxy(name, options), deferred_nodes_for_association(name), cached_result)
+    def fresh_association_proxy(name, options = {}, result_cache_proc = nil)
+      AssociationProxy.new(association_query_proxy(name, options), deferred_nodes_for_association(name), result_cache_proc)
     end
 
     def previous_proxy_results_by_previous_id(result_cache, association_name)

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

@@ -199,7 +199,7 @@ module Neo4j
           self.to_a[index]
         end
 
-        def create(other_nodes, properties)
+        def create(other_nodes, properties = {})
           fail 'Can only create relationships on associations' if !@association
           other_nodes = _nodeify!(*other_nodes)
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '7.0.9'
+  VERSION = '7.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 7.0.9
+  version: 7.0.10
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter