neo4j 6.0.0.alpha.4 → 6.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d0692e7269df978b91b6159ae61bf13d5b1e6f
-  data.tar.gz: fcbe9452451260b44431ed4d69559d0880a218c3
+  metadata.gz: 51e7f7f2111156aec6a405435bfb1d54ba872b21
+  data.tar.gz: 25ff673e9f3baf99812fdf9a9cf090e7071004b7
 SHA512:
-  metadata.gz: fe05be04e219c87f1af15db0480b6b89ea627b466fe20509e1e46365f8f09f40714a4d0b0118917e91766dca134f4c19754d7d4b661b0b1a3245687a89e0a199
-  data.tar.gz: 9b8fb18005ef90978d9d1acd2589179f1e6aa661b1b38cf67c342cb49b337eef1a37cf7fa7a172e1e32c0171847cdc21bd85e6d8202d7fb1210a08835f6d5beb
+  metadata.gz: 510aa9f0861552d70b27a5e15c765ed24c7ee47d6a74a80d11daf402a616da286fb69d4456159c34e3d9c52f8928ae6ad8de85e168592fa1ded6ea8b28340da4
+  data.tar.gz: b5a78ff50ce7b9815687f7e9dcc619dae0f21dbf68668f0190c7b1b83328948db39bd3eeccb64d0aaefe219e9d3e2af997fff8a8934b81e98518eb659d50a45c

data/CHANGELOG.md

@@ -3,11 +3,11 @@ 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/).
 
-## [6.0.0.alpha.4] - 10-17-2015
+## [6.0.0.alpha.5] - 10-18-2015
 
-### Fixed
+### Changed
 
-- `QueryProxy` was not converting Boolean properties correctly
+- Change size and length so that they match expected Ruby / ActiveRecord behavior (see http://stackoverflow.com/questions/6083219/activerecord-size-vs-count and #875)
 
 ## [6.0.0.alpha.3] - 10-14-2015
 

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

@@ -13,9 +13,10 @@ module Neo4j
           result(node, rel).each(&block)
         end
 
-        def result(node = true, rel = true)
+        def result(node = true, rel = nil)
+          puts '@result_cache', @result_cache.inspect
           @result_cache ||= {}
-          return @result_cache[[node, rel]] if @result_cache[[node, rel]]
+          return result_cache_for(node, rel) if has_result_cache?(node, rel)
 
           pluck_vars = []
           pluck_vars << identity if node
@@ -31,6 +32,14 @@ module Neo4j
           @result_cache[[node, rel]] ||= result
         end
 
+        def has_result_cache?(node = true, rel = nil)
+          !!result_cache_for(node, rel)
+        end
+
+        def result_cache_for(node = true, rel = nil)
+          (@result_cache || {})[[node, rel]]
+        end
+
         def fetch_result_cache
           @result_cache ||= yield
         end

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

@@ -63,8 +63,18 @@ module Neo4j
           end
         end
 
-        alias_method :size,   :count
-        alias_method :length, :count
+        def size
+          puts 'size'
+          if has_result_cache?
+            result_cache_for.length
+          else
+            count
+          end
+        end
+
+        def length
+          to_a.length
+        end
 
         # TODO: update this with public API methods if/when they are exposed
         def limit_value

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.0.0.alpha.4'
+  VERSION = '6.0.0.alpha.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.4
+  version: 6.0.0.alpha.5
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby