http_utilities 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: decfb9fe1f727937094df0974e3629ad5ca1f5f244e10d5a8e23044e189a266a
-  data.tar.gz: edaa2d78def545bd34fd3bce759b645da7ee778a84aa3fe51a6165a5fe3a0d3f
+  metadata.gz: 24370403c5f8396cac1f6fbf76af2bfce33b594d494725f11f4b7dd7e54763a5
+  data.tar.gz: f0e387ec4cfc14c5caa1edf1041c393b0b1aec7a2242fd666e5a595e843522ea
 SHA512:
-  metadata.gz: 13a753076e2eba04b84cdbf5b75f939740fea97dd9e39f33d4fe49308fb2bc107d26f5af707c7e77150df432348bf10038a1d5d6d204c8b66a7c064c078f788d
-  data.tar.gz: c6f2e4ad1e670c8df318356cec55ad535984acb6c26c7ed425449a58c70acdf592fa4b4a8efa24469ed27b683e425a0ce191ee93d4d3e1a9b4fd20401c751a76
+  metadata.gz: 82c7226e7d4d2a7aa535e86bc6f19f83bfc9a2d127ae2c33ee7ff417dbb53f10ddf3ef5148560e7b9241c37dcd2536c3aadd7df9fda5b9a2c41b49737a3bba9e
+  data.tar.gz: c227b8881310827ab34b7ab3a4c50c118c668021afccd8573010c4be89067104a5d15d3d5d6a8bb24bcb7c6caf4a8cd4ee2850c570162fbb91995a9f9a466086

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

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.3.2"
+  s.version = "1.3.3"
 
   s.authors = ["Sebastian Johnsson"]
   s.description = "Wrapper for Faraday with additional functionality"

data/lib/http_utilities/http/client.rb

@@ -56,7 +56,7 @@ module HttpUtilities
         request.set_proxy_options(options)
         
         proxy_options                       =   request.generate_proxy_options
-        client_options                      =   client_options.merge(proxy: proxy_options) unless proxy_options.empty?
+        client_options                      =   client_options.merge(proxy: proxy_options) if proxy_options && !proxy_options.empty?
         
         connection      =   Faraday.new(client_options) do |builder|
           builder.headers[:user_agent]      =   request.user_agent

data/lib/http_utilities/http/proxy_support.rb

@@ -14,8 +14,7 @@ module HttpUtilities
         proxy_protocol            =   options.fetch(:proxy_protocol, :all)
         
         if use_proxy || specific_proxy
-          self.proxy[:protocol]   =   proxy_protocol
-          self.proxy[:type]       =   proxy_type
+          self.proxy            ||=   {}
           
           if specific_proxy && specific_proxy.is_a?(String)
             specific_proxy        =   specific_proxy.gsub(/^http(s)?:\/\//i, "")
@@ -34,7 +33,7 @@ module HttpUtilities
             if specific_proxy && specific_proxy.is_a?(::Proxy)
               proxy_object        =   specific_proxy
             else
-              proxy_object        =   ::Proxy.get_random_proxy(protocol: self.proxy[:protocol], proxy_type: self.proxy[:type])
+              proxy_object        =   ::Proxy.get_random_proxy(protocol: proxy_protocol, proxy_type: proxy_type)
             end
             
             #log(:info, "[HttpUtilities::Http::ProxySupport] - Randomized Proxy object: #{proxy_object.inspect}")
@@ -42,13 +41,13 @@ module HttpUtilities
             if proxy_object
               self.proxy[:host]   =   proxy_object.host
               self.proxy[:port]   =   proxy_object.port
-              proxy_username      =   proxy_object.username.present? ? proxy_object.username : nil
-              proxy_password      =   proxy_object.password.present? ? proxy_object.password : nil
+              proxy_username      =   !proxy_object.username.to_s.empty? ? proxy_object.username : nil
+              proxy_password      =   !proxy_object.password.to_s.empty? ? proxy_object.password : nil
             end
           end
+          
+          set_proxy_credentials(proxy_username, proxy_password, proxy_credentials)
         end
-
-        set_proxy_credentials(proxy_username, proxy_password, proxy_credentials)
       end
 
       def set_proxy_credentials(proxy_username, proxy_password, proxy_credentials)
@@ -73,22 +72,24 @@ module HttpUtilities
       end
       
       def proxy_model_defined?
-        defined = Module.const_get("Proxy").is_a?(Class) rescue false
-        defined = (defined && ::Proxy.respond_to?(:get_random_proxy))
+        defined                     =   Module.const_get("Proxy").is_a?(Class) rescue false
+        defined                     =   (defined && ::Proxy.respond_to?(:get_random_proxy))
         
         return defined
       end
       
       def generate_proxy_options
-        proxy_options             =   {}
+        proxy_options               =   {}
         
-        proxy_options[:uri]       =   "http://#{self.proxy[:host]}:#{self.proxy[:port]}"
-        proxy_options[:user]      =   self.proxy[:username] if self.proxy[:username] && !self.proxy[:username].empty?
-        proxy_options[:password]  =   self.proxy[:password] if self.proxy[:password] && !self.proxy[:password].empty?
+        if !self.proxy[:host].to_s.empty? && !self.proxy[:port].to_s.empty?
+          proxy_options[:uri]       =   "http://#{self.proxy[:host]}:#{self.proxy[:port]}"
+          proxy_options[:user]      =   self.proxy[:username] if !self.proxy[:username].to_s.empty?
+          proxy_options[:password]  =   self.proxy[:password] if !self.proxy[:password].to_s.empty?
+        end
         
         return proxy_options
       end
 
     end
   end
-end
+end

data/lib/http_utilities/http/request.rb

@@ -7,7 +7,7 @@ module HttpUtilities
       
       attr_accessor :interface, :proxy, :user_agent
       
-      def initialize(interface: nil, proxy: {}, options: {})
+      def initialize(interface: nil, proxy: nil, options: {})
         self.interface  =   interface
         self.proxy      =   proxy
         
@@ -16,4 +16,4 @@ module HttpUtilities
             
     end
   end
-end
+end

data/lib/http_utilities.rb

@@ -5,7 +5,7 @@ require "faraday_middleware"
 require "mechanize"
 
 module HttpUtilities
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
   
   require File.join(File.dirname(__FILE__), 'http_utilities/railtie') if defined?(Rails)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_utilities
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Sebastian Johnsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday