neo4j 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 276174c101922613a542e86d6e9cd493c1f48a24
-  data.tar.gz: c9a94adc2fd8d557adc44fc499b368bd95c9e489
+  metadata.gz: 2f494789056a2cf7cdf67ad93320d087aec27ef9
+  data.tar.gz: d20cf2ef3016d84ecf8ddc85a68b3224518a424e
 SHA512:
-  metadata.gz: 983f69b3c76689e65b951a36db641ecc3c57001f3a6bbbace282ec4ef856509e802f798dc5d0efe1b985d27692bc64f438ed7c9c0d477f95097b162c5fa1bee5
-  data.tar.gz: 087725cfbc3cf345af9f0594ee7e7363fddba832182760b8ef5e2ae367d970d28a194f2f79997dd5cca9cdb313368589d469240015e21cca4ce8c788535a4279
+  metadata.gz: 059712836b2762ba02ea73fa4c0581a24cea4d9c10e87da127c0be60a8288c0a4e4b376f7b87836e8277ff78f6be1b44b8bff7832db96a320d738ac5ddde976d
+  data.tar.gz: 34a29e62bee5492358d3ab93ac3b18c06455480d4c3cd3d54b0fa5f78875c792d2aaee0f6b73c9cdba8254c6d8a31276960b3078213f9db14ebed915b4595300

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [5.0.2] - 2015-06-30
+
+### Fixed
+- Fix error when calling `#empty?` or `#blank?` on a query chain with on `order` specified
+- Make `#find_each` and `#find_in_batches` return the actual objects rather than the result objects
+- Query logging on console should be to STDOUT with `puts`.  Using `Rails.logger` outputs to the file in the `log` directory
+
 ## [5.0.1] - 2015-06-23
 
 ### Fixed

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

@@ -4,13 +4,13 @@ module Neo4j
       module QueryProxyFindInBatches
         def find_in_batches(options = {})
           query.return(identity).find_in_batches(identity, @model.primary_key, options) do |batch|
-            yield batch
+            yield batch.map(&:identity)
           end
         end
 
         def find_each(options = {})
           query.return(identity).find_each(identity, @model.primary_key, options) do |result|
-            yield result
+            yield result.send(identity)
           end
         end
       end

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

@@ -75,10 +75,18 @@ module Neo4j
 
         alias_method :blank?, :empty?
 
+        # @param [Neo4j::ActiveNode, Neo4j::Node, String] other An instance of a Neo4j.rb model, a Neo4j-core node, or a string uuid
+        # @param [String, Symbol] target An identifier of a link in the Cypher chain
+        # @return [Boolean]
         def include?(other, target = nil)
-          fail(InvalidParameterError, ':include? only accepts nodes') unless other.respond_to?(:neo_id)
           query_with_target(target) do |var|
-            self.where("ID(#{var}) = {other_node_id}").params(other_node_id: other.neo_id).query.return("count(#{var}) as count").first.count > 0
+            where_filter = if other.respond_to?(:neo_id)
+                             "ID(#{var}) = {other_node_id}"
+                           else
+                             "#{var}.#{association_id_key} = {other_node_id}"
+                           end
+            node_id = other.respond_to?(:neo_id) ? other.neo_id : other
+            self.where(where_filter).params(other_node_id: node_id).query.return("count(#{var}) as count").first.count > 0
           end
         end
 
@@ -86,7 +94,7 @@ module Neo4j
           fail(InvalidParameterError, ':exists? only accepts neo_ids') unless node_condition.is_a?(Integer) || node_condition.is_a?(Hash) || node_condition.nil?
           query_with_target(target) do |var|
             start_q = exists_query_start(node_condition, var)
-            start_q.query.return("COUNT(#{var}) AS count").first.count > 0
+            start_q.query.reorder.return("COUNT(#{var}) AS count").first.count > 0
           end
         end
 

data/lib/neo4j/railtie.rb

@@ -72,7 +72,7 @@ module Neo4j
       return if @neo4j_cypher_logging_registered
 
       Neo4j::Server::CypherSession.log_with do |message|
-        Rails.logger.info message
+        puts message
       end
 
       @neo4j_cypher_logging_registered = true

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.0.1'
+  VERSION = '5.0.2'
 end

metadata

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