http_utilities 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 774cb888defe73c5ebb8902a8915aa5350970b1e
-  data.tar.gz: 8387ca5e76a00a84a506ed0662cc0ccb8c2e73d3
+  metadata.gz: 3577e7c051ab3a26079db6562db3bf872b04dfb6
+  data.tar.gz: d39436f355b7c6df18009cabc68178e48dd72373
 SHA512:
-  metadata.gz: 0e4d363c20736b462836155ea717641a34b38d83def074d8455d619335932c8f644f6ca8fceb22544e8a450b1269a7aba3168236bcbf08da73f9f61f67e30f91
-  data.tar.gz: 0aff8e5f4a0a0331bb549cb131cb3bc2d09c948a6af5ce6b7e7ff95be14ad52031f776a7baaca93f601df13ccd11bd2cc3ea1c14b2bb03384976acbcd51a8362
+  metadata.gz: 64fda9009c189da05973d2c774b4c3c64af0045029e768ad035c26efcf2f07d274840d633217281506a47024a0d47916b6724888eb3664d98e8c05532dbd5563
+  data.tar.gz: 259a5b420c51ca5f03dbd2c2505a41b487c0674665a18160c7ead7014acf649b3ff936c9b81affbd68df74a5f082572b3726a81c1dacd665ac99ca6301df03ed

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

data/http_utilities.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
   
   s.name = "http_utilities"
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   s.authors = ["Sebastian Johnsson"]
   s.description = "Wrapper for Faraday with additional functionality"
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
  lib/http_utilities/http/proxy_support.rb
  lib/http_utilities/http/request.rb
  lib/http_utilities/http/response.rb
- lib/http_utilities/http/url.rb
  lib/http_utilities/http/user_agent.rb
  lib/http_utilities/jobs/resque/proxies/check_proxies_job.rb
  lib/http_utilities/jobs/resque/proxies/check_proxy_job.rb

data/lib/http_utilities.rb

@@ -1,12 +1,11 @@
 # -*- encoding : utf-8 -*-
 module HttpUtilities
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
   
   require File.join(File.dirname(__FILE__), 'http_utilities/railtie') if defined?(Rails)
 
   require File.join(File.dirname(__FILE__), 'http_utilities/http/proxy_support')
   require File.join(File.dirname(__FILE__), 'http_utilities/http/user_agent')
-  require File.join(File.dirname(__FILE__), 'http_utilities/http/url')
   require File.join(File.dirname(__FILE__), 'http_utilities/http/logger')
 
   require File.join(File.dirname(__FILE__), 'http_utilities/http/request')

data/lib/http_utilities/http/client.rb

@@ -1,7 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'open-uri'
-require 'uri'
-require 'cgi'
 
 module HttpUtilities
   module Http
@@ -10,7 +7,7 @@ module HttpUtilities
       
       def get(url, arguments: {}, options: {}, retries: 3)
         response        =   nil
-        request         =   build_request(options)
+        request         =   build_request(options: options)
         
         begin
           response      =   request.interface.get(url, arguments)
@@ -27,7 +24,7 @@ module HttpUtilities
       
       def post(url, data: nil, options: {}, retries: 3)
         response        =   nil
-        request         =   build_request(options)
+        request         =   build_request(options: options)
     
         begin
           response      =   request.interface.post(url, data)
@@ -43,25 +40,36 @@ module HttpUtilities
       end
       
       private
-      def build_request(options = {}, faraday_options = {})
-        options         =   options.dup
-        options         =   options.merge(ssl: {:verify => false})
+      def build_request(options: {}, client_options: {})
+        client_options                      =   client_options.merge(ssl: {verify: false})
         
-        adapter         =   options.delete(:adapter)                { |opt| Faraday.default_adapter }
-        timeout         =   options.delete(:timeout)                { |opt| 60 }
-        open_timeout    =   options.delete(:open_timeout)           { |opt| 60 }
+        adapter                             =   options.fetch(:adapter, Faraday.default_adapter)
+        timeout                             =   options.fetch(:timeout, 60)
+        open_timeout                        =   options.fetch(:open_timeout, 60)
+        request_headers                     =   options.fetch(:request_headers, {})
+        response_adapters                   =   options.fetch(:response_adapters, [])
         
         request                             =   HttpUtilities::Http::Request.new
         request.set_proxy_options(options)
         
         proxy_options                       =   request.generate_proxy_options
     
-        connection      =   Faraday.new(faraday_options) do |builder|
+        connection      =   Faraday.new(client_options) do |builder|
           builder.headers[:user_agent]      =   request.user_agent
-          builder.options[:timeout]         =   timeout
-          builder.options[:open_timeout]    =   open_timeout        
-          #builder.response  :logger
+          
+          request_headers.each do |key, value|
+            builder.headers[key]            =   value 
+          end if request_headers && !request_headers.empty?
+          
+          builder.options[:timeout]         =   timeout if timeout
+          builder.options[:open_timeout]    =   open_timeout if open_timeout
+          
+          response_adapters.each do |response_adapter|
+            builder.send(:response, response_adapter)
+          end if response_adapters && response_adapters.any?
+
           builder.proxy     proxy_options unless proxy_options.empty?
+          
           builder.adapter   adapter
         end
 

data/lib/http_utilities/http/mechanize/client.rb

@@ -1,10 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'open-uri'
-require 'net/http'
-require 'uri'
-require 'cgi'
-require 'mechanize'
-require 'logger'
 
 module HttpUtilities
   module Http
@@ -14,7 +8,6 @@ module HttpUtilities
         attr_accessor :agent, :proxy, :user_agent
         
         include HttpUtilities::Http::Logger
-        include HttpUtilities::Http::Url
         include HttpUtilities::Http::ProxySupport
         include HttpUtilities::Http::UserAgent
         

data/lib/http_utilities/http/proxy_support.rb

@@ -1,6 +1,3 @@
-require 'open-uri'
-require 'uri'
-
 module HttpUtilities
   module Http
     module ProxySupport
@@ -13,7 +10,7 @@ module HttpUtilities
         proxy_credentials         =   options.fetch(:proxy_credentials, nil)
         reset_proxy               =   options.fetch(:reset_proxy, true)
 
-        if (reset_proxy)
+        if reset_proxy
           self.proxy              =   {}
           self.proxy[:host]       =   options.fetch(:proxy_host, nil)
           self.proxy[:port]       =   options.fetch(:proxy_port, nil)

data/lib/http_utilities/http/response.rb

@@ -6,22 +6,20 @@ module HttpUtilities
       attr_accessor :body, :parsed_body, :page, :format, :request, :force_encoding
 
       def initialize(response = nil, request = nil, options = {})
-        options               =   options.dup
-
         self.body             =   (response && response.body) ? response.body : nil
         self.request          =   request
 
         self.parsed_body      =   nil
 
-        self.format           =   options.delete(:format) { |e| nil }
-        self.force_encoding   =   options.delete(:force_encoding) { |e| true }
+        self.format           =   options.fetch(:format, nil)
+        self.force_encoding   =   options.fetch(:force_encoding, true)
 
         encode if (self.force_encoding)
         parse_response
       end
 
       def encode
-        if (self.body)
+        if self.body && self.body.is_a?(String)
           begin
             self.body = self.body.force_encoding('UTF-8').encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => "")
           rescue Exception => e
@@ -49,9 +47,9 @@ module HttpUtilities
       def set_page(page)
         self.page = page
 
-        if (page && page.parser)
-          self.body         =   page.parser.content
-          self.parsed_body  =   page.parser
+        if (self.page && self.page.parser)
+          self.body         =   self.page.parser.content
+          self.parsed_body  =   self.page.parser
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_utilities
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Sebastian Johnsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -148,7 +148,6 @@ files:
 - lib/http_utilities/http/proxy_support.rb
 - lib/http_utilities/http/request.rb
 - lib/http_utilities/http/response.rb
-- lib/http_utilities/http/url.rb
 - lib/http_utilities/http/user_agent.rb
 - lib/http_utilities/jobs/resque/proxies/check_proxies_job.rb
 - lib/http_utilities/jobs/resque/proxies/check_proxy_job.rb

data/lib/http_utilities/http/url.rb

@@ -1,48 +0,0 @@
-require 'open-uri'
-require 'uri'
-require 'cgi'
-
-module HttpUtilities
-  module Http
-    module Url
-      
-      def generate_request_url(params = {})
-        params.symbolize_keys!
-        url = params.delete(:url) { |e| "" }
-
-        sorted_params = params.sort
-        query_parts = []
-
-        sorted_params.each do |param_row|
-          param = encode_param(param_row.first)
-          value = encode_param(param_row.last)
-          query_parts << "#{param}=#{value}"
-        end
-
-        query = query_parts.join("&")
-        request = "#{url}?#{query}"
-        return request
-      end
-      
-      def generate_request_params(params)
-        sorted_params = params.sort
-        query_parts = []
-
-        sorted_params.each do |param_row|
-          param = param_row.first
-          value = param_row.last
-          query_parts << "#{param}=#{value}"
-        end
-
-        query = query_parts.join("&")
-        
-        return query
-      end
-
-      def encode_param(param)
-        return CGI.escape(param.to_s).to_s.gsub("+", "%20").gsub("%7E", "~") if (param)
-      end
-      
-    end
-  end
-end