diff --git a/Gemfile.lock b/Gemfile.lock index f7630b3..7ea6ada 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,7 @@ GEM httparty (0.7.4) crack (= 0.1.8) json (1.4.6) + json (1.4.6-java) net-http-spy (0.2.1) rake (0.8.7) rspec (2.0.1) @@ -34,6 +35,6 @@ PLATFORMS DEPENDENCIES fakeweb (~> 1.3.0) neography! - net-http-spy (~> 0.2.1) + net-http-spy (= 0.2.1) rake (~> 0.8.7) rspec (~> 2.0.0.beta.22) diff --git a/lib/neography/rest.rb b/lib/neography/rest.rb index 624e9ac..52abac5 100644 --- a/lib/neography/rest.rb +++ b/lib/neography/rest.rb @@ -244,8 +244,9 @@ def create_node_index(name, type = "exact", provider = "lucene") end def add_node_to_index(index, key, value, id) - options = { :body => (self.configuration + "/node/#{get_id(id)}").to_json, :headers => {'Content-Type' => 'application/json'} } - post("/index/node/#{index}/#{key}/#{value}", options) + options = { :body => ({:uri => self.configuration + "/node/#{get_id(id)}", :key => key, :value => value }).to_json, :headers => {'Content-Type' => 'application/json'} } + #post("/index/node/#{index}/#{key}/#{value}", options) + post("/index/node/#{index}", options) end def remove_node_from_index(*args) @@ -283,8 +284,8 @@ def create_relationship_index(name, type = "exact", provider = "lucene") end def add_relationship_to_index(index, key, value, id) - options = { :body => (self.configuration + "/relationship/#{get_id(id)}").to_json, :headers => {'Content-Type' => 'application/json'} } - post("/index/relationship/#{index}/#{key}/#{value}", options) + options = { :body => ({:uri => self.configuration + "/relationship/#{get_id(id)}", :key => key, :value => value}).to_json, :headers => {'Content-Type' => 'application/json'} } + post("/index/relationship/#{index}", options) end def remove_relationship_from_index(*args) diff --git a/lib/neography/version.rb b/lib/neography/version.rb index d932f03..ed6caed 100644 --- a/lib/neography/version.rb +++ b/lib/neography/version.rb @@ -1,3 +1,3 @@ module Neography - VERSION = "0.0.13" + VERSION = "0.0.14" end diff --git a/neography.gemspec b/neography.gemspec index 252a18c..dc7e9a5 100644 --- a/neography.gemspec +++ b/neography.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_development_dependency "rspec", "~> 2.0.0.beta.22" - s.add_development_dependency "net-http-spy", "~> 0.2.1" + s.add_development_dependency "net-http-spy", "0.2.1" s.add_development_dependency "fakeweb", "~> 1.3.0" s.add_development_dependency "rake", "~> 0.8.7" s.add_dependency "httparty", "~> 0.7.3" diff --git a/spec/integration/rest_traverse_spec.rb b/spec/integration/rest_traverse_spec.rb index c2dc875..f4d3465 100644 --- a/spec/integration/rest_traverse_spec.rb +++ b/spec/integration/rest_traverse_spec.rb @@ -101,8 +101,8 @@ paths.should_not be_nil paths[0]["nodes"].should == [@new_node1["self"], @new_node2["self"]] - paths[1]["nodes"].should == [@new_node1["self"], @new_node2["self"], @new_node3["self"]] - paths[2]["nodes"].should == [@new_node1["self"], @new_node2["self"], @new_node5["self"]] + paths[1]["nodes"].should == [@new_node1["self"], @new_node2["self"], @new_node5["self"]] + paths[2]["nodes"].should == [@new_node1["self"], @new_node2["self"], @new_node3["self"]] paths[3]["nodes"].should == [@new_node1["self"], @new_node2["self"], @new_node3["self"], @new_node4["self"]] end @@ -131,7 +131,7 @@ @neo.create_relationship("friends", @new_node3, @new_node4) @neo.create_relationship("friends", @new_node4, @new_node5) @neo.create_relationship("friends", @new_node3, @new_node5) - nodes = @neo.traverse(@new_node1, "nodes", {"relationships" => {"type"=> "friends", "direction" => "out"}, + nodes = @neo.traverse(@new_node1, "node", {"relationships" => {"type"=> "friends", "direction" => "out"}, "return filter" => {"language" => "builtin", "name" => "all"}, "depth" => 4} ) nodes.should_not be_nil