neo4j 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6ae51fafbda1eedad90d0500b4255243c5599c
-  data.tar.gz: ba8dce88dcb6dc10bbcf19a959e9d2bd3797a581
+  metadata.gz: 214bb0b66d0b3fa649214373da3e8923e6f36f87
+  data.tar.gz: 0548874119a1a6ea09ae1daa725b3867bea93cfa
 SHA512:
-  metadata.gz: 6b322bd2cd84b6befbfcc57e6a3a330b9ec2ec03cd8a2aceea92d61d29af305896fc878f506d5a2661c98e49c6bfb0216dbfdfaaeb1656ba05122c2895381656
-  data.tar.gz: 3259941e9b7d399fd8c17b38d8614ed56b285bab4518b9db1fc409aa6d2d297cc1e3b1ac9c01479806c15b41a72fca19fc3b03575905327656bbaa7877f82065
+  metadata.gz: 41e2e9cce3410653abcf032e5afd1a33e3105edeb4c0c1129b8c0672f82f005b3765552b962237a35de61188b699aaf21679b3431fdf6df303ee5127f565b484
+  data.tar.gz: 88536c0d94cbc7245ac33b57b3b372d0b8d2b02722b043844847bf3fd0d7401048c49354236dc765fde0801020c3528e732b129c570dc8699d25fae4fa414de7

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/).
 
+## [7.0.6] - 05-26-2016
+
+### Fixed
+
+- Allow models to use their superclass' scopes (forward-ported from 6.1.11 / thanks to veetow for the heads-up / see #1205)
+
 ## [7.0.6] - 05-11-2016
 
 ### Added
@@ -109,6 +115,12 @@ No changes from `rc.7`
 - All `call` class methods from Type Converters. Use `to_ruby` instead.
 - `Neo4j::ActiveNode::Labels::InvalidQueryError`, since it's unused.
 
+## [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/shared/declared_property/index.rb

@@ -16,12 +16,12 @@ module Neo4j::Shared
       end
 
       def index!(type = :exact)
-        fail Neo4j::InvalidPropertyOptionsError, "Unable to set index on constrainted property #{name} (constraints get indexes automatically)" if constraint?(:unique)
+        fail Neo4j::InvalidPropertyOptionsError, "Can't set index on constrainted property #{name} (constraints get indexes automatically)" if constraint?(:unique)
         options[:index] = type
       end
 
       def constraint!(type = :unique)
-        fail Neo4j::InvalidPropertyOptionsError, "Unable to set constraint on indexed property #{name} (constraints get indexes automatically)" if index?(:exact)
+        fail Neo4j::InvalidPropertyOptionsError, "Can't set constraint on indexed property #{name} (constraints get indexes automatically)" if index?(:exact)
         options[:constraint] = type
       end
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '7.0.6'
+  VERSION = '7.0.7'
 end

metadata

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