neo4j 6.0.0.alpha.8 → 6.0.0.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 715265763c28f04acb9e54f3dc25dbffc1257df8
-  data.tar.gz: 4947537ea67beca1ffa59d22837079129425562b
+  metadata.gz: 5e9a0580979b896fd0ff1da7bdb6e42e8dc5a3dd
+  data.tar.gz: 9709fe48514ff2aad702b9e8606ca25f9afb0e64
 SHA512:
-  metadata.gz: 8d6b66ede21482b9183f5276654c66e88daedae44f20befa26b6b8c4206f6ed9e49c76e2fdf7ff88f4c2bafbba521ac25b29194368f7dccaddf25c6ee01736e5
-  data.tar.gz: 6caec430e130b5810a20c57c5fe8874b97d77e295cda0e191cdd08d362d8f10a6359b517889af7dcfad5f2d769e8979ce713f3faff702005970be3da349cfab0
+  metadata.gz: 96781c2cb44acf832b0eb205ffa25dd7a7fa86ea058d45ef647be8dc02bb5a8d0c2ce242a5d9ff75a4143c86f59a55ae7d4c4bd279c00a752c109eb3cef7057e
+  data.tar.gz: 46ebc2cf7bf7a7b0883eb36c46ed327762bba6e77a3d17a6dbb74e7d80b255225ae2ac64b149f8d662bf35263643364ee2d386cc390611cb56dbe9956c796d01

data/CHANGELOG.md

@@ -3,7 +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/).
 
-## [Unreleased]
+## [6.0.0.alpha.9] - 10-27-2015
+
+### Fixed
+- `uninitialized constant Neo4j::Core::CypherSession` error
+
+## [6.0.0.alpha.8] - 10-19-2015
 
 ### Added
 
@@ -74,6 +79,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Certain actions that were intended as once-in-the-app's-lifetime events, notably schema operations, will only occur immediately upon the first session's establishment.
 - Context now set for Model.all QueryProxy so that logs can reflect that it wasn't just a raw Cypher query
 
+## [5.2.13] - 10-26-2015
+
+### Fixed
+- Fixed `#after_initialize` and `#after_find` callbacks.
+- The `#touch` method should to raise errors when unsuccessful and avoid `#attributes` for performance.
+
+## [5.2.12] - 10-25-2015
+
+### Fixed
+- Fix the `#touch` method for `ActiveNode` and `ActiveRel`
+
 ## [5.2.11] - 10-18-2015
 
 ### Fixed

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
+# gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
 # gem 'neo4j-core', path: '../neo4j-core'
 
 # gem 'active_attr', github: 'neo4jrb/active_attr', branch: 'performance'

data/README.md

@@ -48,12 +48,15 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 
 ## Neo4j version support
 
-| **Neo4j Version** | v2.x | v3.x | >= v4.x |
-|-------------------|------|------|---------|
-| 1.9.x             | Yes  | No   | No      |
-| 2.0.x             | No   | Yes  | No      |
-| 2.1.x             | No   | Yes  | Yes     |
-| 2.2.x             | No   | No   | Yes     |
+| **Neo4j Version** | v2.x | v3.x  | >= v4.x |
+|-------------------|------|-------|---------|
+| 1.9.x             | Yes  | No    | No      |
+| 2.0.x             | No   | Yes   | No      |
+| 2.1.x             | No   | Yes   | Yes *   |
+| 2.2.x             | No   | No    | Yes     |
+| 2.3.x             | 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
 
 ## Neo4j feature support
 

data/lib/neo4j.rb

@@ -10,6 +10,7 @@ require 'neo4j/version'
 # require "active_support/time_with_zone"
 
 require 'neo4j-core'
+require 'neo4j/core/cypher_session'
 require 'neo4j/core/query'
 require 'active_model'
 require 'active_support/concern'

data/lib/neo4j/active_node/labels.rb

@@ -47,19 +47,19 @@ module Neo4j
         @_persisted_obj.remove_label(*label)
       end
 
-      def self.add_wrapped_class(model)
-        _wrapped_classes << model
+      def self._wrapped_classes
+        WRAPPED_CLASSES
       end
 
-      def self._wrapped_classes
-        Neo4j::ActiveNode::Labels::WRAPPED_CLASSES
+      def self.add_wrapped_class(model)
+        _wrapped_classes << model
       end
 
+      # Finds an appropriate matching model given a set of labels
+      # which are assigned to a node
       def self.model_for_labels(labels)
-        MODELS_FOR_LABELS_CACHE[labels] || model_cache(labels)
-      end
+        return MODELS_FOR_LABELS_CACHE[labels] if MODELS_FOR_LABELS_CACHE[labels]
 
-      def self.model_cache(labels)
         models = WRAPPED_CLASSES.select do |model|
           (model.mapped_label_names - labels).size == 0
         end
@@ -69,12 +69,10 @@ module Neo4j
         end
       end
 
-      def self.clear_model_for_label_cache
-        MODELS_FOR_LABELS_CACHE.clear
-      end
-
       def self.clear_wrapped_models
         WRAPPED_CLASSES.clear
+        MODELS_FOR_LABELS_CACHE.clear
+        Neo4j::Node::Wrapper::CONSTANTS_FOR_LABELS_CACHE.clear
       end
 
       module ClassMethods
@@ -91,7 +89,7 @@ module Neo4j
                      find_by_id(map_id.call(id))
                    end
           fail Neo4j::RecordNotFound if result.blank?
-          result
+          result.tap { |r| find_callbacks!(r) }
         end
 
         # Finds the first record matching the specified conditions. There is no implied ordering so if order matters, you should specify it yourself.
@@ -164,6 +162,17 @@ module Neo4j
 
         private
 
+        def find_callbacks!(result)
+          case result
+          when Neo4j::ActiveNode
+            result.run_callbacks(:find)
+          when Array
+            result.each { |r| find_callbacks!(r) }
+          else
+            result
+          end
+        end
+
         def label_for_model
           (self.name.nil? ? object_id.to_s.to_sym : decorated_label_name)
         end

data/lib/neo4j/active_rel/types.rb

@@ -59,13 +59,13 @@ module Neo4j
           end
         end
 
-        def add_wrapped_class(type)
-          # _wrapped_classes[type.to_sym.downcase] = self.name
-          _wrapped_classes[type.to_sym] = self.name
+        def _wrapped_classes
+          WRAPPED_CLASSES
         end
 
-        def _wrapped_classes
-          Neo4j::ActiveRel::Types::WRAPPED_CLASSES
+        def add_wrapped_class(type)
+          # WRAPPED_CLASSES[type.to_sym.downcase] = self.name
+          _wrapped_classes[type.to_sym] = self.name
         end
 
         def rel_type?

data/lib/neo4j/shared/callbacks.rb

@@ -9,8 +9,13 @@ module Neo4j
 
       included do
         include ActiveModel::Validations::Callbacks
+        # after_find is triggered by the `find` method defined in lib/neo4j/active_node/id_property.rb
         define_model_callbacks :initialize, :find, only: :after
-        define_model_callbacks :save, :create, :update, :destroy
+        define_model_callbacks :save, :create, :update, :destroy, :touch
+      end
+
+      def initialize(args = nil)
+        run_callbacks(:initialize) { super }
       end
 
       def destroy #:nodoc:
@@ -25,7 +30,7 @@ module Neo4j
         tx.close if tx
       end
 
-      def touch(*) #:nodoc:
+      def touch #:nodoc:
         run_callbacks(:touch) { super }
       end
 

data/lib/neo4j/shared/persistence.rb

@@ -82,6 +82,11 @@ module Neo4j::Shared
       end
     end
 
+    def touch
+      fail 'Cannot touch on a new record object' unless persisted?
+      update_attribute!(:updated_at, Time.now) if respond_to?(:updated_at=)
+    end
+
     # Returns +true+ if the record is persisted, i.e. it's not a new record and it was not destroyed
     def persisted?
       !new_record? && !destroyed?

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.0.0.alpha.8'
+  VERSION = '6.0.0.alpha.9'
 end

data/neo4j.gemspec

@@ -30,7 +30,7 @@ A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks h
   s.add_dependency('activemodel', '~> 4')
   s.add_dependency('activesupport', '~> 4')
   s.add_dependency('active_attr', '~> 0.8')
-  s.add_dependency('neo4j-core', '~> 6.0.0.alpha.1')
+  s.add_dependency('neo4j-core', '~> 6.0.0.alpha.5')
   s.add_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/
   s.add_development_dependency('railties', '~> 4')
   s.add_development_dependency('pry')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.8
+  version: 6.0.0.alpha.9
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.alpha.1
+        version: 6.0.0.alpha.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.alpha.1
+        version: 6.0.0.alpha.5
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement