micky 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8856a3b9bdf0070da933541f52c3571e5499783
-  data.tar.gz: fbcd0010c28a491fe267a27d0617774906d30b2a
+  metadata.gz: 6d13c64e9e5f8191118021ff693f21ea68f72f81
+  data.tar.gz: 7a37f05f5f04731b34082f38ea3f1b2e3ee0f24c
 SHA512:
-  metadata.gz: f6f1d6969aa4957ec2983d44b841d3a5515cbadb067858b6b6bf859f785b5e8814e324d06db993cbc5960eda6a1e15d1ecc9bfd228db8f808ac56eadcaa250ee
-  data.tar.gz: 41d5a0daa0d33f7655082863beea63bc6a233f1f5e43e433ed18f90ff5e7d43a7ea6e8b8f82b10886d922802c2ff262de8126784840ecfcfe90ffec93f74f856
+  metadata.gz: c55274c85383c743de964a36974a2508e6610f747cbed85a71556d9b75df408f8c6b6e8df12f7899070b1f6a93abb9908780030ad4b48130d4415d96a5d9bb53
+  data.tar.gz: 42e54932ac4de572954c07caca24605cb1483c724dacb20cd6f194c0fbb5c6520e044331fa5e860a2f70a4d539315bcd3773090d94e3c080cb1b5a27d4df658c

data/README.md

@@ -175,4 +175,4 @@ end
 
 ---
 
-© 2013 [Rafaël Blais Masson](http://rafbm.com). Micky is released under the MIT license.
+© 2014 [Rafaël Blais Masson](http://rafbm.com). Micky is released under the MIT license.

data/lib/micky/errors.rb

@@ -1,13 +1,23 @@
 module Micky
   class Error < StandardError
-    attr_reader :response
+    attr_reader :exception, :response
 
-    def initialize(response = nil)
+    def initialize(message = nil, exception: nil, response: nil)
+      @exception = exception
       @response = response
+      @message = message
     end
 
-    def to_s
-      "#{response_code} #{response_message} at #{request_uri}"
+    def message
+      if response
+        "#{response_code} #{response_message} at #{request_uri}"
+      elsif exception
+        exception.inspect
+      elsif @message
+        @message
+      else
+        super
+      end
     end
 
     def request_uri
@@ -23,9 +33,19 @@ module Micky
     end
   end
 
+  # Client errors
   class ClientError < Error
   end
+  class HTTPClientError < ClientError
+  end
+  class InvalidURIError < ClientError
+  end
 
+  # Server errors
   class ServerError < Error
   end
+  class HTTPServerError < ServerError
+  end
+  class TooManyRedirects < ServerError
+  end
 end

data/lib/micky/request.rb

@@ -24,7 +24,11 @@ module Micky
   private
 
     def request_with_redirect_handling(uri, redirect_count = 0)
-      return log "Max redirects reached (#{@max_redirects})" if redirect_count >= @max_redirects
+      if redirect_count >= @max_redirects
+        raise Micky::TooManyRedirects, "Max redirects reached (#{@max_redirects})" if @raise_errors
+        log "Max redirects reached (#{@max_redirects})"
+        return nil
+      end
 
       case response = request(uri)
       when Net::HTTPSuccess
@@ -34,40 +38,45 @@ module Micky
         log "Redirect to #{uri}"
         request_with_redirect_handling(uri, redirect_count + 1)
       else
-        log response
-        log response.body
-
         if @raise_errors
           case response
           when Net::HTTPClientError
-            raise Micky::ClientError.new(response)
+            raise Micky::HTTPClientError, response: response
           when Net::HTTPServerError
-            raise Micky::ServerError.new(response)
+            raise Micky::HTTPServerError, response: response
           end
         else
+          log response
+          log response.body
           nil
         end
       end
     end
 
     def request(uri)
-      @uri = Micky::URI(uri) or return nil
+      @uri = Micky::URI(uri) or begin
+        raise Micky::InvalidURIError, uri if @raise_errors
+        warn "Micky.#{@request_class_name.downcase}('#{uri}'): Invalid URI"
+        return nil
+      end
 
       unless @skip_resolve == true
-        # Resolv is the only domain validity check that can be wrapped with Timeout.
+        # Resolv is the only host validity check that can be wrapped with Timeout.
         # Net::HTTP and OpenURI use TCPSocket.open which isn’t timeoutable.
         require 'resolv' unless defined? Resolv
         begin
           Timeout.timeout(@resolve_timeout) do
             begin
               Resolv::DNS.new.getaddress(@uri.host)
-            rescue Resolv::ResolvError
-              log 'Domain resolution error'
+            rescue Resolv::ResolvError => e
+              raise Micky::ClientError, exception: e if @raise_errors
+              log 'Host resolution error'
               return nil
             end
           end
-        rescue Timeout::Error
-          log 'Domain resolution timeout'
+        rescue Timeout::Error => e
+          raise Micky::ClientError, "Host resolution timeout: #{@uri}" if @raise_errors
+          log 'Host resolution timeout'
           return nil
         end
       end
@@ -111,7 +120,12 @@ module Micky
       @headers.each { |k,v| request[k] = v }
 
       http.request(request)
-    rescue Timeout::Error, OpenSSL::SSL::SSLError, SystemCallError, SocketError => e
+    rescue Errno::ECONNREFUSED, OpenSSL::SSL::SSLError, SocketError => e
+      raise Micky::ClientError, exception: e if @raise_errors
+      log e
+      nil
+    rescue SystemCallError, IOError, Timeout::Error => e
+      raise Micky::ServerError, exception: e if @raise_errors
       log e
       nil
     end

data/lib/micky/version.rb

@@ -1,3 +1,3 @@
 module Micky
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/micky.rb

@@ -1,9 +1,9 @@
-require 'micky/version'
+require_relative 'micky/version'
 
-require 'micky/uri'
-require 'micky/request'
-require 'micky/response'
-require 'micky/errors'
+require_relative 'micky/uri'
+require_relative 'micky/request'
+require_relative 'micky/response'
+require_relative 'micky/errors'
 
 module Micky
   class << self
@@ -20,10 +20,10 @@ module Micky
 
   # Reasonable defaults
   @raise_errors = false
-  @max_redirects = 10
-  @timeout = 5
+  @max_redirects = 20
+  @timeout = 10
   @skip_resolve = false
-  @resolve_timeout = 2
+  @resolve_timeout = 5
   @oauth = {}
   @query = {}
   @headers = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micky
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rafaël Blais Masson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Lightweight and worry-free HTTP client