neography 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16e39f25ab231bc89fdd3264b2733afe76ba05c
-  data.tar.gz: c8f8bda96a4a56e46883c98724e6595b34ffbf93
+  metadata.gz: 89f4b73b7076509662fa63dcd258140246c1eba9
+  data.tar.gz: c7d4f53d9ab25de8d6c1e392387581b667cb4688
 SHA512:
-  metadata.gz: fa8b0790fc17409f22d894f10256a83773992047d7e63dd9864cc6e3d8b40b55f24caa4d907a83b5f3902892fe5d21e68a015ce190898b46391a14ed5d2146ad
-  data.tar.gz: d2bc2fbec2ded020a7f3df4d010f06380c6c936c6849f2088d15e4c931323cd14938a2571982a1e4aeac620748c1590ebe0865234207560c81e0001a0a81650b
+  metadata.gz: ee4def6fd87563f802e9019f43b808525c6d9a13d2d137613b587c37cbd714cb832d0fb243702c0b3a9f53009b71f8c743820a88ef27b58f16a21e330360f631
+  data.tar.gz: 0c63606246d769a7af6e45eb3fe44903994e6a201514e27d56807da6953dc7a3267c3b5f96a9bdce2a6f2f51ff5f0a6aeaf6ada15fe961edc03584a2d032d2cc

data/Guardfile

@@ -1,14 +1,6 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
 guard :rspec do
-  # Just rerun the whole suite until the file names are matching
-  # in lib/ and spec/
-  #
-  # watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  # watch(%r{^lib/(.+)\.rb$})     { |m| "spec/unit/lib/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})     { "spec" }
-
+  watch(%r{^lib/neography/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
+  watch(%r{^lib/neography/(.+)\.rb$}) { |m| "spec/integration/#{m[1]}_spec.rb" }
   watch(%r{^spec/.+_spec\.rb$})
   watch('spec/spec_helper.rb')  { "spec" }
 end

data/lib/neography/connection.rb

@@ -213,7 +213,7 @@ module Neography
       message = parsed_body["message"]
       stacktrace = parsed_body["stacktrace"]
 
-      @logger.error "#{response.dump} error: #{body}" if @log_enabled
+      @logger.error "#{response.data} error: #{body}" if @log_enabled
       raise_errors(code, parsed_body["exception"], message, stacktrace, request, index)
     end
 

data/lib/neography/node.rb

@@ -53,11 +53,34 @@ module Neography
       end
     end
 
-    ##
-    # List of labels of current node.
-    # Returns array of strings
     def labels
-      self.neo_server.get_node_labels(self.neo_id)
+      @cached_labels ||= [self.neo_server.get_node_labels(self.neo_id)].compact.flatten
+    end
+
+    def set_labels(labels)
+      # I just invalidate the cache instead of updating it to make sure
+      # it doesn't contain something else than what ends up in neo4j
+      # (consider duplicate/invalid labels, etc).
+      @cached_labels = nil
+      self.neo_server.set_label(self, [labels].flatten)
+    end
+    alias_method :set_label, :set_labels
+
+    def add_labels(labels)
+      # Just invalidating the cache on purpose, see set_labels
+      @cached_labels = nil
+      self.neo_server.add_label(self, [labels].flatten)
+    end
+    alias_method :add_label, :add_labels
+
+
+    def delete_label(label)
+      @cached_labels = nil
+      self.neo_server.delete_label(self, label)
+    end
+
+    def cached_labels=(labels)
+      @cached_labels = [labels].flatten
     end
   end
 end

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

data/neography.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", ">= 2.11"
+  s.add_development_dependency "rspec", "3.0"
   s.add_development_dependency "net-http-spy", "0.2.1"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "debugger"

data/spec/integration/node_spec.rb

@@ -247,14 +247,41 @@ describe Neography::Node do
     end
   end
 
-  describe 'gets labels' do
-    let(:subject) {
+  describe 'labels' do
+
+    it "loading from neo4j" do
       node = Neography::Node.create
       node.neo_server.add_label(node, 'Label')
       node.neo_server.add_label(node, 'Label2')
-      node
-    }
+      expect(node.labels).to eq(%w(Label Label2))
+    end
+
+    it "adding via the node" do
+      node = Neography::Node.create
+      node.neo_server.add_label(node, 'Label')
+      node.add_labels('Label2')
+      expect(node.labels).to eq(%w(Label Label2))
+    end
+
+    it "resetting via the node" do
+      node = Neography::Node.create
+      node.neo_server.add_label(node, 'Label')
+      expect do
+        node.set_labels("Reset")
+      end.to change{ node.labels }.from(['Label']).to(["Reset"])
+    end
+
+    it "deleting via the node" do
+      node = Neography::Node.create
+      node.neo_server.add_label(node, 'Label')
+      expect do
+        node.delete_label("Label")
+      end.to change{ node.labels }.from(['Label']).to([])
+    end
+
+
+
 
-    it { expect(subject.labels).to eq(%w(Label Label2)) }
   end
+
 end

data/spec/spec_helper.rb

@@ -39,6 +39,7 @@ def error_response(attributes)
     message:   attributes[:message],
     exception: attributes[:exception],
     stacktrace: attributes[:stacktrace]
-  }.reject { |k,v| v.nil? }.to_json
+  }.reject { |k,v| v.nil? }.to_json,
+    data: http_header
   )
 end

data/spec/unit/connection_spec.rb

@@ -156,6 +156,13 @@ module Neography
 
       context "errors" do
 
+        subject(:connection) do
+          Connection.new({
+            :logger => Logger.new(nil),
+            :log_enabled => true
+          })
+        end
+
         it "raises NodeNotFoundException" do
           response = error_response(code: 404, message: "a message", exception: "NodeNotFoundException")
           allow(connection.client).to receive(:request).and_return(response)

data/spec/unit/node_spec.rb

@@ -27,6 +27,76 @@ module Neography
           Node.create(properties)
         end
 
+        describe "labels" do
+          let(:node){ Node.create }
+
+          it "are only fetched once" do
+            expect(@db).to receive(:get_node_labels).exactly(1).and_return []
+            node.labels
+            node.labels
+          end
+
+          it "cache can be set from the outside" do
+            expect(@db).to_not receive(:get_node_labels)
+            node.cached_labels = ["Bar"]
+
+            expect(node.labels).to eq ["Bar"]
+          end
+
+          it "cache is invalidated when labels are set" do
+            expect(@db).to receive(:get_node_labels).exactly(2).and_return []
+            expect(@db).to receive(:set_label).exactly(1)
+            node.labels
+            node.set_labels("Something")
+            node.labels
+          end
+
+          it "cache is invalidated when labels are set" do
+            expect(@db).to receive(:get_node_labels).exactly(2).and_return []
+            expect(@db).to receive(:add_label).exactly(1)
+            node.labels
+            node.add_labels("Something")
+            node.labels
+          end
+
+          it "cache is invalidated when labels are deleted" do
+            expect(@db).to receive(:get_node_labels).exactly(2).and_return []
+            expect(@db).to receive(:delete_label).exactly(1)
+            node.labels
+            node.delete_label("Something")
+            node.labels
+          end
+
+          describe "set" do
+            it "as a single label" do
+              expect(@db).to receive(:set_label).with(node, ["Foo"])
+              node.set_label("Foo")
+            end
+
+            it "as an array" do
+              expect(@db).to receive(:set_label).with(node, ["Foo"])
+              node.set_labels(["Foo"])
+            end
+          end
+
+          describe "add" do
+            it "as a single label" do
+              expect(@db).to receive(:add_label).with(node, ["Foo"])
+              node.add_label("Foo")
+            end
+
+            it "as an array" do
+              expect(@db).to receive(:add_label).with(node, ["Foo"])
+              node.add_labels(["Foo"])
+            end
+          end
+
+          it "can be deleted" do
+            expect(@db).to receive(:delete_label).with(node, "Foo")
+            node.delete_label("Foo")
+          end
+        end
+
       end
 
       context "explicit server" do
@@ -79,18 +149,18 @@ module Neography
 
       context "explicit server" do
 
-        it "cannot pass a server as the first argument, node as the second (depracted)" do
+        it "cannot pass a server as the first argument, node as the second (deprecated)" do
           @other_server = Neography::Rest.new
           expect(@other_server).not_to receive(:get_node).with(42)
           expect {
-            node = Node.load(@other_server, 42)
+            Node.load(@other_server, 42)
           }.to raise_error(ArgumentError)
         end
 
         it "can pass a node as the first argument, server as the second" do
           @other_server = Neography::Rest.new
           expect(@other_server).to receive(:get_node).with(42)
-          node = Node.load(42, @other_server)
+          Node.load(42, @other_server)
         end
 
       end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-http-spy
   requirement: !ruby/object:Gem::Requirement