neo4j 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8753bbe4fbbcae1dff577b11647a0820121d448b
-  data.tar.gz: 4b8672e9fc47bd07df4dcb7b3be15f7110f24b27
+  metadata.gz: 724a4190d800d63d07f3b4c8bb970f5c771e630a
+  data.tar.gz: e733ecfc04025dab1b1c3b950f05410fbf753063
 SHA512:
-  metadata.gz: d3eb1743258e2049d1a35a9d726fe960e21bbf488d70ab40b316dd8b8b74bbf69dcf0b9f66973a828d7aed6773a34e8046bacf14f0752694e9cce3b3e123b79b
-  data.tar.gz: 9bd62e09506edc3daa6b769e1fa40e032fbb9c59db50a1fa29d5c56812011fd660a48c5b81dbada76264571197cc6875fc38570be8a45d42ecf36ef20c5b9d9a
+  metadata.gz: 5b94b84c1d37125d22fd292183bc366141768c0bae5bf768eda0aba836f9eafe7c0bff0f6674c6aab667ab53c8c9e508d102db7c0b77d976498ad447c01a311c
+  data.tar.gz: 8db3d934146ca5b72aa7ecf6ee8a0c432ff358fd6c93b030210c08b5c534cacc922f98f88414b6f1e244ab98ec43edbd847604a35c2bf9177c1d52e451070cb7

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.0.5] - 12-29-2015
+
+### Fixed
+
+- If a property and a scope have the same name, a "Stack level too deep" error occurs.  Fixed by removing the instance method which scopes define.  Could break something, but I very much doubt anybody is using this, and if they are it's likely a bug (#1088)
+
 ## [6.0.4] - 12-23-2015
 
 ### Fixed

data/lib/neo4j/active_base.rb

@@ -0,0 +1,19 @@
+module Neo4j
+  # To contain any base login for ActiveNode/ActiveRel which
+  # is external to the main classes
+  module ActiveBase
+    class << self
+      def current_session
+        SessionRegistry.current_session
+      end
+
+      def set_current_session(session)
+        SessionRegistry.current_session = session
+      end
+
+      def set_current_session_by_adaptor(adaptor)
+        set_current_session(Neo4j::Core::CypherSession.new(adaptor))
+      end
+    end
+  end
+end

data/lib/neo4j/active_base/session_registry.rb

@@ -0,0 +1,12 @@
+require 'active_support/per_thread_registry'
+
+module Neo4j
+  module ActiveBase
+    # Provides a simple API to manage sessions in a thread-safe manner
+    class SessionRegistry
+      extend ActiveSupport::PerThreadRegistry
+
+      attr_accessor :current_session
+    end
+  end
+end

data/lib/neo4j/active_node/scope.rb

@@ -37,10 +37,6 @@ module Neo4j::ActiveNode
       def scope(name, proc)
         _scope[name.to_sym] = proc
 
-        define_method(name) do |query_params = nil, some_var = nil|
-          self.class.send(name, query_params, some_var, current_scope)
-        end
-
         klass = class << self; self; end
         klass.instance_eval do
           define_method(name) do |query_params = nil, _ = nil|

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.0.4'
+  VERSION = '6.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -224,6 +224,8 @@ files:
 - config/neo4j/add_classnames.yml
 - config/neo4j/config.yml
 - lib/neo4j.rb
+- lib/neo4j/active_base.rb
+- lib/neo4j/active_base/session_registry.rb
 - lib/neo4j/active_node.rb
 - lib/neo4j/active_node/callbacks.rb
 - lib/neo4j/active_node/dependent.rb