neography 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581fe5af6cd93c2dfeced6167fdf507c41dd508e
-  data.tar.gz: a2cbef7d720a7988035fc199e89516ee7acce42d
+  metadata.gz: 8cb990bec3b2c9e7a9134d22360940ddd1e7f839
+  data.tar.gz: 39b4c012fbc1cb3281681c101987a3a0ec8a6f7f
 SHA512:
-  metadata.gz: e51373c2a7cbe9a45b740f9ae8ac2af1d7738c5d3b4b2a00d977b6137b68df2a1fd3e15e118687ce19ac2f2d39eab7efac785697bc059ad5fc8cf998534b4082
-  data.tar.gz: 91544b56b7f1f4d69ce9d0fadc438f4591721654176cb586ad8ddcd9a5b98d38697ab3f75dcfcf7d1358c94c30a613c5708f76164aef14e0e6f3e17f5d129cf4
+  metadata.gz: 837ea1e306b28344ac8474ae5624476191bd4506f53aa9c6ea2375b91d2e13119a4ae2986af0d2edc472abc765e85b5e316cfc37604292ad51f75c62ac699846
+  data.tar.gz: baa0fda9441fc33e46b0123b4ba3f34350dcfbf138755fef003c03fca980932f7a04fb89b88d27337b5c158062b52b0188336013a189320f13ab0d9a353cd880

data/lib/neography/config.rb

@@ -6,7 +6,7 @@ module Neography
       :log_file, :log_enabled, :slow_log_threshold,
       :max_threads,
       :authentication, :username, :password,
-      :parser
+      :parser, :max_execution_time
 
     def initialize
       set_defaults
@@ -27,7 +27,8 @@ module Neography
         :authentication     => @authentication,
         :username           => @username,
         :password           => @password,
-        :parser             => @parser
+        :parser             => @parser,
+        :max_execution_time => @max_execution_time
       }
     end
 
@@ -48,6 +49,7 @@ module Neography
       @username           = nil
       @password           = nil
       @parser             = MultiJsonParser
+      @max_execution_time = 6000
       end
 
   end

data/lib/neography/connection.rb

@@ -29,22 +29,24 @@ module Neography
     end
 
     def configuration
-      @configuration ||= "#{@protocol}#{@server}:#{@port}#{@directory}/db/data"
+      @configuration ||= "#{@protocol}#{@server}:#{@port}#{@directory}"
     end
 
     def merge_options(options)
       merged_options = options.merge!(@authentication)
       merged_options[:headers].merge!(@user_agent) if merged_options[:headers]
       merged_options[:headers].merge!('X-Stream' => true) if merged_options[:headers]
+      merged_options[:headers].merge!(@max_execution_time) if merged_options[:headers]
       merged_options
     end
 
     ACTIONS.each do |action|
-      define_method(action) do |path, options = {}|
-        query_path = configuration + path
+      define_method(action) do |path, options = {}| 
+        base = path.start_with?("/unmanaged") ? "" : "/db/data"
+        query_path = configuration + base + path
         query_body = merge_options(options)[:body] 
         log path, query_body do
-          evaluate_response(@client.send(action.to_sym, query_path, query_body, merge_options(options)[:headers]))    
+          evaluate_response(@client.send(action.to_sym, query_path, query_body, merge_options(options)[:headers]), path, query_body)    
         end
       end 
     end
@@ -88,6 +90,7 @@ module Neography
       @max_threads        = config[:max_threads]
       @parser             = config[:parser]
 
+      @max_execution_time = { 'max-execution-time' => config[:max_execution_time] }
       @user_agent     = { "User-Agent" => USER_AGENT }
 
       @authentication = {}
@@ -110,7 +113,7 @@ module Neography
       return_result(code, result)
     end
 
-    def evaluate_response(response)
+    def evaluate_response(response, path, query_body)
       if response.http_header.request_uri.request_uri == "/db/data/batch"
         code, body, parsed = handle_batch(response)
       else
@@ -118,7 +121,7 @@ module Neography
         body = response.body.force_encoding("UTF-8")
         parsed = false
       end
-      return_result(response, code, body, parsed)
+      return_result(response, code, body, parsed, path, query_body)
     end
 
     def handle_batch(response)
@@ -133,7 +136,7 @@ module Neography
       return code, body, true
     end
     
-    def return_result(response, code, body, parsed)
+    def return_result(response, code, body, parsed, path, query_body)
       case code
       when 200
         @logger.debug "OK, created #{body}" if @log_enabled
@@ -147,20 +150,23 @@ module Neography
         @logger.debug "OK, no content returned" if @log_enabled
         nil
       when 400..500
-        handle_4xx_500_response(response, code, body)
+        handle_4xx_500_response(response, code, body, path, query_body)
         nil
       end      
     end
 
-    def handle_4xx_500_response(response, code, body)
+    def handle_4xx_500_response(response, code, body, path, query_body)
+      index = 0
+      request = {:path => path, :body => query_body}
       if body.nil? or body == ""
         parsed_body = {"message" => "No error message returned from server.",
                        "stacktrace" => "No stacktrace returned from server." }
       elsif body.is_a? Hash
         parsed_body = body
       elsif body.is_a? Array
-        body.each do |result|
+        body.each_with_index do |result, idx|
           if result["status"] >= 400
+            index = idx
             parsed_body = result["body"] || result
             break
           end
@@ -173,10 +179,10 @@ module Neography
       stacktrace = parsed_body["stacktrace"]
 
       @logger.error "#{response.dump} error: #{body}" if @log_enabled
-      raise_errors(code, parsed_body["exception"], message, stacktrace)
+      raise_errors(code, parsed_body["exception"], message, stacktrace, request, index)
     end
     
-    def raise_errors(code, exception, message, stacktrace)
+    def raise_errors(code, exception, message, stacktrace, request, index)
       error = nil
       case code
         when 401
@@ -199,7 +205,7 @@ module Neography
           NeographyError
       end
       
-      raise error.new(message, code, stacktrace)      
+      raise error.new(message, code, stacktrace, request, index)      
     end
 
     def parse_string_options(options)

data/lib/neography/errors.rb

@@ -1,12 +1,14 @@
 module Neography
 
   class NeographyError < StandardError
-    attr_reader :message, :code, :stacktrace
+    attr_reader :message, :code, :stacktrace, :request, :index
 
-    def initialize(message = nil, code = nil, stacktrace = nil)
+    def initialize(message = nil, code = nil, stacktrace = nil, request = nil, index = 0)
       @message    = message
       @code       = code
       @stacktrace = stacktrace
+      @request    = request
+      @index      = index
     end
   end
 

data/lib/neography/version.rb

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

data/neography.gemspec

@@ -22,12 +22,17 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec", ">= 2.11"
   s.add_development_dependency "net-http-spy", "0.2.1"
-  s.add_development_dependency "rake", ">= 0.8.7"
   s.add_development_dependency "coveralls"
   s.add_dependency "httpclient", ">= 2.3.3"
-  s.add_dependency "rake", ">= 0.8.7"
   s.add_dependency "json", ">= 1.7.7"
   s.add_dependency "os", ">= 0.9.6"
-  s.add_dependency "rubyzip", "~> 1.0.0"
+  s.add_dependency "rubyzip", ">= 1.0.0"
   s.add_dependency "multi_json", ">= 1.3.2"
+  
+  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    s.add_runtime_dependency 'rake', '>= 0.8.7'
+  else
+    s.add_development_dependency "rake", ">= 0.8.7"
+    s.add_dependency "rake", ">= 0.8.7"
+  end
 end

data/spec/integration/index_spec.rb

@@ -34,10 +34,11 @@ describe Neography::Index do
   end
 
   it "can find a node in an index with brackets" do
+    key = generate_text(6)
     value = "Sen. Roy Blunt [R-MO]"
     new_node = Neography::Node.create("name" => value)
-    new_node.add_to_index("node_test_index", "name", value)
-    existing_node = Neography::Node.find("node_test_index", "name", value)
+    new_node.add_to_index(key, "name", value)
+    existing_node = Neography::Node.find(key, "name", value)
     existing_node.name.should == value
   end
 

data/spec/integration/rest_batch_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Neography::Rest do
   before(:each) do
-    @neo = Neography::Rest.new(:log_enabled => true)
+    @neo = Neography::Rest.new
   end
 
   describe "simple batch" do
@@ -482,6 +482,20 @@ describe Neography::Rest do
                                         [:create_node, {:street1=>"94437 Kemmer Crossing", :street2=>"Apt. 333", :city=>"Abshireton", :state=>"AA", :zip=>"65820", :_type=>"Address", :created_at=>1335269478}],
                                         [:create_relationship, "has", "{0}", "{2}", {}]
             }.to raise_error(Neography::NeographyError)
+            
+      begin
+        batch_result = @neo.batch [:create_unique_node, "person", "ssn", "000-00-0001", {:first_name=>"Jane", :last_name=>"Doe", :ssn=>"000-00-0001", :_type=>"Person", :created_at=>1335269478}],
+                                  [:add_node_to_index, "person_ssn", "ssn", "000-00-0001", "{0}"],
+                                  [:create_node, {:street1=>"94437 Kemmer Crossing", :street2=>"Apt. 333", :city=>"Abshireton", :state=>"AA", :zip=>"65820", :_type=>"Address", :created_at=>1335269478}],
+                                  [:create_relationship, "has", "{0}", "{2}", {}]
+      rescue Neography::NeographyError => e
+        e.message.should == "Not Found"
+        e.code.should == 404
+        e.stacktrace.should be_nil
+        e.request[:path].should == "/batch"
+        e.request[:body].should_not be_nil
+        e.index.should == 3
+      end            
     end
 
   end

data/spec/integration/rest_header_spec.rb

@@ -8,7 +8,7 @@ describe Neography::Connection do
 
   it "should add a content type if there's existing headers" do
     subject.merge_options({:headers => {'Content-Type' => 'foo/bar'}})[:headers].should ==
-      {'Content-Type' => "foo/bar",  "User-Agent"   => "Neography/#{Neography::VERSION}" , "X-Stream"=>true}
+      {'Content-Type' => "foo/bar",  "User-Agent"   => "Neography/#{Neography::VERSION}" , "X-Stream"=>true, "max-execution-time"=>6000}
   end
 
 end

data/spec/integration/rest_index_spec.rb

@@ -30,7 +30,7 @@ describe Neography::Rest do
       name = generate_text(6)
       new_index = @neo.create_node_index(name)
       new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/index/node/#{name}/{key}/{value}"
+      new_index["template"].should == "#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}"
       new_index["provider"].should == "lucene"
       new_index["type"].should == "exact"
     end
@@ -39,7 +39,7 @@ describe Neography::Rest do
       name = generate_text(6)
       new_index = @neo.create_node_index(name, "fulltext","lucene")
       new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/index/node/#{name}/{key}/{value}"
+      new_index["template"].should == "#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}"
       new_index["provider"].should == "lucene"
       new_index["type"].should == "fulltext"
     end
@@ -48,7 +48,7 @@ describe Neography::Rest do
       name = generate_text(6)
       new_index = @neo.create_node_index(name, "fulltext","lucene", extra: 'extra-value')
       new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/index/node/#{name}/{key}/{value}"
+      new_index["template"].should == "#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}"
       new_index["provider"].should == "lucene"
       new_index["extra"].should == "extra-value"
       new_index["type"].should == "fulltext"
@@ -58,7 +58,7 @@ describe Neography::Rest do
       name = generate_text(6)
       new_index = @neo.create_relationship_index(name)
       new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/index/relationship/#{name}/{key}/{value}"
+      new_index["template"].should == "#{@neo.configuration}/db/data/index/relationship/#{name}/{key}/{value}"
       new_index["provider"].should == "lucene"
       new_index["type"].should == "exact"
     end
@@ -67,7 +67,7 @@ describe Neography::Rest do
       name = generate_text(6)
       new_index = @neo.create_relationship_index(name, "fulltext","lucene")
       new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/index/relationship/#{name}/{key}/{value}"
+      new_index["template"].should == "#{@neo.configuration}/db/data/index/relationship/#{name}/{key}/{value}"
       new_index["provider"].should == "lucene"
       new_index["type"].should == "fulltext"
     end

data/spec/unit/config_spec.rb

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

data/spec/unit/connection_spec.rb

@@ -8,7 +8,7 @@ module Neography
     context "defaults" do
 
       it "intializes with defaults" do
-        connection.configuration.should == "http://localhost:7474/db/data"
+        connection.configuration.should == "http://localhost:7474"
       end
 
     end
@@ -38,7 +38,7 @@ module Neography
         end
 
         it "accepts all options in a hash" do
-          connection.configuration.should == "https://foobar:4242/dir/db/data"
+          connection.configuration.should == "https://foobar:4242/dir"
 
           connection.protocol.should           == "https://"
           connection.server.should             == "foobar"
@@ -65,7 +65,7 @@ module Neography
         let(:options) { "https://user:pass@somehost:8585/path" }
 
         it "accepts a string as configuration" do
-          connection.configuration.should == "https://somehost:8585/path/db/data"
+          connection.configuration.should == "https://somehost:8585/path"
           connection.authentication.should == {
             :basic_auth => {
               :username => "user",
@@ -125,7 +125,7 @@ module Neography
       it "adds the User-Agent to the headers" do
         connection.client.should_receive(:get).with(
           "http://localhost:7474/db/data/foo/bar",
-          nil, { "User-Agent" => "Neography/#{Neography::VERSION}", "X-Stream"=>true}
+          nil, { "User-Agent" => "Neography/#{Neography::VERSION}", "X-Stream"=>true, "max-execution-time"=>6000}
           ) { double.as_null_object }
 
         connection.get("/foo/bar", :headers => {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,20 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +98,14 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -150,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: A Ruby wrapper to the Neo4j Rest API see http://docs.neo4j.org/chunked/stable/rest-api.html
   for more details.
 email: maxdemarzi@gmail.com
@@ -296,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neography
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: ruby wrapper to Neo4j Rest API