neography 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02984a89ccb8239cc1512ec697d742953aef36f7
-  data.tar.gz: c97a3fdfb802c83754ac35d127eeb571378974d7
+  metadata.gz: fcd694c03de5bbb920692ee87085c2da39815c2b
+  data.tar.gz: 27cac259abff49d847b099819c6c5bd7f617f69f
 SHA512:
-  metadata.gz: 32d3b4de20035dca8f58762969fdd336ce64307d549ea14e43ae83ea011f1ce3bdd3f8093bb1b11ceb9ebafaca11375ebbc68fa1880de4851d80fcff50bdc9d7
-  data.tar.gz: 301c1d21db5b478d5fda1c3f6792a0848f2dc7403973a1a0ce228b8a60b1c3594fde81c1a3d60295b49e2511a55f7715b67d6609f1f8b9b1622ff420a0258ecf
+  metadata.gz: 31203feeec0907870e2be162a47f201c78a1ab5e306119e6dd018ed711365f35b9580d87b48bfdb842b4e1f003162db2e2bf2b4bfa65ef9f1ad72a030ecd1e23
+  data.tar.gz: 79270c702fb7e25a6c9a8a2858dc510dbad1c60a333df6ecc2e7105c431ecee60be0371bba1c6c12ac9c755f511e772e19ea9b76e0c1f5952f34b250711c017e

data/lib/neography/connection.rb

@@ -40,11 +40,27 @@ module Neography
 
     ACTIONS.each do |action|
       define_method(action) do |path, options = {}|
-        authenticate(configuration + path)
-        evaluate_response(@client.send(action.to_sym, configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))    
+        query_path = configuration + path
+        query_body = merge_options(options)[:body] 
+        authenticate(query_path)
+        log path, query_body do
+          evaluate_response(@client.send(action.to_sym, query_path, query_body, merge_options(options)[:headers]))    
+        end
       end 
     end
 
+    def log(path, body)
+      if @log_enabled
+        start_time = Time.now
+        response = yield
+        time = ((Time.now - start_time) * 1000).round(2)
+        @logger.info "[Neography::Query] #{path} #{body} [#{time}ms]"
+        response
+      else
+        yield
+      end
+    end
+
     def authenticate(path)
       @client.set_auth(path, 
                        @authentication[@authentication.keys.first][:username], 

data/lib/neography/node.rb

@@ -17,6 +17,14 @@ module Neography
         node
       end
 
+      def create_unique(index, key, value, props = nil, db = Neography::Rest.new)
+        raise ArgumentError.new("syntax deprecated") if props.is_a?(Neography::Rest)
+
+        node = self.new(db.create_unique_node(index, key, value, props))
+        node.neo_server = db
+        node
+      end
+
       def load(node, db = Neography::Rest.new)
         raise ArgumentError.new("syntax deprecated") if node.is_a?(Neography::Rest)
         node = node.first if node.kind_of?(Array)

data/lib/neography/relationship.rb

@@ -16,6 +16,14 @@ module Neography
         rel
       end
 
+      def create_unique(index, key, value, type, from_node, to_node, props = nil)
+        rel = Neography::Relationship.new(from_node.neo_server.create_unique_relationship(index, key, value, type, from_node, to_node, props))
+        rel.start_node = from_node
+        rel.end_node = to_node
+        rel.rel_type = type
+        rel
+      end
+
       def load(rel, db = Neography::Rest.new)
         raise ArgumentError.new("syntax deprecated") if rel.is_a?(Neography::Rest)
 

data/lib/neography/rest.rb

@@ -347,8 +347,8 @@ module Neography
       @relationship_indexes.create_auto(type, provider)
     end
 
-    def create_unique_relationship(index, key, value, type, from, to)
-      @relationship_indexes.create_unique(index, key, value, type, from, to)
+    def create_unique_relationship(index, key, value, type, from, to, props = nil)
+      @relationship_indexes.create_unique(index, key, value, type, from, to, props)
     end
 
     def add_relationship_to_index(index, key, value, id)

data/lib/neography/rest/batch.rb

@@ -54,6 +54,21 @@ module Neography
 
       # NodeIndexes
 
+      def create_node_index(name, type = "exact", provider = "lucene")
+        post NodeIndexes.all_path do
+          { :name => name,
+            :config => {
+              :type => type,
+              :provider => provider
+            }
+          }
+        end
+      end
+
+      def drop_node_index(index)
+        delete NodeIndexes.unique_path(:index => index)
+      end
+
       def create_unique_node(index, key, value, properties)
         post NodeIndexes.unique_path(:index => index) do
           {

data/lib/neography/rest/relationship_indexes.rb

@@ -17,13 +17,14 @@ module Neography
         super(connection, :relationship)
       end
 
-      def create_unique(index, key, value, type, from, to)
+      def create_unique(index, key, value, type, from, to, props = nil)
         body = {
           :key   => key,
           :value => value,
           :type  => type,
           :start => @connection.configuration + "/node/#{get_id(from)}",
-          :end   => @connection.configuration + "/node/#{get_id(to)}"
+          :end   => @connection.configuration + "/node/#{get_id(to)}",
+          :properties => props
         }
         options = { :body => body.to_json, :headers => json_content_type }
 

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/integration/rest_batch_spec.rb

@@ -210,6 +210,23 @@ describe Neography::Rest do
       existing_relationship["self"].should == new_relationship["self"]
     end
 
+    it "can drop a node index" do
+      index_name = generate_text(6)
+      @neo.create_node_index(index_name)
+      @neo.batch [:drop_node_index, index_name]
+      @neo.list_node_indexes[index_name].should be_nil
+    end
+
+    it "can create a node index" do
+      index_name = generate_text(6)
+      @neo.batch [:create_node_index, index_name, "fulltext", "lucene"]
+      indexes = @neo.list_node_indexes
+      index = indexes[index_name]
+      index.should_not be_nil
+      index["provider"].should == "lucene"
+      index["type"].should == "fulltext"
+    end
+
     it "can add a node to an index" do
       index_name = generate_text(6)
       new_node = @neo.create_node

data/spec/unit/connection_spec.rb

@@ -204,6 +204,31 @@ module Neography
         end
 
       end
+
+      context "query logging" do
+        before do
+          connection.logger = Logger.new(nil)
+          connection.log_enabled = true
+        end
+
+        let :expected_response do
+          "expected_response"
+        end
+
+        let :request_body do
+          {key1: :val1}
+        end
+
+        it "should log query" do
+          connection.should_receive(:log).with("/foo/bar", request_body).once
+          connection.get("/foo/bar", {body: request_body})
+        end
+
+        it "should return original response" do
+          connection.stub(:evaluate_response).and_return expected_response
+          connection.get("/foo/bar").should eq expected_response
+        end
+      end
     end
   end
 end

data/spec/unit/rest/relationship_indexes_spec.rb

@@ -47,10 +47,11 @@ module Neography
           "value"      => "value",
           "type"       => "type",
           "start"      => "http://configuration/node/42",
-          "end"        => "http://configuration/node/43"
+          "end"        => "http://configuration/node/43",
+          "properties" => "properties"
         }
         connection.should_receive(:post).with("/index/relationship/some_index?unique", json_match(:body, expected_body))
-        subject.create_unique("some_index", "key", "value", "type", "42", "43")
+        subject.create_unique("some_index", "key", "value", "type", "42", "43", "properties")
       end
 
       it "adds a relationship to an index" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec