neo4j 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52df19251c38a7049d0b9278957d4082d5e383c
-  data.tar.gz: 85fa3a60b9010119344fb6f1483552c6d3c9b975
+  metadata.gz: 8753bbe4fbbcae1dff577b11647a0820121d448b
+  data.tar.gz: 4b8672e9fc47bd07df4dcb7b3be15f7110f24b27
 SHA512:
-  metadata.gz: c4382d6c1b6c775bd9ef932550e43b5c442ef1e75c5013a9fc310741440af660972a9efb72394b3acbd2fd0608a7fd810838a299061d9d65de8230d7688c6794
-  data.tar.gz: 7d1531abe853894486407d1cd17d5e6367fbd2a7cc035dac29c1056bc6e9bd374195a98b2cff77f986c0cffe537c925ebea62049ba48e900fb44a8564361cf4c
+  metadata.gz: d3eb1743258e2049d1a35a9d726fe960e21bbf488d70ab40b316dd8b8b74bbf69dcf0b9f66973a828d7aed6773a34e8046bacf14f0752694e9cce3b3e123b79b
+  data.tar.gz: 9bd62e09506edc3daa6b769e1fa40e032fbb9c59db50a1fa29d5c56812011fd660a48c5b81dbada76264571197cc6875fc38570be8a45d42ecf36ef20c5b9d9a

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.4] - 12-23-2015
+
+### Fixed
+
+- When a `model_class` is specified on an association which is not an ActiveNode model, an error is raised
+
 ## [6.0.3] - 12-18-2015
 
 ### Fixed

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

@@ -91,9 +91,17 @@ module Neo4j
         def target_class
           return @target_class if @target_class
 
-          @target_class = target_class_names[0].constantize if target_class_names && target_class_names.size == 1
+          if target_class_names && target_class_names.size == 1
+            class_const = target_class_names[0].constantize
+
+            if !class_const.included_modules.include?(Neo4j::ActiveNode)
+              fail ArgumentError, "Invalid argument to `#{name}` association: `#{class_const.inspect}` is not an ActiveNode model"
+            end
+
+            @target_class = class_const
+          end
         rescue NameError
-          raise ArgumentError, "Could not find `#{@target_class}` class and no :model_class specified"
+          raise ArgumentError, "Invalid argument to `#{name}` association: Could not find class `#{target_class_names[0]}`"
         end
 
         def callback(type)

data/lib/neo4j/active_node/initialize.rb

@@ -13,4 +13,9 @@ module Neo4j::ActiveNode::Initialize
     changed_attributes && changed_attributes.clear
     @attributes = convert_and_assign_attributes(properties)
   end
+
+  def init_on_reload(reloaded)
+    @attributes = nil
+    init_on_load(reloaded, reloaded.props)
+  end
 end

data/lib/neo4j/active_rel/initialize.rb

@@ -15,5 +15,14 @@ module Neo4j::ActiveRel
       @attributes = convert_and_assign_attributes(persisted_rel.props)
       load_nodes(from_node_id, to_node_id)
     end
+
+    def init_on_reload(unwrapped_reloaded)
+      @attributes = nil
+      init_on_load(unwrapped_reloaded,
+                   unwrapped_reloaded._start_node_id,
+                   unwrapped_reloaded._end_node_id,
+                   unwrapped_reloaded.rel_type)
+      self
+    end
   end
 end

data/lib/neo4j/active_rel/persistence.rb

@@ -72,6 +72,10 @@ module Neo4j::ActiveRel
       def create_method
         creates_unique? ? :create_unique : :create
       end
+
+      def load_entity(id)
+        Neo4j::Relationship.load(id)
+      end
     end
 
     def create_method

data/lib/neo4j/shared/persistence.rb

@@ -137,11 +137,8 @@ module Neo4j::Shared
     end
 
     def reload_from_database
-      # TODO: - Neo4j::IdentityMap.remove_node_by_id(neo_id)
-      if reloaded = self.class.load_entity(neo_id)
-        send(:attributes=, reloaded.attributes)
-      end
-      reloaded
+      reloaded = self.class.load_entity(neo_id)
+      reloaded ? init_on_reload(reloaded._persisted_obj) : nil
     end
 
     # Updates this resource with all the attributes from the passed-in Hash and requests that the record be saved.

data/lib/neo4j/shared/property.rb

@@ -53,6 +53,11 @@ module Neo4j::Shared
       hash.each { |key, value| send("#{key}=", value) }
     end
 
+    def reload_properties!(properties)
+      @attributes = nil
+      convert_and_assign_attributes(properties)
+    end
+
     protected
 
     # This method is defined in ActiveModel.

data/lib/neo4j/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter