neography 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 039df0f3084aed3efe2328a0cc5ec7fc892bf25a
-  data.tar.gz: 8b54bd42b4aab949decb5b69bdbd6704517459af
+  metadata.gz: 153541ce7b1f118e53b97931722139408722084d
+  data.tar.gz: 4134c1a97af5d2666d5e9b80863615dc66995bbd
 SHA512:
-  metadata.gz: 287cb8520af34a0fe26e53ead1de0d86328d6565a679a6b5d03a989088f11da33db48a4e4cdd81d837f06958bd9796ad11ef5ec35cfed9b58e589835acf62376
-  data.tar.gz: 21a921f59b26cb5c6bc09a943679a2bcdf3c9b335dcd6d81d958c10252d7a579a9d49c21f9d19c39b954762870d02b2e57327655d30441f4cfef3480fe522f0f
+  metadata.gz: fab8b438fb39df376d1071517dcadee4d2e402199d473f8d45957b7a7c3312a7d13398e8b64dfae5b980df418c9e256f1575debf6974fb94d53e5ba5821b534e
+  data.tar.gz: f7eb79617eb7d2bc449fa9be5282f3f3a4d3a0068dd1fc56d937cbe1982251ac547ccaca1fb302c289d0479d2cac10279a51cd949bcff1a7d427543d271b5fbc

data/ChangeLog

@@ -1,3 +1,17 @@
+v1.3.8
+======
+3343c5e  Bump to 1.3.8
+e99ba36  add ChangeLog (using git-changelog gem)
+de53b89  update neo to 2.0.1, update ruby tests to 2.0.0
+9a76e11  add unmanaged extensions spec (skipped for test suite)
+b788b68  moved broken spatial tests out to their own file, and skipping them until we track this Neo4j bug down
+f1e172e  more work on adding spatial to batch... failing test however...
+8ee5de4  + .labels Node instance method
+d358eb7  + colors in tests
+07e63dc  let body of post extension pass through without the to_json if headers are not nil
+cb21b01  allow headers to be past in when using extensions
+43b64d3  deal with unmanaged extensions a little better... well not really, but at least it should work
+
 v1.3.7
 ======
 6bd6842  Bump to 1.3.7

data/lib/neography/connection.rb

@@ -66,9 +66,18 @@ module Neography
     end
 
     def authenticate(path = nil)
-      @client.set_auth(path, 
-                       @authentication[@authentication.keys.first][:username], 
-                       @authentication[@authentication.keys.first][:password]) unless @authentication.empty?
+      unless @authentication.empty?
+        auth_type = @authentication.keys.first
+        @client.set_auth(
+          path,
+          @authentication[auth_type][:username],
+          @authentication[auth_type][:password]
+        )
+        # Force http client to always send auth credentials without
+        # waiting for WWW-Authenticate headers, thus saving one request
+        # roundtrip for each URI. Only works for HTTP basic auth.
+        @client.www_auth.basic_auth.challenge(configuration) if auth_type == 'basic_auth'
+      end
     end
     
     private
@@ -204,6 +213,7 @@ module Neography
         when /RelationshipNotFoundException/ ; RelationshipNotFoundException
         when /NotFoundException/             ; NotFoundException
         when /UniquePathNotUniqueException/  ; UniquePathNotUniqueException
+        when /DeadlockDetectedException/     ; DeadlockDetectedException          
         else
           NeographyError
       end

data/lib/neography/errors.rb

@@ -44,4 +44,7 @@ module Neography
   # Thrown when CREATE UNIQUE matches multiple paths.
   class UniquePathNotUniqueException < NeographyError; end
 
+  # Signals that a deadlock between two or more transactions has been detected
+  class DeadlockDetectedException < NeographyError; end
+
 end

data/lib/neography/rest.rb

@@ -29,6 +29,7 @@ require 'neography/rest/batch'
 require 'neography/rest/clean'
 require 'neography/rest/transactions'
 require 'neography/rest/spatial'
+require 'neography/rest/constraints'
 
 require 'neography/errors'
 
@@ -71,6 +72,7 @@ module Neography
       @clean                     = Clean.new(@connection)
       @transactions              = Transactions.new(@connection)
       @spatial                   = Spatial.new(@connection)
+      @constraints               = Constraints.new(@connection)
     end
 
     # meta-data
@@ -123,6 +125,28 @@ module Neography
       @schema_indexes.drop(label, property)
     end
 
+    # constraints
+    
+    def get_constraints(label=nil)
+      label.nil? ? @constraints.list : @constraints.get(label)
+    end
+
+    def drop_constraint(label, property)
+      @constraints.drop(label, property)
+    end
+
+    def get_uniqueness(label)
+      @constraints.get_uniqueness(label)
+    end
+
+    def get_unique_constraint(label, property)
+      @constraints.get_unique(label, property)
+    end
+
+    def create_unique_constraint(label, property)
+      @constraints.create_unique(label, property)
+    end
+      
     # transactions
     
     def begin_transaction(statements=nil)

data/lib/neography/rest/batch.rb

@@ -114,6 +114,10 @@ module Neography
         end
       end
 
+      def remove_node_property(id, property)
+        delete NodeProperties.single_path(:id => get_id(id), :property => property)
+      end
+
       # NodeLabel
 
       def add_label(id, body)

data/lib/neography/rest/constraints.rb

@@ -0,0 +1,48 @@
+module Neography
+  class Rest
+    class Constraints
+      extend Neography::Rest::Paths
+      include Neography::Rest::Helpers
+
+      add_path :base,       "/schema/constraint/"
+      add_path :label,      "/schema/constraint/:label"            
+      add_path :uniqueness, "/schema/constraint/:label/uniqueness/"
+      add_path :unique,     "/schema/constraint/:label/uniqueness/:property"
+      
+      def initialize(connection)
+        @connection = connection
+      end
+
+      def drop(label, property)
+        @connection.delete(unique_path(:label => label, :property => property))
+      end
+
+      def list
+        @connection.get(base_path)
+      end
+
+      def get(label)
+        @connection.get(label_path(:label => label))
+      end
+
+      def get_uniqueness(label)
+        @connection.get(uniqueness_path(:label => label))
+      end
+
+      def get_unique(label, property)
+        @connection.get(unique_path(:label => label, :property => property))
+      end
+
+      def create_unique(label, property)
+        options = {
+          :body => {
+            :property_keys => [property]
+          }.to_json,
+          :headers => json_content_type
+        }
+        @connection.post(uniqueness_path(:label => label), options)
+      end
+
+    end
+  end
+end

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end

data/spec/integration/rest_batch_spec.rb

@@ -123,6 +123,32 @@ describe Neography::Rest do
       existing_node["data"]["weight"].should be_nil
     end
 
+    it "can remove a property of a node" do
+      new_node = @neo.create_node("name" => "Max", "weight" => 200)
+      batch_result = @neo.batch [:remove_node_property, new_node, "weight"]
+      batch_result.first.should have_key("id")
+      batch_result.first.should have_key("from")
+      existing_node = @neo.get_node(new_node)
+      existing_node["data"]["name"].should == "Max"
+      existing_node["data"]["weight"].should be_nil
+    end
+
+    it "can remove a property of multiple nodes" do
+      node1 = @neo.create_node("name" => "Max", "weight" => 200)
+      node2 = @neo.create_node("name" => "Marc", "weight" => 180)
+      batch_result = @neo.batch [:remove_node_property, node1, "name"], [:remove_node_property, node2, "name"]
+      batch_result.first.should have_key("id")
+      batch_result.first.should have_key("from")
+      batch_result.last.should have_key("id")
+      batch_result.last.should have_key("from")
+      existing_node = @neo.get_node(node1)
+      existing_node["data"]["name"].should be_nil
+      existing_node["data"]["weight"].should == 200
+      existing_node = @neo.get_node(node2)
+      existing_node["data"]["name"].should be_nil
+      existing_node["data"]["weight"].should == 180
+    end
+
     it "can get a single relationship" do
       node1 = @neo.create_node
       node2 = @neo.create_node

data/spec/integration/rest_constraints_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Neography::Rest do
+  before(:each) do
+    @neo = Neography::Rest.new
+  end
+
+  describe "create unique constraint" do
+    it "can create a unique constraint" do
+      label = "User"
+      property = "user_id"
+      uc = @neo.create_unique_constraint(label, property)
+      uc.should_not be_nil
+      uc["label"].should == label
+      uc["property_keys"].should == [property]
+    end
+  end
+
+  describe "get a unique constraint" do
+    it "can get a unique constraint" do
+      label = "User"
+      property = "user_id"
+      uc = @neo.get_unique_constraint(label, property)
+      uc.should_not be_nil
+      uc.first["label"].should == label
+      uc.first["property_keys"].should == [property]
+    end
+  end
+
+  describe "get unique constraints" do
+    it "can get unique constraints for a label" do
+      label = "User"
+      property = "user_id"
+      uc = @neo.get_uniqueness(label)
+      uc.should_not be_nil
+      uc.first["label"].should == label
+      uc.first["property_keys"].should == [property]
+    end
+  end
+  
+  describe "list constraints" do
+    it "can get a list of constraints" do
+      label = "User"
+      property = "user_id"
+      cs = @neo.get_constraints
+      cs.should_not be_nil
+      cs.first["label"].should == label
+      cs.first["property_keys"].should == [property]
+    end
+
+    it "can get a list of constraints for a specifc label" do
+      label = "User"
+      property = "user_id"
+      cs = @neo.get_constraints(label)
+      cs.should_not be_nil
+      cs.first["label"].should == label
+      cs.first["property_keys"].should == [property]
+    end
+  end
+  
+  describe "drop a constraint" do
+    it "can drop a constraint" do
+      label = "User"
+      property = "user_id"
+      uc = @neo.drop_constraint(label, property)
+      uc.should be_nil
+      cs = @neo.get_constraints(label)
+      cs.should be_empty
+    end
+  end
+    
+end

data/spec/unit/rest/constraints_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+module Neography
+  class Rest
+    describe Constraints do
+
+      let(:connection) { double }
+      subject { Constraints.new(connection) }
+
+      it "list constraints" do
+        connection.should_receive(:get).with("/schema/constraint/")
+        subject.list
+      end
+
+      it "get constraints for a label" do
+        connection.should_receive(:get).with("/schema/constraint/label")
+        subject.get("label")
+      end
+
+      it "create a unique constraint for a label" do
+        options = {
+            :body    => '{"property_keys":["property"]}',
+            :headers => json_content_type
+          }
+        connection.should_receive(:post).with("/schema/constraint/label/uniqueness/", options)
+        subject.create_unique("label", "property")
+      end
+      
+      it "get unique constraints for a label" do
+        connection.should_receive(:get).with("/schema/constraint/label/uniqueness/")
+        subject.get_uniqueness("label")
+      end
+
+      it "get a specific unique constraint for a label" do
+        connection.should_receive(:get).with("/schema/constraint/label/uniqueness/property")
+        subject.get_unique("label", "property")
+      end
+      
+      it "can delete a constraint for a label" do
+        connection.should_receive(:delete).with("/schema/constraint/label/uniqueness/property")
+        subject.drop("label","property")
+      end
+      
+    end
+  end
+end  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -182,6 +182,7 @@ files:
 - lib/neography/rest/auto_indexes.rb
 - lib/neography/rest/batch.rb
 - lib/neography/rest/clean.rb
+- lib/neography/rest/constraints.rb
 - lib/neography/rest/cypher.rb
 - lib/neography/rest/extensions.rb
 - lib/neography/rest/gremlin.rb
@@ -223,6 +224,7 @@ files:
 - spec/integration/rest_batch_spec.rb
 - spec/integration/rest_batch_streaming_spec.rb
 - spec/integration/rest_bulk_spec.rb
+- spec/integration/rest_constraints_spec.rb
 - spec/integration/rest_experimental_spec.rb
 - spec/integration/rest_gremlin_fail_spec.rb
 - spec/integration/rest_header_spec.rb
@@ -249,6 +251,7 @@ files:
 - spec/unit/relationship_spec.rb
 - spec/unit/rest/batch_spec.rb
 - spec/unit/rest/clean_spec.rb
+- spec/unit/rest/constraints_spec.rb
 - spec/unit/rest/cypher_spec.rb
 - spec/unit/rest/extensions_spec.rb
 - spec/unit/rest/gremlin_spec.rb
@@ -307,6 +310,7 @@ test_files:
 - spec/integration/rest_batch_spec.rb
 - spec/integration/rest_batch_streaming_spec.rb
 - spec/integration/rest_bulk_spec.rb
+- spec/integration/rest_constraints_spec.rb
 - spec/integration/rest_experimental_spec.rb
 - spec/integration/rest_gremlin_fail_spec.rb
 - spec/integration/rest_header_spec.rb
@@ -333,6 +337,7 @@ test_files:
 - spec/unit/relationship_spec.rb
 - spec/unit/rest/batch_spec.rb
 - spec/unit/rest/clean_spec.rb
+- spec/unit/rest/constraints_spec.rb
 - spec/unit/rest/cypher_spec.rb
 - spec/unit/rest/extensions_spec.rb
 - spec/unit/rest/gremlin_spec.rb