api-client 1.0.0 → 1.1.0

data/README.md

@@ -39,8 +39,9 @@ Then, on your action, just put into it:
     @user = User.get("http://api.example.com/user/3")
 
 ## TODO
-   Add Support to Typhoeus and Faraday
-   Proper Treatment for validation errors
+   * Add Support to Typhoeus and Faraday
+   * Proper Treatment for validation errors
+   * Add more Response Handlers
 
 ## Contributing
 
@@ -48,4 +49,4 @@ Then, on your action, just put into it:
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/api-client.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec", "2.9.0"
 
   gem.add_runtime_dependency "activemodel"
+  gem.add_runtime_dependency "json_pure"
 end

data/lib/api-client.rb

@@ -1,8 +1,8 @@
 require "api-client/version"
-require "net/http"
-require "active_model"
 
 module ApiClient
   autoload :Exceptions, 'api-client/exceptions'
   autoload :Base, 'api-client/base'
+  autoload :Dispatcher, 'api-client/dispatcher'
+  autoload :Parser, 'api-client/parser'
 end

data/lib/api-client/base.rb

@@ -1,8 +1,13 @@
+require "active_model"
+
 class ApiClient::Base
   include ActiveModel::Validations
   include ActiveModel::Conversion
   extend ActiveModel::Naming
 
+  extend ApiClient::Parser
+  extend ApiClient::Dispatcher
+
   def initialize(attributes = {})
     attributes.each do |name, value|
       send("#{name}=", value)
@@ -14,23 +19,23 @@ class ApiClient::Base
   end
 
   def self.get(url = '')
-    call do Net::HTTP.get_response(URI.parse(url)) end
+    dispatch { _get(url) }
   end
 
   def self.post(url = '', args = {})
-    call do Net::HTTP.post_form(URI.parse(url), args) end
+    dispatch { _post(url, args) }
   end
 
   protected
 
-  def self.call
+  def self.dispatch
     begin
-      response = yield
+      code, body = _response(yield)
     rescue Errno::ECONNREFUSED
       raise ApiClient::Exceptions::ConnectionRefused
     end
-    raise_exception(response.code)
-    new(JSON.parse(response.body))
+    raise_exception(code)
+    new(body)
   end
 
   def self.raise_exception(code)
@@ -41,6 +46,7 @@ class ApiClient::Base
       when '500' then raise ApiClient::Exceptions::InternalServerError
       when '502' then raise ApiClient::Exceptions::BadGateway
       when '503' then raise ApiClient::Exceptions::ServiceUnavailable
+      else return
     end
   end
 end

data/lib/api-client/dispatcher.rb

@@ -0,0 +1,13 @@
+require "net/http"
+
+module ApiClient::Dispatcher
+  def _get(url = '')
+    Net::HTTP.get_response(URI.parse(url))
+  end
+
+  def _post(url = '', args = {})
+    uri = URI(url)
+    http = Net::HTTP.new(uri.host)
+    http.post(uri.path, args.to_json, { 'Content-Type' => 'application/json' })
+  end
+end

data/lib/api-client/parser.rb

@@ -0,0 +1,10 @@
+module ApiClient::Parser
+  def _response(response)
+    begin
+      body = JSON.parse(response.body)
+    rescue JSON::ParserError
+      body = nil
+    end
+    return response.code, body
+  end
+end

data/lib/api-client/version.rb

@@ -1,3 +1,3 @@
 module ApiClient
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/api-client/base/get_spec.rb

@@ -6,7 +6,7 @@ describe ApiClient::Base do
   describe "#get" do
     context "when connection is refused" do
       before :each do
-        Net::HTTP.stub(:get_response).and_raise(Errno::ECONNREFUSED)
+        FakeWeb.register_uri(:get, "http://api.example.com/user/5", :exception => Errno::ECONNREFUSED)
       end
 
       it "should return a ConnectionRefused exception" do

data/spec/api-client/base/post_spec.rb

@@ -6,7 +6,7 @@ describe ApiClient::Base do
   describe "#post" do
     context "when connection is refused" do
       before :each do
-        Net::HTTP.stub(:post_form).and_raise(Errno::ECONNREFUSED)
+        FakeWeb.register_uri(:post, "http://api.example.com/user/5", :exception => Errno::ECONNREFUSED)
       end
 
       it "should return a ConnectionRefused exception" do

data/spec/api-client/dispatcher_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe ApiClient::Dispatcher do
+  describe "#_get" do
+    before :each do
+      FakeWeb.register_uri(:get, "http://api.example.com/user/5", :status => "200")
+    end
+
+    it "should return the response code and body" do
+      ApiClient::Base._get("http://api.example.com/user/5").should be_a(Net::HTTPOK)
+    end
+  end
+
+  describe "#_post" do
+    before :each do
+      FakeWeb.register_uri(:post, "http://api.example.com/user/5", :status => "201")
+    end
+
+    it "should return the response code and body" do
+      ApiClient::Base._post("http://api.example.com/user/5", {}).should be_a(Net::HTTPCreated)
+    end
+  end
+end

data/spec/api-client/parser_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe ApiClient::Parser do
+  describe "#_response" do
+    context "with a valid json response" do
+      before :each do
+        FakeWeb.register_uri(:post, "http://api.example.com/user/5",
+                             :body => { :a => :b }.to_json,
+                             :status => "201")
+        @response = ApiClient::Base._post('http://api.example.com/user/5', {})
+      end
+
+      it "should return the response code and the body parsed" do
+        ApiClient::Base._response(@response).should == ['201', { "a" => "b" }]
+      end
+    end
+
+    context "with a invalid json response" do
+      before :each do
+        FakeWeb.register_uri(:post, "http://api.example.com/user/5",
+                             :body => "wrong",
+                             :status => "201")
+        @response = ApiClient::Base._post('http://api.example.com/user/5', {})
+      end
+
+      it "should return the response code and a nil body" do
+        ApiClient::Base._response(@response).should == ['201', nil]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: plribeiro3000@gmail.com
 executables: []
@@ -92,6 +108,7 @@ files:
 - api-client.gemspec
 - lib/api-client.rb
 - lib/api-client/base.rb
+- lib/api-client/dispatcher.rb
 - lib/api-client/exceptions.rb
 - lib/api-client/exceptions/bad_gateway.rb
 - lib/api-client/exceptions/connection_refused.rb
@@ -101,10 +118,13 @@ files:
 - lib/api-client/exceptions/not_found.rb
 - lib/api-client/exceptions/service_unavailable.rb
 - lib/api-client/exceptions/unauthorized.rb
+- lib/api-client/parser.rb
 - lib/api-client/version.rb
 - spec/api-client/base/get_spec.rb
 - spec/api-client/base/post_spec.rb
 - spec/api-client/base_spec.rb
+- spec/api-client/dispatcher_spec.rb
+- spec/api-client/parser_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -118,12 +138,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2592261694451152331
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2592261694451152331
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24