neomirror 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91d4c19efa74a09c812dfbffc777ebb884f3289c
-  data.tar.gz: 06e831911c25f4022c41038d5af73d1ca20085e6
+  metadata.gz: 9033be66b0aaf79a9d2f5b946e8e3a19dcc50270
+  data.tar.gz: 56b46cf350db86ff7a25fcc6b9f8d5376ac4cd41
 SHA512:
-  metadata.gz: 171520bb5e991c0605a03d5adb5d8774e16cf31bc494c8f8e4beb635505af69038be2881831a84d78bd2b7b1610897d7d61a7f8956c1b05e0caeb59f9118fd2b
-  data.tar.gz: 13de4c46626309fd61fc6046156a405909e9805a67039ae0a7f8804fe43d1d063338f9b50b904e2b5846e1bd93cf1738ad3b30dde3dcf8c3cecf8e6bf1dce8c9
+  metadata.gz: c00f6a547613e9bfecae74de9d892f2e20a6ff2d09be8ce961dfa5ff87fc657be2cdd8aca5370983a44fb2b2ef111bf44ddbc790a25a9c39e6051d8654baa1a8
+  data.tar.gz: d7ef2a0cad7a5cedffeed87095c219c7d3a4a66834b743d641862e1a804c457428a85cca48831c98a7d77ef3eca77cb862aba3fc5d9418b09d4b11f4473013ee

data/README.md

@@ -163,7 +163,7 @@ class Staff < ActiveRecord::Base
 end
 ```
 
-Even possible reflect model as node (vertex) and relation(s) (edge).
+Even possible reflect model as node (vertex) and relationship(s) (edge).
 
 ```ruby
 class Group < ActiveRecord::Base

data/lib/neomirror/relationship.rb

@@ -19,7 +19,7 @@ module Neomirror::Relationship
 
     # Find declaration by partial options.
     def rel_mirror(p)
-      return rel_mirrors.first unless p
+      return rel_mirrors.first unless p.present?
       rel_mirrors.find { |m| (!p[:start_node] || p[:start_node] == m[:start_node]) &&
         (!p[:end_node] || p[:end_node] == m[:end_node]) && (!p[:type] || p[:type] == m[:type]) }
     end
@@ -35,6 +35,7 @@ module Neomirror::Relationship
       m[:properties] = Neomirror::PropertyCollector.new(&block).properties if block_given?
       m[:if] = m[:if].to_proc if m[:if]
       m[:index_name] = "#{m[:start_node] == :self ? class_name.downcase : m[:start_node]}_#{m[:type]}_#{m[:end_node] == :self ? class_name.downcase : m[:end_node]}"
+      m[:complete] = true # indicates a completely filled rel mirror hash (not partial, that used for search)
       ::Neomirror.neo.create_relationship_index(m[:index_name])
       rel_mirrors << m
     end
@@ -46,59 +47,66 @@ module Neomirror::Relationship
   end
 
   def neo_relationship(partial_mirror = nil)
-    find_neo_relationship(partial_mirror) || create_neo_relationship(partial_mirror)
+    raise "Couldn't find neo_relationship declaration" unless rel_mirror = self.class.rel_mirror(partial_mirror)
+    find_neo_relationship(rel_mirror) || create_neo_relationship(rel_mirror)
   end
   alias_method :neo_rel, :neo_relationship
 
-  def neo_relationship_properties(partial_mirror = nil)
-    raise "Couldn't find neo_relationship declaration" unless rel_mirror = self.class.rel_mirror(partial_mirror)
+  def neo_relationship_properties(rel_mirror = {})
+    raise "Couldn't find neo_relationship declaration" unless rel_mirror[:complete] || (rel_mirror = self.class.rel_mirror(rel_mirror))
     return nil unless rel_mirror[:properties]
     rel_mirror[:properties].reduce({}) { |hash, (property, rule)| hash[property] = rule.call(self); hash }
   end
 
-  def neo_relationship_must_exist?(partial_mirror = nil)
-    raise "Couldn't find neo_relationship declaration" unless rel_mirror = self.class.rel_mirror(partial_mirror)
+  def neo_relationship_must_exist?(rel_mirror = {})
+    raise "Couldn't find neo_relationship declaration" unless rel_mirror[:complete] || (rel_mirror = self.class.rel_mirror(rel_mirror))
     !rel_mirror[:if] || !!rel_mirror[:if].call(self)
   end
 
-  def find_neo_relationship(partial_mirror = nil)
-    raise "Couldn't find neo_relationship declaration" unless rel_mirror = self.class.rel_mirror(partial_mirror)
+  def find_neo_relationship(rel_mirror = {})
+    raise "Couldn't find neo_relationship declaration" unless rel_mirror[:complete] || (rel_mirror = self.class.rel_mirror(rel_mirror))
     return nil unless rel = ::Neomirror.neo.get_relationship_index(rel_mirror[:index_name], :id, self.__send__(self.class.neo_primary_key))
-    @neo_rel = ::Neography::Relationship.load(rel, ::Neomirror.neo)
+    ::Neography::Relationship.load(rel, ::Neomirror.neo)
   end
 
-  def create_neo_relationship(partial_mirror = nil)
-    raise "Couldn't find neo_relationship declaration" unless rel_mirror = self.class.rel_mirror(partial_mirror)
+  def create_neo_relationship(rel_mirror = {})
+    raise "Couldn't find neo_relationship declaration" unless rel_mirror[:complete] || (rel_mirror = self.class.rel_mirror(rel_mirror))
     return nil unless (m1 = related_object(rel_mirror[:start_node])) && (m2 = related_object(rel_mirror[:end_node])) &&
       neo_relationship_must_exist?(rel_mirror)
-    @neo_rel = ::Neography::Relationship.create(rel_mirror[:type], m1.neo_node, m2.neo_node, neo_relationship_properties(rel_mirror))
-    ::Neomirror.neo.add_relationship_to_index(rel_mirror[:index_name], :id, self.__send__(self.class.neo_primary_key), @neo_rel)
-    @neo_rel
+    neo_rel = ::Neography::Relationship.create(rel_mirror[:type], m1.neo_node, m2.neo_node, neo_relationship_properties(rel_mirror))
+    ::Neomirror.neo.add_relationship_to_index(rel_mirror[:index_name], :id, self.__send__(self.class.neo_primary_key), neo_rel)
+    neo_rel
   end
 
   def related_object(method_name)
     method_name == :self ? self : self.__send__(method_name)
   end
 
-  def update_neo_relationship(partial_mirror = nil)
-    raise "Couldn't find neo_relationship declaration" unless rel_mirror = self.class.rel_mirror(partial_mirror)
-    if find_neo_relationship(rel_mirror)
+  def update_neo_relationship(rel_mirror = {})
+    raise "Couldn't find neo_relationship declaration" unless rel_mirror[:complete] || (rel_mirror = self.class.rel_mirror(rel_mirror))
+    if neo_rel = find_neo_relationship(rel_mirror)
       if related_object(rel_mirror[:start_node]) && related_object(rel_mirror[:end_node]) && neo_relationship_must_exist?(rel_mirror)
-        ::Neomirror.neo.reset_relationship_properties(@neo_rel, neo_relationship_properties(rel_mirror))
+        if related_object(rel_mirror[:start_node]).neo_node.id != neo_rel.start_node.id || related_object(rel_mirror[:end_node]).neo_node.id != neo_rel.end_node.id
+          destroy_neo_relationship(rel_mirror, neo_rel: neo_rel)
+          create_neo_relationship(rel_mirror)
+        else
+          ::Neomirror.neo.reset_relationship_properties(neo_rel, neo_relationship_properties(rel_mirror))
+        end
       else
-        ::Neomirror.neo.remove_relationship_from_index(rel_mirror[:index_name], :id, self.__send__(self.class.neo_primary_key), @neo_rel)
-        ::Neomirror.neo.delete_relationship(@neo_rel)
+        destroy_neo_relationship(rel_mirror, neo_rel: neo_rel)
       end
     else
       create_neo_relationship(rel_mirror) if neo_relationship_must_exist?(rel_mirror)
     end
   end
 
-  def destroy_neo_relationship(partial_mirror = nil)
-    raise "Couldn't find neo_relationship declaration" unless rel_mirror = self.class.rel_mirror(partial_mirror)
-    if find_neo_relationship(rel_mirror)
-      ::Neomirror.neo.remove_relationship_from_index(rel_mirror[:index_name], :id, self.__send__(self.class.neo_primary_key), @neo_rel)
-      ::Neomirror.neo.delete_relationship(@neo_rel)
+  def destroy_neo_relationship(rel_mirror = {}, options = {})
+    raise "Couldn't find neo_relationship declaration" unless rel_mirror[:complete] || (rel_mirror = self.class.rel_mirror(rel_mirror))
+    if neo_rel = options.fetch(:neo_rel, find_neo_relationship(rel_mirror))
+      ::Neomirror.neo.remove_relationship_from_index(rel_mirror[:index_name], :id, self.__send__(self.class.neo_primary_key), neo_rel)
+      ::Neomirror.neo.delete_relationship(neo_rel)
+    else
+      true
     end
   end
 

data/lib/neomirror/version.rb

@@ -1,3 +1,3 @@
 module Neomirror
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/neomirror.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "neography", ">= 1.5.2"
+  spec.add_dependency "neography", ">= 1.3.7"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.11"

data/spec/neomirror/neomirror_spec.rb

@@ -4,6 +4,7 @@ describe Neomirror do
   describe "Reflection of model as node and relation" do
     let(:group) { create(:group) }
     let(:child_group) { create(:group, parent: group) }
+    let(:other_group) { create(:group) }
 
     it "creates neo4j nodes" do
       group.find_neo_node.should be_a Neography::Node
@@ -21,5 +22,12 @@ describe Neomirror do
       child_group.find_neo_relationship.should be_nil
       Neomirror.neo.execute_query("MATCH (:Group {id: #{child_group.id}})-[r:CHILD_OF]->(:Group {id: #{group.id}}) RETURN r")["data"].first.should be_nil
     end
+
+    it "recreates itself if at least one of nodes is changed on update" do
+      child_group.update(parent_id: other_group.id)
+      child_group.find_neo_relationship.should be_a Neography::Relationship
+      Neomirror.neo.execute_query("MATCH (:Group {id: #{child_group.id}})-[r:CHILD_OF]->(:Group {id: #{group.id}}) RETURN r")["data"].first.should be_nil
+      Neomirror.neo.execute_query("MATCH (:Group {id: #{child_group.id}})-[r:CHILD_OF]->(:Group {id: #{other_group.id}}) RETURN r")["data"].first.should be_present
+    end
   end
 end

data/spec/neomirror/relationship_spec.rb

@@ -8,6 +8,7 @@ describe Neomirror::Relationship do
   let(:staff_of_premises) { create(:staff, user: user, premises: premises) }
   let(:staff_of_group) { create(:staff, user: user, group: group) }
   let(:staff) { create(:staff, user: user, premises: premises, group: group) }
+  let(:other_premises) { create(:premises) }
 
   describe "#find_neo_relationship" do
     it "searches neo4j relationship, returns Neography::Relationship instance" do
@@ -99,6 +100,14 @@ describe Neomirror::Relationship do
       staff_of_premises.update(premises_id: nil)
       Neomirror.neo.execute_query("MATCH (:User {id: #{user.id}})-[r:STAFF_OF]->(:Premises {id: #{premises.id}}) RETURN r")["data"].first.should be_nil
     end
+
+    it "removes itself and recreate if at least one of related object has changed" do
+      staff_of_premises
+      Neomirror.neo.execute_query("MATCH (:User {id: #{user.id}})-[r:STAFF_OF]->(:Premises {id: #{premises.id}}) RETURN r")["data"].first.should be_present
+      staff_of_premises.update(premises_id: other_premises.id)
+      Neomirror.neo.execute_query("MATCH (:User {id: #{user.id}})-[r:STAFF_OF]->(:Premises {id: #{premises.id}}) RETURN r")["data"].first.should be_nil
+      Neomirror.neo.execute_query("MATCH (:User {id: #{user.id}})-[r:STAFF_OF]->(:Premises {id: #{other_premises.id}}) RETURN r")["data"].first.should be_present
+    end
   end
 
   describe "#destroy_neo_relationship" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neomirror
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alex Avoyants
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neography
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement