neography 0.0.23 → 0.0.24

data/README.rdoc

@@ -86,7 +86,9 @@ to your Rakefile to have access to these tasks.
                               :password => 'your password',  #leave out for default 
                               :log_file => 'neography.log',
                               :log_enabled => false,
-                              :max_threads => 20})
+                              :max_threads => 20,
+                              :cypher_path => '/cypher',
+                              :gremlin_path => '/ext/GremlinPlugin/graphdb/execute_script'})
 
 Quick initializer (assumes basic authorization if username is given):
 
@@ -159,6 +161,9 @@ To Use:
 
   @neo.get_path(node1, node2, relationships, depth=4, algorithm="shortestPath") # finds the shortest path between two nodes 
   @neo.get_paths(node1, node2, relationships, depth=3, algorithm="allPaths")    # finds all paths between two nodes
+  @neo.get_shortest_weighted_path(node1, node2, relationships,   # find the shortest path between two nodes
+                                  weight_attr='weight', depth=2, # accounting for weight in the relationships
+                                  algorithm='dijkstra')          # using 'weight' as the attribute
 
   nodes = @neo.traverse(node1,                                              # the node where the traversal starts
                         "nodes",                                            # return_type "nodes", "relationships" or "paths"

data/lib/neography/config.rb

@@ -1,17 +1,19 @@
 module Neography
   class Config 
-    class << self; attr_accessor :protocol, :server, :port, :directory, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password end
+    class << self; attr_accessor :protocol, :server, :port, :directory, :cypher_path, :gremlin_path, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password end
 
-    @protocol = 'http://'
-    @server = 'localhost'
-    @port = 7474 
-    @directory = ''
-    @log_file = 'neography.log'
-    @log_enabled = false
-    @logger = Logger.new(@log_file) if @log_enabled
-    @max_threads = 20
+    @protocol       = 'http://'
+    @server         = 'localhost'
+    @port           = 7474 
+    @directory      = ''
+    @cypher_path    = '/cypher'
+    @gremlin_path   = '/ext/GremlinPlugin/graphdb/execute_script'
+    @log_file       = 'neography.log'
+    @log_enabled    = false
+    @logger         = Logger.new(@log_file) if @log_enabled
+    @max_threads    = 20
     @authentication = {}
-    @username = nil
-    @password = nil
+    @username       = nil
+    @password       = nil
   end
 end

data/lib/neography/rest.rb

@@ -2,13 +2,15 @@ module Neography
   class Rest
     include HTTParty
 
-    attr_accessor :protocol, :server, :port, :directory, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password
+    attr_accessor :protocol, :server, :port, :directory, :cypher_path, :gremlin_path, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password
 
       def initialize(options=ENV['NEO4J_URL'] || {})
         init = {:protocol       => Neography::Config.protocol, 
                 :server         => Neography::Config.server, 
                 :port           => Neography::Config.port, 
-                :directory      => Neography::Config.directory, 
+                :directory      => Neography::Config.directory,
+                :cypher_path    => Neography::Config.cypher_path,
+                :gremlin_path   => Neography::Config.gremlin_path, 
                 :log_file       => Neography::Config.log_file, 
                 :log_enabled    => Neography::Config.log_enabled, 
                 :max_threads    => Neography::Config.max_threads,
@@ -34,6 +36,8 @@ module Neography
         @server         = init[:server]
         @port           = init[:port]
         @directory      = init[:directory]
+        @cypher_path    = init[:cypher_path]
+        @gremlin_path   = init[:gremlin_path]
         @log_file       = init[:log_file]
         @log_enabled    = init[:log_enabled]
         @logger         = Logger.new(@log_file) if @log_enabled
@@ -353,15 +357,20 @@ module Neography
         options = { :body => {"to" => self.configuration + "/node/#{get_id(to)}", "relationships" => relationships, "max_depth" => depth, "algorithm" => get_algorithm(algorithm) }.to_json, :headers => {'Content-Type' => 'application/json'} } 
         paths = post("/node/#{get_id(from)}/paths", options) || Array.new
       end
+      
+      def get_shortest_weighted_path(from, to, relationships, weight_attr='weight', depth=1, algorithm="dijkstra")
+        options = { :body => {"to" => self.configuration + "/node/#{get_id(to)}", "relationships" => relationships, "cost_property" => weight_attr, "max_depth" => depth, "algorithm" => get_algorithm(algorithm) }.to_json, :headers => {'Content-Type' => 'application/json'} } 
+        paths = post("/node/#{get_id(from)}/paths", options) || Hash.new
+      end
 
       def execute_query(query, params = {})
           options = { :body => {:query => query, :params => params}.to_json, :headers => {'Content-Type' => 'application/json'} }
-          result = post("/cypher", options)
+          result = post(@cypher_path, options)
       end
       
       def execute_script(script, params = {})
         options = { :body => {:script => script, :params => params}.to_json , :headers => {'Content-Type' => 'application/json'} }
-        result = post("/ext/GremlinPlugin/graphdb/execute_script", options)
+        result = post(@gremlin_path, options)
         result == "null" ? nil : result
       end
 
@@ -397,7 +406,7 @@ module Neography
           when :set_relationship_property
             {:method => "PUT", :to => "/relationship/#{get_id(args[1])}/properties/#{args[2].keys.first}", :body => args[2].values.first}
           when :reset_relationship_properties
-            {:method => "PUT", :to => "/relationship/#{get_id(args[1])}/properties", :body => args[2]}
+            {:method => "PUT", :to => (args[1].is_a?(String) && args[1].start_with?("{") ? "" : "/relationship/") + "#{get_id(args[1])}/properties", :body => args[2]}
           when :add_node_to_index
             {:method => "POST", :to => "/index/node/#{args[1]}", :body => {:uri => (args[4].is_a?(String) && args[4].start_with?("{") ? "" : "/node/") + "#{get_id(args[4])}", :key => args[2], :value => args[3] } }
           when :add_relationship_to_index
@@ -482,6 +491,8 @@ module Neography
             "shortestPath"
           when :allSimplePaths, "allSimplePaths", :simple, "simple"
             "allSimplePaths"
+          when :dijkstra, "dijkstra"
+            "dijkstra"
           else
             "allPaths"
         end

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.6")
+    args.with_defaults(:edition => "community", :version => "1.7.M01")
     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.23"
+  VERSION = "0.0.24"
 end

data/spec/integration/rest_batch_spec.rb

@@ -235,9 +235,6 @@ describe Neography::Rest do
       batch_result.first["body"].first["end"].split('/').last.should == node2["self"].split('/').last
     end
 
-
-
-
   describe "referenced batch" do
     it "can create a relationship from two newly created nodes" do
       batch_result = @neo.batch [:create_node, {"name" => "Max"}], [:create_node, {"name" => "Marc"}], [:create_relationship, "friends", "{0}", "{1}", {:since => "high school"}]
@@ -285,7 +282,21 @@ describe Neography::Rest do
       existing_index = @neo.find_relationship_index("test_relationship_index", key, value) 
       existing_index.should_not be_nil
       existing_index.first["self"].should == batch_result.first["body"]["self"]
+    end
 
+    it "can reset the properties of a newly created relationship" do
+      node1 = @neo.create_node
+      node2 = @neo.create_node
+      batch_result = @neo.batch [:create_relationship, "friends", node1, node2, {:since => "high school"}], [:reset_relationship_properties, "{0}", {"since" => "college", "dated" => "yes"}]
+      batch_result.first.should have_key("id")
+      batch_result.first.should have_key("from")
+      existing_relationship = @neo.get_relationship(batch_result.first["body"]["self"].split('/').last)
+      existing_relationship["type"].should == "friends"
+      existing_relationship["data"]["since"].should == "college"
+      existing_relationship["data"]["dated"].should == "yes"
+      existing_relationship["start"].split('/').last.should == node1["self"].split('/').last
+      existing_relationship["end"].split('/').last.should == node2["self"].split('/').last
+      existing_relationship["self"].should == batch_result.first["body"]["self"]
     end
 
     it "can kitchen sink" do

data/spec/integration/rest_path_spec.rb

@@ -33,6 +33,28 @@ describe Neography::Rest do
       path["nodes"].should == [new_node1["self"], new_node2["self"], new_node3["self"], new_node5["self"]]
     end
 
+    it "can get the shortest weighted path between two nodes" do
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_node3 = @neo.create_node
+      new_node4 = @neo.create_node
+      new_node5 = @neo.create_node
+      rel1_2 = @neo.create_relationship("friends", new_node1, new_node2)
+      rel2_3 = @neo.create_relationship("friends", new_node2, new_node3)
+      rel3_4 = @neo.create_relationship("friends", new_node3, new_node4)
+      rel4_5 = @neo.create_relationship("friends", new_node4, new_node5)
+      rel3_5 = @neo.create_relationship("friends", new_node3, new_node5)
+      @neo.set_relationship_properties(rel1_2, {:weight => 1})
+      @neo.set_relationship_properties(rel2_3, {:weight => 1})
+      @neo.set_relationship_properties(rel3_4, {:weight => 1})
+      @neo.set_relationship_properties(rel4_5, {:weight => 1})
+      @neo.set_relationship_properties(rel3_5, {:weight => 3})
+      path = @neo.get_shortest_weighted_path(new_node1, new_node5, {"type"=> "friends", "direction" => "out"})
+      path.first["start"].should == new_node1["self"]
+      path.first["end"].should == new_node5["self"]
+      path.first["nodes"].should == [new_node1["self"], new_node2["self"], new_node3["self"], new_node4["self"], new_node5["self"]]
+    end
+
     it "can get a simple path between two nodes" do
       new_node1 = @neo.create_node
       new_node2 = @neo.create_node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-03-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85677290 !ruby/object:Gem::Requirement
+  requirement: &81537140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85677290
+  version_requirements: *81537140
 - !ruby/object:Gem::Dependency
   name: net-http-spy
-  requirement: &85677040 !ruby/object:Gem::Requirement
+  requirement: &81536810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *85677040
+  version_requirements: *81536810
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &85676790 !ruby/object:Gem::Requirement
+  requirement: &81536470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *85676790
+  version_requirements: *81536470
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &85676560 !ruby/object:Gem::Requirement
+  requirement: &81535920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *85676560
+  version_requirements: *81535920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &85738040 !ruby/object:Gem::Requirement
+  requirement: &81535730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85738040
+  version_requirements: *81535730
 - !ruby/object:Gem::Dependency
   name: os
-  requirement: &85737810 !ruby/object:Gem::Requirement
+  requirement: &81518230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85737810
+  version_requirements: *81518230
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &85737600 !ruby/object:Gem::Requirement
+  requirement: &81517920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85737600
+  version_requirements: *81517920
 description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/
   for more details.
 email: maxdemarzi@gmail.com