neography 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb990bec3b2c9e7a9134d22360940ddd1e7f839
-  data.tar.gz: 39b4c012fbc1cb3281681c101987a3a0ec8a6f7f
+  metadata.gz: c0370d9441fe781940dd20f4a89eac1306299d8a
+  data.tar.gz: 51f228c713783eac9783df52a61676ddead5435c
 SHA512:
-  metadata.gz: 837ea1e306b28344ac8474ae5624476191bd4506f53aa9c6ea2375b91d2e13119a4ae2986af0d2edc472abc765e85b5e316cfc37604292ad51f75c62ac699846
-  data.tar.gz: baa0fda9441fc33e46b0123b4ba3f34350dcfbf138755fef003c03fca980932f7a04fb89b88d27337b5c158062b52b0188336013a189320f13ab0d9a353cd880
+  metadata.gz: ac5122807662830386f371b96335e98b6d3b967bd871dbe8c4f5e53de41ece3638e251d05d891a9323f5551c80d4ae3e1857307c23573c56bf414416a3e4445e
+  data.tar.gz: 6e8b5282ece9f8b52c30c5b599a7ea7ef1d08facb786d34b62be2078e836214f51e4782123d88295de50d71b49abc4f2011f30f45a86db42a8eda51b99ba514a

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, :slow_log_threshold,
+      :log_file, :log_enabled, :logger, :slow_log_threshold,
       :max_threads,
       :authentication, :username, :password,
       :parser, :max_execution_time
@@ -22,6 +22,7 @@ module Neography
         :gremlin_path       => @gremlin_path,
         :log_file           => @log_file,
         :log_enabled        => @log_enabled,
+        :logger             => @logger,
         :slow_log_threshold => @slow_log_threshold,
         :max_threads        => @max_threads,
         :authentication     => @authentication,

data/lib/neography/connection.rb

@@ -89,6 +89,7 @@ module Neography
       @slow_log_threshold = config[:slow_log_threshold]
       @max_threads        = config[:max_threads]
       @parser             = config[:parser]
+      @logger             = config[:logger]
 
       @max_execution_time = { 'max-execution-time' => config[:max_execution_time] }
       @user_agent     = { "User-Agent" => USER_AGENT }
@@ -104,7 +105,7 @@ module Neography
       end
 
       if @log_enabled
-        @logger = Logger.new(@log_file)
+        @logger ||= Logger.new(@log_file)
       end
     end
 

data/lib/neography/rest.rb

@@ -144,7 +144,7 @@ module Neography
     end
     
     def rollback_transaction(tx)
-      @transactions.add(tx)    
+      @transactions.rollback(tx)    
     end    
     
     # nodes

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end

data/spec/integration/rest_transaction_spec.rb

@@ -157,7 +157,7 @@ describe Neography::Rest do
       tx.should have_key("transaction")
       tx["results"].should_not be_empty
       existing_tx = @neo.rollback_transaction(tx)
-      existing_tx.should have_key("transaction")
+      existing_tx.should_not have_key("transaction")
       existing_tx.should have_key("results")
       existing_tx["results"].should be_empty
     end

data/spec/unit/config_spec.rb

@@ -15,6 +15,7 @@ module Neography
       its(:gremlin_path)       { should == '/ext/GremlinPlugin/graphdb/execute_script' }
       its(:log_file)           { should == 'neography.log' }
       its(:log_enabled)        { should == false }
+      its(:logger)             { should == nil }
       its(:slow_log_threshold) { should == 0 }
       its(:max_threads)        { should == 20 }
       its(:authentication)     { should == nil }
@@ -33,6 +34,7 @@ module Neography
           :gremlin_path       => '/ext/GremlinPlugin/graphdb/execute_script',
           :log_file           => 'neography.log',
           :log_enabled        => false,
+          :logger             => nil,
           :slow_log_threshold => 0,
           :max_threads        => 20,
           :authentication     => nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec