neo4j 8.2.2 → 8.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5861188abcbc84eddc8c83d12f1a9e8d624c4b9
-  data.tar.gz: 8fe16e1c7c5be6e9dd99e40f8995ac49e81e8157
+  metadata.gz: ed3de6664c585f0e48662a419cdb5287f361d2ec
+  data.tar.gz: d0be71975e969b60b575e22ba333613c4eada69f
 SHA512:
-  metadata.gz: 6e41237691379fbb59c4121de33f59b424d1b8b6eebd063497d4f80998a8f0d231057d9b90c9c12924f8e73607cec3e614729a998f2b829619a4c20c9fa60687
-  data.tar.gz: e5895c4ed969f3682488485ef18f3f8531824e92ca4ae1890e736cdbf62735b7d073c2ca766ebc4362916ca39501a12ead2ec90e35acb3c0bf11ad6941d7848c
+  metadata.gz: e8494b0eb6c7fc75733b806656d4cdc46eb2877056f6ae9161bc0a96aa300452ed881bd32e3025d3da84f0d235655bf976c70114a57c8a809be70dbf6f81c26d
+  data.tar.gz: 1687fdb57c2d83a94aaebdb6682bf0b22ba5100b31d03fa58b1f233cf78223b89f4888a35f69e782fc2cafdca40e95cc0e1c93c92a969788aaa5e174510c6bf2

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/).
 
+## [8.2.3] 2017-09-19
+
+### Fixes
+
+- Scopes now work when inherited three or more levels deep (see #1415, #1413, #1412 / thanks @thefliik)
+
 ## [8.2.2] 2017-09-18
 
 ### Fixes

data/README.md

@@ -59,8 +59,7 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 | 2.1.x             | No   | Yes   | Yes *   | Yes      |
 | 2.2.x             | No   | No    | Yes     | Yes      |
 | 2.3.x             | No   | No    | Yes     | Yes      |
-| 3.0.x             | No   | No    | No      | Yes      |
-| 3.1.x             | No   | No    | No      | Yes      |
+| >= 3.0.0           | No   | No    | No      | Yes      |
 
 `*` Neo4j.rb >= 4.x doesn't support Neo4j versions before 2.1.5.  To use 2.1.x you should upgrade to a version >= 2.1.5
 

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

@@ -164,7 +164,8 @@ module Neo4j
           base_query.optional_match(
             "(#{identity})#{path.each_with_index.map do |element, index|
               relationship_part(element.association, path_name(path[0..index]))
-            end.join}")
+            end.join}"
+          )
         end
 
         def relationship_part(association, path_name)

data/lib/neo4j/active_node/scope.rb

@@ -55,16 +55,21 @@ module Neo4j::ActiveNode
       end
       # rubocop:enable Style/PredicateName
 
+      # @return [Boolean] true if model has access to scope with this name
       def scope?(name)
         full_scopes.key?(name.to_sym)
       end
 
+      # @return [Hash] of scopes assigned to this model. Keys are scope name, value is scope callable.
       def scopes
         @scopes ||= {}
       end
 
+      # @return [Hash] of scopes available to this model. Keys are scope name, value is scope callable.
       def full_scopes
-        self.superclass.respond_to?(:scopes) ? self.superclass.scopes.merge(scopes) : scopes
+        self.ancestors.find_all { |a| a.respond_to?(:scopes) }.reverse.inject({}) do |scopes, a|
+          scopes.merge(a.scopes)
+        end
       end
 
       def _call_scope_context(eval_context, query_params, proc)

data/lib/neo4j/tasks/migration.rake

@@ -95,7 +95,7 @@ COMMENT
 
         args.with_defaults(remove_missing: false)
 
-        schema_data = YAML.load(File.read(SCHEMA_YAML_PATH))
+        schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH))
 
         Neo4j::Core::CypherSession::Adaptors::Base.subscribe_to_query(&method(:puts))
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.2.2'
+  VERSION = '8.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.2.2
+  version: 8.2.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter