neography 0.0.13 → 0.0.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neography (0.0.12)
+    neography (0.0.13)
       httparty (~> 0.7.3)
       json
 
@@ -11,10 +11,9 @@ GEM
     crack (0.1.8)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
-    httparty (0.7.3)
+    httparty (0.7.4)
       crack (= 0.1.8)
     json (1.4.6)
-    json (1.4.6-java)
     net-http-spy (0.2.1)
     rake (0.8.7)
     rspec (2.0.1)

data/lib/neography.rb

@@ -34,6 +34,7 @@ require 'neography/relationship_traverser'
 require 'neography/node_traverser'
 require 'neography/path_traverser'
 require 'neography/equal'
+require 'neography/index'
 
 require 'neography/node'
 require 'neography/relationship'

data/lib/neography/{node_index.rb → index.rb}

@@ -1,5 +1,9 @@
 module Neography
-  module NodeIndex
+  module Index
+
+    def index
+
+    end
 
     def find
 

data/lib/neography/node.rb

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

data/lib/neography/relationship.rb

@@ -31,11 +31,20 @@ module Neography
       end
     end
 
-    def initialize(hash=nil, neo_server=nil)
+    def initialize(hash=nil, server=nil)
       super(hash)
       @start_node = hash["start"].split('/').last
       @end_node = hash["end"].split('/').last
       @rel_type = hash["type"]
+      neo_server = server
+    end
+    
+    def neo_server
+      @neo_server ||= self.start_node.neo_server
+    end
+    
+    def neo_server=(server)
+      @neo_server = server
     end
 
     def del

data/lib/neography/relationship_traverser.rb

@@ -21,8 +21,8 @@ module Neography
     def each
       iterator.each do |i| 
         rel = Neography::Relationship.new(i, @node.neo_server)
-        rel.start_node = Neography::Node.load(rel.start_node)
-        rel.end_node = Neography::Node.load(rel.end_node)
+        rel.start_node = Neography::Node.load(rel.start_node, @node.neo_server)
+        rel.end_node = Neography::Node.load(rel.end_node, @node.neo_server)
 
         yield rel if match_to_other?(rel)
       end

data/lib/neography/rest.rb

@@ -311,19 +311,19 @@ module Neography
         options = { :body => {"order" => get_order(description["order"]), 
                               "uniqueness" => get_uniqueness(description["uniqueness"]), 
                               "relationships" => description["relationships"], 
-                              "prune evaluator" => description["prune evaluator"], 
-                              "return filter" => description["return filter"], 
-                              "max depth" => get_depth(description["depth"]), }.to_json, :headers => {'Content-Type' => 'application/json'} } 
+                              "prune_evaluator" => description["prune evaluator"], 
+                              "return_filter" => description["return filter"], 
+                              "max_depth" => get_depth(description["depth"]), }.to_json, :headers => {'Content-Type' => 'application/json'} } 
         traversal = post("/node/#{get_id(id)}/traverse/#{get_type(return_type)}", options) || Array.new
       end
 
       def get_path(from, to, relationships, depth=1, algorithm="shortestPath")
-        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'} } 
+        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'} } 
         path = post("/node/#{get_id(from)}/path", options) || Hash.new
       end
 
       def get_paths(from, to, relationships, depth=1, algorithm="allPaths")
-        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'} } 
+        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
 

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/integration/relationship_spec.rb

@@ -19,7 +19,7 @@ describe Neography::Relationship do
       rel[:since].should == 1998
       rel[:colour].should == 'blue'
       rel.since.should == 1998
-      rel.colourshould == 'blue'
+      rel.colour.should == 'blue'
     end
 
     it "#outgoing(:friends).create(other) creates a new relationship between self and other node" do

metadata

@@ -2,7 +2,7 @@
 name: neography
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Max De Marzi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -07:00
+date: 2011-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,9 +104,9 @@ files:
 - lib/neography.rb
 - lib/neography/config.rb
 - lib/neography/equal.rb
+- lib/neography/index.rb
 - lib/neography/neography.rb
 - lib/neography/node.rb
-- lib/neography/node_index.rb
 - lib/neography/node_path.rb
 - lib/neography/node_relationship.rb
 - lib/neography/node_traverser.rb