related 0.6.0 → 0.6.1

data/lib/related/node.rb

@@ -136,18 +136,18 @@ module Related
         else
           if entity.is_a?(node_class)
             @result_type = :nodes
-            Related.redis.sismember(key, entity.to_s)
+            Related.redis.sismember(key, entity.id)
           elsif entity.is_a?(Related::Relationship)
             @result_type = :relationships
-            Related.redis.sismember(key, entity.to_s)
+            Related.redis.sismember(key, entity.id)
           end
         end
       end
 
       def find(node)
         if @result_type == :nodes
-          if Related.redis.sismember(key, node.to_s)
-            node_class.find(node.to_s, @options)
+          if Related.redis.sismember(key, node.id)
+            node_class.find(node.id, @options)
           end
         else
           if id = Related.redis.get(dir_key(node))
@@ -235,18 +235,16 @@ module Related
       end
 
       def key(node=nil)
-        if @result_type == :nodes
-          "#{node ? node.to_s : @node.to_s}:n:#{@relationship_type}:#{@direction}"
-        else
-          "#{node ? node.to_s : @node.to_s}:r:#{@relationship_type}:#{@direction}"
-        end
+        n = node || @node
+        node_id = n.is_a?(String) ? n : n.id
+        "#{node_id}:#{@result_type == :nodes ? "n" : "r"}:#{@relationship_type}:#{@direction}"
       end
 
       def dir_key(node)
         if @direction == :out
-          "#{@node.to_s}:#{@relationship_type}:#{node.to_s}"
+          "#{@node.id}:#{@relationship_type}:#{node.id}"
         elsif @direction == :in
-          "#{node.to_s}:#{@relationship_type}:#{@node.to_s}"
+          "#{node.id}:#{@relationship_type}:#{@node.id}"
         end
       end
 

data/lib/related/relationship.rb

@@ -41,8 +41,8 @@ module Related
     def self.create(label, node1, node2, attributes = {})
       self.new(attributes.merge(
         :label => label,
-        :start_node_id => node1.to_s,
-        :end_node_id => node2.to_s
+        :start_node_id => node1.is_a?(String) ? node1 : (node1 ? node1.id : nil),
+        :end_node_id => node2.is_a?(String) ? node2 : (node2 ? node2.id : nil)
       )).save
     end
 

data/lib/related/version.rb

@@ -1,3 +1,3 @@
 module Related
-  Version = VERSION = '0.6.0'
+  Version = VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: related
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70275674186620 !ruby/object:Gem::Requirement
+  requirement: &70355260457740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70275674186620
+  version_requirements: *70355260457740
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70275674186120 !ruby/object:Gem::Requirement
+  requirement: &70355260492040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70275674186120
+  version_requirements: *70355260492040
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70275674185740 !ruby/object:Gem::Requirement
+  requirement: &70355260491660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275674185740
+  version_requirements: *70355260491660
 description: Related is a Redis-backed high performance distributed graph database.
 email: niklas@sutajio.se
 executables: []
@@ -69,10 +69,6 @@ files:
 - test/active_model_test.rb
 - test/custom_node_test.rb
 - test/data_flow_test.rb
-- test/dump-1.rdb
-- test/dump-2.rdb
-- test/dump-3.rdb
-- test/dump-4.rdb
 - test/follower_test.rb
 - test/model_test.rb
 - test/performance_test.rb