neography 1.0.9 → 1.0.10

data/.gitignore

@@ -1,5 +1,7 @@
 coverage
 .DS_Store
+TAGS
+*.rbc
 Gemfile.lock
 .idea
 *.iml
@@ -10,3 +12,4 @@ pkg/*
 log/*
 .rvmrc
 Gemfile.lock
+*.swp

data/README.md

@@ -73,7 +73,7 @@ Neography.configure do |config|
   config.authentication = nil  # 'basic' or 'digest'
   config.username       = nil
   config.password       = nil
-  config.parser         = {:parser => MultiJsonParser}
+  config.parser         = MultiJsonParser
 end
 ```
 

data/lib/neography/connection.rb

@@ -1,4 +1,6 @@
 module Neography
+  module WasCreated
+  end
   class Connection
     USER_AGENT = "Neography/#{Neography::VERSION}"
 
@@ -13,6 +15,7 @@ module Neography
       config = merge_configuration(options)
       save_local_configuration(config)
       @client = HTTPClient.new
+      @client.send_timeout = 1200 # 10 minutes
     end
 
     def configure(protocol, server, port, directory)
@@ -42,6 +45,23 @@ module Neography
       evaluate_response(@client.post(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
     end
 
+    def post_chunked(path, options={})
+      authenticate(configuration + path)
+      result = ""
+
+      response = @client.post(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]) do |chunk|
+        result << chunk
+      end
+
+      r = evaluate_chunk_response(response, result)
+
+      if r.last["status"] > 399
+        handle_4xx_500_response(r.last["status"], r.last["body"] || r.last )
+      end
+      
+      r
+    end
+
     def put(path, options={})
       authenticate(configuration + path)
       evaluate_response(@client.put(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
@@ -95,23 +115,34 @@ module Neography
       end
     end
 
+    def evaluate_chunk_response(response, result)
+      code = response.code
+      return_result(code, result)
+    end
+
     def evaluate_response(response)
       code = response.code
       body = response.body
+      return_result(code, body)
+    end
+    
+    def return_result(code, body)
       case code
       when 200
         @logger.debug "OK" if @log_enabled
         @parser.json(body) #response.parsed_response
       when 201
         @logger.debug "OK, created #{body}" if @log_enabled
-        @parser.json(body) #response.parsed_response
+        r = @parser.json(body) #response.parsed_response
+        r.extend(WasCreated)
+        r
       when 204
         @logger.debug "OK, no content returned" if @log_enabled
         nil
       when 400..500
         handle_4xx_500_response(code, body)
         nil
-      end
+      end      
     end
 
     def handle_4xx_500_response(code, body)
@@ -119,6 +150,10 @@ module Neography
         parsed_body = {}
         message = "No error message returned from server."
         stacktrace = ""
+      elsif body.is_a? Hash
+        parsed_body = body
+        message = parsed_body["message"]
+        stacktrace = parsed_body["stacktrace"]
       else
         parsed_body = @parser.json(body)
         message = parsed_body["message"]

data/lib/neography/index.rb

@@ -5,9 +5,9 @@ module Neography
       base.extend(ClassMethods)
     end
   
-    def add_to_index(index, key, value)
+    def add_to_index(index, key, value, unique = false)
       if self.is_a? Neography::Node
-        self.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, unique)
       else
         self.neo_server.add_relationship_to_index(index, key, value, self.neo_id)
       end
@@ -49,4 +49,4 @@ module Neography
     end
     
   end
-end
+end

data/lib/neography/rest.rb

@@ -10,6 +10,7 @@ require 'neography/rest/auto_indexes'
 require 'neography/rest/nodes'
 require 'neography/rest/node_properties'
 require 'neography/rest/node_relationships'
+require 'neography/rest/other_node_relationships'
 require 'neography/rest/node_indexes'
 require 'neography/rest/node_auto_indexes'
 require 'neography/rest/node_traversal'
@@ -44,6 +45,7 @@ module Neography
       @nodes                     = Nodes.new(@connection)
       @node_properties           = NodeProperties.new(@connection)
       @node_relationships        = NodeRelationships.new(@connection)
+      @other_node_relationships  = OtherNodeRelationships.new(@connection)
       @node_indexes              = NodeIndexes.new(@connection)
       @node_auto_indexes         = NodeAutoIndexes.new(@connection)
       @node_traversal            = NodeTraversal.new(@connection)
@@ -142,7 +144,7 @@ module Neography
     def get_relationship_end_node(rel)
       get_node(rel["end"])
     end
-
+    
     # relationship properties
 
     def get_relationship_properties(id, *properties)
@@ -167,6 +169,10 @@ module Neography
       @node_relationships.get(id, dir, types)
     end
 
+    def get_node_relationships_to(id, other_id, dir = "all", types = nil)
+      @other_node_relationships.get(id, other_id, dir, Array(types || [nil]))
+    end
+
     def create_relationship(type, from, to, props = nil)
       @node_relationships.create(type, from, to, props)
     end
@@ -190,8 +196,8 @@ module Neography
       @node_indexes.create_unique(index, key, value, props)
     end
 
-    def add_node_to_index(index, key, value, id)
-      @node_indexes.add(index, key, value, id)
+    def add_node_to_index(index, key, value, id, unique=false)
+      @node_indexes.add(index, key, value, id, unique)
     end
     alias_method :add_to_index, :add_node_to_index
 

data/lib/neography/rest/batch.rb

@@ -29,8 +29,11 @@ module Neography
           :body => batch.to_json,
           :headers => json_content_type.merge(accept_header)
         }
-
-        @connection.post(batch_path, options)
+        if accept_header.empty?
+          @connection.post(batch_path, options)
+        else
+          @connection.post_chunked(batch_path, options)
+        end
       end
 
       def get_batch(args)
@@ -69,8 +72,9 @@ module Neography
         end
       end
 
-      def add_node_to_index(index, key, value, id)
-        post NodeIndexes.base_path(:index => index) do
+      def add_node_to_index(index, key, value, id, unique = false)
+        path = unique ? NodeIndexes.unique_path(:index => index) : NodeIndexes.base_path(:index => index)
+        post path do
           {
             :uri   => build_node_uri(id),
             :key   => key,

data/lib/neography/rest/indexes.rb

@@ -31,7 +31,7 @@ module Neography
         create("#{@index_type}_auto_index", type, provider)
       end
 
-      def add(index, key, value, id)
+      def add(index, key, value, id, unique = false)
         options = {
           :body => (
             { :uri   => @connection.configuration + "/#{@index_type}/#{get_id(id)}",
@@ -41,8 +41,8 @@ module Neography
           ).to_json,
           :headers => json_content_type
         }
-
-        @connection.post(base_path(:index => index), options)
+        path = unique ? unique_path(:index => index) : base_path(:index => index)
+        @connection.post(path, options)
       end
 
       def get(index, key, value)

data/lib/neography/rest/node_indexes.rb

@@ -7,6 +7,7 @@ module Neography
       add_path :all,       "/index/node"
       add_path :base,      "/index/node/:index"
       add_path :unique,    "/index/node/:index?unique"
+      add_path :uniqueness,    "/index/node/:index?uniqueness=:function"
       add_path :id,        "/index/node/:index/:id"
       add_path :key,       "/index/node/:index/:key/:id"
       add_path :value,     "/index/node/:index/:key/:value/:id"
@@ -30,6 +31,20 @@ module Neography
         @connection.post(unique_path(:index => index), options)
       end
 
+      def get_or_create_unique(index, key, value, properties = {})
+        options = {
+          :body => (
+            { :properties => properties,
+              :key => key,
+              :value => value
+            }
+          ).to_json,
+          :headers => json_content_type
+        }
+        @connection.post(uniqueness_path(:index => index, :function => 'get_or_create'), options)
+        
+      end
+
     end
   end
 end

data/lib/neography/rest/other_node_relationships.rb

@@ -0,0 +1,59 @@
+module Neography
+  class Rest
+    class OtherNodeRelationships
+      extend Neography::Rest::Paths
+      include Neography::Rest::Helpers
+
+      add_path :base,       "/node/:id/traverse/relationship"
+
+      def initialize(connection)
+        @connection = connection
+      end
+
+      def get(id, other_id, direction = "all", types = [nil])
+        
+        body = case parse_direction(direction)
+                 when "all"
+                   "position.endNode().getId() == " + get_id(other_id)
+                 when "in"
+                   "position.length() > 0 && position.lastRelationship().getStartNode().getId() == " + get_id(other_id)
+                 when "out"
+                   "position.length() > 0 && position.lastRelationship().getEndNode().getId() == " + get_id(other_id) 
+                end
+
+        relationships = {:relationships => types.map{|row| Hash[{:type => row}].merge({:direction => parse_direction(direction)})} }
+
+        if types.first.nil?
+          relationships = {}
+        end
+                
+        options = {
+          :body => {:order      => "breadth_first",
+                    :uniqueness => "relationship_global",
+                    :max_depth  => 1,
+                    :return_filter => {:language => "javascript",
+                                       :body =>  body }
+                    }.merge(relationships).to_json,
+          :headers => json_content_type
+        }
+        #puts options.inspect
+        node_relationships = @connection.post(base_path(:id => get_id(id)), options) || []
+
+        return nil if node_relationships.empty?
+        node_relationships
+      end
+
+      def parse_direction(direction)
+        case direction
+          when :incoming, "incoming", :in, "in"
+            "in"
+          when :outgoing, "outgoing", :out, "out"
+            "out"
+          else
+            "all"
+        end
+      end
+
+    end
+  end
+end

data/lib/neography/tasks.rb

@@ -57,14 +57,31 @@ namespace :neo4j do
     puts "Starting Neo4j..."
     if OS::Underlying.windows? 
       if %x[reg query "HKU\\S-1-5-19"].size > 0 
-        %x[neo4j/bin/Neo4j.bat start]  #start service
+        value = %x[neo4j/bin/Neo4j.bat start]  #start service
       else
         puts "Starting Neo4j directly, not as a service."
-        %x[neo4j/bin/Neo4j.bat]
+        value = %x[neo4j/bin/Neo4j.bat]
       end      
     else
-      %x[neo4j/bin/neo4j start]  
+     value = %x[neo4j/bin/neo4j start]       
     end
+     puts value
+  end
+
+  desc "Start the Neo4j Server in the background"
+  task :start_no_wait do
+    puts "Starting Neo4j in the background..."
+    if OS::Underlying.windows? 
+      if %x[reg query "HKU\\S-1-5-19"].size > 0 
+        value = %x[neo4j/bin/Neo4j.bat start-no-wait]  #start service
+      else
+        puts "Starting Neo4j directly, not as a service."
+        value = %x[neo4j/bin/Neo4j.bat start-no-wait]
+      end      
+    else
+     value = %x[neo4j/bin/neo4j start-no-wait]       
+    end
+     puts value
   end
   
   desc "Stop the Neo4j Server"
@@ -72,13 +89,14 @@ namespace :neo4j do
     puts "Stopping Neo4j..."
     if OS::Underlying.windows? 
       if %x[reg query "HKU\\S-1-5-19"].size > 0
-         %x[neo4j/bin/Neo4j.bat stop]  #stop service
+        value = %x[neo4j/bin/Neo4j.bat stop]  #stop service
       else
         puts "You do not have administrative rights to stop the Neo4j Service"   
       end
     else  
-      %x[neo4j/bin/neo4j stop]
+      value = %x[neo4j/bin/neo4j stop]
     end
+    puts value
   end
 
   desc "Restart the Neo4j Server"

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

data/neography.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coveralls"
   s.add_dependency "httpclient", ">= 2.3.3"
   s.add_dependency "rake", ">= 0.8.7"
-  s.add_dependency "json", ">= 1.6.0"
+  s.add_dependency "json", ">= 1.7.7"
   s.add_dependency "os", ">= 0.9.6"
   s.add_dependency "rubyzip", ">= 0.9.7"
   s.add_dependency "multi_json", ">= 1.3.2" 

data/spec/integration/index_spec.rb

@@ -9,6 +9,13 @@ describe Neography::Index do
     new_node.add_to_index("node_test_index", key, value)
   end
 
+  it "can add a node to an index uniquely" do
+    new_node = Neography::Node.create
+    key = generate_text(6)
+    value = generate_text
+    new_node.add_to_index("node_test_index", key, value, true)
+  end
+
   it "can add a relationship to an index" do
     node1 = Neography::Node.create
     node2 = Neography::Node.create

data/spec/integration/performance_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Neography::Rest, :slow => true do
+  before(:each) do
+    @neo = Neography::Rest.new
+  end
+
+  describe "can perform" do
+    it "is fast" do
+      Benchmark.bm do |x|
+        x.report(" 100 Times") {  100.times { @neo.create_node } }
+        x.report(" 500 Times") {  500.times { @neo.create_node } }
+        x.report("1000 Times") { 1000.times { @neo.create_node } }
+      end
+    end
+  end
+end

data/spec/integration/rest_batch_spec.rb

@@ -441,16 +441,44 @@ describe Neography::Rest do
                                 [:create_relationship, "has", "{0}", "{2}", {}]
       batch_result.should_not be_nil
 
-
-      batch_result = @neo.batch [:create_unique_node, "person", "ssn", "000-00-0001", {:first_name=>"Jane", :last_name=>"Doe", :ssn=>"000-00-0001", :_type=>"Person", :created_at=>1335269478}],
-                                [:add_node_to_index, "person_ssn", "ssn", "000-00-0001", "{0}"],
-                                [:create_node, {:street1=>"94437 Kemmer Crossing", :street2=>"Apt. 333", :city=>"Abshireton", :state=>"AA", :zip=>"65820", :_type=>"Address", :created_at=>1335269478}],
-                                [:create_relationship, "has", "{0}", "{2}", {}]
       # create_unique_node is returning an index result, not a node, so we can't do this yet.
       # See https://github.com/neo4j/community/issues/697
-      batch_result.should_not be_nil
+
+      expect {
+        batch_result = @neo.batch [:create_unique_node, "person", "ssn", "000-00-0001", {:first_name=>"Jane", :last_name=>"Doe", :ssn=>"000-00-0001", :_type=>"Person", :created_at=>1335269478}],
+                                  [:add_node_to_index, "person_ssn", "ssn", "000-00-0001", "{0}"],
+                                  [:create_node, {:street1=>"94437 Kemmer Crossing", :street2=>"Apt. 333", :city=>"Abshireton", :state=>"AA", :zip=>"65820", :_type=>"Address", :created_at=>1335269478}],
+                                  [:create_relationship, "has", "{0}", "{2}", {}]
+      }.to raise_error(Neography::BadInputException)
     end
 
   end
 
+  describe "broken queries" do
+    it "should return errors when bad syntax is passed in batch" do
+
+      batch_commands = []
+      # batch_commands << [ :create_unique_node, "person", "ssn", "000-00-0002", {:foo => "bar"} ]
+    
+      # this doesn't raise error
+      batch_commands << [ :execute_query, "start person_n=node:person(ssn = '000-00-0002')
+                                         set bar1 = {foo}",
+                        { :other => "what" }
+                      ]
+
+
+      # this does raise error
+      expect { 
+          @neo.execute_query("start person_n=node:person(ssn = '000-00-0001')
+                              set bar = {foo}",
+                        { :other => "what" })
+      }.to raise_exception Neography::SyntaxException
+                      
+      expect { 
+        batch_result = @neo.batch *batch_commands
+      }.to raise_exception Neography::SyntaxException          
+      
+    end    
+  end
+
 end

data/spec/integration/rest_batch_streaming_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Neography::Rest do
+  before(:each) do
+    @neo = Neography::Rest.new
+  end
+  
+  describe "streaming" do
+  
+    it "can send a 1000 item batch" do
+      commands = []
+      1000.times do |x|
+        commands << [:create_node, {"name" => "Max " + x.to_s}]
+      end
+      batch_result = @neo.batch *commands
+      batch_result.first["body"]["data"]["name"].should == "Max 0"
+      batch_result.last["body"]["data"]["name"].should == "Max 999"
+    end  
+
+    it "can send a 10000 item batch" do
+      commands = []
+      10000.times do |x|
+        commands << [:get_node, 0]
+      end
+      batch_result = @neo.batch *commands
+      batch_result.first["body"]["self"].split('/').last.should == "0"
+      batch_result.last["body"]["self"].split('/').last.should == "0"
+    end  
+
+  end
+
+end

data/spec/integration/rest_other_node_relationship_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe Neography::Rest do
+  before(:each) do
+    @neo = Neography::Rest.new
+  end
+
+  describe "get_relationship" do
+    it "can get a relationship that exists" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2)
+      existing_relationships = @neo.get_node_relationships_to(new_node1, new_node2)
+      existing_relationships[0].should_not be_nil
+      existing_relationships[0].should have_key("self")
+      existing_relationships[0]["self"].should == new_relationship["self"]
+    end
+
+    it "returns nil if it tries to get a relationship that does not exist" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_node3 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2)
+      existing_relationship = @neo.get_node_relationships_to(new_node1, new_node3)
+      existing_relationship.should be_nil
+    end
+  end
+
+  describe "get_node_relationships" do
+    it "can get a node's relationship" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"since" => '10-1-2005', "met" => "college"})
+      relationships = @neo.get_node_relationships_to(new_node1, new_node2)
+      relationships.should_not be_nil
+      relationships[0]["start"].should == new_node1["self"]
+      relationships[0]["end"].should == new_node2["self"]
+      relationships[0]["type"].should == "friends"
+      relationships[0]["data"]["met"].should == "college"
+      relationships[0]["data"]["since"].should == '10-1-2005'
+    end
+
+    it "can get a node's multiple relationships" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_node3 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"since" => '10-1-2005', "met" => "college"})
+      new_relationship = @neo.create_relationship("enemies", new_node1, new_node2, {"since" => '10-2-2010', "met" => "work"})
+      relationships = @neo.get_node_relationships_to(new_node1, new_node2)
+      relationships.should_not be_nil
+      relationships[0]["start"].should == new_node1["self"]
+      relationships[0]["end"].should == new_node2["self"]
+      relationships[0]["type"].should == "friends"
+      relationships[0]["data"]["met"].should == "college"
+      relationships[0]["data"]["since"].should == '10-1-2005'
+      relationships[1]["start"].should == new_node1["self"]
+      relationships[1]["end"].should == new_node2["self"]
+      relationships[1]["type"].should == "enemies"
+      relationships[1]["data"]["met"].should == "work"
+      relationships[1]["data"]["since"].should == '10-2-2010'
+    end
+
+    it "can get all of a node's outgoing relationship" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_node3 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"since" => '10-1-2005', "met" => "college"})
+      new_relationship = @neo.create_relationship("enemies", new_node2, new_node1, {"since" => '10-2-2010', "met" => "work"})
+      relationships = @neo.get_node_relationships_to(new_node1, new_node2, "out")
+      relationships.should_not be_nil
+      relationships[0]["start"].should == new_node1["self"]
+      relationships[0]["end"].should == new_node2["self"]
+      relationships[0]["type"].should == "friends"
+      relationships[0]["data"]["met"].should == "college"
+      relationships[0]["data"]["since"].should == '10-1-2005'
+      relationships[1].should be_nil
+    end
+
+    it "can get all of a node's incoming relationship" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_node3 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"since" => '10-1-2005', "met" => "college"})
+      new_relationship = @neo.create_relationship("enemies", new_node3, new_node1, {"since" => '10-2-2010', "met" => "work"})
+      relationships = @neo.get_node_relationships_to(new_node1, new_node3, "in")
+      relationships.should_not be_nil
+      relationships[0]["start"].should == new_node3["self"]
+      relationships[0]["end"].should == new_node1["self"]
+      relationships[0]["type"].should == "enemies"
+      relationships[0]["data"]["met"].should == "work"
+      relationships[0]["data"]["since"].should == '10-2-2010'
+      relationships[1].should be_nil
+    end
+
+    it "can get a specific type of node relationships" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_node3 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"since" => '10-1-2005', "met" => "college"})
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node3, {"since" => '10-2-2010', "met" => "work"})
+      relationships = @neo.get_node_relationships_to(new_node1, new_node2, "all", "friends")
+      relationships.should_not be_nil
+      relationships[0]["start"].should == new_node1["self"]
+      relationships[0]["end"].should == new_node2["self"]
+      relationships[0]["type"].should == "friends"
+      relationships[0]["data"]["met"].should == "college"
+      relationships[0]["data"]["since"].should == '10-1-2005'
+      relationships[1].should be_nil
+    end
+
+    it "can get a specific type and direction of a node relationships" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_node3 = @neo.create_node
+      new_node4 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"since" => '10-1-2005', "met" => "college"})
+      new_relationship = @neo.create_relationship("enemies", new_node1, new_node3, {"since" => '10-2-2010', "met" => "work"})
+      new_relationship = @neo.create_relationship("enemies", new_node4, new_node1, {"since" => '10-3-2010', "met" => "gym"})
+      relationships = @neo.get_node_relationships_to(new_node1, new_node4, "in", "enemies")
+      relationships.should_not be_nil
+      relationships[0]["start"].should == new_node4["self"]
+      relationships[0]["end"].should == new_node1["self"]
+      relationships[0]["type"].should == "enemies"
+      relationships[0]["data"]["met"].should == "gym"
+      relationships[0]["data"]["since"].should == '10-3-2010'
+      relationships[1].should be_nil
+    end
+
+    it "returns nil if there are no relationships" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      relationships = @neo.get_node_relationships_to(new_node1, new_node2)
+      relationships.should be_nil
+    end
+  end
+
+end

data/spec/unit/rest/batch_spec.rb

@@ -13,7 +13,7 @@ module Neography
           { "id" => 1, "method" => "GET", "to" => "/node/bar" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:get_node, "foo"], [:get_node, "bar"]
       end
 
@@ -23,7 +23,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "/node", "body" => { "baz" => "qux" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:create_node, { "foo" => "bar" }], [:create_node, { "baz" => "qux" }]
       end
 
@@ -33,7 +33,7 @@ module Neography
           { "id" => 1, "method" => "DELETE", "to" => "/node/bar" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:delete_node, "foo"], [:delete_node, "bar"]
       end
 
@@ -43,7 +43,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "/index/node/quux?unique", "body" => { "key" => "corge", "value" => "grault", "properties" => "garply" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:create_unique_node, "foo", "bar", "baz", "qux" ],
                         [:create_unique_node, "quux", "corge", "grault", "garply"]
       end
@@ -54,7 +54,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "/index/node/quux", "body" => { "uri" => "{0}", "key" => "corge", "value" => "grault" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:add_node_to_index, "foo", "bar", "baz", "qux" ],
                         [:add_node_to_index, "quux", "corge", "grault", "{0}"]
       end
@@ -65,7 +65,7 @@ module Neography
           { "id" => 1, "method" => "GET", "to" => "/index/node/qux/quux/corge" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:get_node_index, "foo", "bar", "baz" ],
                         [:get_node_index, "qux", "quux", "corge" ]
       end
@@ -77,7 +77,7 @@ module Neography
           { "id" => 2, "method" => "DELETE", "to" => "/index/node/index3/key3/value3/id3" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:remove_node_from_index, "index1", "id1", ],
                         [:remove_node_from_index, "index2", "key2", "id2" ],
                         [:remove_node_from_index, "index3", "key3", "value3", "id3" ]
@@ -89,7 +89,7 @@ module Neography
           { "id" => 1, "method" => "PUT", "to" => "/node/index2/properties/key2", "body" => "value2" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:set_node_property, "index1", { "key1" => "value1" } ],
                         [:set_node_property, "index2", { "key2" => "value2" } ]
       end
@@ -100,7 +100,7 @@ module Neography
           { "id" => 1, "method" => "PUT", "to" => "/node/index2/properties", "body" => { "key2" => "value2" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:reset_node_properties, "index1", { "key1" => "value1" } ],
                         [:reset_node_properties, "index2", { "key2" => "value2" } ]
       end
@@ -111,7 +111,7 @@ module Neography
           { "id" => 1, "method" => "GET", "to" => "/node/id2/relationships/all" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:get_node_relationships, "id1", "direction1" ],
                         [:get_node_relationships, "id2" ]
       end
@@ -122,7 +122,7 @@ module Neography
           { "id" => 1, "method" => "GET", "to" => "/relationship/bar" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:get_relationship, "foo"], [:get_relationship, "bar"]
       end
 
@@ -132,7 +132,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "{0}/relationships", "body" => { "to" => "{1}", "type" => "type2", "data" => "data2" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:create_relationship, "type1", "from1", "to1", "data1" ],
                         [:create_relationship, "type2", "{0}", "{1}", "data2" ]
       end
@@ -143,7 +143,7 @@ module Neography
           { "id" => 1, "method" => "DELETE", "to" => "/relationship/bar" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:delete_relationship, "foo"], [:delete_relationship, "bar"]
       end
 
@@ -153,7 +153,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "/index/relationship/index2?unique", "body" => { "key" => "key2", "value" => "value2", "type" => "type2", "start" => "{0}", "end" => "{1}" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:create_unique_relationship, "index1", "key1", "value1", "type1", "node1", "node2" ],
                         [:create_unique_relationship, "index2", "key2", "value2", "type2", "{0}", "{1}" ]
       end
@@ -164,7 +164,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "/index/relationship/index2", "body" => { "uri" => "{0}", "key" => "key2", "value" => "value2" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:add_relationship_to_index, "index1", "key1", "value1", "rel1" ],
                         [:add_relationship_to_index, "index2", "key2", "value2", "{0}"]
       end
@@ -175,7 +175,7 @@ module Neography
           { "id" => 1, "method" => "GET", "to" => "/index/relationship/qux/quux/corge" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:get_relationship_index, "foo", "bar", "baz" ],
                         [:get_relationship_index, "qux", "quux", "corge" ]
       end
@@ -187,7 +187,7 @@ module Neography
           { "id" => 2, "method" => "DELETE", "to" => "/index/relationship/index3/key3/value3/id3" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:remove_relationship_from_index, "index1", "id1", ],
                         [:remove_relationship_from_index, "index2", "key2", "id2" ],
                         [:remove_relationship_from_index, "index3", "key3", "value3", "id3" ]
@@ -199,7 +199,7 @@ module Neography
           { "id" => 1, "method" => "PUT", "to" => "/relationship/index2/properties/key2", "body" => "value2" }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:set_relationship_property, "index1", { "key1" => "value1" } ],
                         [:set_relationship_property, "index2", { "key2" => "value2" } ]
       end
@@ -210,7 +210,7 @@ module Neography
           { "id" => 1, "method" => "PUT", "to" => "{0}/properties", "body" => { "key2" => "value2" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:reset_relationship_properties, "index1", { "key1" => "value1" } ],
                         [:reset_relationship_properties, "{0}", { "key2" => "value2" } ]
       end
@@ -221,7 +221,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "/gremlin", "body" => { "script" => "script2", "params" => "params2" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:execute_script, "script1", "params1"],
                         [:execute_script, "script2", "params2"]
       end
@@ -232,7 +232,7 @@ module Neography
           { "id" => 1, "method" => "POST", "to" => "/cypher", "body" => { "query" => "query2" } }
         ]
 
-        connection.should_receive(:post).with("/batch", json_match(:body, expected_body))
+        connection.should_receive(:post_chunked).with("/batch", json_match(:body, expected_body))
         subject.execute [:execute_query, "query1", "params1"],
                         [:execute_query, "query2" ]
       end

data/spec/unit/rest/node_indexes_spec.rb

@@ -51,6 +51,16 @@ module Neography
         subject.create_unique("some_index", "key", "value", "properties")
       end
 
+      it "gets or creates a unique node in an index" do
+        expected_body = {
+          "properties" => "properties",
+          "key" => "key",
+          "value" => "value"
+        }
+        connection.should_receive(:post).with("/index/node/some_index?uniqueness=get_or_create", json_match(:body, expected_body))
+        subject.get_or_create_unique("some_index", "key", "value", "properties")
+      end
+
       it "adds a node to an index" do
         expected_body = {
           "uri" => "http://configuration/node/42",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,7 @@ files:
 - lib/neography/rest/node_relationships.rb
 - lib/neography/rest/node_traversal.rb
 - lib/neography/rest/nodes.rb
+- lib/neography/rest/other_node_relationships.rb
 - lib/neography/rest/paths.rb
 - lib/neography/rest/properties.rb
 - lib/neography/rest/relationship_auto_indexes.rb
@@ -243,14 +244,17 @@ files:
 - spec/integration/node_relationship_spec.rb
 - spec/integration/node_spec.rb
 - spec/integration/parsing_spec.rb
+- spec/integration/performance_spec.rb
 - spec/integration/relationship_spec.rb
 - spec/integration/rest_batch_spec.rb
+- spec/integration/rest_batch_streaming_spec.rb
 - spec/integration/rest_bulk_spec.rb
 - spec/integration/rest_experimental_spec.rb
 - spec/integration/rest_gremlin_fail_spec.rb
 - spec/integration/rest_header_spec.rb
 - spec/integration/rest_index_spec.rb
 - spec/integration/rest_node_spec.rb
+- spec/integration/rest_other_node_relationship_spec.rb
 - spec/integration/rest_path_spec.rb
 - spec/integration/rest_plugin_spec.rb
 - spec/integration/rest_relationship_spec.rb
@@ -312,14 +316,17 @@ test_files:
 - spec/integration/node_relationship_spec.rb
 - spec/integration/node_spec.rb
 - spec/integration/parsing_spec.rb
+- spec/integration/performance_spec.rb
 - spec/integration/relationship_spec.rb
 - spec/integration/rest_batch_spec.rb
+- spec/integration/rest_batch_streaming_spec.rb
 - spec/integration/rest_bulk_spec.rb
 - spec/integration/rest_experimental_spec.rb
 - spec/integration/rest_gremlin_fail_spec.rb
 - spec/integration/rest_header_spec.rb
 - spec/integration/rest_index_spec.rb
 - spec/integration/rest_node_spec.rb
+- spec/integration/rest_other_node_relationship_spec.rb
 - spec/integration/rest_path_spec.rb
 - spec/integration/rest_plugin_spec.rb
 - spec/integration/rest_relationship_spec.rb