Refactor Relationships

lib/neography/rest.rb

@@ -46,6 +46,7 @@ class Rest
     include Transactions
     include Nodes
     include NodeProperties
+    include Relationships
     extend Forwardable
 
     attr_reader :connection
@@ -62,7 +63,6 @@ def initialize(options = ENV['NEO4J_URL'] || {})
       @node_traversal            ||= NodeTraversal.new(@connection)
       @node_paths                ||= NodePaths.new(@connection)
 
-      @relationships             ||= Relationships.new(@connection)
       @relationship_properties   ||= RelationshipProperties.new(@connection)
       @relationship_indexes      ||= RelationshipIndexes.new(@connection)
       @relationship_auto_indexes ||= RelationshipAutoIndexes.new(@connection)
@@ -91,24 +91,16 @@ def delete_node!(id)
     #   get("/nodes/")
     # end
 
-
     # relationships
 
-    def get_relationship(id)
-      @relationships.get(id)
-    end
-
-    def delete_relationship(id)
-      @relationships.delete(id)
-    end
-
     def get_relationship_start_node(rel)
       get_node(rel["start"])
     end
 
     def get_relationship_end_node(rel)
       get_node(rel["end"])
     end
+
 
     # relationship properties
 

lib/neography/rest/batch.rb

@@ -139,11 +139,11 @@ def get_node_relationships(id, direction = nil, types = nil)
       # Relationships
 
       def get_relationship(id)
-        get Relationships.base_path(:id => get_id(id))
+        get "/relationship/%{id}" % {:id => get_id(id)}
       end
 
       def delete_relationship(id)
-        delete Relationships.base_path(:id => get_id(id))
+        delete "/relationship/%{id}" % {:id => get_id(id)}
       end
 
       def create_relationship(type, from, to, data = nil)

lib/neography/rest/relationships.rb

@@ -1,21 +1,14 @@
 module Neography
   class Rest
-    class Relationships
-      extend Neography::Rest::Paths
+    module Relationships
       include Neography::Rest::Helpers
-
-      add_path :base,   "/relationship/:id"
-
-      def initialize(connection)
-        @connection ||= connection
-      end
-
-      def get(id)
-        @connection.get(base_path(:id => get_id(id)))
+
+      def get_relationship(id)
+        @connection.get("/relationship/%{id}" % {:id => get_id(id)})
       end
 
-      def delete(id)
-        @connection.delete(base_path(:id => get_id(id)))
+      def delete_relationship(id)
+        @connection.delete("/relationship/%{id}" % {:id => get_id(id)})
       end
 
     end

spec/unit/rest/relationships_spec.rb

@@ -4,17 +4,16 @@ module Neography
   class Rest
     describe Relationships do
 
-      let(:connection) { double }
-      subject { Relationships.new(connection) }
+      subject { Neography::Rest.new }
 
       it "gets a relationship" do
-        connection.should_receive(:get).with("/relationship/42")
-        subject.get("42")
+        subject.connection.should_receive(:get).with("/relationship/42")
+        subject.get_relationship("42")
       end
 
       it "deletes a relationship" do
-        connection.should_receive(:delete).with("/relationship/42")
-        subject.delete("42")
+        subject.connection.should_receive(:delete).with("/relationship/42")
+        subject.delete_relationship("42")
       end
 
     end