micky 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3ca66fab6596cf504eb875cfdac174caf530c6
-  data.tar.gz: bbaf1adc0f7fdf7e2a1bba530872e0e70f3374d6
+  metadata.gz: af45a8a8f7fc7e48b95beeffbff81a51e9948ad1
+  data.tar.gz: 057926d44234a5d7cea3205f35e905ee58d9ebeb
 SHA512:
-  metadata.gz: da7fe99bed4c2819a06fa22f036a704ade75ae6e731cb712c455365f07818d52d2d11ef2bb7c33ba3c3550ebb39ee128861fc9554bf25223c46372cc3c269183
-  data.tar.gz: 2868f075661f8bb2b1a0722bb992088b71a86db44cdb8cb624b1e5b882668809ae18883d8256ae85871357d40476b573d3f218ae7c90eb8bccbd83268457c676
+  metadata.gz: 0e9b6c1d51655b9e995e4bad8ffe680f8f105a8d29371cbecef8936ac53da0eed02547995e44da155df9d139d44bb1570d044316d58d3631dca734150430c865
+  data.tar.gz: a93d83e01d8511b1c56a4fb00b83ecb0ab8291a4a9d5b45d4148770b074ffb43ff2723d200b5a21bcf1193c964770d06adb42ad0427c7fa4ab3e59e7650c3320

data/README.md

@@ -52,7 +52,7 @@ if Micky.head(params[:website_url])
   url.path = '/favicon.ico'
 
   if favicon = Micky.get(url)
-    # Do whatever with the raw `favicon.data`, for whatever reason
+    # Do whatever with the raw `favicon.body`, for whatever reason
   else
     # This site has no favicon, or a broken one, too bad
   end
@@ -105,11 +105,11 @@ Micky.parsers['application/json'] = -> (body) {
 }
 ```
 
-Parse images into [mini_magick](https://github.com/minimagick/minimagick)
+Parse images into [MiniMagick](https://github.com/minimagick/minimagick)
 instances:
 
 ```ruby
-parser = -> (body) {
+image_parser = -> (body) {
   begin
     MiniMagick::Image.read(body)
   rescue MiniMagick::Invalid
@@ -117,7 +117,7 @@ parser = -> (body) {
 }
 
 %w[image/png image/jpeg image/jpg image/gif].each do |type|
-  Micky.parsers[type] = parser
+  Micky.parsers[type] = image_parser
 end
 ```
 
@@ -125,6 +125,7 @@ end
 
 - Add tests
 - Better document configuration options in README
+- Add `raise_errors: true` option
 
 ## Contributing
 

data/lib/micky/request.rb

@@ -5,7 +5,7 @@ module Micky
   class Request
     def initialize(opts = {})
       # Options can be set per request and fallback to module-level defaults
-      [:max_redirects, :timeout, :skip_resolve, :resolve_timeout, :headers, :parsers].each do |name|
+      [:max_redirects, :timeout, :skip_resolve, :resolve_timeout, :oauth, :query, :headers, :parsers].each do |name|
         value = opts.has_key?(name) ? opts[name] : Micky.public_send(name)
         instance_variable_set "@#{name}", value
       end
@@ -13,25 +13,35 @@ module Micky
 
     def get(uri)
       @request_class_name = 'Get'
-      request(uri)
+      request_with_redirect_handling(uri)
     end
 
     def head(uri)
       @request_class_name = 'Head'
-      request(uri)
+      request_with_redirect_handling(uri)
     end
 
   private
 
-    def request(uri)
-      @uri = uri
-      request_with_redirect_handling(0)
-    end
-
-    def request_with_redirect_handling(redirect_count)
+    def request_with_redirect_handling(uri, redirect_count = 0)
       return log "Max redirects reached (#{@max_redirects})" if redirect_count >= @max_redirects
 
-      @uri = Micky::URI(@uri)
+      case response = request(uri)
+      when Net::HTTPSuccess
+        Response.new(response)
+      when Net::HTTPRedirection
+        uri = response['Location']
+        log "Redirect to #{uri}"
+        request_with_redirect_handling(uri, redirect_count + 1)
+      else
+        log response
+        log response.body
+        nil
+      end
+    end
+
+    def request(uri)
+      @uri = Micky::URI(uri) or return nil
 
       unless @skip_resolve == true
         # Resolv is the only domain validity check that can be wrapped with Timeout.
@@ -60,24 +70,38 @@ module Micky
       http.read_timeout = @timeout
       http.ssl_timeout  = @timeout
 
+      # Query string
+      query = Hash[::URI.decode_www_form(@uri.query || '')]
+
+      if @query && @query.any?
+        query.merge! Hash[@query.map { |k,v| [k.to_s, v] }]
+        @uri.query = ::URI.encode_www_form(query)
+      end
+
+      # OAuth
+      if @oauth && @oauth.any?
+        unless defined? SimpleOAuth
+          begin
+            require 'simple_oauth'
+          rescue LoadError
+            raise 'You must install the simple_oauth gem to use the :oauth argument.'
+          end
+        end
+
+        uri_without_query = @uri.dup
+        uri_without_query.query = ''
+        header = SimpleOAuth::Header.new(@request_class_name, uri_without_query, query, @oauth).to_s
+        @headers['Authorization'] = header
+      end
+
       # Request
       request = Net::HTTP.const_get(@request_class_name).new(@uri)
-      @headers.each { |k,v| request[k] = v }
 
-      response = http.request(request)
+      # Headers
+      @headers.each { |k,v| request[k] = v }
 
-      case response
-      when Net::HTTPSuccess
-        Response.new(response)
-      when Net::HTTPRedirection
-        log "Redirect to #{response['Location']}"
-        @uri = response['Location']
-        request_with_redirect_handling(redirect_count + 1)
-      else
-        log response
-        nil
-      end
-    rescue Timeout::Error, ::URI::InvalidURIError, OpenSSL::SSL::SSLError, SystemCallError, SocketError => e
+      http.request(request)
+    rescue Timeout::Error, OpenSSL::SSL::SSLError, SystemCallError, SocketError => e
       log e
       nil
     end

data/lib/micky/uri.rb

@@ -1,12 +1,30 @@
-require 'delegate'
 require 'uri'
 
 module Micky
-  HTTP_URI_REGEX = /\Ahttps?:\/\//
+  HTTP_URI_REGEX = %r{\Ahttps?://}
 
   def self.URI(uri)
     uri = uri.to_s.strip
     uri = "http://#{uri}" if uri !~ HTTP_URI_REGEX
-    ::URI.parse(uri) rescue ::URI.parse(::URI.encode(uri))
+    begin
+      ::URI.parse(uri)
+    rescue ::URI::InvalidURIError
+      begin
+        ::URI.parse(::URI.encode(uri))
+      rescue ::URI::InvalidURIError
+      end
+    end
+  end
+
+  module URI
+    def self.extract(text)
+      ::URI.extract(text).select { |uri|
+        begin
+          ::URI.parse(uri).is_a? ::URI::HTTP
+        rescue ::URI::InvalidURIError
+          false
+        end
+      }
+    end
   end
 end

data/lib/micky/version.rb

@@ -1,3 +1,3 @@
 module Micky
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/micky.rb

@@ -10,6 +10,8 @@ module Micky
     attr_accessor :timeout
     attr_accessor :skip_resolve
     attr_accessor :resolve_timeout
+    attr_accessor :oauth
+    attr_accessor :query
     attr_accessor :headers
     attr_accessor :parsers
   end
@@ -19,6 +21,8 @@ module Micky
   @timeout = 5
   @skip_resolve = false
   @resolve_timeout = 2
+  @oauth = {}
+  @query = {}
   @headers = {}
   @parsers = {
     'application/json' => -> (body) {

data/micky.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
     'exceptions (invalid hosts/URIs, server errors, timeouts, redirect loops), ' \
     'automatically parses responses (JSON, etc.), is very lightweight, and has no ' \
     'dependency.'
-  spec.summary       = 'Simple, worry-free HTTP client'
+  spec.summary       = 'Lightweight and worry-free HTTP client'
   spec.homepage      = 'http://github.com/rafBM/micky'
   spec.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micky
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rafaël Blais Masson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
-summary: Simple, worry-free HTTP client
+summary: Lightweight and worry-free HTTP client
 test_files: []