neo4j 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b250e0735aaa127d7d195085c3a19701cc2f4b6f
-  data.tar.gz: 6075c523fd160cb11aa0a4669d49c56c3a875561
+  metadata.gz: fc205134a4b67af95256deb3b4d72808e387e9a1
+  data.tar.gz: fb4afe4dac4036b227867b1dd771bb13b1a067df
 SHA512:
-  metadata.gz: e6306ab117ee233f4470597bd97974930fc56892aff959b3c1c1241bc4fc86d1cc9d9ae2d4bca5bd9f25b22d85cb5debea624daf5ee408d28a81458ef8b1156b
-  data.tar.gz: 2835569c30076f2a82ec0e7785077ff50abd9d0777de3d43aa981f6fc6796c923d7e61b4553162e1fbc787920f78fb8676306edaaf8c165720e7f31db1097bb5
+  metadata.gz: 3d9a385384d249676e13f41da6ab838ab7ba9c56808ccab74bbe1e02c44798d91c179477181b8b554d60eabf6cb69b74452527ff9bc5717c8c82dc50cdab204c
+  data.tar.gz: 7beacde3a246b22f70fe45f1bf08ba5ccd5de7a89d35aa56a40f71ae99b4f1af96d3a783fde036482133efc57c8cb511bb5f25d84d57809d94b4960b63000e80

data/lib/neo4j/active_node/has_n.rb

@@ -106,6 +106,7 @@ module Neo4j::ActiveNode
                                                        start_object: self,
                                                        node: options[:node],
                                                        rel: options[:rel],
+                                                       optional: options[:optional],
                                                        context: '#{self.name}##{name}',
                                                        caller: self
                                                      })
@@ -122,8 +123,8 @@ module Neo4j::ActiveNode
           end}, __FILE__, __LINE__)
 
         instance_eval(%{
-          def #{name}(node = nil, rel = nil, proxy_obj = nil)
-            #{name}_query_proxy(node: node, rel: rel, proxy_obj: proxy_obj)
+          def #{name}(node = nil, rel = nil, proxy_obj = nil, options = {})
+            #{name}_query_proxy({node: node, rel: rel, proxy_obj: proxy_obj}.merge(options))
           end
 
           def #{name}_query_proxy(options = {})
@@ -139,7 +140,7 @@ module Neo4j::ActiveNode
                                                        node: options[:node],
                                                        rel: options[:rel],
                                                        context: context,
-                                                       optional: query_proxy.optional?,
+                                                       optional: options[:optional] || query_proxy.optional?,
                                                        caller: query_proxy.caller
                                                      })
           end}, __FILE__, __LINE__)
@@ -180,9 +181,9 @@ module Neo4j::ActiveNode
                                                      {session: self.neo4j_session}.merge(options))
           end
 
-          def #{name}(node = nil, rel = nil, query_proxy = nil)
+          def #{name}(node = nil, rel = nil, query_proxy = nil, options = {})
             context = (query_proxy && query_proxy.context ? query_proxy.context : '#{self.name}') + '##{name}'
-            #{name}_query_proxy(query_proxy: query_proxy, node: node, rel: rel, context: context)
+            #{name}_query_proxy({query_proxy: query_proxy, node: node, rel: rel, context: context}.merge(options))
           end}, __FILE__, __LINE__)
       end
       # rubocop:enable Style/PredicateName

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

@@ -41,6 +41,7 @@ module Neo4j
           @rel_var = options[:rel] || _rel_chain_var
           @session = options[:session]
           @caller = options[:caller]
+          @chain_level = options[:chain_level]
           @chain = []
           @starting_query = options[:starting_query]
           @optional = options[:optional]
@@ -87,9 +88,11 @@ module Neo4j
                          starting_query ? (starting_query & _query_model_as(var)) : _query_model_as(var)
                        end
           # Build a query chain via the chain, return the result
-          @chain.inject(base_query.params(@params)) do |query, (method, arg)|
+          result_query = @chain.inject(base_query.params(@params)) do |query, (method, arg)|
             query.send(method, arg.respond_to?(:call) ? arg.call(var) : arg)
           end
+
+          result_query.tap { |query| query.proxy_chain_level = _chain_level }
         end
 
         # Scope all queries to the current scope.
@@ -246,6 +249,8 @@ module Neo4j
         def _chain_level
           if query_proxy = @options[:query_proxy]
             query_proxy._chain_level + 1
+          elsif @chain_level
+            @chain_level + 1
           else
             1
           end

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

@@ -114,11 +114,8 @@ module Neo4j
 
         # A shortcut for attaching a new, optional match to the end of a QueryProxy chain.
         # TODO: It's silly that we have to call constantize here. There should be a better way of finding the target class of the destination.
-        def optional(association, node_id = nil)
-          target_qp = self.send(association)
-          model = target_qp.name.constantize
-          var = node_id || target_qp.identity
-          self.query.proxy_as(model, var, true)
+        def optional(association, node_var = nil, rel_var = nil)
+          self.send(association, node_var, rel_var, nil, optional: true)
         end
 
         private

data/lib/neo4j/core/query.rb

@@ -8,12 +8,15 @@ module Neo4j::Core
     # @return [Neo4j::ActiveNode::Query::QueryProxy] A QueryProxy object.
     def proxy_as(model, var, optional = false)
       # TODO: Discuss whether it's necessary to call `break` on the query or if this should be left to the user.
-      Neo4j::ActiveNode::Query::QueryProxy.new(model, nil,  starting_query: self.break, node: var, optional: optional)
+      Neo4j::ActiveNode::Query::QueryProxy.new(model, nil,  starting_query: self, node: var, optional: optional, chain_level: @proxy_chain_level)
     end
 
     # Calls proxy_as with `optional` set true. This doesn't offer anything different from calling `proxy_as` directly but it may be more readable.
     def proxy_as_optional(model, var)
       proxy_as(model, var, true)
     end
+    #
+    # For instances where you turn a QueryProxy into a Query and then back to a QueryProxy with `#proxy_as`
+    attr_accessor :proxy_chain_level
   end
 end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '4.1.2'
+  VERSION = '4.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby