neography 0.0.30 → 0.0.31

data/CONTRIBUTORS

@@ -13,4 +13,5 @@ Contributors:
 * Pablo Fernandez
 * Nick Reavill
 * Marcel Sherf
-* David Pitman
+* David Pitman
+* Garrett Heaver

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    neography (0.0.28)
+    neography (0.0.30)
       httparty (>= 0.8.1)
       json
       multi_json
       os
-      rake (>= 0.8.7)
+      rake
       rubyzip
 
 GEM
@@ -16,21 +16,22 @@ GEM
     httparty (0.8.3)
       multi_json (~> 1.0)
       multi_xml
-    json (1.7.3)
+    json (1.7.5)
+    json (1.7.5-java)
     multi_json (1.3.6)
     multi_xml (0.5.1)
     net-http-spy (0.2.1)
     os (0.9.6)
-    rake (0.8.7)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rubyzip (0.9.8)
+    rspec-mocks (2.11.2)
+    rubyzip (0.9.9)
 
 PLATFORMS
   java
@@ -39,5 +40,5 @@ PLATFORMS
 DEPENDENCIES
   neography!
   net-http-spy (= 0.2.1)
-  rake (~> 0.8.7)
+  rake
   rspec

data/lib/neography/rest.rb

@@ -314,7 +314,7 @@ module Neography
 
       def find_node_index(*args)
         case args.size
-          when 3 then index = get("/index/node/#{args[0]}/#{args[1]}?query=#{args[2]}") || Array.new
+          when 3 then index = get("/index/node/#{args[0]}/#{args[1]}?query=\"#{args[2]}\"") || Array.new
           when 2 then index = get("/index/node/#{args[0]}?query=#{args[1]}") || Array.new
         end
         return nil if index.empty?
@@ -547,6 +547,12 @@ module Neography
               when 4 then {:method => "DELETE", :to => "/index/node/#{args[1]}/#{args[2]}/#{get_id(args[3])}" } 
               when 3 then {:method => "DELETE", :to => "/index/node/#{args[1]}/#{get_id(args[2])}" } 
             end
+          when :remove_relationship_from_index
+           case args.size
+             when 5 then {:method => "DELETE", :to => "/index/relationship/#{args[1]}/#{args[2]}/#{args[3]}/#{get_id(args[4])}" }
+             when 4 then {:method => "DELETE", :to => "/index/relationship/#{args[1]}/#{args[2]}/#{get_id(args[3])}" }
+             when 3 then {:method => "DELETE", :to => "/index/relationship/#{args[1]}/#{get_id(args[2])}" }
+           end
     		  when :delete_node
     		   	{:method => "DELETE", :to => "/node/#{get_id(args[1])}"}
     		  else
@@ -583,8 +589,6 @@ module Neography
           evaluate_response(HTTParty.get(configuration + URI.encode(path), merge_options(options)))
        end
 
-
-
        def post(path,options={})
           evaluate_response(HTTParty.post(configuration + URI.encode(path), merge_options(options)))
        end

data/lib/neography/version.rb

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

data/neography.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "net-http-spy", "0.2.1"
-  s.add_development_dependency "rake", "~> 0.8.7"
+  s.add_development_dependency "rake"
   s.add_dependency "httparty", ">= 0.8.1"
-  s.add_dependency "rake", ">= 0.8.7"
+  s.add_dependency "rake"
   s.add_dependency "json"
   s.add_dependency "os"
   s.add_dependency "rubyzip"

data/spec/integration/rest_batch_spec.rb

@@ -310,6 +310,24 @@ describe Neography::Rest do
 		@neo.get_node_index(index, key, value3).should be_nil
 	end
 
+  it "can remove a relationship from an index in batch" do
+     index = generate_text(6)
+     key = generate_text(6)
+     value1 = generate_text
+     value2 = generate_text
+
+     node1 = @neo.create_node
+     node2 = @neo.create_node
+     relationship1 = @neo.create_unique_relationship(index, key, value1, "friends", node1, node2)
+     relationship2 = @neo.create_unique_relationship(index, key, value2, "friends", node2, node1)
+
+     batch_result = @neo.batch [:remove_relationship_from_index, index, key, relationship1],
+       [:remove_relationship_from_index, index, key, relationship2]
+
+     @neo.get_relationship_index(index, key, value1).should be_nil
+     @neo.get_relationship_index(index, key, value2).should be_nil
+   end
+
   end
 
   describe "referenced batch" do

data/spec/integration/rest_index_spec.rb

@@ -224,6 +224,28 @@ describe Neography::Rest do
       @neo.remove_node_from_index("test_node_index", key, value, new_node)
     end
 
+    it "can find a node index with spaces 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.find_node_index("test_node_index", key, value)
+      new_index.should_not be_nil
+      new_index.first["self"].should == new_node["self"]
+      @neo.remove_node_from_index("test_node_index", key, value, new_node)
+    end
+
+    it "can find a node index with slashes 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.find_node_index("test_node_index", key, value)
+      new_index.should_not be_nil
+      new_index.first["self"].should == new_node["self"]
+      @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
@@ -387,4 +409,4 @@ describe Neography::Rest do
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement