neography 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd694c03de5bbb920692ee87085c2da39815c2b
-  data.tar.gz: 27cac259abff49d847b099819c6c5bd7f617f69f
+  metadata.gz: c6478336dc213df2da26cfd9db4c8814222ea162
+  data.tar.gz: 7d94c3529e2e0464108f16cfa58887db58b00940
 SHA512:
-  metadata.gz: 31203feeec0907870e2be162a47f201c78a1ab5e306119e6dd018ed711365f35b9580d87b48bfdb842b4e1f003162db2e2bf2b4bfa65ef9f1ad72a030ecd1e23
-  data.tar.gz: 79270c702fb7e25a6c9a8a2858dc510dbad1c60a333df6ecc2e7105c431ecee60be0371bba1c6c12ac9c755f511e772e19ea9b76e0c1f5952f34b250711c017e
+  metadata.gz: 2435540bf31595f410aab104dd8d3d3d848cb45b03daee4d2d45233fd886234bc4de048221f5dadb6caf50452b291b83126854837072ead1d15e2444bd5ddc0d
+  data.tar.gz: 8e9590e796a496cf69c1c4cf11c298a67dd602ab79d8fd9a3a1ec2c7912d6df433940ff6527e9593f378f84a0da620e94faab524ba5a01fa464ebc4edb7376f8

data/.travis.yml

@@ -1,4 +1,4 @@
-script: "bundle exec rake neo4j:install['enterprise','2.0.0-M06'] neo4j:start spec --trace"
+script: "bundle exec rake neo4j:install['enterprise','2.0.0'] neo4j:start spec --trace"
 language: ruby
 rvm:
   - 1.9.3

data/README.md

@@ -61,21 +61,22 @@ Configure Neography as follows:
 ```ruby
 # these are the default values:
 Neography.configure do |config|
-  config.protocol       = "http://"
-  config.server         = "localhost"
-  config.port           = 7474
-  config.directory      = ""  # prefix this path with '/' 
-  config.cypher_path    = "/cypher"
-  config.gremlin_path   = "/ext/GremlinPlugin/graphdb/execute_script"
-  config.log_file       = "neography.log"
-  config.log_enabled    = false
-  config.max_threads    = 20
-  config.authentication = nil  # 'basic' or 'digest'
-  config.username       = nil
-  config.password       = nil
-  config.parser         = MultiJsonParser
-end
-```
+  config.protocol           = "http://"
+  config.server             = "localhost"
+  config.port               = 7474
+  config.directory          = ""  # prefix this path with '/'
+  config.cypher_path        = "/cypher"
+  config.gremlin_path       = "/ext/GremlinPlugin/graphdb/execute_script"
+  config.log_file           = "neography.log"
+  config.log_enabled        = false
+  config.slow_log_threshold = 0    # time in ms for query logging
+  config.max_threads        = 20
+  config.authentication     = nil  # 'basic' or 'digest'
+  config.username           = nil
+  config.password           = nil
+  config.parser             = MultiJsonParser
+  end
+  ```
 
 Then initialize a `Rest` instance:
 

data/lib/neography/config.rb

@@ -3,7 +3,7 @@ module Neography
 
     attr_accessor :protocol, :server, :port, :directory,
       :cypher_path, :gremlin_path,
-      :log_file, :log_enabled,
+      :log_file, :log_enabled, :slow_log_threshold,
       :max_threads,
       :authentication, :username, :password,
       :parser
@@ -14,39 +14,41 @@ module Neography
 
     def to_hash
       {
-        :protocol       => @protocol,
-        :server         => @server,
-        :port           => @port,
-        :directory      => @directory,
-        :cypher_path    => @cypher_path,
-        :gremlin_path   => @gremlin_path,
-        :log_file       => @log_file,
-        :log_enabled    => @log_enabled,
-        :max_threads    => @max_threads,
-        :authentication => @authentication,
-        :username       => @username,
-        :password       => @password,
-        :parser         => @parser
+        :protocol           => @protocol,
+        :server             => @server,
+        :port               => @port,
+        :directory          => @directory,
+        :cypher_path        => @cypher_path,
+        :gremlin_path       => @gremlin_path,
+        :log_file           => @log_file,
+        :log_enabled        => @log_enabled,
+        :slow_log_threshold => @slow_log_threshold,
+        :max_threads        => @max_threads,
+        :authentication     => @authentication,
+        :username           => @username,
+        :password           => @password,
+        :parser             => @parser
       }
     end
 
     private
 
     def set_defaults
-      @protocol       = "http://"
-      @server         = "localhost"
-      @port           = 7474
-      @directory      = ""
-      @cypher_path    = "/cypher"
-      @gremlin_path   = "/ext/GremlinPlugin/graphdb/execute_script"
-      @log_file       = "neography.log"
-      @log_enabled    = false
-      @max_threads    = 20
-      @authentication = nil
-      @username       = nil
-      @password       = nil
-      @parser         = MultiJsonParser
-    end
+      @protocol           = "http://"
+      @server             = "localhost"
+      @port               = 7474
+      @directory          = ""
+      @cypher_path        = "/cypher"
+      @gremlin_path       = "/ext/GremlinPlugin/graphdb/execute_script"
+      @log_file           = "neography.log"
+      @log_enabled        = false
+      @slow_log_threshold = 0
+      @max_threads        = 20
+      @authentication     = nil
+      @username           = nil
+      @password           = nil
+      @parser             = MultiJsonParser
+      end
 
   end
 end

data/lib/neography/connection.rb

@@ -7,7 +7,7 @@ module Neography
     
     attr_accessor :protocol, :server, :port, :directory,
       :cypher_path, :gremlin_path,
-      :log_file, :log_enabled, :logger,
+      :log_file, :log_enabled, :logger, :slow_log_threshold,
       :max_threads,
       :authentication, :username, :password,
       :parser, :client
@@ -54,7 +54,7 @@ module Neography
         start_time = Time.now
         response = yield
         time = ((Time.now - start_time) * 1000).round(2)
-        @logger.info "[Neography::Query] #{path} #{body} [#{time}ms]"
+        @logger.info "[Neography::Query] #{path} #{body} [#{time}ms]" if time >= slow_log_threshold
         response
       else
         yield
@@ -76,16 +76,17 @@ module Neography
     end
 
     def save_local_configuration(config)
-      @protocol       = config[:protocol]
-      @server         = config[:server]
-      @port           = config[:port]
-      @directory      = config[:directory]
-      @cypher_path    = config[:cypher_path]
-      @gremlin_path   = config[:gremlin_path]
-      @log_file       = config[:log_file]
-      @log_enabled    = config[:log_enabled]
-      @max_threads    = config[:max_threads]
-      @parser         = config[:parser]
+      @protocol           = config[:protocol]
+      @server             = config[:server]
+      @port               = config[:port]
+      @directory          = config[:directory]
+      @cypher_path        = config[:cypher_path]
+      @gremlin_path       = config[:gremlin_path]
+      @log_file           = config[:log_file]
+      @log_enabled        = config[:log_enabled]
+      @slow_log_threshold = config[:slow_log_threshold]
+      @max_threads        = config[:max_threads]
+      @parser             = config[:parser]
 
       @user_agent     = { "User-Agent" => USER_AGENT }
 

data/lib/neography/tasks.rb

@@ -7,7 +7,7 @@ require 'net/http'
 namespace :neo4j do
   desc "Install Neo4j"
   task :install, :edition, :version do |t, args|
-    args.with_defaults(:edition => "community", :version => "1.9.4")
+    args.with_defaults(:edition => "community", :version => "2.0.0")
     puts "Installing Neo4j-#{args[:edition]}-#{args[:version]}"
     
     if OS::Underlying.windows?

data/lib/neography/version.rb

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

data/spec/integration/neography_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Neography do
-  describe "ref_node" do
+  describe "ref_node", :reference => true do
     it "can get the reference node" do
       root_node = Neography.ref_node
       root_node.should have_key("self")

data/spec/integration/rest_node_spec.rb

@@ -8,7 +8,7 @@ describe Neography::Rest do
   end
 
   describe "get_root" do
-    it "can get the root node" do
+    it "can get the root node", :reference => true do
       root_node = @neo.get_root
       root_node.should have_key("self")
       root_node["self"].split('/').last.should == "0"

data/spec/integration/rest_plugin_spec.rb

@@ -141,7 +141,7 @@ describe Neography::Rest do
     end
 
 
-    it "can delete everything but start node" do
+    it "can delete everything but start node", :reference => true do
       @neo.execute_query("START n=node(*) MATCH n-[r?]-() WHERE ID(n) <> 0 DELETE n,r")
       expect {
         @neo.execute_query("start n=node({id}) return n", {:id => 1})

data/spec/integration/rest_schema_index_spec.rb

@@ -9,7 +9,7 @@ describe Neography::Rest do
     it "can create a schema index" do
       si = @neo.create_schema_index("person", ["name"]) 
       si.should_not be_nil
-      si["property-keys"].should include("name")
+      si["property_keys"].should include("name")
     end
     
   end
@@ -19,7 +19,7 @@ describe Neography::Rest do
       si = @neo.get_schema_index("person")
       si.should_not be_nil
       si.first["label"].should include("person")
-      si.first["property-keys"].should include("name")
+      si.first["property_keys"].should include("name")
     end
   end
   

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ def generate_text(length=8)
 end
 
 RSpec.configure do |c|
-  c.filter_run_excluding :slow => true, :gremlin => true
+  c.filter_run_excluding :slow => true, :gremlin => true, :reference => true
 end
 
 

data/spec/unit/config_spec.rb

@@ -7,35 +7,37 @@ module Neography
 
     context "defaults" do
 
-      its(:protocol)       { should == 'http://' }
-      its(:server)         { should == 'localhost' }
-      its(:port)           { should == 7474 }
-      its(:directory)      { should == '' }
-      its(:cypher_path)    { should == '/cypher' }
-      its(:gremlin_path)   { should == '/ext/GremlinPlugin/graphdb/execute_script' }
-      its(:log_file)       { should == 'neography.log' }
-      its(:log_enabled)    { should == false }
-      its(:max_threads)    { should == 20 }
-      its(:authentication) { should == nil }
-      its(:username)       { should == nil }
-      its(:password)       { should == nil }
-      its(:parser)         { should == MultiJsonParser}
+      its(:protocol)           { should == 'http://' }
+      its(:server)             { should == 'localhost' }
+      its(:port)               { should == 7474 }
+      its(:directory)          { should == '' }
+      its(:cypher_path)        { should == '/cypher' }
+      its(:gremlin_path)       { should == '/ext/GremlinPlugin/graphdb/execute_script' }
+      its(:log_file)           { should == 'neography.log' }
+      its(:log_enabled)        { should == false }
+      its(:slow_log_threshold) { should == 0 }
+      its(:max_threads)        { should == 20 }
+      its(:authentication)     { should == nil }
+      its(:username)           { should == nil }
+      its(:password)           { should == nil }
+      its(:parser)             { should == MultiJsonParser}
 
       it "has a hash representation" do
         expected_hash = {
-          :protocol       => 'http://',
-          :server         => 'localhost',
-          :port           => 7474,
-          :directory      => '',
-          :cypher_path    => '/cypher',
-          :gremlin_path   => '/ext/GremlinPlugin/graphdb/execute_script',
-          :log_file       => 'neography.log',
-          :log_enabled    => false,
-          :max_threads    => 20,
-          :authentication => nil,
-          :username       => nil,
-          :password       => nil,
-          :parser         => MultiJsonParser
+          :protocol           => 'http://',
+          :server             => 'localhost',
+          :port               => 7474,
+          :directory          => '',
+          :cypher_path        => '/cypher',
+          :gremlin_path       => '/ext/GremlinPlugin/graphdb/execute_script',
+          :log_file           => 'neography.log',
+          :log_enabled        => false,
+          :slow_log_threshold => 0,
+          :max_threads        => 20,
+          :authentication     => nil,
+          :username           => nil,
+          :password           => nil,
+          :parser             => MultiJsonParser
         }
         config.to_hash.should == expected_hash
       end

data/spec/unit/connection_spec.rb

@@ -20,35 +20,37 @@ module Neography
       context "hash options" do
         let(:options) do
           {
-            :protocol       => "https://",
-            :server         => "foobar",
-            :port           => 4242,
-            :directory      => "/dir",
-            :cypher_path    => "/cyph",
-            :gremlin_path   => "/grem",
-            :log_file       => "neo.log",
-            :log_enabled    => false,
-            :max_threads    => 10,
-            :parser         => Foo,
-            :authentication => "foo",
-            :username       => "bar",
-            :password       => "baz"
+            :protocol           => "https://",
+            :server             => "foobar",
+            :port               => 4242,
+            :directory          => "/dir",
+            :cypher_path        => "/cyph",
+            :gremlin_path       => "/grem",
+            :log_file           => "neo.log",
+            :log_enabled        => false,
+            :slow_log_threshold => 0,
+            :max_threads        => 10,
+            :parser             => Foo,
+            :authentication     => "foo",
+            :username           => "bar",
+            :password           => "baz"
           }
         end
 
         it "accepts all options in a hash" do
           connection.configuration.should == "https://foobar:4242/dir/db/data"
 
-          connection.protocol.should     == "https://"
-          connection.server.should       == "foobar"
-          connection.port.should         == 4242
-          connection.directory.should    == "/dir"
-          connection.cypher_path.should  == "/cyph"
-          connection.gremlin_path.should == "/grem"
-          connection.log_file.should     == "neo.log"
-          connection.log_enabled.should  == false
-          connection.max_threads.should  == 10
-          connection.parser.should       == Foo
+          connection.protocol.should           == "https://"
+          connection.server.should             == "foobar"
+          connection.port.should               == 4242
+          connection.directory.should          == "/dir"
+          connection.cypher_path.should        == "/cyph"
+          connection.gremlin_path.should       == "/grem"
+          connection.log_file.should           == "neo.log"
+          connection.log_enabled.should        == false
+          connection.slow_log_threshold.should == 0
+          connection.max_threads.should        == 10
+          connection.parser.should             == Foo
 
           connection.authentication.should == {
             :foo_auth => {
@@ -207,17 +209,14 @@ module Neography
 
       context "query logging" do
         before do
-          connection.logger = Logger.new(nil)
+          @logger = Logger.new(nil)
+          connection.logger = @logger
           connection.log_enabled = true
         end
 
-        let :expected_response do
-          "expected_response"
-        end
+        let(:expected_response) {"expected_response"}
 
-        let :request_body do
-          {key1: :val1}
-        end
+        let(:request_body) { {key1: :val1} }
 
         it "should log query" do
           connection.should_receive(:log).with("/foo/bar", request_body).once
@@ -228,6 +227,30 @@ module Neography
           connection.stub(:evaluate_response).and_return expected_response
           connection.get("/foo/bar").should eq expected_response
         end
+
+        describe "slow_log_threshold" do
+          before do
+            connection.stub(:evaluate_response).and_return expected_response
+          end
+
+          context "default value" do
+            it "should have output" do
+              @logger.should_receive(:info).once
+            end
+          end
+
+          context "high value" do
+            before { connection.slow_log_threshold = 100_000 }
+            it "should not have output" do
+              @logger.should_not_receive(:info)
+            end
+          end
+
+          after do
+            connection.get("/foo/bar", {body: request_body})
+          end
+        end
+
       end
     end
   end

metadata

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