neography 0.0.22 → 0.0.23

data/README.rdoc

@@ -182,12 +182,19 @@ To Use:
              [:create_node, {"name" => "Marc"}]                            # Creates two nodes in a batch
   @neo.batch [:set_node_property, node1, {"name" => "Tom"}], 
              [:set_node_property, node2, {"name" => "Jerry"}]              # Sets the property of two nodes
+  @neo.batch [:create_unique_node, index_name, key, value, 
+               {"age" => 33, "name" => "Max"}]                             # Creates a unique node
   @neo.batch [:get_relationship, rel1],
              [:get_relationship, rel2]                                     # Gets two relationships in a batch
   @neo.batch [:create_relationship, "friends",
                node1, node2, {:since => "high school"}],
              [:create_relationship, "friends",
                node1, node3, {:since => "college"}]                        # Creates two relationships in a batch
+  @neo.batch [:create_unique_relationship, index_name,               
+               key, value, "friends", node1, node2]                        # Creates a unique relationship
+  @neo.batch [:get_node_index, index_name, key, value]                     # Get node index
+  @neo.batch [:get_relationship_index, index_name, key, value]             # Get relationship index
+
   @neo.batch [:create_node, {"name" => "Max"}], 
              [:create_node, {"name" => "Marc"}],                           # Creates two nodes and index them
              [:add_node_to_index, "test_node_index", key, value, "{0}"],
@@ -347,7 +354,8 @@ Contribute patches via pull requests.
 
 === Help
 
-If you are just starting out, or need help send me an e-mail at maxdemazi@gmail.com.
+If you are just starting out, or need help send me an e-mail at maxdemarzi@gmail.com.
+Check you my blog at http://maxdemarzi.com where I have more Neography examples.
 
 === Licenses
 

data/lib/neography/rest.rb

@@ -382,6 +382,8 @@ module Neography
             {:method => "GET", :to => "/node/#{get_id(args[1])}"}
           when :create_node
             {:method => "POST", :to => "/node/", :body => args[1]}
+          when :create_unique_node
+            {:method => "POST", :to => "/index/node/#{args[1]}?unique", :body => {:key => args[2], :value => args[3], :properties => args[4]}}
           when :set_node_property
             {:method => "PUT", :to => "/node/#{get_id(args[1])}/properties/#{args[2].keys.first}", :body => args[2].values.first}
           when :reset_node_properties
@@ -390,6 +392,8 @@ module Neography
             {:method => "GET", :to => "/relationship/#{get_id(args[1])}"}
           when :create_relationship
             {:method => "POST", :to => (args[2].is_a?(String) && args[2].start_with?("{") ? "" : "/node/") + "#{get_id(args[2])}/relationships", :body => {:to => (args[3].is_a?(String) && args[3].start_with?("{") ? "" : "/node/") + "#{get_id(args[3])}", :type => args[1], :data => args[4] } }
+          when :create_unique_relationship
+            {:method => "POST", :to => "/index/relationship/#{args[1]}?unique", :body => {:key => args[2], :value => args[3], :type => args[4], :start => (args[5].is_a?(String) && args[5].start_with?("{") ? "" : "/node/") + "#{get_id(args[5])}", :end=> (args[6].is_a?(String) && args[6].start_with?("{") ? "" : "/node/") + "#{get_id(args[6])}"} }
           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
@@ -398,6 +402,10 @@ module Neography
             {: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
             {:method => "POST", :to => "/index/relationship/#{args[1]}", :body => {:uri => (args[4].is_a?(String) && args[4].start_with?("{") ? "" : "/relationship/") + "#{get_id(args[4])}", :key => args[2], :value => args[3] } }
+          when :get_node_index
+            {:method => "GET", :to => "/index/node/#{args[1]}/#{args[2]}/#{args[3]}"}
+          when :get_relationship_index
+            {:method => "GET", :to => "/index/relationship/#{args[1]}/#{args[2]}/#{args[3]}"}
         end
      end
 

data/lib/neography/version.rb

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

data/spec/integration/rest_batch_spec.rb

@@ -53,6 +53,26 @@ describe Neography::Rest do
       batch_result.last["body"]["data"]["name"].should == "Marc"
     end
 
+    it "can create a unique node" do
+      index_name = generate_text(6)
+      key = generate_text(6)
+      value = generate_text
+      @neo.create_node_index(index_name)
+      batch_result = @neo.batch [:create_unique_node, index_name, key, value, {"age" => 31, "name" => "Max"}]
+      batch_result.first["body"]["data"]["name"].should == "Max"
+      batch_result.first["body"]["data"]["age"].should == 31
+      new_node_id = batch_result.first["body"]["self"].split('/').last
+      batch_result = @neo.batch [:create_unique_node, index_name, key, value, {"age" => 31, "name" => "Max"}]
+      batch_result.first["body"]["self"].split('/').last.should == new_node_id
+      batch_result.first["body"]["data"]["name"].should == "Max"
+      batch_result.first["body"]["data"]["age"].should == 31
+
+      #Sanity Check
+      existing_node = @neo.create_unique_node(index_name, key, value, {"age" => 31, "name" => "Max"})
+      existing_node["self"].split('/').last.should == new_node_id
+      existing_node["data"]["name"].should == "Max"
+      existing_node["data"]["age"].should == 31
+    end
 
     it "can update a property of a node" do
       new_node = @neo.create_node("name" => "Max")
@@ -124,6 +144,19 @@ describe Neography::Rest do
       batch_result.first["body"]["end"].split('/').last.should == node2["self"].split('/').last
     end
 
+    it "can create a unique relationship" do
+      index_name = generate_text(6)
+      key = generate_text(6)
+      value = generate_text
+      @neo.create_relationship_index(index_name)
+      node1 = @neo.create_node
+      node2 = @neo.create_node
+      batch_result = @neo.batch [:create_unique_relationship, index_name, key, value, "friends", node1, node2]
+      batch_result.first["body"]["type"].should == "friends"
+      batch_result.first["body"]["start"].split('/').last.should == node1["self"].split('/').last
+      batch_result.first["body"]["end"].split('/').last.should == node2["self"].split('/').last
+    end
+
     it "can update a single relationship" do
       node1 = @neo.create_node
       node2 = @neo.create_node
@@ -139,21 +172,72 @@ describe Neography::Rest do
       existing_relationship["self"].should == new_relationship["self"]
     end
 
+    it "can reset the properties of a relationship" do
+      node1 = @neo.create_node
+      node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", node1, node2, {:since => "high school"})
+      batch_result = @neo.batch [:reset_relationship_properties, new_relationship, {"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["from"].split('/')[2])
+      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 == new_relationship["self"]
+    end
+
     it "can add a node to an index" do
+      index_name = generate_text(6)
       new_node = @neo.create_node
       key = generate_text(6)
       value = generate_text
-      new_index = @neo.get_node_index("test_node_index", key, value) 
-      batch_result = @neo.batch [:add_node_to_index, "test_node_index", key, value, new_node]
+      new_index = @neo.get_node_index(index_name, key, value) 
+      batch_result = @neo.batch [:add_node_to_index, index_name, key, value, new_node]
       batch_result.first.should have_key("id")
       batch_result.first.should have_key("from")
-      existing_index = @neo.find_node_index("test_node_index", key, value) 
+      existing_index = @neo.find_node_index(index_name, key, value) 
       existing_index.should_not be_nil
       existing_index.first["self"].should == new_node["self"]
-      @neo.remove_node_from_index("test_node_index", key, value, new_node) 
+      @neo.remove_node_from_index(index_name, key, value, new_node) 
     end
   end
 
+    it "can get a node index" do
+      index_name = generate_text(6)
+      key = generate_text(6)
+      value = generate_text
+      @neo.create_node_index(index_name)
+      new_node = @neo.create_node
+      @neo.add_node_to_index(index_name, key, value, new_node)
+      batch_result = @neo.batch [:get_node_index, index_name, key, value]
+      batch_result.first.should have_key("id")
+      batch_result.first.should have_key("from")
+      batch_result.first["body"].first["self"].should == new_node["self"]
+      @neo.remove_node_from_index(index_name, key, value, new_node) 
+    end
+
+    it "can get a relationship index" do
+      index_name = generate_text(6)
+      key = generate_text(6)
+      value = generate_text
+      @neo.create_relationship_index(index_name)
+      node1 = @neo.create_node
+      node2 = @neo.create_node
+      new_relationship = @neo.create_relationship("friends", node1, node2, {:since => "high school"})
+      @neo.add_relationship_to_index(index_name, key, value, new_relationship)
+      batch_result = @neo.batch [:get_relationship_index, index_name, key, value]
+      batch_result.first.should have_key("id")
+      batch_result.first.should have_key("from")
+      batch_result.first["body"].first["type"].should == "friends"
+      batch_result.first["body"].first["start"].split('/').last.should == node1["self"].split('/').last
+      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"}]

data/spec/integration/rest_node_spec.rb

@@ -45,6 +45,11 @@ describe Neography::Rest do
       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
+      new_node_id = new_node["self"].split('/').last
+      existing_node = @neo.create_unique_node(index_name, key, value, {"age" => 31, "name" => "Max"})
+      existing_node["self"].split('/').last.should == new_node_id
+      existing_node["data"]["name"].should == "Max"
+      existing_node["data"]["age"].should == 31
     end
 
   end

metadata

@@ -1,135 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: neography
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 0.0.23
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 22
-  version: 0.0.22
 platform: ruby
-authors: 
+authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &85677290 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-http-spy
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *85677290
+- !ruby/object:Gem::Dependency
+  name: net-http-spy
+  requirement: &85677040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *85677040
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &85676790 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *85676790
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &85676560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.7.8
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *85676560
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &85738040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: os
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *85738040
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: &85737810 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *85737810
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &85737600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/ for more details.
+  prerelease: false
+  version_requirements: *85737600
+description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/
+  for more details.
 email: maxdemarzi@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .project
 - .travis.yml
@@ -185,36 +150,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/neography
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: neography
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ruby wrapper to Neo4j Rest API
 test_files: []
-