neography 0.0.31 → 1.0.0

data/lib/neography/tasks.rb

@@ -4,7 +4,7 @@ require 'os'
 namespace :neo4j do
   desc "Install Neo4j"
   task :install, :edition, :version do |t, args|
-    args.with_defaults(:edition => "community", :version => "1.7")
+    args.with_defaults(:edition => "community", :version => "1.8")
     puts "Installing Neo4j-#{args[:edition]}-#{args[:version]}"
     
     if OS::Underlying.windows?

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.31"
+  VERSION = "1.0.0"
 end

data/lib/neography.rb

@@ -13,8 +13,6 @@ def find_and_require_user_defined_code
   end
 end
 
-DIRECTIONS = ["incoming", "in", "outgoing", "out", "all", "both"]
-
 require 'cgi'
 require 'httparty'
 require 'json'
@@ -29,7 +27,9 @@ require 'neography/multi_json_parser'
 require 'neography/version'
 
 require 'neography/config'
+
 require 'neography/rest'
+
 require 'neography/neography'
 
 require 'neography/property_container'
@@ -49,3 +49,14 @@ require 'neography/railtie' if defined? Rails::Railtie
 
 find_and_require_user_defined_code
 
+module Neography
+
+  def self.configure
+    yield configuration
+  end
+
+  def self.configuration
+    @configuration ||= Config.new
+  end
+
+end

data/neography.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = "maxdemarzi@gmail.com"
   s.homepage    = "http://rubygems.org/gems/neography"
   s.summary     = "ruby wrapper to Neo4j Rest API"
-  s.description = "A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/ for more details."
+  s.description = "A Ruby wrapper to the Neo4j Rest API see http://docs.neo4j.org/chunked/stable/rest-api.html for more details."
 
   s.rubyforge_project = "neography"
 
@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", ">= 2.0"
   s.add_development_dependency "net-http-spy", "0.2.1"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", ">= 0.8.7"
   s.add_dependency "httparty", ">= 0.8.1"
-  s.add_dependency "rake"
-  s.add_dependency "json"
-  s.add_dependency "os"
-  s.add_dependency "rubyzip"
-  s.add_dependency "multi_json"
+  s.add_dependency "rake", ">= 0.8.7"
+  s.add_dependency "json", ">= 1.6.0"
+  s.add_dependency "os", ">= 0.9.6"
+  s.add_dependency "rubyzip", ">= 0.9.7"
+  s.add_dependency "multi_json", ">= 1.3.2" 
 end

data/spec/integration/authorization_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Rest, :slow => true do
   describe "basic authentication"  do
@@ -45,4 +45,4 @@ describe Neography::Rest, :slow => true do
     end
   end
 
-end
+end

data/spec/integration/index_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Index do
 
@@ -6,7 +6,7 @@ describe Neography::Index do
     new_node = Neography::Node.create
     key = generate_text(6)
     value = generate_text
-    new_node.add_to_index("node_test_index", key, value)      
+    new_node.add_to_index("node_test_index", key, value)
   end
 
   it "can add a relationship to an index" do
@@ -17,5 +17,5 @@ describe Neography::Index do
     value = generate_text
     r.add_to_index("relationship_test_index", key, value)
   end
-  
-end
+
+end

data/spec/integration/neography_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography do
   describe "ref_node" do
@@ -7,4 +7,4 @@ describe Neography do
       root_node.should have_key("self")
     end
   end
-end
+end

data/spec/integration/node_path_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::NodePath do
 
@@ -219,4 +219,4 @@ describe Neography::NodePath do
       end
     end
   end
-end
+end

data/spec/integration/node_relationship_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::NodeRelationship do
 
@@ -367,8 +367,10 @@ describe Neography::NodeRelationship do
       p2 = Neography::Node.create
       new_rel = Neography::Relationship.create(:family, p1, p2)
       new_rel.del
-      Neography::Relationship.load(new_rel).should be_nil
+      expect {
+        Neography::Relationship.load(new_rel)
+      }.to raise_error Neography::RelationshipNotFoundException
     end
   end
 
-end
+end

data/spec/integration/node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Node do
 
@@ -26,11 +26,11 @@ describe Neography::Node do
       new_node.age.should == 31
     end
 
-    it "can create a node with more than one property not on the default rest server the other way" do
+    it "cannot create a node with more than one property not on the default rest server the other way" do
       @neo = Neography::Rest.new
-      new_node = Neography::Node.create(@neo, {"age" => 31, "name" => "Max"})
-      new_node.name.should == "Max"
-      new_node.age.should == 31
+      expect {
+        new_node = Neography::Node.create(@neo, {"age" => 31, "name" => "Max"})
+      }.to raise_error(ArgumentError)
     end
   end
 
@@ -44,29 +44,29 @@ describe Neography::Node do
       existing_node.neo_id.should == new_node.neo_id
     end
 
-    it "returns nil if it tries to load a node that does not exist" do
+    it "raises an error if it tries to load a node that does not exist" do
       new_node = Neography::Node.create
       fake_node = new_node.neo_id.to_i + 1000
-      existing_node = Neography::Node.load(fake_node)
-      existing_node.should be_nil
+      expect {
+        existing_node = Neography::Node.load(fake_node)
+      }.to raise_error Neography::NodeNotFoundException
     end
 
     it "can load a node that exists not on the default rest server" do
       @neo = Neography::Rest.new
-      new_node = Neography::Node.create(@neo)
+      new_node = Neography::Node.create({}, @neo)
       existing_node = Neography::Node.load(new_node, @neo)
       existing_node.should_not be_nil
       existing_node.neo_id.should_not be_nil
       existing_node.neo_id.should == new_node.neo_id
     end
 
-    it "can load a node that exists not on the default rest server the other way" do
+    it "cannot load a node that exists not on the default rest server the other way" do
       @neo = Neography::Rest.new
-      new_node = Neography::Node.create(@neo)
-      existing_node = Neography::Node.load(@neo, new_node)
-      existing_node.should_not be_nil
-      existing_node.neo_id.should_not be_nil
-      existing_node.neo_id.should == new_node.neo_id
+      new_node = Neography::Node.create({}, @neo)
+      expect {
+        existing_node = Neography::Node.load(@neo, new_node)
+      }.to raise_error(ArgumentError)
     end
   end
 
@@ -75,15 +75,16 @@ describe Neography::Node do
       new_node = Neography::Node.create
       node_id = new_node.neo_id
       new_node.del
-      deleted_node = Neography::Node.load(node_id)
-      deleted_node.should be_nil
+      expect {
+        Neography::Node.load(node_id)
+      }.to raise_error Neography::NodeNotFoundException
     end
   end
 
   describe "exists?" do
     it "can tell if it exists" do
       new_node = Neography::Node.create
-      new_node.exist?.should be_true 
+      new_node.exist?.should be_true
     end
 
     it "can tell if does not exists" do
@@ -221,4 +222,4 @@ describe Neography::Node do
   end
 
 
-end
+end

data/spec/integration/parsing_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography do
   subject { Neography::Rest.new }
@@ -10,4 +10,4 @@ describe Neography do
       node['data']['text'].should == ':1456'
     end
   end
-end
+end

data/spec/integration/relationship_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Relationship do
   describe "create relationship" do
@@ -34,4 +34,4 @@ describe Neography::Relationship do
     end
   end
 
-end
+end

data/spec/integration/rest_batch_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Rest do
   before(:each) do
@@ -16,7 +16,7 @@ describe Neography::Rest do
       batch_result.first.should have_key("from")
       batch_result.first["body"]["self"].split('/').last.should == new_node[:id]
     end
-    
+
     it "can get multiple nodes" do
       node1 = @neo.create_node
       node1[:id] = node1["self"].split('/').last
@@ -133,7 +133,7 @@ describe Neography::Rest do
       batch_result.first["body"]["end"].split('/').last.should == node2["self"].split('/').last
       batch_result.first["body"]["self"].should == new_relationship["self"]
     end
-    
+
     it "can create a single relationship" do
       node1 = @neo.create_node
       node2 = @neo.create_node
@@ -205,14 +205,13 @@ describe Neography::Rest do
       new_node = @neo.create_node
       key = generate_text(6)
       value = generate_text
-      new_index = @neo.get_node_index(index_name, key, value) 
       batch_result = @neo.batch [:add_node_to_index, index_name, key, value, new_node]
       batch_result.first.should have_key("id")
       batch_result.first.should have_key("from")
-      existing_index = @neo.find_node_index(index_name, key, value) 
+      existing_index = @neo.find_node_index(index_name, key, value)
       existing_index.should_not be_nil
       existing_index.first["self"].should == new_node["self"]
-      @neo.remove_node_from_index(index_name, key, value, new_node) 
+      @neo.remove_node_from_index(index_name, key, value, new_node)
     end
 
     it "can get a node index" do
@@ -251,7 +250,7 @@ describe Neography::Rest do
       batch_result.first.should have_key("id")
       batch_result.first.should have_key("from")
       batch_result.first["body"]["self"].split('/').last.should == "0"
-    end  
+    end
 
     it "can batch gremlin with parameters" do
       new_node = @neo.create_node
@@ -260,14 +259,14 @@ describe Neography::Rest do
       batch_result.first.should have_key("id")
       batch_result.first.should have_key("from")
       batch_result.first["body"]["self"].split('/').last.should == id
-    end  
+    end
 
     it "can batch cypher" do
       batch_result = @neo.batch [:execute_query, "start n=node(0) return n"]
       batch_result.first.should have_key("id")
       batch_result.first.should have_key("from")
       batch_result.first["body"]["data"][0][0]["self"].split('/').last.should == "0"
-    end  
+    end
 
     it "can batch cypher with parameters" do
       new_node = @neo.create_node
@@ -276,18 +275,20 @@ describe Neography::Rest do
       batch_result.first.should have_key("id")
       batch_result.first.should have_key("from")
       batch_result.first["body"]["data"][0][0]["self"].split('/').last.should == id
-    end  
-  
+    end
+
 	it "can delete a node in batch" do
-		
 		node1 = @neo.create_node
 		node2 = @neo.create_node
 		id1 = node1['self'].split('/').last
 		id2 = node2['self'].split('/').last
 		batch_result = @neo.batch [:delete_node, id1 ], [:delete_node, id2]
-		@neo.get_node(node1).should be_nil
-		@neo.get_node(node2).should be_nil
-
+    expect {
+      @neo.get_node(node1).should be_nil
+    }.to raise_error Neography::NodeNotFoundException
+    expect {
+      @neo.get_node(node2).should be_nil
+    }.to raise_error Neography::NodeNotFoundException
 	end
 
 	it "can remove a node from an index in batch " do
@@ -295,16 +296,16 @@ describe Neography::Rest do
 		key = generate_text(6)
 		value1 = generate_text
 		value2 = generate_text
-		value3 = generate_text  
-		
+		value3 = generate_text
+
 		node1 = @neo.create_unique_node(index, key, value1, { "name" => "Max" })
 		node2 = @neo.create_unique_node(index, key, value2, { "name" => "Neo" }) 
 		node3 = @neo.create_unique_node(index, key, value3, { "name" => "Samir"})
-		
+
 		batch_result = @neo.batch [:remove_node_from_index, index, key, value1, node1 ], 
 		                          [:remove_node_from_index, index, key, node2 ],
 		                          [:remove_node_from_index, index, node3 ]
-		
+
 		@neo.get_node_index(index, key, value1).should be_nil
 		@neo.get_node_index(index, key, value2).should be_nil
 		@neo.get_node_index(index, key, value3).should be_nil
@@ -354,14 +355,13 @@ describe Neography::Rest do
     it "can add a newly created node to an index" do
       key = generate_text(6)
       value = generate_text
-      new_index = @neo.get_node_index("test_node_index", key, value) 
       batch_result = @neo.batch [:create_node, {"name" => "Max"}], [:add_node_to_index, "test_node_index", key, value, "{0}"]
       batch_result.first.should have_key("id")
       batch_result.first.should have_key("from")
-      existing_index = @neo.find_node_index("test_node_index", key, value) 
+      existing_index = @neo.find_node_index("test_node_index", key, value)
       existing_index.should_not be_nil
       existing_index.first["self"].should == batch_result.first["body"]["self"]
-      @neo.remove_node_from_index("test_node_index", key, value, batch_result.first["body"]["self"].split('/').last) 
+      @neo.remove_node_from_index("test_node_index", key, value, batch_result.first["body"]["self"].split('/').last)
     end
 
     it "can add a newly created relationship to an index" do
@@ -398,12 +398,12 @@ describe Neography::Rest do
       key = generate_text(6)
       value = generate_text
 
-      batch_result = @neo.batch [:create_node, {"name" => "Max"}], 
-                                [:create_node, {"name" => "Marc"}],                           
+      batch_result = @neo.batch [:create_node, {"name" => "Max"}],
+                                [:create_node, {"name" => "Marc"}],
                                 [:add_node_to_index, "test_node_index", key, value, "{0}"]
                                 [:add_node_to_index, "test_node_index", key, value, "{1}"]
-                                [:create_relationship, "friends", "{0}", "{1}", {:since => "college"}]                        
-                                [:add_relationship_to_index, "test_relationship_index", key, value, "{4}"] 
+                                [:create_relationship, "friends", "{0}", "{1}", {:since => "college"}]
+                                [:add_relationship_to_index, "test_relationship_index", key, value, "{4}"]
       batch_result.should_not be_nil
     end
 
@@ -428,7 +428,7 @@ describe Neography::Rest do
       batch_result = @neo.batch [:create_node, {:street1=>"94437 Kemmer Crossing", :street2=>"Apt. 333", :city=>"Abshireton", :state=>"AA", :zip=>"65820", :_type=>"Address", :created_at=>1335269478}],
                                 [:add_node_to_index, "person_ssn", "ssn", "000-00-0001", "{0}"],
                                 [:create_unique_node, "person", "ssn", "000-00-0001", {:first_name=>"Jane", :last_name=>"Doe", :ssn=>"000-00-0001", :_type=>"Person", :created_at=>1335269478}],
-                                [:create_relationship, "has", "{0}", "{2}", {}]   
+                                [:create_relationship, "has", "{0}", "{2}", {}]
       batch_result.should_not be_nil
 
 
@@ -442,5 +442,5 @@ describe Neography::Rest do
     end
 
   end
-  
+
 end

data/spec/integration/rest_bulk_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Rest do
   before(:each) do
@@ -103,4 +103,4 @@ describe Neography::Rest do
 
   end
 
-end
+end

data/spec/integration/rest_experimental_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Rest do
   before(:each) do
@@ -19,4 +19,4 @@ describe Neography::Rest do
       existing_nodes.should_not be_nil
     end
   end
-end
+end

data/spec/integration/rest_gremlin_fail_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Rest do
   before(:each) do
@@ -43,4 +43,4 @@ describe Neography::Rest do
   end
 
 
-end
+end

data/spec/integration/rest_header_spec.rb

@@ -1,19 +1,14 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
-describe Neography::Rest do
-  before(:each) do
-    @neo = Neography::Rest.new
-  end
+describe Neography::Connection do
 
   it "should not add a content-type header if there's no existing headers" do
-    @neo.merge_options({}).keys.should == [:parser]
+    subject.merge_options({}).keys.should == [:parser]
   end
 
   it "should add a content type if there's existing headers" do
-    @neo.merge_options({:headers => {'Content-Type' => 'foo/bar'}})[:headers].should ==
+    subject.merge_options({:headers => {'Content-Type' => 'foo/bar'}})[:headers].should ==
       {'Content-Type' => "foo/bar",  "User-Agent"   => "Neography/#{Neography::VERSION}"}
-
   end
 
-
 end

data/spec/integration/rest_index_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Neography::Rest do
   before(:each) do
@@ -180,6 +180,26 @@ describe Neography::Rest do
       @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
 
+    it "can get a node index with a space in the value" do
+      new_node = @neo.create_node
+      key = generate_text(6)
+      value = generate_text + " " + generate_text
+      @neo.add_node_to_index("test_node_index", key, value, new_node)
+      new_index = @neo.get_node_index("test_node_index", key, value)
+      new_index.should_not be_nil
+      @neo.remove_node_from_index("test_node_index", key, value, new_node)
+    end
+
+    it "can get a node index with a slash in the value" do
+      new_node = @neo.create_node
+      key = generate_text(6)
+      value = generate_text + "/" + generate_text
+      @neo.add_node_to_index("test_node_index", key, value, new_node)
+      new_index = @neo.get_node_index("test_node_index", key, value)
+      new_index.should_not be_nil
+      @neo.remove_node_from_index("test_node_index", key, value, new_node)
+    end
+
     it "can get a relationship index" do
       new_node1 = @neo.create_node
       new_node2 = @neo.create_node