web_client 0.0.1 → 0.0.2

data/lib/web_client/base.rb

@@ -4,34 +4,39 @@ module WebClient
 
     attr_reader :http
 
-    def initialize(host, port=nil)
+    def initialize(*args)
+      if args.first.is_a? Hash
+        host = args[0]['host'] || args[0][:host]
+        port = args[0]['port'] || args[0][:port]
+      else
+        host = args[0]
+        port = args[1]
+      end
       @http = HTTP.new(host, port)
     end
 
-    def get(path, data={}, &block)
-      request(HTTP::Get, path, data, &block)
-    end
-
-    def post(path, data, &block)
-      request(HTTP::Post, path, data, &block)
-    end
-
-    def put(path, data, &block)
-      request(HTTP::Put, path, data, &block)
-    end
-
-    def delete(path, data={}, &block)
-      request(HTTP::Delete, path, data, &block)
+    WebClient::HTTP_METHODS.each do |http_method|
+      define_method http_method.to_s.demodulize.downcase do |path='/', data={}, &block|
+        request(http_method, path, data, &block)
+      end
     end
 
     private
 
-    def request(method_class, path, data=nil)
-      request = method_class.new(path)
-      request.set_form_data(data) if data.is_a? Hash
-      request.body = data if data.is_a? String
-      yield(request, http) if block_given?
-      http.request(request)
+    def request(method_class, path='/', data=nil)
+      begin
+        WebClient.logger.debug "[WebClient] #{method_class.to_s.demodulize.upcase} Url: http://#{@http.address}#{(@http.port != 80) ? ":#{@http.port}" : ''}#{path} | Params: #{data}"
+        request = method_class.new(path)
+        request.set_form_data(data) if data.is_a? Hash
+        request.body = data if data.is_a? String
+        yield(request, http) if block_given?
+        response = http.request(request)
+        WebClient.logger.debug "[WebClient] RESPONSE Status: #{response.code} | Content: #{response.body}"
+        response
+      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, HTTPBadResponse, HTTPHeaderSyntaxError, ProtocolError, SocketError, Errno::ECONNREFUSED => e
+        WebClient.logger.error "[WebClient] #{e.class}: #{e.message}"
+        raise Error, e
+      end
     end
 
   end

data/lib/web_client/error.rb

@@ -0,0 +1,17 @@
+module WebClient
+
+  class Error < StandardError
+    def initialize(inner_error)
+      @inner_error = inner_error
+    end
+
+    def type
+      @inner_error.class
+    end
+
+    def message
+      @inner_error.message
+    end
+  end
+
+end

data/lib/web_client/resource.rb

@@ -7,8 +7,8 @@ module WebClient
       super(*args)
     end
 
-    def index(&block)
-      get("/#{resource}.json", &block)
+    def index(data={}, &block)
+      get("/#{resource}.json", data, &block)
     end
 
     def show(id, &block)

data/lib/web_client/version.rb

@@ -1,3 +1,3 @@
 module WebClient
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/web_client.rb

@@ -1,7 +1,22 @@
 require 'net/http'
+require 'active_support/all'
+require 'logger'
+require 'json'
+
+module WebClient
+  HTTP_METHODS = [Net::HTTP::Get, Net::HTTP::Post, Net::HTTP::Put, Net::HTTP::Delete].freeze
+
+  def self.logger
+    @@logger ||= defined?(Rails) ? Rails.logger : Logger.new($stdout)
+  end
+
+  def self.logger=(logger)
+    @@logger = logger
+  end
+  
+end
 
 require 'web_client/version'
+require 'web_client/error'
 require 'web_client/base'
 require 'web_client/resource'
-
-

data/spec/base_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-HOST = 'www.mock.dev'
-
 describe WebClient::Base do
 
   let(:client) { WebClient::Base.new(HOST) }
@@ -74,4 +72,18 @@ describe WebClient::Base do
 
   end
 
+  context 'Errors handling' do
+
+    it 'Invalid host exception' do
+      stub_request(:get, /.*/).to_raise(SocketError.new('getaddrinfo: No such host is known.'))
+      lambda { client.get }.should raise_error WebClient::Error
+    end
+
+    it 'Timeout exception' do
+      stub_request(:get, /.*/).to_timeout
+      lambda { client.get }.should raise_error WebClient::Error
+    end
+
+  end
+
 end

data/spec/resource_spec.rb

@@ -3,42 +3,43 @@ require 'spec_helper'
 
 describe WebClient::Resource do
 
-  let(:resource) { WebClient::Resource.new(:users, 'localhost', 3000) }
+  let(:resource) { WebClient::Resource.new(:users, HOST) }
 
   it 'index' do
-    content = '[{"email":"jperez@mail.com","first_name":"Juan","id":1,"last_name":"Perez","organization":"Test"}]'
-    stub_request(:get, "http://localhost:3000/users.json").to_return(body: content)
+    content = '[{"id":1,"email":"jperez@mail.com","first_name":"Juan","last_name":"Perez","organization":"Test"}]'
+    stub_request(:get, "http://#{HOST}/users.json").to_return(body: content)
 
     response = resource.index
 
     response.should be_a Net::HTTPOK
     data = JSON.parse(response.body)
     data.should be_a Array
-    data.first['id'].should_not be_nil
-    data.first['first_name'].should_not be_nil
-    data.first['last_name'].should_not be_nil
-    data.first['email'].should_not be_nil
-    data.first['organization'].should_not be_nil
+    data.first['id'].should eq 1
+    data.first['email'].should eq 'jperez@mail.com'
+    data.first['first_name'].should eq 'Juan'
+    data.first['last_name'].should eq 'Perez'
+    data.first['organization'].should eq 'Test'
   end
 
   it 'show' do
-    content = '{"email":"jperez@mail.com","first_name":"Juan","id":1,"last_name":"Perez","organization":"Test"}'
-    stub_request(:get, "http://localhost:3000/users/1.json").to_return(body: content)
+    content = '{"id":1,"email":"jperez@mail.com","first_name":"Juan","last_name":"Perez","organization":"Test"}'
+    stub_request(:get, "http://#{HOST}/users/1.json").to_return(body: content)
 
     response = resource.show(1)
 
     response.should be_a Net::HTTPOK
     data = JSON.parse(response.body)
-    data['id'].should_not be_nil
+    data.should be_a Hash
+    data['id'].should eq 1
+    data['email'].should eq 'jperez@mail.com'
     data['first_name'].should eq 'Juan'
     data['last_name'].should eq 'Perez'
-    data['email'].should eq 'jperez@mail.com'
     data['organization'].should eq 'Test'
   end
 
   it 'create' do
-    content = '{"email":"jperez@mail.com","first_name":"Juan","id":1,"last_name":"Perez","organization":"Test"}'
-    stub_request(:post, "http://localhost:3000/users.json").to_return(body: content, status: 201)
+    content = '{"id":1,"email":"jperez@mail.com","first_name":"Juan","last_name":"Perez","organization":"Test"}'
+    stub_request(:post, "http://#{HOST}/users.json").to_return(body: content, status: 201)
 
     params = {
         'user[first_name]' => 'Juan',
@@ -50,15 +51,16 @@ describe WebClient::Resource do
 
     response.should be_a Net::HTTPCreated
     data = JSON.parse(response.body)
-    data['id'].should_not be_nil
+    data.should be_a Hash
+    data['id'].should eq 1
+    data['email'].should eq 'jperez@mail.com'
     data['first_name'].should eq 'Juan'
     data['last_name'].should eq 'Perez'
-    data['email'].should eq 'jperez@mail.com'
     data['organization'].should eq 'Test'
   end
 
   it 'update' do
-    stub_request(:put, "http://localhost:3000/users/1.json").to_return(status: 204)
+    stub_request(:put, "http://#{HOST}/users/1.json").to_return(status: 204)
 
     params = {
         'user[first_name]' => 'Juan',
@@ -73,7 +75,7 @@ describe WebClient::Resource do
   end
 
   it 'destroy' do
-    stub_request(:delete, "http://localhost:3000/users/1.json").to_return(status: 204)
+    stub_request(:delete, "http://#{HOST}/users/1.json").to_return(status: 204)
 
     response = resource.destroy(1)
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
 require 'webmock/rspec'
 require 'json'
 require 'web_client'
+
+HOST = 'www.mock.dev'

data/web_client.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency 'activesupport', '>= 3.0.0'
+
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'webmock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &20747148 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *20747148
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20428260 !ruby/object:Gem::Requirement
+  requirement: &20746608 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20428260
+  version_requirements: *20746608
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &20427120 !ruby/object:Gem::Requirement
+  requirement: &20745984 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20427120
+  version_requirements: *20745984
 description: Net::HTTP wrapper easy to use
 email:
 - gabynaiman@gmail.com
@@ -46,6 +57,7 @@ files:
 - Rakefile
 - lib/web_client.rb
 - lib/web_client/base.rb
+- lib/web_client/error.rb
 - lib/web_client/resource.rb
 - lib/web_client/version.rb
 - spec/base_spec.rb