neography 0.0.21 → 0.0.22

data/README.rdoc

@@ -1,12 +1,14 @@
 == Welcome to Neography
 
 Neography is a thin Ruby wrapper to the Neo4j Rest API, for more information:
-* {Getting Started with Neo4j Server}[http://wiki.neo4j.org/content/Getting_Started_with_Neo4j_Server]
-* {Neo4j Rest API Reference}[http://components.neo4j.org/neo4j-server/milestone/rest.html]
+* {Getting Started with Neo4j Server}[http://neo4j.org/community/]
+* {Neo4j Rest API Reference}[http://docs.neo4j.org/chunked/milestone/rest-api.html]
 
 If you want to the full power of Neo4j, you will want to use JRuby and the excellent Neo4j.rb gem at https://github.com/andreasronge/neo4j by Andreas Ronge
 
-A complement to Neography is the Neology Gem at https://github.com/lordkada/neology by Carlo Alberto Degli Atti
+Complement to Neography are the:
+Neology Gem at https://github.com/lordkada/neology by Carlo Alberto Degli Atti
+Neoid Gem at https://github.com/elado/neoid by Elad Ossadon
 
 An alternative is the Architect4r Gem at https://github.com/namxam/architect4r by Maximilian Schulz 
 
@@ -96,8 +98,11 @@ To Use:
   @neo = Neography::Rest.new                                 # Inialize using all default parameters 
 
   @neo.get_root                                              # Get the root node
-  node1 = @neo.create_node                                   # Create an empty node
-  node2 = @neo.create_node("age" => 31, "name" => "Max")     # Create a node with some properties
+  @neo.create_node                                           # Create an empty node
+  @neo.create_node("age" => 31, "name" => "Max")             # Create a node with some properties
+  @neo.create_unique_node(index_name, key, unique_value,     # Create a unique node 
+                         {"age" => 31, "name" => "Max"})     # this needs an existing index
+
   @neo.get_node(node2)                                       # Get a node and its properties
   @neo.delete_node(node2)                                    # Delete an unrelated node
   @neo.delete_node!(node2)                                   # Delete a node and all its relationships
@@ -110,8 +115,11 @@ To Use:
   @neo.remove_node_properties(node1, "weight")               # Remove one property of a node
   @neo.remove_node_properties(node1, ["weight","age"])       # Remove multiple properties of a node
 
-  rel1 = @neo.create_relationship("friends", node1, node2)   # Create a relationship between node1 and node2
-  rel2 = @neo.get_relationship(rel1)                         # Get a relationship
+  @neo.create_relationship("friends", node1, node2)          # Create a relationship between node1 and node2
+  @neo.create_unique_relationship(index_name, key, value,    # Create a unique relationship between nodes 
+                          "friends", new_node1, new_node2)   # this needs an existing index
+
+  @neo.get_relationship(rel1)                                # Get a relationship
   @neo.get_node_relationships(node1)                         # Get all relationships
   @neo.get_node_relationships(node1, "in")                   # Get only incoming relationships
   @neo.get_node_relationships(node1, "all", "enemies")       # Get all relationships of type enemies
@@ -169,10 +177,6 @@ To Use:
   # "depth" is a short-hand way of specifying a prune evaluator which prunes after a certain depth. 
   # If not specified a depth of 1 is used and if a "prune evaluator" is specified instead of a depth, no depth limit is set.
 
-Please see the specs for more examples.
-
-Batch (in progress):
-
   @neo.batch [:get_node, node1], [:get_node, node2]                        # Gets two nodes in a batch
   @neo.batch [:create_node, {"name" => "Max"}], 
              [:create_node, {"name" => "Marc"}]                            # Creates two nodes in a batch
@@ -198,6 +202,10 @@ Batch (in progress):
 
 See http://docs.neo4j.org/chunked/milestone/rest-api-batch-ops.html for Neo4j Batch operations documentation.
 
+
+Please see the specs for more examples.
+
+
 Experimental:
 
   nodes = @neo.create_nodes(5)                                              # Create 5 empty nodes

data/examples/greatest.rb

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'neography'
+
+def create_great(name)
+  Neography::Node.create("name" => name)
+end
+
+game      = create_great('The 1958 NFL Championship Game')
+brando    = create_great('Marlon Brando')
+alex      = create_great('Alexander the Great')
+circus    = create_great('The Ringling Bros. and Barnum and Bailey')
+beatles   = create_great('The Beatles')
+ali       = create_great('Muhammad Ali')
+bread     = create_great('Sliced Bread')
+gatsby    = create_great('The Great Gatsby')
+
+greats = [game,brando,alex,circus,beatles,ali,bread,gatsby]
+
+def as_great(great, other_greats)
+  other_greats.each do |og|
+    great.outgoing(:as_great) << og
+  end
+end
+
+greats.each do |g|
+  ogs = greats.select{|v| v != g }.sample(1 + rand(5))
+  as_great(g, ogs)
+end
+
+def the_greatest
+  neo = Neography::Rest.new
+  neo.execute_script("m = [:];
+                      c = 0;
+                      g.
+                        V.
+                        out.
+                        groupCount(m).
+                        loop(2){c++ < 1000}.iterate();
+                        
+                        m.sort{a,b -> b.value <=> a.value}.keySet().name[0];")
+end
+
+puts "The greatest is #{the_greatest}"

data/lib/neography/rest.rb

@@ -172,6 +172,14 @@ module Neography
          post("/node/#{get_id(from)}/relationships", options)
       end
 
+      def create_unique_relationship(index, key, value, type, from, to)
+        body = {:key=>key,:value=>value, :type => type }
+        body[:start] = self.configuration + "/node/#{get_id(from)}"
+        body[:end] = self.configuration + "/node/#{get_id(to)}"
+        options = { :body => body.to_json, :headers => {'Content-Type' => 'application/json'} } 
+        post("/index/relationship/#{index}?unique", options) 
+      end
+
       def get_relationship(id)
         get("/relationship/#{get_id(id)}")
       end
@@ -256,6 +264,11 @@ module Neography
         post("/index/node/#{index}", options)
       end
 
+      def create_unique_node(index, key, value, props={})
+        options = { :body => ({:properties=>props, :key => key, :value => value }).to_json, :headers => {'Content-Type' => 'application/json'} } 
+        post("/index/node/#{index}?unique", options) 
+      end
+
       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])}")
@@ -343,7 +356,7 @@ module Neography
 
       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)
+          result = post("/cypher", options)
       end
       
       def execute_script(script, params = {})

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/lib/neography.rb

@@ -40,7 +40,7 @@ require 'neography/index'
 require 'neography/node'
 require 'neography/relationship'
 
-require 'neography/railtie' if defined? Rails
+require 'neography/railtie' if defined? Rails::Railtie
 
 find_and_require_user_defined_code
 

data/spec/integration/rest_node_spec.rb

@@ -36,6 +36,17 @@ describe Neography::Rest do
       new_node["data"]["name"].should == "Max"
       new_node["data"]["age"].should == 31
     end
+
+    it "can create a unique node with more than one property" do
+      index_name = generate_text(6)
+      key = generate_text(6)
+      value = generate_text
+      @neo.create_node_index(index_name)
+      new_node = @neo.create_unique_node(index_name, key, value, {"age" => 31, "name" => "Max"})
+      new_node["data"]["name"].should == "Max"
+      new_node["data"]["age"].should == 31
+    end
+
   end
 
   describe "get_node" do

data/spec/integration/rest_relationship_spec.rb

@@ -30,6 +30,28 @@ describe Neography::Rest do
       new_relationship["data"]["since"].should == '10-1-2010'
       new_relationship["data"]["met"].should == "college"
     end
+    
+    it "can create a unique node with more than one property" do
+      index_name = generate_text(6)
+      key = generate_text(6)
+      value = generate_text
+      @neo.create_node_index(index_name)
+      new_node = @neo.create_unique_node(index_name, key, value, {"age" => 31, "name" => "Max"})
+      new_node["data"]["name"].should == "Max"
+      new_node["data"]["age"].should == 31
+    end
+    
+    it "can create a unique relationship" do
+      index_name = generate_text(6)
+      key = generate_text(6)
+      value = generate_text
+      new_node1 = @neo.create_node
+      new_node2 = @neo.create_node
+      new_relationship = @neo.create_unique_relationship(index_name, key, value, "friends", new_node1, new_node2)
+      new_relationship["data"][key].should == value
+    end
+
+    
   end
 
   describe "get_relationship" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neography
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Max De Marzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -141,6 +141,7 @@ files:
 - Rakefile
 - examples/facebook.rb
 - examples/facebook_v2.rb
+- examples/greatest.rb
 - examples/linkedin.rb
 - examples/linkedin_v2.rb
 - examples/traversal_example1.rb