neography 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f56fdcb0ba1b76f8465e82a5df1839ed3e337b9
-  data.tar.gz: c7c10be33f26d6e7efe8c2db48178706f5c41ba9
+  metadata.gz: 4089edb953cf8a75450a374587509e36a7ebc2cb
+  data.tar.gz: 23729f4789ae38f437570cc3cb40bd81a07159e1
 SHA512:
-  metadata.gz: 11d21194b44429abcc0c516a98c5476a98ed693ce6d24bcb5118caf93e5fef6e573c610d85e713bea2e710defe824840d7e85725570542e7304b24234eb1abe4
-  data.tar.gz: 55272d62fdfe09a8e2e5bb38b97e6137b2326a307621c84083ffd311930220ed1f87311863682efc32fede698f972acef57a0510d351fa94d77876a2fc965531
+  metadata.gz: 838825f354af0d739a24aac78a89afa1a9c95d733460ba7a59ab18fd27e182cc445b736686bffcbdbb69e035b1c4a39e47ee3139d6164795099d2a3e3a0744f3
+  data.tar.gz: a656969ff18920af8302a87ac33b7f89e130d7e813ae2c091edbaf0c6799d667001cba24c0b972e81af07a02e280b5e32fc24b3d9a4e23c5b325e158141f38c6

data/lib/neography/config.rb

@@ -6,7 +6,8 @@ module Neography
       :log_file, :log_enabled, :logger, :slow_log_threshold,
       :max_threads,
       :authentication, :username, :password,
-      :parser, :max_execution_time
+      :parser, :max_execution_time,
+      :proxy
 
     def initialize
       set_defaults
@@ -29,7 +30,8 @@ module Neography
         :username           => @username,
         :password           => @password,
         :parser             => @parser,
-        :max_execution_time => @max_execution_time
+        :max_execution_time => @max_execution_time,
+        :proxy              => @proxy
       }
     end
 
@@ -51,6 +53,7 @@ module Neography
       @password           = nil
       @parser             = MultiJsonParser
       @max_execution_time = 6000
+      @proxy              = nil
       end
 
   end

data/lib/neography/connection.rb

@@ -10,12 +10,13 @@ module Neography
       :log_file, :log_enabled, :logger, :slow_log_threshold,
       :max_threads,
       :authentication, :username, :password,
-      :parser, :client
+      :parser, :client,
+      :proxy
 
     def initialize(options = ENV['NEO4J_URL'] || {})
       config = merge_configuration(options)
       save_local_configuration(config)
-      @client = HTTPClient.new
+      @client = HTTPClient.new(config[:proxy])
       @client.send_timeout = 1200 # 10 minutes
       @client.receive_timeout = 1200
       authenticate
@@ -101,6 +102,7 @@ module Neography
       @max_threads        = config[:max_threads]
       @parser             = config[:parser]
       @logger             = config[:logger]
+      @proxy              = config[:proxy]
 
       @max_execution_time = { 'max-execution-time' => config[:max_execution_time] }
       @user_agent     = { "User-Agent" => USER_AGENT }
@@ -190,7 +192,7 @@ module Neography
       message = parsed_body["message"]
       stacktrace = parsed_body["stacktrace"]
 
-      @logger.error "#{response.dump} error: #{body} request: #{request}" if @log_enabled
+      @logger.error "#{response.dump} error: #{body}" if @log_enabled
       raise_errors(code, parsed_body["exception"], message, stacktrace, request, index)
     end
     

data/lib/neography/errors.rb

@@ -12,6 +12,10 @@ module Neography
     end
   end
 
+    def to_s
+     "NeographyError: \n--message: #{@message}, \n--code: #{@code}, \n--stacktrace: #{@stacktrace}, \n--request: #{@request}, \n--index: #{@index}"
+    end
+
   # HTTP Authentication error
   class UnauthorizedError < NeographyError; end
 

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.3.10"
+  VERSION = "1.3.11"
 end

data/spec/unit/config_spec.rb

@@ -23,6 +23,8 @@ module Neography
       its(:password)           { should == nil }
       its(:parser)             { should == MultiJsonParser}
       its(:max_execution_time) { should == 6000 }
+      its(:proxy)              { should == nil }
+
 
       it "has a hash representation" do
         expected_hash = {
@@ -41,7 +43,8 @@ module Neography
           :username           => nil,
           :password           => nil,
           :parser             => MultiJsonParser,
-          :max_execution_time => 6000
+          :max_execution_time => 6000,
+          :proxy              => nil
         }
         config.to_hash.should == expected_hash
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec