neography 0.0.11 → 0.0.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neography (0.0.10)
+    neography (0.0.11)
       httparty (~> 0.7.3)
       json
 
@@ -16,6 +16,7 @@ GEM
     json (1.4.6)
     json (1.4.6-java)
     net-http-spy (0.2.1)
+    rake (0.8.7)
     rspec (2.0.1)
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
@@ -37,4 +38,5 @@ DEPENDENCIES
   json
   neography!
   net-http-spy (~> 0.2.1)
+  rake (~> 0.8.7)
   rspec (~> 2.0.0.beta.22)

data/README.rdoc

@@ -19,7 +19,7 @@ in order to access the functionality.
 
 === Try it now!
 
-I am hosting an instance of Neo4j (1.2) at neography.org for you to try out.
+I am hosting an instance of Neo4j (1.3M04) at neography.org for you to try out.
 
 You can see the administration at: {Neo4j Web Admin}[http://neography.org]
 
@@ -99,12 +99,18 @@ To Use:
   @neo.create_node_index(name, type, provider)               # creates an index, defaults are "exact" and "lucene"
   @neo.add_node_to_index(index, key, value, node1)           # adds a node to the index with the given key/value pair
   @neo.remove_node_from_index(index, key, value, node1)      # removes a node from the index with the given key/value pair
-  @neo.get_node_index(index, key, value)                     # queries the index with the given key/value pair
+  @neo.remove_node_from_index(index, key, node1)             # removes a node from the index with the given key
+  @neo.remove_node_from_index(index, node1)                  # removes a node from the index
+  @neo.get_node_index(index, key, value)                     # exact query of the node index with the given key/value pair
+  @neo.find_node_index(index, key, value)                    # advanced query of the node index with the given key/value pair
   @neo.list_relationship_indexes                             # gives names and query templates for relationship indices
-  @neo.create_relationshp_index(name, "fulltext", provider)  # creates a relationship index with "fulltext" option
+  @neo.create_relationship_index(name, "fulltext", provider) # creates a relationship index with "fulltext" option
   @neo.add_relationship_to_index(index, key, value, rel1)    # adds a relationship to the index with the given key/value pair
   @neo.remove_relationship_from_index(index, key, value, rel1) # removes a relationship from the index with the given key/value pair
-  @neo.get_relationship_index(index, key, value)             # queries the relationship index with the given key/value pair
+  @neo.remove_relationship_from_index(index, key, rel1)      # removes a relationship from the index with the given key
+  @neo.remove_relationship_from_index(index, rel1)           # removes a relationship from the index
+  @neo.get_relationship_index(index, key, value)             # exact query of the relationship index with the given key/value pair
+  @neo.find_relationship_index(index, key, value)            # advanced query of the relationship index with the given key/value pair
 
 
   @neo.get_path(node1, node2, relationships, depth=4, algorithm="shortestPath") # finds the shortest path between two nodes 

data/Rakefile

@@ -1,2 +1,11 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--color"
+  t.pattern = "spec/integration/*_spec.rb"
+end
+
+task :default => :spec

data/lib/neography/rest.rb

@@ -248,8 +248,12 @@ module Neography
         post("/index/node/#{index}/#{key}/#{value}", options)
       end
 
-      def remove_node_from_index(index, key, value, id)
-        delete("/index/node/#{index}/#{key}/#{value}/#{get_id(id)}")
+      def remove_node_from_index(*args)
+        case args.size
+          when 4 then delete("/index/node/#{args[0]}/#{args[1]}/#{args[2]}/#{get_id(args[3])}")
+          when 3 then delete("/index/node/#{args[0]}/#{args[1]}/#{get_id(args[2])}")
+          when 2 then delete("/index/node/#{args[0]}/#{get_id(args[1])}")
+        end
       end
 
       def get_node_index(index, key, value)
@@ -258,6 +262,12 @@ module Neography
         index
       end
 
+      def find_node_index(index, key, value)
+        index = get("/index/node/#{index}/#{key}?query=#{value}") || Array.new
+        return nil if index.empty?
+        index
+      end
+
       alias_method :list_indexes, :list_node_indexes
       alias_method :add_to_index, :add_node_to_index
       alias_method :remove_from_index, :remove_node_from_index
@@ -277,8 +287,12 @@ module Neography
         post("/index/relationship/#{index}/#{key}/#{value}", options)
       end
 
-      def remove_relationship_from_index(index, key, value, id)
-        delete("/index/relationship/#{index}/#{key}/#{value}/#{get_id(id)}")
+      def remove_relationship_from_index(*args)
+        case args.size
+          when 4 then delete("/index/relationship/#{args[0]}/#{args[1]}/#{args[2]}/#{get_id(args[3])}")
+          when 3 then delete("/index/relationship/#{args[0]}/#{args[1]}/#{get_id(args[2])}")
+          when 2 then delete("/index/relationship/#{args[0]}/#{get_id(args[1])}")
+        end
       end
 
       def get_relationship_index(index, key, value)
@@ -286,6 +300,13 @@ module Neography
         return nil if index.empty?
         index
       end
+
+      def find_relationship_index(index, key, value)
+        index = get("/index/relationship/#{index}/#{key}?query=#{value}") || Array.new
+        return nil if index.empty?
+        index
+      end
+
       def traverse(id, return_type, description)
         options = { :body => {"order" => get_order(description["order"]), 
                               "uniqueness" => get_uniqueness(description["uniqueness"]), 
@@ -335,19 +356,19 @@ module Neography
       end
 
        def get(path,options={})
-          evaluate_response(HTTParty.get(configuration + path, options.merge!(@authentication)))
+          evaluate_response(HTTParty.get(configuration + URI.encode(path), options.merge!(@authentication)))
        end
 
        def post(path,options={})
-          evaluate_response(HTTParty.post(configuration + path, options.merge!(@authentication)))
+          evaluate_response(HTTParty.post(configuration + URI.encode(path), options.merge!(@authentication)))
        end
 
        def put(path,options={})
-          evaluate_response(HTTParty.put(configuration + path, options.merge!(@authentication)))
+          evaluate_response(HTTParty.put(configuration + URI.encode(path), options.merge!(@authentication)))
        end
 
        def delete(path,options={})
-          evaluate_response(HTTParty.delete(configuration + path, options.merge!(@authentication)))
+          evaluate_response(HTTParty.delete(configuration + URI.encode(path), options.merge!(@authentication)))
        end
 
       def get_id(id)

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/neography.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.0.0.beta.22"
   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"
   s.add_dependency "json"
 end

data/spec/integration/authorization_spec.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-describe Neography::Rest do
-  describe "basic authentication" do
+describe Neography::Rest, :slow => true do
+  describe "basic authentication"  do
     describe "get_root" do
-      it "can get the root node" do
+      it "can get the root node"do
         @neo = Neography::Rest.new({:server => '4c36b641.neo4j.atns.de', :port => 7474, :directory => '/9dc1fda5be8b5cde29621e21cae5adece3de0f37', :authentication => 'basic', :username => "abbe3c012", :password => "34d7b22eb"})
         root_node = @neo.get_root
         root_node.should have_key("reference_node")
@@ -18,7 +18,7 @@ describe Neography::Rest do
       end
     end
 
-    describe "quick initalizer" do
+    describe "quick initializer" do
       it "can get the root node" do
         @neo = Neography::Rest.new("http://abbe3c012:34d7b22eb@4c36b641.neo4j.atns.de:7474/9dc1fda5be8b5cde29621e21cae5adece3de0f37")
         root_node = @neo.get_root
@@ -27,7 +27,7 @@ describe Neography::Rest do
     end
   end
 
-  describe "digest authentication" do
+  describe "digest authentication"  do
     describe "get_root" do
       it "can get the root node" do
         @neo = Neography::Rest.new({:server => '4c36b641.neo4j.atns.de', :port => 7474, :directory => '/9dc1fda5be8b5cde29621e21cae5adece3de0f37', :authentication => 'digest', :username => "abbe3c012", :password => "34d7b22eb"})

data/spec/integration/rest_bulk_spec.rb

@@ -12,7 +12,7 @@ describe Neography::Rest do
       new_nodes.size.should == 2
     end
 
-    it "is faster than non-threaded?" do
+    it "is faster than non-threaded?" , :slow => true do
       Benchmark.bm do |x|
         x.report("create 500 nodes         ") { @not_threaded = @neo.create_nodes(500) }
         x.report("create 500 nodes threaded") { @threaded     = @neo.create_nodes_threaded(500) }
@@ -61,7 +61,7 @@ describe Neography::Rest do
       new_nodes[1]["data"]["weight"].should == 215
     end
 
-    it "is not super slow?" do
+    it "is not super slow?" , :slow => true do
       Benchmark.bm do |x|
         x.report(  "create 1 node" ) { @neo.create_nodes(  1) }
         x.report( "create 10 nodes") { @neo.create_nodes( 10) }
@@ -89,7 +89,7 @@ describe Neography::Rest do
       existing_nodes[1]["self"] == new_node2["self"]
     end
 
-    it "is not super slow?" do
+    it "is not super slow?" , :slow => true do
                one_node  = @neo.create_nodes(  1)
               ten_nodes =  @neo.create_nodes( 10)
       one_hundred_nodes =  @neo.create_nodes(100)

data/spec/integration/rest_experimental_spec.rb

@@ -6,11 +6,10 @@ describe Neography::Rest do
   end
 
 
-  describe "get_nodes" do
+  describe "get_nodes", :slow => true do
     it "can get nodes that exists" do
       existing_nodes = @neo.get_nodes
       existing_nodes.should_not be_nil
-      puts existing_nodes.inspect
     end
 
     it "can get all nodes that exists the ugly way" do

data/spec/integration/rest_index_spec.rb

@@ -102,7 +102,31 @@ describe Neography::Rest do
       new_index.should be_nil
     end
 
-    it "can remove a relationshp from an index" do
+    it "can remove a node from an index without supplying value" do
+      new_node = @neo.create_node
+      key = generate_text(6)
+      value = generate_text
+      @neo.add_node_to_index("test_index", key, value, new_node) 
+      new_index = @neo.get_node_index("test_index", key, value) 
+      new_index.should_not be_nil
+      @neo.remove_node_from_index("test_index", key, new_node) 
+      new_index = @neo.get_node_index("test_index", key, value) 
+      new_index.should be_nil
+    end
+
+    it "can remove a node from an index without supplying key nor value" do
+      new_node = @neo.create_node
+      key = generate_text(6)
+      value = generate_text
+      @neo.add_node_to_index("test_index", key, value, new_node) 
+      new_index = @neo.get_node_index("test_index", key, value) 
+      new_index.should_not be_nil
+      @neo.remove_node_from_index("test_index", new_node) 
+      new_index = @neo.get_node_index("test_index", key, value) 
+      new_index.should be_nil
+    end
+
+    it "can remove a relationship from an index" do
       new_node1 = @neo.create_node
       new_node2 = @neo.create_node
       new_relationship = @neo.create_relationship("friends", new_node1, new_node2)
@@ -115,6 +139,34 @@ describe Neography::Rest do
       new_index = @neo.get_relationship_index("test_index", key, value) 
       new_index.should be_nil
     end
+
+    it "can remove a relationship from an index without supplying value" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2)
+      key = generate_text(6)
+      value = generate_text
+      @neo.add_relationship_to_index("test_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_index", key, value) 
+      new_index.should_not be_nil
+      @neo.remove_relationship_from_index("test_index", key, new_relationship) 
+      new_index = @neo.get_relationship_index("test_index", key, value) 
+      new_index.should be_nil
+    end
+
+    it "can remove a relationship from an index without supplying key nor value" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2)
+      key = generate_text(6)
+      value = generate_text
+      @neo.add_relationship_to_index("test_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_index", key, value) 
+      new_index.should_not be_nil
+      @neo.remove_relationship_from_index("test_index", new_relationship) 
+      new_index = @neo.get_relationship_index("test_index", key, value) 
+      new_index.should be_nil
+    end
   end
 
   describe "get index" do
@@ -152,6 +204,16 @@ describe Neography::Rest do
       @neo.remove_node_from_index("test_index", key, value, new_node) 
     end
 
+    it "can find a node index" do
+      new_node = @neo.create_node
+      key = generate_text(6)
+      value = generate_text
+      @neo.add_node_to_index("test_index", key, value, new_node) 
+      new_index = @neo.find_node_index("test_index", key, value) 
+      new_index.first["self"].should == new_node["self"]
+      @neo.remove_node_from_index("test_index", key, value, new_node) 
+    end
+
     it "can get a relationship index" do
       new_node1 = @neo.create_node
       new_node2 = @neo.create_node
@@ -163,6 +225,31 @@ describe Neography::Rest do
       new_index.first["self"].should == new_relationship["self"]
       @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
     end
+
+    it "can get a relationship index with empty spaces" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2)
+      key = generate_text(6)
+      value = generate_text + " " + generate_text
+      @neo.add_relationship_to_index("test_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_index", key, value) 
+      new_index.first["self"].should == new_relationship["self"]
+      @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
+    end
+
+    it "can find a relationship index" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", new_node1, new_node2)
+      key = generate_text(6)
+      value = generate_text
+      @neo.add_relationship_to_index("test_index", key, value, new_relationship) 
+      new_index = @neo.find_relationship_index("test_index", key, value) 
+      new_index.first["self"].should == new_relationship["self"]
+      @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
+    end
+
   end
 
 

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'neography'
-require 'fakeweb'
+require 'fake_web'
 require 'benchmark'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
@@ -22,4 +22,8 @@ def generate_text(length=8)
   key = ''
   length.times { |i| key << chars[rand(chars.length)] }
   key
+end
+
+RSpec.configure do |c|
+  c.filter_run_excluding :slow => true
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neography
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Max De Marzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -08:00
+date: 2011-03-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,9 +69,25 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -83,11 +99,11 @@ dependencies:
         - 3
         version: 0.7.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,7 +113,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/ for more details.
 email: maxdemarzi@gmail.com
 executables: []