Allow all HTTParty's options for Neo4j Sessions, #51

See https://github.com/jnunemaker/httparty/blob/master/lib/httparty.rb

README.md

@@ -69,12 +69,19 @@ Open a IRB/Pry session:
   session = Neo4j::Session.open(:server_db)
 ```
 
-Basic Authentication:
+### Session Configuration
+
+Example, Basic Authentication:
 
 ```ruby
-  Neo4j::Session.open(:server_db, 'http://my.server', basic_auth: { username: 'username', password: 'password')
+  Neo4j::Session.open(:server_db, 'http://my.server', basic_auth: { username: 'username', password: 'password'})
 ```
 
+The last option hash is passed on to HTTParty. See here for more available options:
+http://rdoc.info/github/jnunemaker/httparty/HTTParty/ClassMethods
+
+### Embedded Session
+
 Using the Neo4j Embedded Database, `:embedded_db`
 
 ```ruby
@@ -90,6 +97,8 @@ session.running? #=> false
 session.close # make the session not current/default
 ```
 
+### Session.current
+
 When a session has been created it will be stored in the `Neo4j::Session` object.
 Example, get the default session
 

lib/neo4j-server/cypher_session.rb

@@ -11,11 +11,17 @@ class CypherSession < Neo4j::Session
 
     alias_method :super_query, :query
 
-    def self.open(url = nil, params = nil)
-      endpoint = Neo4jServerEndpoint.new(url, params)
 
-      endpoint_url = url || 'http://localhost:7474'
-      response = endpoint.get(endpoint_url)
+    # Opens a session to the database
+    # @see Neo4j::Session#open
+    #
+    # @param url - defaults to 'http://localhost:7474' if not given
+    # @params - see https://github.com/jnunemaker/httparty/blob/master/lib/httparty.rb for supported
+    # HTTParty options
+    def self.open(endpoint_url=nil, params = {})
+      endpoint = Neo4jServerEndpoint.new(params)
+      url = endpoint_url || 'http://localhost:7474'
+      response = endpoint.get(url)
       raise "Server not available on #{url} (response code #{response.code})" unless response.code == 200
 
       root_data = JSON.parse(response.body)

lib/neo4j-server/neo4j_server_endpoint.rb

@@ -1,20 +1,24 @@
 module Neo4j::Server
   class Neo4jServerEndpoint
-    def initialize(url, params = nil)
-      unless params.nil?
-        @auth = params if params[:basic_auth]
-      end
+    def initialize(params = {})
+      @params = params
     end
 
-    ["get", "post", "delete"].each do |verb|
-      define_method verb do |url, *params|
-        unless @auth.nil?
-          params.push({}) if params.empty?
-          params.last.merge!(@auth)
-        end
+    def merged_options(options)
+      options.merge!(@params)
+    end
+
+    def get(url, options={})
+      HTTParty.get(url, merged_options(options))
+    end
 
-        HTTParty.send(verb, url, *params)
-      end
+    def post(url, options={})
+      HTTParty.post(url, merged_options(options))
     end
+
+    def delete(url, options={})
+      HTTParty.delete(url, merged_options(options))
+    end
+
   end
 end

lib/neo4j/session.rb

@@ -89,7 +89,8 @@ def _query(*params)
     end
 
     class << self
-      # Creates a new session
+      # Creates a new session to Neo4j
+      # @see also Neo4j::Server::CypherSession#open for :server_db params
       # @param db_type the type of database, e.g. :embedded_db, or :server_db
       def open(db_type, *params)
         register(create_session(db_type, params))

spec/neo4j-server/unit/cypher_session_unit_spec.rb

@@ -4,7 +4,7 @@ module Neo4j::Server
   describe CypherSession do
 
     before(:each) do
-      @endpoint = Neo4jServerEndpoint.new(nil, nil)
+      @endpoint = Neo4jServerEndpoint.new()
     end
 
     let(:cypher_response) do
@@ -51,7 +51,7 @@ def request
       end
 
       it 'allow root resource with urls ending with slash' do
-        Neo4jServerEndpoint.should_receive(:new).with(nil, nil).and_return(@endpoint)
+        Neo4jServerEndpoint.should_receive(:new).with({}).and_return(@endpoint)
 
         @endpoint.should_receive(:get).with('http://localhost:7474').and_return(TestResponse.new(root_resource_with_slash))
         @endpoint.should_receive(:get).with("http://localhost:7474/db/data/").and_return(TestResponse.new(data_resource))
@@ -61,7 +61,7 @@ def request
       end
 
       it 'allow root resource with urls NOT ending with slash' do
-        Neo4jServerEndpoint.should_receive(:new).with(nil, nil).and_return(@endpoint)
+        Neo4jServerEndpoint.should_receive(:new).with({}).and_return(@endpoint)
 
         @endpoint.should_receive(:get).with('http://localhost:7474').and_return(TestResponse.new(root_resource_with_no_slash))
         @endpoint.should_receive(:get).with("http://localhost:7474/db/data/").and_return(TestResponse.new(data_resource))
@@ -75,7 +75,7 @@ def request
         auth = {basic_auth: { username: 'username', password: 'password'}}
         params = [base_url, auth]
 
-        Neo4jServerEndpoint.should_receive(:new).with(*params).and_return(@endpoint)
+        Neo4jServerEndpoint.should_receive(:new).with(auth).and_return(@endpoint)
 
         @endpoint.should_receive(:get).with(base_url)
           .and_return(TestResponse.new(root_resource_with_slash))
@@ -90,15 +90,15 @@ def request
         auth = {basic_auth: { username: 'username', password: 'password'}}
         params = [base_url, auth]
 
-        Neo4jServerEndpoint.should_receive(:new).with(*params).and_return(@endpoint)
+        Neo4jServerEndpoint.should_receive(:new).with(auth).and_return(@endpoint)
         @endpoint.should_receive(:get).with(base_url)
           .and_return(TestResponse.new(root_resource_with_slash))
         @endpoint.should_receive(:get).with("http://localhost:7474/db/data/")
           .and_return(TestResponse.new(data_resource))
 
         Neo4j::Session.create_session(:server_db, params)
 
-        Neo4jServerEndpoint.should_receive(:new).with(nil, nil).and_return(@endpoint)
+        Neo4jServerEndpoint.should_receive(:new).with({}).and_return(@endpoint)
         @endpoint.should_receive(:get).with('http://localhost:7474')
           .and_return(TestResponse.new(root_resource_with_no_slash))
         @endpoint.should_receive(:get).with("http://localhost:7474/db/data/")

spec/neo4j-server/unit/neo4j_server_endpoint_unit_spec.rb

@@ -12,18 +12,18 @@ module Neo4j::Server
 
     describe "for requests WITHOUT basic auth" do
       before(:each) do
-        @endpoint = Neo4jServerEndpoint.new(nil, nil)
+        @endpoint = Neo4jServerEndpoint.new()
       end
 
       it "should allow HTTP requests WITHOUT params" do
-        HTTParty.should_receive(:get).with(url).and_return(response)
+        HTTParty.should_receive(:get).with(url, {}).and_return(response)
         expect(@endpoint.get(url)).to eq(response)
 
-        HTTParty.should_receive(:post).with(url).and_return(response)
-        expect(@endpoint.post(url)).to eq(response)
+        HTTParty.should_receive(:post).with(url, {}).and_return(response)
+        expect(@endpoint.post(url, {})).to eq(response)
 
-        HTTParty.should_receive(:delete).with(url).and_return(response)
-        expect(@endpoint.delete(url)).to eq(response)
+        HTTParty.should_receive(:delete).with(url, {}).and_return(response)
+        expect(@endpoint.delete(url, {})).to eq(response)
       end
 
       it "should allow HTTP requests WITH params" do
@@ -43,7 +43,7 @@ module Neo4j::Server
     describe "for requests with basic auth" do
       before(:each) do
         @basic_auth = { basic_auth: { username: "U", password: "P"} }
-        @endpoint = Neo4jServerEndpoint.new(nil, @basic_auth)
+        @endpoint = Neo4jServerEndpoint.new(@basic_auth)
       end
 
       it "should allow HTTP requests WITHOUT other params" do