micky 0.6.9 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9be790e9b69f56620b27af765fcdd4230b57d5164ac5f24374fc168986db291
-  data.tar.gz: eb604f6cefd295336b46903d050d617108a943ef75d0a7fe1c57acb021f773a5
+  metadata.gz: f2be6c8fcc885dfca7a1733f5957e089906e033347e39f37a570804692a1430b
+  data.tar.gz: 043bdc08aa5c099bf07927ba30011f87696ec8302eb7de9257865f857a5f1a57
 SHA512:
-  metadata.gz: ebb52a2e4a80055e47f31e40a7acbe00c1f15d025fe2c38c986dea4d2d456fe78771a9b3d0f483443521051d7f6f6059a1385e295be2f105f777d41dd6d36692
-  data.tar.gz: 65b29b7898f38eaa2ecff1538b80070dfe03bc108e712f8b9662591ec3f812dcd0866fa57a443124c51c8698f1b7050a5aac005349d8e0ffd7d9eaa3a006bf40
+  metadata.gz: 585dcfdc3f897d0880acab1591331774db0f18b189adb1e2111371e4d5b8075bb9f0975e58b3c1b9007c7d2d6f49ce0b95663b944adcff2e9b74a7aeb257b367
+  data.tar.gz: 91645ed087cb98abd4c16bae8eac88d088e62cf8fca49cddd1f05c526a9ce560de122d506f6a314003d665a5df269d6ed735c23eccaa7b08acf3466de5addca8

data/lib/micky/errors.rb

@@ -32,4 +32,6 @@ module Micky
   end
   class NoRedirectLocation < ServerError
   end
+  class InvalidLocation < ServerError
+  end
 end

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
-      [:raise_errors, :max_redirects, :timeout, :skip_resolve, :resolve_timeout, :oauth, :query, :headers, :parsers].each do |name|
+      DEFAULTS.each_key do |name|
         value = opts.has_key?(name) ? opts[name] : Micky.public_send(name)
         instance_variable_set "@#{name}", value
       end
@@ -32,6 +32,7 @@ module Micky
 
       case response = request(uri)
       when Net::HTTPSuccess
+        debug "#{response.code} success"
         Response.new(response, @uri)
       when Net::HTTPRedirection
         previous_uri = uri
@@ -39,7 +40,7 @@ module Micky
 
         if uri.nil?
           raise Micky::NoRedirectLocation, response: response if @raise_errors
-          warn "Micky.#{@request_class_name.downcase}('#{previous_uri}'): No “Location” for #{response.code} response"
+          log "No “Location” for #{response.code} response", previous_uri
           return nil
         end
 
@@ -59,7 +60,18 @@ module Micky
           end
         end
 
-        log "Redirect to #{uri}"
+        parsed_uri = Micky::URI(uri)
+        if parsed_uri.nil?
+          raise Micky::InvalidLocation, response: response if @raise_errors
+          log "Invalid “Location” for #{response.code} response: #{uri}", previous_uri
+          return nil
+        elsif parsed_uri.hostname.empty?
+          raise Micky::NoRedirectLocation, response: response if @raise_errors
+          log "Empty hostname for #{response.code} response", previous_uri
+          return nil
+        end
+
+        debug "#{response.code} redirect to #{uri}"
         request_with_redirect_handling(uri, redirect_count + 1)
       else
         if @raise_errors
@@ -70,7 +82,7 @@ module Micky
             raise Micky::HTTPServerError, response: response
           end
         else
-          log response
+          log "#{response.code} error" if response
           nil
         end
       end
@@ -79,7 +91,7 @@ module Micky
     def request(uri)
       @uri = Micky::URI(uri) or begin
         raise Micky::InvalidURIError, uri if @raise_errors
-        warn "Micky.#{@request_class_name.downcase}('#{uri}'): Invalid URI"
+        log 'Invalid URI', uri
         return nil
       end
 
@@ -159,9 +171,13 @@ module Micky
       end
     end
 
-    def log(message)
+    def log(message, uri = @uri, severity = Logger::WARN)
       message = "#{message.class}: #{message.message}" if message.is_a? Exception
-      warn "Micky.#{@request_class_name.downcase}('#{@uri}'): #{message}"
+      @logger.add(severity, "[Micky] #{@request_class_name.upcase} #{uri} - #{message}")
+    end
+
+    def debug(message, uri = @uri)
+      log(message, uri, Logger::DEBUG)
     end
   end
 end

data/lib/micky/uri.rb

@@ -16,7 +16,7 @@ module Micky
       ::URI.parse(uri)
     rescue ::URI::InvalidURIError
       begin
-        ::URI.parse(::URI.encode(uri))
+        ::URI.parse(::URI::Parser.new.escape(uri))
       rescue ::URI::InvalidURIError
       end
     end

data/lib/micky/version.rb

@@ -1,3 +1,3 @@
 module Micky
-  VERSION = '0.6.9'
+  VERSION = '0.7.1'
 end

data/lib/micky.rb

@@ -5,34 +5,36 @@ require_relative 'micky/request'
 require_relative 'micky/response'
 require_relative 'micky/errors'
 
+require 'logger'
+
 module Micky
+  DEFAULTS = {
+    raise_errors: false,
+    max_redirects: 20,
+    timeout: 10,
+    skip_resolve: false,
+    resolve_timeout: 5,
+    oauth: {},
+    query: {},
+    headers: {},
+    parsers: {
+      'application/json' => -> (body) {
+        require 'json' unless defined? JSON
+        JSON.parse(body) rescue nil
+      }
+    },
+    logger: Logger.new(STDOUT),
+  }
+
   class << self
-    attr_accessor :raise_errors
-    attr_accessor :max_redirects
-    attr_accessor :timeout
-    attr_accessor :skip_resolve
-    attr_accessor :resolve_timeout
-    attr_accessor :oauth
-    attr_accessor :query
-    attr_accessor :headers
-    attr_accessor :parsers
+    DEFAULTS.each_key do |key|
+      attr_accessor key
+    end
   end
 
-  # Reasonable defaults
-  @raise_errors = false
-  @max_redirects = 20
-  @timeout = 10
-  @skip_resolve = false
-  @resolve_timeout = 5
-  @oauth = {}
-  @query = {}
-  @headers = {}
-  @parsers = {
-    'application/json' => -> (body) {
-      require 'json' unless defined? JSON
-      JSON.parse(body) rescue nil
-    }
-  }
+  DEFAULTS.each do |key, value|
+    instance_variable_set :"@#{key}", value
+  end
 
   def self.get(uri, opts = {})
     Request.new(opts).get(uri)

data/micky.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

metadata

@@ -1,29 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micky
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.1
 platform: ruby
 authors:
 - Rafaël Blais Masson
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +48,6 @@ homepage: http://github.com/rafBM/micky
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Lightweight and worry-free HTTP client
 test_files: []