neography 1.0.5 → 1.0.6

data/lib/neography/index.rb

@@ -7,34 +7,43 @@ module Neography
   
     def add_to_index(index, key, value)
       if self.is_a? Neography::Node
-        neo_server.add_node_to_index(index, key, value, self.neo_id)
+        self.neo_server.add_node_to_index(index, key, value, self.neo_id)
       else
-        neo_server.add_relationship_to_index(index, key, value, self.neo_id)
+        self.neo_server.add_relationship_to_index(index, key, value, self.neo_id)
       end
     end
 
     def remove_from_index(*args)
       if self.is_a? Neography::Node
-        neo_server.remove_node_from_index(*args)
+        self.neo_server.remove_node_from_index(*args)
       else
-        neo_server.remove_relationship_from_index(*args)
+        self.neo_server.remove_relationship_from_index(*args)
       end
     end
 
     module ClassMethods
       def find(*args)
-        if name == "Neography::Node"
-          if args.size > 1
-            neo_server.find_node_index(*args)
-          else
-            neo_server.get_node_index(*args)
+        db = args[3] ? args.pop : Neography::Rest.new
+
+        if self.inspect == "Neography::Node"
+          nodes = []
+          results = db.find_node_index(*args)
+          return nil unless results
+          results.each do |r|
+            node = self.new(r)
+            node.neo_server = db
+            nodes << node
           end
+          nodes.size > 1 ? nodes : nodes.first
         else
-          if args.size > 1
-            neo_server.find_relationship_index(*args)
-          else
-            neo_server.get_relationship_index(*args)
+          rels = []
+          results = db.find_relationship_index(*args)
+          return nil unless results
+          results.each do |r|
+            rel = self.new(r, db)
+            rels << rel
           end
+          rels.size > 1 ? rels : rels.first
         end  
       end
     end

data/lib/neography/node.rb

@@ -29,6 +29,11 @@ module Neography
       end
 
       #alias_method :new, :create
+    end    
+
+    def find(*args)
+      node = self.new
+      node.find(args)
     end
 
     def del

data/lib/neography/node_traverser.rb

@@ -121,7 +121,7 @@ module Neography
       options["depth"]           = @depth  unless @depth.nil?
 
       if @relationships[0]["type"].empty?
-        rels = @from.neo_server.get_node_relationships(@from, @relationships[0]["direction"])
+        rels = @from.neo_server.get_node_relationships(@from, @relationships[0]["direction"]) || []
         case @relationships[0]["direction"]
           when "in"
             rels.collect { |r| @from.neo_server.get_node(r["start"]) } #.uniq

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/integration/index_spec.rb

@@ -18,4 +18,38 @@ describe Neography::Index do
     r.add_to_index("relationship_test_index", key, value)
   end
 
+  it "can find a node in an index" do
+    value = generate_text
+    new_node = Neography::Node.create("name" => value)
+    new_node.add_to_index("node_test_index", "name", value)
+    existing_node = Neography::Node.find("node_test_index", "name", value)
+    existing_node.name.should == value
+  end
+
+  it "can find a relationship in an index" do
+    value = generate_text
+    node1 = Neography::Node.create
+    node2 = Neography::Node.create
+    r = Neography::Relationship.create(:friends, node1, node2, {"name" => value})
+    r.add_to_index("relationship_test_index", "name", value)
+    existing_r = Neography::Relationship.find("relationship_test_index", "name", value)
+    existing_r.name.should == value
+  end
+
+  it "can find multiple nodes in an index" do
+    value1 = generate_text
+    value2 = generate_text
+    value3 = generate_text
+    node1 = Neography::Node.create("first_name" => value1, "last_name" => value2)
+    node1.add_to_index("node_test_index", "first_name", value1)
+    node2 = Neography::Node.create("first_name" => value1, "last_name" => value3)
+    node2.add_to_index("node_test_index", "first_name", value1)
+
+    existing_nodes = Neography::Node.find("node_test_index", "first_name", value1)
+    existing_nodes.size.should == 2
+    existing_nodes.first.last_name.should == value2
+    existing_nodes.last.last_name.should == value3
+  end
+
+
 end

data/spec/integration/node_relationship_spec.rb

@@ -157,6 +157,11 @@ describe Neography::NodeRelationship do
       b.outgoing.should include(c)
     end
 
+    it "#both returns an empty array for unconnected nodes" do
+      a = Neography::Node.create
+      a.both.size.should == 0
+    end
+
     it "#both(type) should return both incoming and outgoing nodes of the given type of depth one" do
       a,b,c,d,e,f = create_nodes
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec