neography 1.0.8 → 1.0.9

data/.gitignore

@@ -1,3 +1,5 @@
+coverage
+.DS_Store
 Gemfile.lock
 .idea
 *.iml

data/README.md

@@ -1,5 +1,10 @@
-[![Build Status](https://secure.travis-ci.org/maxdemarzi/neography.png?branch=master)](http://travis-ci.org/maxdemarzi/neography)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/maxdemarzi/neography)
+Neography
+=========
+
+- [![Gem Version](https://badge.fury.io/rb/neography.png)](https://rubygems.org/gems/neography)
+- [![Build Status](https://secure.travis-ci.org/maxdemarzi/neography.png?branch=master)](http://travis-ci.org/maxdemarzi/neography)
+- [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/maxdemarzi/neography)
+- [![Coverage Status](https://coveralls.io/repos/maxdemarzi/neography/badge.png?branch=master)](https://coveralls.io/r/maxdemarzi/neography)
 
 ## Welcome to Neography 
 

data/lib/neography.rb

@@ -1,5 +1,5 @@
 require 'cgi'
-require 'httparty'
+require 'httpclient'
 require 'json'
 require 'multi_json'
 require 'logger'

data/lib/neography/config.rb

@@ -45,7 +45,7 @@ module Neography
       @authentication = nil
       @username       = nil
       @password       = nil
-      @parser         = {:parser => MultiJsonParser}
+      @parser         = MultiJsonParser
     end
 
   end

data/lib/neography/connection.rb

@@ -1,6 +1,5 @@
 module Neography
   class Connection
-
     USER_AGENT = "Neography/#{Neography::VERSION}"
 
     attr_accessor :protocol, :server, :port, :directory,
@@ -8,11 +7,12 @@ module Neography
       :log_file, :log_enabled, :logger,
       :max_threads,
       :authentication, :username, :password,
-      :parser
+      :parser, :client
 
     def initialize(options = ENV['NEO4J_URL'] || {})
       config = merge_configuration(options)
       save_local_configuration(config)
+      @client = HTTPClient.new
     end
 
     def configure(protocol, server, port, directory)
@@ -27,27 +27,37 @@ module Neography
     end
 
     def merge_options(options)
-      merged_options = options.merge!(@authentication).merge!(@parser)
+      merged_options = options.merge!(@authentication)#.merge!(@parser)
       merged_options[:headers].merge!(@user_agent) if merged_options[:headers]
       merged_options
     end
 
     def get(path, options={})
-      evaluate_response(HTTParty.get(configuration + path, merge_options(options)))
+      authenticate(configuration + path)
+      evaluate_response(@client.get(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
     end
 
     def post(path, options={})
-      evaluate_response(HTTParty.post(configuration + path, merge_options(options)))
+      authenticate(configuration + path)
+      evaluate_response(@client.post(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
     end
 
     def put(path, options={})
-      evaluate_response(HTTParty.put(configuration + path, merge_options(options)))
+      authenticate(configuration + path)
+      evaluate_response(@client.put(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
     end
 
     def delete(path, options={})
-      evaluate_response(HTTParty.delete(configuration + path, merge_options(options)))
+      authenticate(configuration + path)
+      evaluate_response(@client.delete(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
     end
 
+    def authenticate(path)
+      @client.set_auth(path, 
+                       @authentication[@authentication.keys.first][:username], 
+                       @authentication[@authentication.keys.first][:password]) unless @authentication.empty?
+    end
+    
     private
 
     def merge_configuration(options)
@@ -91,10 +101,10 @@ module Neography
       case code
       when 200
         @logger.debug "OK" if @log_enabled
-        response.parsed_response
+        @parser.json(body) #response.parsed_response
       when 201
         @logger.debug "OK, created #{body}" if @log_enabled
-        response.parsed_response
+        @parser.json(body) #response.parsed_response
       when 204
         @logger.debug "OK, no content returned" if @log_enabled
         nil
@@ -110,7 +120,7 @@ module Neography
         message = "No error message returned from server."
         stacktrace = ""
       else
-        parsed_body = JSON.parse(body)
+        parsed_body = @parser.json(body)
         message = parsed_body["message"]
         stacktrace = parsed_body["stacktrace"]
       end

data/lib/neography/multi_json_parser.rb

@@ -1,6 +1,5 @@
-class MultiJsonParser < HTTParty::Parser
+class MultiJsonParser
 
-  protected
 
     # I know this looks pretty ugly, but we have issues with Neo4j returning true, false,
     # plain numbers and plain strings, which is considered by some JSON libraries to be
@@ -8,7 +7,7 @@ class MultiJsonParser < HTTParty::Parser
     # This ugly hack deals with the problem.  Send me a Pull Request if you
     # come up with a nicer solution... please!
     #
-    def json
+    def self.json(body)
       begin
         MultiJson.load(body)
       rescue MultiJson::DecodeError, ArgumentError

data/lib/neography/rest.rb

@@ -31,7 +31,6 @@ require 'neography/connection'
 module Neography
 
   class Rest
-    include HTTParty
     include Helpers
     extend Forwardable
 

data/lib/neography/tasks.rb

@@ -1,6 +1,6 @@
 # borrowed from architect4r
 require 'os'
-require 'httparty'
+require 'httpclient'
 require 'zip/zip'
 
 namespace :neo4j do
@@ -14,7 +14,7 @@ namespace :neo4j do
       unless File.exist?('neo4j.zip')
         df = File.open('neo4j.zip', 'wb')
         begin
-          df << HTTParty.get("http://dist.neo4j.org/neo4j-#{args[:edition]}-#{args[:version]}-windows.zip")
+          df << HTTPClient.new.get("http://dist.neo4j.org/neo4j-#{args[:edition]}-#{args[:version]}-windows.zip")
         ensure
           df.close()
         end

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/neography.gemspec

@@ -22,7 +22,8 @@ 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_dependency "httparty", ">= 0.8.1"
+  s.add_development_dependency "coveralls"
+  s.add_dependency "httpclient", ">= 2.3.3"
   s.add_dependency "rake", ">= 0.8.7"
   s.add_dependency "json", ">= 1.6.0"
   s.add_dependency "os", ">= 0.9.6"

data/spec/integration/rest_header_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Neography::Connection do
 
   it "should not add a content-type header if there's no existing headers" do
-    subject.merge_options({}).keys.should == [:parser]
+    subject.merge_options({}).keys.should == []
   end
 
   it "should add a content type if there's existing headers" do

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'neography'
 require 'benchmark'
 require 'matchers'
+require 'coveralls'
+Coveralls.wear!
 
 # If you want to see more, uncomment the next few lines
 # require 'net-http-spy'

data/spec/unit/config_spec.rb

@@ -19,7 +19,7 @@ module Neography
       its(:authentication) { should == nil }
       its(:username)       { should == nil }
       its(:password)       { should == nil }
-      its(:parser)         { should == { :parser => MultiJsonParser } }
+      its(:parser)         { should == MultiJsonParser}
 
       it "has a hash representation" do
         expected_hash = {
@@ -35,7 +35,7 @@ module Neography
           :authentication => nil,
           :username       => nil,
           :password       => nil,
-          :parser         => { :parser => MultiJsonParser }
+          :parser         => MultiJsonParser
         }
         config.to_hash.should == expected_hash
       end

data/spec/unit/connection_spec.rb

@@ -78,22 +78,22 @@ module Neography
     context "requests" do
 
       it "does a GET request" do
-        HTTParty.should_receive(:get).with("http://localhost:7474/db/data/foo/bar", { :parser => MultiJsonParser }) { stub.as_null_object }
+        connection.client.should_receive(:get).with("http://localhost:7474/db/data/foo/bar", nil, nil) { stub.as_null_object }
         connection.get("/foo/bar")
       end
 
       it "does a POST request" do
-        HTTParty.should_receive(:post).with("http://localhost:7474/db/data/foo/bar", { :parser => MultiJsonParser }) { stub.as_null_object }
+        connection.client.should_receive(:post).with("http://localhost:7474/db/data/foo/bar", nil, nil) { stub.as_null_object }
         connection.post("/foo/bar")
       end
 
       it "does a PUT request" do
-        HTTParty.should_receive(:put).with("http://localhost:7474/db/data/foo/bar", { :parser => MultiJsonParser }) { stub.as_null_object }
+        connection.client.should_receive(:put).with("http://localhost:7474/db/data/foo/bar", nil, nil) { stub.as_null_object }
         connection.put("/foo/bar")
       end
 
       it "does a DELETE request" do
-        HTTParty.should_receive(:delete).with("http://localhost:7474/db/data/foo/bar", { :parser => MultiJsonParser }) { stub.as_null_object }
+        connection.client.should_receive(:delete).with("http://localhost:7474/db/data/foo/bar", nil, nil) { stub.as_null_object }
         connection.delete("/foo/bar")
       end
 
@@ -107,25 +107,24 @@ module Neography
         end
 
         it "does requests with authentication" do
-          HTTParty.should_receive(:get).with(
+          connection.client.should_receive(:set_auth).with(
             "http://localhost:7474/db/data/foo/bar",
-            { :parser => MultiJsonParser,
-              :basic_auth => {
-                :username => "foo",
-                :password => "bar"
-              }
-            }) { stub.as_null_object }
+             "foo",
+             "bar") { stub.as_null_object }
+
+          connection.client.should_receive(:get).with(
+            "http://localhost:7474/db/data/foo/bar", nil, nil
+            ) { stub.as_null_object }
 
           connection.get("/foo/bar")
         end
       end
 
       it "adds the User-Agent to the headers" do
-        HTTParty.should_receive(:get).with(
+        connection.client.should_receive(:get).with(
           "http://localhost:7474/db/data/foo/bar",
-          { :parser => MultiJsonParser,
-            :headers => { "User-Agent" => "Neography/#{Neography::VERSION}" }
-          }) { stub.as_null_object }
+          nil, { "User-Agent" => "Neography/#{Neography::VERSION}" }
+          ) { stub.as_null_object }
 
         connection.get("/foo/bar", :headers => {})
       end
@@ -134,7 +133,7 @@ module Neography
 
         it "raises NodeNotFoundException" do
           response = error_response(code: 404, message: "a message", exception: "NodeNotFoundException")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error NodeNotFoundException
@@ -142,7 +141,7 @@ module Neography
 
         it "raises OperationFailureException" do
           response = error_response(code: 409, message: "a message", exception: "OperationFailureException")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error OperationFailureException
@@ -150,7 +149,7 @@ module Neography
 
         it "raises PropertyValueException" do
           response = error_response(code: 400, message: "a message", exception: "PropertyValueException")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error PropertyValueException
@@ -158,7 +157,7 @@ module Neography
 
         it "raises NoSuchPropertyException" do
           response = error_response(code: 404, message: "a message", exception: "NoSuchPropertyException")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error NoSuchPropertyException
@@ -166,7 +165,7 @@ module Neography
 
         it "raises RelationshipNotFoundException" do
           response = error_response(code: 404, message: "a message", exception: "RelationshipNotFoundException")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error RelationshipNotFoundException
@@ -174,7 +173,7 @@ module Neography
 
         it "raises BadInputException" do
           response = error_response(code: 400, message: "a message", exception: "BadInputException")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error BadInputException
@@ -182,7 +181,7 @@ module Neography
 
         it "raises UnauthorizedError" do
           response = error_response(code: 401)
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error UnauthorizedError
@@ -190,7 +189,7 @@ module Neography
 
         it "raises NeographyError in all other cases" do
           response = error_response(code: 418, message: "I'm a teapot.")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error NeographyError
@@ -198,7 +197,7 @@ module Neography
 
         it "raises BadInputException" do
           response = error_response(code: 500, message: "a message", exception: "JsonParseException")
-          HTTParty.stub(:get).and_return(response)
+          connection.client.stub(:get).and_return(response)
           expect {
             connection.get("/foo/bar")
           }.to raise_error NeographyError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,13 +60,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement