http_utilities 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 100d88c3257aab9fd554b92ebf5acec6f0e76a13610744dbc1334f197db1d69d
-  data.tar.gz: 72a3b17228032109386de4b47bd17e4e25c24111653a29eab467496e22da6016
+  metadata.gz: d35f4d16afe0c14fb152deaa1f4f9499149b8092597048a9634ba7a18c2107fd
+  data.tar.gz: 9e1accc76b228e69dae8e9ab656451720dc75d2136c3988624eed5e8f8775aad
 SHA512:
-  metadata.gz: d53540c7b71697bcc23606676e391d7cc4687e5b88ac37bfc8b8fad4f85bf32c5f868484903bea248951ea808e2928a8a15354fd8661ad6e35771cb570dfdc21
-  data.tar.gz: 8bad3307db72709899fd3a15ea4c23c77014d448239f224ee6f42d9099e553e0423fafe1fbc1d2361a965214fa71b8a6423c9e8bd7e9516cbd05ab45e13cd286
+  metadata.gz: 5d8a4cf017084eb7227864328e86a118f143001e5201238987c000065214e74c9303dea25f9da4a28ac68b22ca20b098281cd7d8927e5e97227bd78b65bccdec
+  data.tar.gz: 9c9845c448c6f8135b6ab9fc437a1beafafa0352aad04e9f24794182bff1f0b62e2a6d1843fd4a9c2df85e8faa7dfe1c67eb6f267289a3e44a5cf85c45a2356c

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

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

data/lib/http_utilities/http/proxy_support.rb

@@ -3,65 +3,81 @@ module HttpUtilities
     module ProxySupport
 
       def set_proxy_options(options = {})
-        use_proxy                 =   options.fetch(:use_proxy, false)
-        specific_proxy            =   options.fetch(:proxy, nil)
-        proxy_host                =   options.fetch(:proxy_host, nil)
-        proxy_port                =   options.fetch(:proxy_port, nil)
-        proxy_username            =   options.fetch(:proxy_username, nil)
-        proxy_password            =   options.fetch(:proxy_password, nil)
-        proxy_credentials         =   options.fetch(:proxy_credentials, nil)
-        proxy_type                =   options.fetch(:proxy_type, :all)
-        proxy_protocol            =   options.fetch(:proxy_protocol, :all)
+        proxy_opts                    =   options.fetch(:proxy, nil)
         
-        if use_proxy || specific_proxy
-          self.proxy            ||=   {}
+        if proxy_opts
+          self.proxy                ||=   {}
           
-          if specific_proxy && specific_proxy.is_a?(String)
-            specific_proxy        =   specific_proxy.gsub(/^http(s)?:\/\//i, "")
-            parts                 =   specific_proxy.split(":")
-
-            if parts.size.eql?(2)
-              self.proxy[:host]   =   parts.first
-              self.proxy[:port]   =   parts.second.to_i
-            end
-
-          elsif proxy_host && proxy_port
-            self.proxy[:host]     =   proxy_host
-            self.proxy[:port]     =   proxy_port
-
-          elsif proxy_model_defined?
-            if specific_proxy && specific_proxy.is_a?(::Proxy)
-              proxy_object        =   specific_proxy
-            else
-              proxy_object        =   ::Proxy.get_random_proxy(protocol: proxy_protocol, proxy_type: proxy_type)
-            end
+          if proxy_opts.is_a?(String)
+            set_from_string(proxy_opts)
+            
+          elsif proxy_opts.is_a?(Hash)
+            set_from_hash(proxy_opts)
             
-            #log(:info, "[HttpUtilities::Http::ProxySupport] - Randomized Proxy object: #{proxy_object.inspect}")
+          elsif proxy_model_defined? && proxy_opts.is_a?(::Proxy)
+            set_from_object(proxy_opts)
+          end
+        end
+      end
+      
+      def set_from_string(proxy_opts)
+        proxy_opts                    =   proxy_opts.gsub(/^http(s)?:\/\//i, "")
+        parts                         =   proxy_opts.split(":")
 
-            if proxy_object
-              self.proxy[:host]   =   proxy_object.host
-              self.proxy[:port]   =   proxy_object.port
-              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
+        if parts.size.eql?(2)
+          self.proxy[:host]           =   parts.first
+          self.proxy[:port]           =   parts.second.to_i
+        end
+      end
+      
+      def set_from_hash(proxy_opts)
+        host                          =   proxy_opts.fetch(:host, nil)
+        port                          =   proxy_opts.fetch(:port, nil)
+        
+        username                      =   proxy_opts.fetch(:username, nil)
+        password                      =   proxy_opts.fetch(:password, nil)
+        credentials                   =   proxy_opts.fetch(:credentials, nil)
+        
+        randomize                     =   proxy_opts.fetch(:randomize, true)
+        type                          =   proxy_opts.fetch(:type, :all)
+        protocol                      =   proxy_opts.fetch(:protocol, :all)
+        
+        if randomize && proxy_model_defined?
+          proxy_object                =   ::Proxy.get_random_proxy(protocol: protocol, proxy_type: type)
+          set_from_object(proxy_object)
+        else
+          if host && port
+            self.proxy[:host]         =   host
+            self.proxy[:port]         =   port
+            
+            set_credentials(username, password)
           end
+        end
+      end
+      
+      def set_from_object(proxy_object)
+        if proxy_object
+          self.proxy[:host]           =   proxy_object.host
+          self.proxy[:port]           =   proxy_object.port
+          username                    =   !proxy_object.username.to_s.empty? ? proxy_object.username : nil
+          password                    =   !proxy_object.password.to_s.empty? ? proxy_object.password : nil
           
-          set_proxy_credentials(proxy_username, proxy_password, proxy_credentials)
+          set_credentials(username, password)
         end
       end
 
-      def set_proxy_credentials(proxy_username, proxy_password, proxy_credentials)
-        if proxy_username && proxy_password
-          self.proxy[:username]       =   proxy_username
-          self.proxy[:password]       =   proxy_password
+      def set_credentials(username, password, credentials = {})
+        if username && password
+          self.proxy[:username]       =   username
+          self.proxy[:password]       =   password
 
-        elsif proxy_credentials
-          if proxy_credentials.is_a?(Hash)
-            self.proxy[:username]     =   proxy_credentials[:username]
-            self.proxy[:password]     =   proxy_credentials[:password]
+        elsif credentials
+          if credentials.is_a?(Hash)
+            self.proxy[:username]     =   credentials[:username]
+            self.proxy[:password]     =   credentials[:password]
 
-          elsif (proxy_credentials.is_a?(String))
-            parts                     =   proxy_credentials.split(":")
+          elsif (credentials.is_a?(String))
+            parts                     =   credentials.split(":")
 
             if parts && parts.any? && parts.size == 2
               self.proxy[:username]   =   parts.first
@@ -72,19 +88,19 @@ 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                 =   {}
         
         if self.proxy && !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?
+          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

data/lib/http_utilities.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_utilities
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Sebastian Johnsson