neography 0.0.16 → 0.0.17

data/.travis.yml

@@ -0,0 +1 @@
+script: "bundle exec rake neo4j:install neo4j:start spec --trace"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neography (0.0.15)
+    neography (0.0.16)
       httparty (~> 0.7.3)
       json
       os

data/README.rdoc

@@ -17,7 +17,7 @@ An alternative is the Architect4r Gem at https://github.com/namxam/architect4r b
 
 or 
 
-  gem install 'neography', '0.0.15' # for version 1.5 of Neo4j
+  gem install 'neography'           # for version 1.5M of Neo4j or higher
 
 After that, in your ruby script:
 
@@ -36,7 +36,6 @@ in order to access the functionality.
   for development:
   rspec 
   net-http-spy 
-  fakeweb 
 
 ==== Rails
 
@@ -44,7 +43,10 @@ Just add gem 'neography' to your Gemfile and run bundle install.
 
 The following tasks will be available to you:
   
-  rake neo4j:install                           # Install Neo4j to the neo4j directory under your project 
+  rake neo4j:install                           # Install Neo4j to the neo4j directory under your project
+  rake neo4j:install[community,1.6.M01]        # Install Neo4j Community edition, version 1.6.M01
+  rake neo4j:install[advanced,1.5]             # Install Neo4j Advanced edition, version 1.5 
+  rake neo4j:install[enterprise,1.5]           # Install Neo4j Enterprise edition, version 1.5
   rake neo4j:start                             # Start Neo4j
   rake neo4j:stop                              # Stop Neo4j
   rake neo4j:restart                           # Restart Neo4j

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
+require 'neography/tasks'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = "--color"

data/examples/facebook.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'neography'
 
-Neography::Config.server = 'neography.org'
 @neo = Neography::Rest.new
 
 def create_person(name)

data/examples/facebook_v2.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'neography'
 
-Neography::Config.server = 'neography.org'
 @neo = Neography::Rest.new
 
 def suggestions_for(node)

data/examples/linkedin.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'neography'
 
-Neography::Config.server = 'neography.org'
 @neo = Neography::Rest.new
 
 def create_person(name)

data/examples/linkedin_v2.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'neography'
 
-Neography::Config.server = 'neography.org'
 @neo = Neography::Rest.new
 
 johnathan = Neography::Node.create("name" =>'Johnathan')

data/lib/neography.rb

@@ -10,8 +10,6 @@ def find_and_require_user_defined_code
         end
       end
     end
-  else
-    puts "No Extensions Found: #{extensions_path}"
   end
 end
 

data/lib/neography/index.rb

@@ -1,11 +1,11 @@
 module Neography
   module Index
 
-    def index
+    def index(*args)
 
     end
 
-    def find
+    def find(*args)
 
     end
 

data/lib/neography/node.rb

@@ -1,6 +1,6 @@
 module Neography
   class Node < PropertyContainer
-    include Neography::Index
+    extend  Neography::Index
     include Neography::NodeRelationship
     include Neography::NodePath
     include Neography::Equal

data/lib/neography/relationship.rb

@@ -2,7 +2,8 @@ module Neography
   class Relationship < PropertyContainer
     include Neography::Equal
     include Neography::Property
-
+    extend  Neography::Index
+    
     attr_accessor :start_node, :end_node, :rel_type
 
     class << self

data/lib/neography/rest.rb

@@ -176,6 +176,14 @@ module Neography
         get("/relationship/#{get_id(id)}")
       end
 
+      def get_relationship_start_node(rel)
+        get_node(rel["start"])
+      end
+      
+      def get_relationship_end_node(rel)
+        get_node(rel["end"])
+      end
+      
       def reset_relationship_properties(id, properties)
         options = { :body => properties.to_json, :headers => {'Content-Type' => 'application/json'} } 
         put("/relationship/#{get_id(id)}/properties", options)

data/lib/neography/tasks.rb

@@ -1,16 +1,18 @@
 # borrowed from architect4r
+require 'os'
 
 namespace :neo4j do
   desc "Install Neo4j"
-  task :install do
-    puts 'Installing Neo4j...'
+  task :install, :edition, :version do |t, args|
+    args.with_defaults(:edition => "community", :version => "1.6.M01")
+    puts "Installing Neo4j-#{args[:edition]}-#{args[:version]}"
     
     if OS::Underlying.windows?
       # Download Neo4j    
       unless File.exist?('neo4j.zip')
         df = File.open('neo4j.zip', 'wb')
         begin
-          df << HTTParty.get("http://dist.neo4j.org/neo4j-community-1.5.M02-windows.zip")
+          df << HTTParty.get("http://dist.neo4j.org/neo4j-#{args[:edition]}-#{args[:version]}-windows.zip")
         ensure
           df.close()
         end
@@ -29,7 +31,7 @@ namespace :neo4j do
            end
           end
         end
-        FileUtils.mv "neo4j-community-1.5.M02", "neo4j"
+        FileUtils.mv "neo4j-#{args[:edition]}-#{args[:version]}", "neo4j"
      end
 
       # Install if running with Admin Privileges
@@ -39,10 +41,10 @@ namespace :neo4j do
       end
 
     else    
-      %x[wget http://dist.neo4j.org/neo4j-community-1.5.M02-unix.tar.gz]
-      %x[tar -xvzf neo4j-community-1.5.M02-unix.tar.gz]
-      %x[mv neo4j-community-1.5.M02 neo4j]
-      %x[rm neo4j-community-1.5.M02-unix.tar.gz]
+      %x[wget http://dist.neo4j.org/neo4j-#{args[:edition]}-#{args[:version]}-unix.tar.gz]
+      %x[tar -xvzf neo4j-#{args[:edition]}-#{args[:version]}-unix.tar.gz]
+      %x[mv neo4j-#{args[:edition]}-#{args[:version]} neo4j]
+      %x[rm neo4j-#{args[:edition]}-#{args[:version]}-unix.tar.gz]
       puts "Neo4j Installed in to neo4j directory."
     end
     puts "Type 'rake neo4j:start' to start it"

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/integration/index_spec.rb

@@ -2,6 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Neography::Relationship, "find" do
   before(:each) do
+    pending "Phase 2 - Index part is not done."
     Neography::Relationship.index(:strength)
   end
 

data/spec/integration/rest_gremlin_fail_spec.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Neography::Rest do
+  before(:each) do
+    @neo = Neography::Rest.new
+  end
+
+  describe "don't break gremlin" do
+    it "can handle node and relationship indexes" 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_node_to_index("test_index", key, value, new_node1)
+      @neo.add_relationship_to_index("test_index2", key, value, new_relationship) 
+    end
+
+    it "gremlin works" do
+      root_node = @neo.execute_script("g.v(0)")
+      root_node.should have_key("self")
+      root_node["self"].split('/').last.should == "0"
+    end
+  end
+
+
+  describe "break gremlin" do
+    it "can can't handle node and relationship indexes with the same name" 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_node_to_index("test_index3", key, value, new_node1)
+      @neo.add_relationship_to_index("test_index3", key, value, new_relationship) 
+    end
+
+    it "gremlin works" do
+      root_node = @neo.execute_script("g.v(0)")
+      root_node.should have_key("self")
+      root_node["self"].split('/').last.should == "0"
+    end
+  end
+
+
+end

data/spec/integration/rest_index_spec.rb

@@ -10,7 +10,7 @@ describe Neography::Rest do
       new_node = @neo.create_node
       key = generate_text(6)
       value = generate_text
-      @neo.add_node_to_index("test_index", key, value, new_node) 
+      @neo.add_node_to_index("test_node_index", key, value, new_node) 
       @neo.list_indexes.should_not be_nil
     end
 
@@ -20,7 +20,7 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       @neo.list_relationship_indexes.should_not be_nil
     end
   end
@@ -70,10 +70,10 @@ describe Neography::Rest 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) 
+      @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_index", key, value, new_node) 
+      @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
   
     it "can add a relationship to an index" do
@@ -82,10 +82,10 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.should_not be_nil
-      @neo.remove_relationship_from_index("test_index", key, value, new_relationship) 
+      @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship) 
     end
   end
 
@@ -94,11 +94,11 @@ describe Neography::Rest 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) 
+      @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_index", key, value, new_node) 
-      new_index = @neo.get_node_index("test_index", key, value) 
+      @neo.remove_node_from_index("test_node_index", key, value, new_node) 
+      new_index = @neo.get_node_index("test_node_index", key, value) 
       new_index.should be_nil
     end
 
@@ -106,11 +106,11 @@ describe Neography::Rest 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) 
+      @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_index", key, new_node) 
-      new_index = @neo.get_node_index("test_index", key, value) 
+      @neo.remove_node_from_index("test_node_index", key, new_node) 
+      new_index = @neo.get_node_index("test_node_index", key, value) 
       new_index.should be_nil
     end
 
@@ -118,11 +118,11 @@ describe Neography::Rest 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) 
+      @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_index", new_node) 
-      new_index = @neo.get_node_index("test_index", key, value) 
+      @neo.remove_node_from_index("test_node_index", new_node) 
+      new_index = @neo.get_node_index("test_node_index", key, value) 
       new_index.should be_nil
     end
 
@@ -132,11 +132,11 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.should_not be_nil
-      @neo.remove_relationship_from_index("test_index", key, value, new_relationship) 
-      new_index = @neo.get_relationship_index("test_index", key, value) 
+      @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.should be_nil
     end
 
@@ -146,11 +146,11 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_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) 
+      @neo.remove_relationship_from_index("test_relationship_index", key, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.should be_nil
     end
 
@@ -160,11 +160,11 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_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) 
+      @neo.remove_relationship_from_index("test_relationship_index", new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.should be_nil
     end
   end
@@ -174,10 +174,10 @@ describe Neography::Rest 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) 
+      @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_index", key, value, new_node) 
+      @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
 
     it "can get a relationship index" do
@@ -186,10 +186,10 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.should_not be_nil
-      @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
+      @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
   end
 
@@ -198,30 +198,30 @@ describe Neography::Rest 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) 
+      @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.first["self"].should == new_node["self"]
-      @neo.remove_node_from_index("test_index", key, value, new_node) 
+      @neo.remove_node_from_index("test_node_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) 
+      @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.first["self"].should == new_node["self"]
-      @neo.remove_node_from_index("test_index", key, value, new_node) 
+      @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
 
     it "can find a node index using generic query" 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}")
+      @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.first["self"].should == new_node["self"]
-      @neo.remove_node_from_index("test_index", key, value, new_node)
+      @neo.remove_node_from_index("test_node_index", key, value, new_node)
     end
 
     it "can get a relationship index" do
@@ -230,10 +230,10 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.first["self"].should == new_relationship["self"]
-      @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
+      @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
     it "can get a relationship index with empty spaces" do
@@ -242,10 +242,10 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
       new_index.first["self"].should == new_relationship["self"]
-      @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
+      @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
     it "can find a relationship index" do
@@ -254,10 +254,10 @@ describe Neography::Rest do
       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) 
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
+      new_index = @neo.find_relationship_index("test_relationship_index", key, value) 
       new_index.first["self"].should == new_relationship["self"]
-      @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
+      @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
     it "can find a relationship index using generic query" do
@@ -266,10 +266,10 @@ describe Neography::Rest do
       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}")
+      @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship)
+      new_index = @neo.find_relationship_index("test_relationship_index", "#{key}: #{value}")
       new_index.first["self"].should == new_relationship["self"]
-      @neo.remove_relationship_from_index("test_index", key, value, new_relationship)
+      @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
     it "can find use the results of a node index" do
@@ -278,17 +278,17 @@ describe Neography::Rest do
       key = generate_text(6)
       value1 = generate_text
       value2 = generate_text
-      @neo.add_node_to_index("test_index", key, value1, new_node1) 
-      @neo.add_node_to_index("test_index", key, value2, new_node2) 
-      existing_node1 = @neo.get_node_index("test_index", key, value1)
-      existing_node2 = @neo.get_node_index("test_index", key, value2)
+      @neo.add_node_to_index("test_node_index", key, value1, new_node1) 
+      @neo.add_node_to_index("test_node_index", key, value2, new_node2) 
+      existing_node1 = @neo.get_node_index("test_node_index", key, value1)
+      existing_node2 = @neo.get_node_index("test_node_index", key, value2)
       new_relationship = @neo.create_relationship("friends", existing_node1, existing_node2)
       new_relationship["start"].should_not be_nil
       new_relationship["start"].should == new_node1["self"]
       new_relationship["end"].should_not be_nil
       new_relationship["end"].should == new_node2["self"]
-      @neo.remove_node_from_index("test_index", new_node1) 
-      @neo.remove_node_from_index("test_index", new_node2) 
+      @neo.remove_node_from_index("test_node_index", new_node1) 
+      @neo.remove_node_from_index("test_node_index", new_node2) 
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neography
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Max De Marzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -136,6 +136,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .project
+- .travis.yml
 - CONTRIBUTORS
 - Gemfile
 - Gemfile.lock
@@ -176,6 +177,7 @@ files:
 - spec/integration/relationship_spec.rb
 - spec/integration/rest_bulk_spec.rb
 - spec/integration/rest_experimental_spec.rb
+- spec/integration/rest_gremlin_fail_spec.rb
 - spec/integration/rest_index_spec.rb
 - spec/integration/rest_node_spec.rb
 - spec/integration/rest_path_spec.rb