api_client 0.2.0 → 0.3.0

data/api_client.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<faraday>, [">= 0.7.5"])
+      s.add_runtime_dependency(%q<faraday>, [">= 0.8.1"])
       s.add_runtime_dependency(%q<hashie>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<faraday>, [">= 0.7.5"])
+      s.add_dependency(%q<faraday>, [">= 0.8.1"])
       s.add_dependency(%q<hashie>, [">= 1.2.0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<faraday>, [">= 0.7.5"])
+    s.add_dependency(%q<faraday>, [">= 0.8.1"])
     s.add_dependency(%q<hashie>, [">= 1.2.0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
   end

data/lib/api_client/connection/basic.rb

@@ -30,9 +30,7 @@ module ApiClient
       # * headers - (optional) headers sent along with the request
       #
       def get(path, data = {}, headers = {})
-        query = Faraday::Utils.build_nested_query(data || {})
-        path  = [path, query].join('?') unless query.empty?
-        handle_response @handler.get(path, headers)
+        handle_response @handler.get(path, data, headers)
       end
 
       #### ApiClient::Connection::Abstract#post
@@ -71,9 +69,7 @@ module ApiClient
       #
       # This method automatically adds the application token header
       def delete(path, data = {}, headers = {})
-        query = Faraday::Utils.build_nested_query(data || {})
-        path  = [path, query].join('?') unless query.empty?
-        handle_response @handler.delete(path, headers)
+        handle_response @handler.delete(path, data, headers)
       end
 
       private

data/lib/api_client/version.rb

@@ -1,3 +1,3 @@
 module ApiClient
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/api_client/connection/basic_spec.rb

@@ -36,33 +36,43 @@ describe ApiClient::Connection::Basic do
       @headers  = { "header" => "token" }
       @params   = { "param" => "1", "nested" => { "param" => "1" } }
       @response = Faraday::Response.new(:status => 200)
+      @faraday_request_params = mock
+      @faraday_request = mock(:params => @faraday_request_params) 
     end
 
     it "can perform GET requests" do
-      @instance.handler.should_receive(:get) do |path, headers|
-        headers.should == @headers
-        Faraday::Utils.send(:parse_nested_query, path.split("?").last).should == @params
-        @response
-      end
+      @instance.handler.
+        should_receive(:run_request).
+        with(:get, '/home', nil, @headers).
+        and_yield(@faraday_request).
+        and_return(@response)
+      @faraday_request_params.should_receive(:update).with(@params)
       @instance.get "/home", @params, @headers
     end
 
     it "can perform POST requests" do
-      @instance.handler.should_receive(:post).with("/home", @params, @headers).and_return(@response)
+      @instance.handler.
+        should_receive(:run_request).
+        with(:post, '/home', @params, @headers).
+        and_return(@response)
       @instance.post "/home", @params, @headers
     end
 
     it "can perform PUT requests" do
-      @instance.handler.should_receive(:put).with("/home", @params, @headers).and_return(@response)
+      @instance.handler.
+        should_receive(:run_request).
+        with(:put, '/home', @params, @headers).
+        and_return(@response)
       @instance.put "/home", @params, @headers
     end
 
     it "can perform DELETE requests" do
-      @instance.handler.should_receive(:delete) do |path, headers|
-        headers.should == @headers
-        Faraday::Utils.send(:parse_nested_query, path.split("?").last).should == @params
-        @response
-      end
+      @instance.handler.
+        should_receive(:run_request).
+        with(:delete, '/home', nil, @headers).
+        and_yield(@faraday_request).
+        and_return(@response)
+      @faraday_request_params.should_receive(:update).with(@params)
       @instance.delete "/home", @params, @headers
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: api_client
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: API client builder