neo4j 6.1.10 → 6.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f009121aff36056cc7bb5b8e43289808ef4b2e
-  data.tar.gz: d0a949bc37dff327631d6662619f0e82e3c45a4c
+  metadata.gz: 24479c7254a9b490b1b321e25b61c6a8d5b01729
+  data.tar.gz: 49a11431ab61452edf90f3f921f1ba80ba1309f7
 SHA512:
-  metadata.gz: 9317f40e2023b164a862828b26fae32c68a05b158175d3ccea8a92f8afbc11842f6ed02efca7c98a1e90074b4a32c0a799909cb0eac1f8f10bde2e1f6443f30b
-  data.tar.gz: b5854b8a73db74c84fb3ab3c5934fdc22bb1986887251b28f235c9dd0263d330a42911fec21c5d35a2d2d2f72ecf88da0e14586c438c8674698a353e16d13c77
+  metadata.gz: e96b0e032983d7b83baa19468d380443324fd16c08f9a5303aad49d2d790c1495ba97fefd6cafaa1a8e1aedce0585f2516475d71033e5116d49eb55576a6a372
+  data.tar.gz: ad29072f6b50740753bd8dcceb64904f3bcb18003cb46a5c97f97de8c948fbf25639ea14a2a11450528fe2a4c98ca580da828f16c8441fe142730dc743eecc90

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/).
 
+## [6.1.11] - 05-25-2016
+
+### Fixed
+
+- Allow models to use their superclass' scopes (thanks to veetow for the heads-up / see #1205)
+
 ## [6.1.10] - 03-14-2016
 
 ### Fixed

data/lib/neo4j/active_node/scope.rb

@@ -35,13 +35,13 @@ module Neo4j::ActiveNode
       #
       # @see http://guides.rubyonrails.org/active_record_querying.html#scopes
       def scope(name, proc)
-        _scope[name.to_sym] = proc
+        scopes[name.to_sym] = proc
 
         klass = class << self; self; end
         klass.instance_eval do
           define_method(name) do |query_params = nil, _ = nil|
             eval_context = ScopeEvalContext.new(self, current_scope || self.query_proxy)
-            proc = _scope[name.to_sym]
+            proc = full_scopes[name.to_sym]
             _call_scope_context(eval_context, query_params, proc)
           end
         end
@@ -56,11 +56,15 @@ module Neo4j::ActiveNode
       # rubocop:enable Style/PredicateName
 
       def scope?(name)
-        _scope.key?(name.to_sym)
+        full_scopes.key?(name.to_sym)
       end
 
-      def _scope
-        @_scope ||= {}
+      def scopes
+        @scopes ||= {}
+      end
+
+      def full_scopes
+        scopes.merge(self.superclass.respond_to?(:scopes) ? self.superclass.scopes : {})
       end
 
       def _call_scope_context(eval_context, query_params, proc)

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.1.10'
+  VERSION = '6.1.11'
 end

metadata

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