neo4j 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df42076f21c3f31cf2cde7b6d226af5c3f27ffd4
-  data.tar.gz: 284cff951e6666fe88f49147c05d89f59be231fd
+  metadata.gz: 276174c101922613a542e86d6e9cd493c1f48a24
+  data.tar.gz: c9a94adc2fd8d557adc44fc499b368bd95c9e489
 SHA512:
-  metadata.gz: dd03334a23759e25ecf0aa6a3586ad8b08b8650312505254e84e06e43502fab6e1ae775f9b86218db686baefdfec11e8078dfd7de378bcffe0ac1055682bc2bc
-  data.tar.gz: 408d0968f7796141d8f04f81fd91b08e859141001285eba1a7f4d79f30ad2be8a2f3f7ed46964b853743e497f9726c8d8b615f3ad3f3508fac132e9f0a946db5
+  metadata.gz: 983f69b3c76689e65b951a36db641ecc3c57001f3a6bbbace282ec4ef856509e802f798dc5d0efe1b985d27692bc64f438ed7c9c0d477f95097b162c5fa1bee5
+  data.tar.gz: 087725cfbc3cf345af9f0594ee7e7363fddba832182760b8ef5e2ae367d970d28a194f2f79997dd5cca9cdb313368589d469240015e21cca4ce8c788535a4279

data/CHANGELOG.md

@@ -4,7 +4,22 @@ This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
-- Nothing yet, placeholder
+
+## [5.0.1] - 2015-06-23
+
+### Fixed
+- Longstanding bug that would prevent association changes (`<<` and ActiveRel.create) in Rails after `reload!` had been called, see https://github.com/neo4jrb/neo4j/pull/839
+- ActiveNode#inspect wasn't displaying the id_property
+- Default property values and magic typecasting not being inherited correctly
+
+### Changed
+- In the absense of a `model_class` key, associations defined in ActiveNode models will use `from_/to_class` defined in `rel_class` to find destination. (Huge thanks to @olance, #838)
+- ActiveRel's DSL was made a bit friendlier by making the `type`, `from_class` and `to_class` methods return their set values when called without arguments.
+- Reworked ActiveRel's wrapper to behave more like ActiveNode's, removing some duplicate methods and moving others to Neo4j::Shared, resulting in a big performance boost when returning large numbers of rels.
+- Updated gemspec to require neo4j-core 5.0.1+
+
+### Added
+- ActiveRel was given `find_or_create_by`, usable across single associations.
 
 ## [5.0.0] - 2015-06-18
 

data/Gemfile

@@ -17,4 +17,5 @@ group 'test' do
   gem 'its'
   gem 'test-unit'
   gem 'overcommit'
+  gem 'colored'
 end

data/lib/neo4j.rb

@@ -35,6 +35,7 @@ require 'neo4j/shared/validations'
 require 'neo4j/shared/identity'
 require 'neo4j/shared/serialized_properties'
 require 'neo4j/shared/typecaster'
+require 'neo4j/shared/initialize'
 require 'neo4j/shared'
 
 require 'neo4j/active_rel/callbacks'

data/lib/neo4j/active_node/has_n/association.rb

@@ -17,6 +17,14 @@ module Neo4j
           apply_vars_from_options(options)
         end
 
+        def derive_model_class
+          return @model_class unless @model_class.nil?
+          return nil if relationship_class.nil?
+          dir_class = direction == :in ? :from_class : :to_class
+          return false if relationship_class.send(dir_class).to_s.to_sym == :any
+          relationship_class.send(dir_class)
+        end
+
         def target_class_option(model_class)
           case model_class
           when nil
@@ -41,10 +49,12 @@ module Neo4j
         end
 
         def target_class_names
-          @target_class_names ||= if @target_class_option.is_a?(Array)
-                                    @target_class_option.map(&:to_s)
-                                  elsif @target_class_option
-                                    [@target_class_option.to_s]
+          option = target_class_option(derive_model_class)
+
+          @target_class_names ||= if option.is_a?(Array)
+                                    option.map(&:to_s)
+                                  elsif option
+                                    [option.to_s]
                                   end
         end
 
@@ -77,7 +87,7 @@ module Neo4j
 
         def relationship_type(create = false)
           case
-          when @relationship_class
+          when relationship_class
             relationship_class_type
           when @relationship_type
             @relationship_type
@@ -88,30 +98,19 @@ module Neo4j
           end
         end
 
-        attr_reader :relationship_class
+        attr_reader :relationship_class_name
 
         def relationship_class_type
-          @relationship_class = @relationship_class.constantize if @relationship_class.class == String || @relationship_class == Symbol
-          @relationship_class._type.to_sym
+          relationship_class._type.to_sym
         end
 
-        def relationship_class_name
-          @relationship_class_name ||= @relationship_class.respond_to?(:constantize) ? @relationship_class : @relationship_class.name
-        end
-
-        def relationship_clazz
-          @relationship_clazz ||= if @relationship_class.is_a?(String)
-                                    @relationship_class.constantize
-                                  elsif @relationship_class.is_a?(Symbol)
-                                    @relationship_class.to_s.constantize
-                                  else
-                                    @relationship_class
-                                  end
+        def relationship_class
+          @relationship_class ||= @relationship_class_name && @relationship_class_name.constantize
         end
 
         def inject_classname(properties)
-          return properties unless @relationship_class
-          properties[Neo4j::Config.class_name_property] = relationship_class_name if relationship_clazz.cached_class?(true)
+          return properties unless relationship_class
+          properties[Neo4j::Config.class_name_property] = relationship_class_name if relationship_class.cached_class?(true)
           properties
         end
 
@@ -179,11 +178,12 @@ module Neo4j
         private
 
         def apply_vars_from_options(options)
-          @target_class_option = target_class_option(options[:model_class])
+          @relationship_class_name = options[:rel_class] && options[:rel_class].to_s
+          @relationship_type  = options[:type] && options[:type].to_sym
+
+          @model_class = options[:model_class]
           @callbacks = {before: options[:before], after: options[:after]}
           @origin = options[:origin] && options[:origin].to_sym
-          @relationship_class = options[:rel_class]
-          @relationship_type  = options[:type] && options[:type].to_sym
           @dependent = options[:dependent].try(:to_sym)
           @unique = options[:unique]
         end

data/lib/neo4j/active_node/initialize.rb

@@ -1,5 +1,7 @@
 module Neo4j::ActiveNode::Initialize
   extend ActiveSupport::Concern
+  include Neo4j::Shared::Initialize
+
   attr_reader :called_by
 
   # called when loading the node from the database
@@ -11,27 +13,4 @@ module Neo4j::ActiveNode::Initialize
     changed_attributes && changed_attributes.clear
     @attributes = convert_and_assign_attributes(properties)
   end
-
-  # Implements the Neo4j::Node#wrapper and Neo4j::Relationship#wrapper method
-  # so that we don't have to care if the node is wrapped or not.
-  # @return self
-  def wrapper
-    self
-  end
-
-  private
-
-  def convert_and_assign_attributes(properties)
-    @attributes ||= self.class.attributes_nil_hash.dup
-    stringify_attributes!(@attributes, properties)
-    self.default_properties = properties
-    self.class.declared_property_manager.convert_properties_to(self, :ruby, @attributes)
-  end
-
-  def stringify_attributes!(attr, properties)
-    properties.each_pair do |k, v|
-      key = self.class.declared_property_manager.string_key(k)
-      attr[key] = v
-    end
-  end
 end

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

@@ -192,7 +192,7 @@ module Neo4j
             (arg.is_a?(Integer) || arg.is_a?(String)) ? @model.find_by(@model.id_property_name => arg) : arg
           end.compact
 
-          if @model && other_nodes.any? { |other_node| !other_node.is_a?(@model) }
+          if @model && other_nodes.any? { |other_node| !other_node.class.mapped_label_names.include?(@model.mapped_label_name) }
             fail ArgumentError, "Node must be of the association's class when model is specified"
           end
 

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

@@ -65,7 +65,7 @@ module Neo4j
         # TODO: update this with public API methods if/when they are exposed
         def limit_value
           return unless self.query.clause?(:limit)
-          limit_clause = self.query.send(:clauses).select { |clause| clause.is_a?(Neo4j::Core::QueryClauses::LimitClause) }.first
+          limit_clause = self.query.send(:clauses).find { |clause| clause.is_a?(Neo4j::Core::QueryClauses::LimitClause) }
           limit_clause.instance_variable_get(:@arg)
         end
 
@@ -161,6 +161,19 @@ module Neo4j
           nodes.each { |node| self << node }
         end
 
+        # When called, this method returns a single node that satisfies the match specified in the params hash.
+        # If no existing node is found to satisfy the match, one is created or associated as expected.
+        def find_or_create_by(params)
+          fail 'Method invalid when called on Class objects' unless source_object
+          result = self.where(params).first
+          return result unless result.nil?
+          Neo4j::Transaction.run do
+            node = model.find_or_create_by(params)
+            self << node
+            return node
+          end
+        end
+
         # Returns all relationships between a node and its last link in the QueryProxy chain, destroys them in Ruby. Callbacks will be run.
         def destroy(node)
           self.rels_to(node).map!(&:destroy)

data/lib/neo4j/active_rel/initialize.rb

@@ -1,29 +1,19 @@
 module Neo4j::ActiveRel
   module Initialize
     extend ActiveSupport::Concern
-
-    attr_reader :_persisted_obj
+    include Neo4j::Shared::Initialize
 
     # called when loading the rel from the database
-    # @param [Hash] properties properties of this relationship
-    # @param [Neo4j::Relationship] start_node the starting node in the relationship.
-    # @param [Neo4j::Relationship] end_node the ending node in the relationship
+    # @param [Neo4j::Embedded::EmbeddedRelationship, Neo4j::Server::CypherRelationship] persisted_rel properties of this relationship
+    # @param [Neo4j::Relationship] from_node_id The neo_id of the starting node of this rel
+    # @param [Neo4j::Relationship] to_node_id The neo_id of the ending node of this rel
     # @param [String] type the relationship type
     def init_on_load(persisted_rel, from_node_id, to_node_id, type)
-      @_persisted_obj = persisted_rel
       @rel_type = type
+      @_persisted_obj = persisted_rel
       changed_attributes && changed_attributes.clear
-      @attributes = attributes.merge(persisted_rel.props.stringify_keys)
+      @attributes = convert_and_assign_attributes(persisted_rel.props)
       load_nodes(from_node_id, to_node_id)
-      self.default_properties = persisted_rel.props
-      @attributes = self.class.declared_property_manager.convert_properties_to(self, :ruby, @attributes)
-    end
-
-    # Implements the Neo4j::Node#wrapper and Neo4j::Relationship#wrapper method
-    # so that we don't have to care if the node is wrapped or not.
-    # @return self
-    def wrapper
-      self
     end
   end
 end

data/lib/neo4j/active_rel/persistence.rb

@@ -60,10 +60,16 @@ module Neo4j::ActiveRel
 
         next if [:any, false].include?(type_class)
 
-        fail ModelClassInvalidError, "Node class was #{node.class}, expected #{type_class}" unless node.is_a?(type_class.to_s.constantize)
+        unless node.class.mapped_label_names.include?(type_class.to_s.constantize.mapped_label_name)
+          fail ModelClassInvalidError, type_validation_error_message(node, type_class)
+        end
       end
     end
 
+    def type_validation_error_message(node, type_class)
+      "Node class was #{node.class} (#{node.class.object_id}), expected #{type_class} (#{type_class.object_id})"
+    end
+
     def _create_rel(from_node, to_node, *args)
       props = self.class.default_property_values(self)
       props.merge!(args[0]) if args[0].is_a?(Hash)
@@ -75,8 +81,6 @@ module Neo4j::ActiveRel
       _rel_creation_query(from_node, to_node, props)
     end
 
-    private
-
     N1_N2_STRING = 'n1, n2'
     ACTIVEREL_NODE_MATCH_STRING = 'ID(n1) = {n1_neo_id} AND ID(n2) = {n2_neo_id}'
     def _rel_creation_query(from_node, to_node, props)

data/lib/neo4j/active_rel/property.rb

@@ -21,7 +21,6 @@ module Neo4j::ActiveRel
 
     def initialize(attributes = {}, options = {})
       super(attributes, options)
-
       send_props(@relationship_props) unless @relationship_props.nil?
     end
 
@@ -36,8 +35,16 @@ module Neo4j::ActiveRel
         end
       end
 
+      def id_property_name
+        false
+      end
+
       %w(to_class from_class).each do |direction|
-        define_method("#{direction}") { |argument| instance_variable_set("@#{direction}", argument) }
+        define_method("#{direction}") do |argument = nil|
+          return self.instance_variable_get("@#{direction}") if argument.nil?
+          instance_variable_set("@#{direction}", argument)
+        end
+
         define_method("_#{direction}") { instance_variable_get "@#{direction}" }
       end
 

data/lib/neo4j/active_rel/rel_wrapper.rb

@@ -2,7 +2,6 @@ class Neo4j::Relationship
   module Wrapper
     def wrapper
       props.symbolize_keys!
-      # return self unless props.is_a?(Hash)
       begin
         most_concrete_class = sorted_wrapper_classes
         wrapped_rel = most_concrete_class.constantize.new
@@ -21,7 +20,7 @@ class Neo4j::Relationship
     end
 
     def class_from_type
-      Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] || rel_type.camelize
+      Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] || Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] = rel_type.camelize
     end
   end
 end

data/lib/neo4j/active_rel/types.rb

@@ -31,10 +31,13 @@ module Neo4j
           subclass.type subclass.namespaced_model_name, true
         end
 
-        # @param type [String] sets the relationship type when creating relationships via this class
-        def type(given_type = namespaced_model_name, auto = false)
+        # @param [String] given_type sets the relationship type when creating relationships via this class
+        # @param [Boolean] auto Should the given_type be changed in compliance with the gem's rel decorator setting?
+        # This option is used internally, users will usually ignore it.
+        def type(given_type = nil, auto = false)
+          return rel_type if given_type.nil?
           @rel_type = (auto ? decorated_rel_type(given_type) : given_type).tap do |type|
-            add_wrapped_class type unless uses_classname?
+            add_wrapped_class(type) unless uses_classname?
           end
         end
 
@@ -49,9 +52,11 @@ module Neo4j
           end
         end
 
-        attr_reader :rel_type
+        def rel_type
+          @rel_type || type(namespaced_model_name, true)
+        end
+
         # @return [String] a string representing the relationship type that will be created
-        # attr_reader :rel_type
         alias_method :_type, :rel_type # Should be deprecated
 
         def add_wrapped_class(type)

data/lib/neo4j/shared/initialize.rb

@@ -0,0 +1,28 @@
+module Neo4j::Shared
+  module Initialize
+    extend ActiveSupport::Concern
+
+    # Implements the Neo4j::Node#wrapper and Neo4j::Relationship#wrapper method
+    # so that we don't have to care if the node is wrapped or not.
+    # @return self
+    def wrapper
+      self
+    end
+
+    private
+
+    def convert_and_assign_attributes(properties)
+      @attributes ||= self.class.attributes_nil_hash.dup
+      stringify_attributes!(@attributes, properties)
+      self.default_properties = properties
+      self.class.declared_property_manager.convert_properties_to(self, :ruby, @attributes)
+    end
+
+    def stringify_attributes!(attr, properties)
+      properties.each_pair do |k, v|
+        key = self.class.declared_property_manager.string_key(k)
+        attr[key] = v
+      end
+    end
+  end
+end

data/lib/neo4j/shared/property.rb

@@ -125,6 +125,13 @@ module Neo4j::Shared
 
       def_delegators :declared_property_manager, :serialized_properties, :serialized_properties=, :serialize, :declared_property_defaults
 
+      def inherited(other)
+        self.declared_property_manager.registered_properties.each_pair do |prop_key, prop_def|
+          other.property(prop_key, prop_def.options)
+        end
+        super
+      end
+
       # Defines a property on the class
       #
       # See active_attr gem for allowed options, e.g which type

data/lib/neo4j/shared/serialized_properties.rb

@@ -14,5 +14,17 @@ module Neo4j::Shared
     def serializable_hash(*args)
       super.merge(id: id)
     end
+
+
+    module ClassMethods
+      def inherited(other)
+        inherit_serialized_properties(other) if self.respond_to?(:serialized_properties)
+        super
+      end
+
+      def inherit_serialized_properties(other)
+        other.serialized_properties = self.serialized_properties
+      end
+    end
   end
 end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 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', '~> 5.0.0')
+  s.add_dependency('neo4j-core', '~> 5.0.1')
   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: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
 - lib/neo4j/shared/declared_property.rb
 - lib/neo4j/shared/declared_property_manager.rb
 - lib/neo4j/shared/identity.rb
+- lib/neo4j/shared/initialize.rb
 - lib/neo4j/shared/persistence.rb
 - lib/neo4j/shared/property.rb
 - lib/neo4j/shared/rel_type_converters.rb