neography 0.0.19 → 0.0.20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neography (0.0.17)
+    neography (0.0.19)
       httparty (= 0.7.8)
       json
       os
@@ -15,7 +15,6 @@ GEM
     httparty (0.7.8)
       crack (= 0.1.8)
     json (1.6.4)
-    json (1.6.4-java)
     net-http-spy (0.2.1)
     os (0.9.5)
     rake (0.8.7)

data/README.rdoc

@@ -30,6 +30,8 @@ in order to access the functionality.
 === Dependencies
 
   for use:
+  os
+  rake
   json
   httparty 
 
@@ -133,8 +135,10 @@ To Use:
   @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.find_relationship_index(index, query)                 # advanced query of the relationship index with the given query
-  @neo.execute_script("g.v(0)")                              # sends a Groovy script(through the Gremlin plugin)
+  @neo.execute_script("g.v(0)")                              # sends a Groovy script (through the Gremlin plugin)
+  @neo.execute_script("g.v(id)", {:id => 3})                 # sends a parameterized Groovy script (optimized for repeated calls)
   @neo.execute_query("start n=node(0) return n")             # sends a Cypher query (through the Cypher plugin)
+  @neo.execute_query("start n=node(id) return n", {:id => 3}) # sends a parameterized Cypher query (optimized for repeated calls)
 
   @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

data/lib/neography/rest.rb

@@ -341,13 +341,18 @@ module Neography
         paths = post("/node/#{get_id(from)}/paths", options) || Array.new
       end
 
-      def execute_query(query)
+      def execute_query_old(query)
           options = { :body => {:query => query}.to_json, :headers => {'Content-Type' => 'application/json'} }
           result = post("/ext/CypherPlugin/graphdb/execute_query", options)
       end
+
+      def execute_query(query, params = {})
+          options = { :body => {:query => query, :params => params}.to_json, :headers => {'Content-Type' => 'application/json'} }
+          result = post("/ext/CypherPlugin/graphdb/execute_query", options)
+      end
       
-      def execute_script(script)
-        options = { :body => "script=" + CGI::escape(script), :headers => {'Content-Type' => 'application/x-www-form-urlencoded'} }
+      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 == "null" ? nil : result
       end

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/neography.gemspec

@@ -21,8 +21,8 @@ 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_dependency "httparty", "0.7.8"
+  s.add_dependency "rake", ">= 0.8.7"
+  s.add_dependency "httparty", "~> 0.7.8"
   s.add_dependency "json"
   s.add_dependency "os"
   s.add_dependency "rubyzip"

data/spec/integration/rest_plugin_spec.rb

@@ -11,6 +11,24 @@ describe Neography::Rest do
       root_node.should have_key("self")
       root_node["self"].split('/').last.should == "0"
     end
+
+    it "can get the a node" do
+      new_node = @neo.create_node
+      id = new_node["self"].split('/').last
+      existing_node = @neo.execute_script("g.v(#{id})")
+      existing_node.should_not be_nil
+      existing_node.should have_key("self")
+      existing_node["self"].split('/').last.should == id
+    end
+
+    it "can get the a node with a variable" do
+      new_node = @neo.create_node
+      id = new_node["self"].split('/').last
+      existing_node = @neo.execute_script("g.v(id)", {:id => id.to_i})
+      existing_node.should_not be_nil
+      existing_node.should have_key("self")
+      existing_node["self"].split('/').last.should == id
+    end
   end
 
   describe "execute cypher query" do
@@ -21,6 +39,29 @@ describe Neography::Rest do
       root_node["data"][0][0].should have_key("self")
       root_node["data"][0][0]["self"].split('/').last.should == "0"
     end
+
+    it "can get the a node" do
+      new_node = @neo.create_node
+      id = new_node["self"].split('/').last
+      existing_node = @neo.execute_query("start n=node(#{id}) return n")
+      existing_node.should_not be_nil
+      existing_node.should have_key("data")
+      existing_node.should have_key("columns")
+      existing_node["data"][0][0].should have_key("self")
+      existing_node["data"][0][0]["self"].split('/').last.should == id
+    end
+
+    it "can get the a node with a variable" do
+      new_node = @neo.create_node
+      id = new_node["self"].split('/').last
+      existing_node = @neo.execute_query("start n=node({id}) return n", {:id => id.to_i})
+      existing_node.should_not be_nil
+      existing_node.should have_key("data")
+      existing_node.should have_key("columns")
+      existing_node["data"][0][0].should have_key("self")
+      existing_node["data"][0][0]["self"].split('/').last.should == id
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-01-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70481300 !ruby/object:Gem::Requirement
+  requirement: &73293220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70481300
+  version_requirements: *73293220
 - !ruby/object:Gem::Dependency
   name: net-http-spy
-  requirement: &70480860 !ruby/object:Gem::Requirement
+  requirement: &73292790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,32 +32,32 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *70480860
+  version_requirements: *73292790
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70480390 !ruby/object:Gem::Requirement
+  requirement: &73292370 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70480390
+  version_requirements: *73292370
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70480000 !ruby/object:Gem::Requirement
+  requirement: &73291920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *70480000
+  version_requirements: *73291920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70479670 !ruby/object:Gem::Requirement
+  requirement: &73291510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70479670
+  version_requirements: *73291510
 - !ruby/object:Gem::Dependency
   name: os
-  requirement: &70479300 !ruby/object:Gem::Requirement
+  requirement: &73290970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70479300
+  version_requirements: *73290970
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70478950 !ruby/object:Gem::Requirement
+  requirement: &73290680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70478950
+  version_requirements: *73290680
 description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/
   for more details.
 email: maxdemarzi@gmail.com