rb-net_http-client 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385806b49e0eb5862c3b4440e12d6834008c30434037938b6da9ccd36564cf8a
-  data.tar.gz: 3a4a62b42dc8c9ec1b814484a5b01a29c0608de26cba913a7fb3d3a3b034563d
+  metadata.gz: 8b228d13177b1a537598d3c2c47da13fc2575d4e9237f399f8bd4c832c10fd5a
+  data.tar.gz: 692ec538534c4d7f7cb6da96415a878646a7fd8f06e15226a06ea6ffd817def2
 SHA512:
-  metadata.gz: 9ea7f8839c0f505a170f6bd0876201e45d2df50a3e9429940b3117c3417c780bc6a1021b0619a6e8a8b0a898c16c20c8107fc989c139b2c750e44744b51d0672
-  data.tar.gz: 72c53ddb920a4df253f5bcc38f733a78b1fe5e5266b9036d84f1944908d05c96906bd7c288abb491ab9253162775c06d7dc07d32afc7b26e3910ef1db5c2db38
+  metadata.gz: c4d311ce8705c1bfce6167f06020088aced267cd23d91861a08649f1753fbd2aae5592829e359217b12beefc2ca9e9ff43ca99498f517ce7b2521c3b15755a03
+  data.tar.gz: 7a3960a8c40b07f89ef7c0ffc81241a80a224e95f587f65de9a0764e6b8279a8d3c4d9a2679e7bdc4623a66e1880d6188a0af48d9896acffaf2acee0f766c1db

data/lib/client/client.rb

@@ -18,6 +18,7 @@ module NetHTTP
                 :pkcs12,
                 :pkcs12_file,
                 :pkcs12_passphrase,
+                :proxy_from_env,
                 :proxy_uri,
                 :proxy_url,
                 :query,
@@ -39,15 +40,20 @@ module NetHTTP
       end
 
       send('uri=', opts)
+      send('proxy_uri=', opts)
       send('client=', opts)
     end
 
     def client=(opts = {})
-      @client = Net::HTTP.new(uri.host, uri.port)
+      if proxy_uri
+        @client = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port).new(uri.host, uri.port)
+      else
+        @client = Net::HTTP.new(uri.host, uri.port)
+      end
 
-      send('proxy_uri=', opts)
-      send('open_timeout=', (opts[:open_timeout] ||= 60))
-      send('read_timeout=', (opts[:read_timeout] ||= 60))
+      send('proxy_from_env=', opts[:proxy_from_env])
+      send('open_timeout=', (opts[:open_timeout] || 60))
+      send('read_timeout=', (opts[:read_timeout] || 60))
       send('use_ssl=', opts[:use_ssl], uri.scheme)
       send('ssl_path=', opts[:ssl_path])
       send('pkcs12_file=', opts[:pkcs12_file])
@@ -58,6 +64,7 @@ module NetHTTP
       send('ca_file=', opts[:ca_file])
       send('verify_mode=', opts[:verify_mode])
 
+      @client.proxy_from_env = proxy_from_env
       @client.open_timeout = open_timeout
       @client.read_timeout = read_timeout
       @client.use_ssl = use_ssl

data/lib/client/ext.rb

@@ -3,7 +3,7 @@
 module NetHTTP
   class Client
     def proxy_uri=(opts = {})
-      proxy_uri = opts[:proxy_uri] ||= opts[:proxy_url] ||= ENV['http_proxy'] ||= ENV['HTTP_PROXY'] ||= ENV['https_proxy'] ||= ENV['HTTPS_PROXY']
+      proxy_uri = opts[:proxy_uri] || opts[:proxy_url]
 
       begin
         if proxy_uri.to_s.empty? == false
@@ -21,14 +21,14 @@ module NetHTTP
             )
           )
         end
-      rescue RuntimeError => error
-        logger.debug(error)
+      rescue RuntimeError => err
+        logger.debug(err)
         @proxy_uri = nil
       end
     end
 
     def uri=(opts = {})
-      uri = opts[:uri] ||= opts[:url]
+      uri = opts[:uri] || opts[:url]
       begin
         if uri.to_s.empty? == false
           @uri = Core::Utilities.parse_uri(uri)
@@ -45,8 +45,8 @@ module NetHTTP
             )
           )
         end
-      rescue RuntimeError => error
-        logger.debug(error)
+      rescue RuntimeError => err
+        logger.debug(err)
         @uri = nil
       end
     end
@@ -109,6 +109,14 @@ module NetHTTP
       end
     end
 
+    def proxy_from_env=(proxy_from_env)
+      if proxy_from_env == true
+        @proxy_from_env = true
+      else
+        @proxy_from_env = false
+      end
+    end
+
     def read_timeout=(read_timeout)
       @read_timeout = read_timeout.to_s.to_i
     end

data/lib/core/utilities.rb

@@ -221,8 +221,8 @@ module NetHTTP
             format: 'snake',
             type: type.downcase
           )
-        rescue RuntimeError => error
-          raise error
+        rescue RuntimeError => err
+          raise err
         end
       end
 
@@ -245,8 +245,8 @@ module NetHTTP
             format: 'snake',
             type: type.downcase
           )
-        rescue RuntimeError => error
-          raise error
+        rescue RuntimeError => err
+          raise err
         end
       end
 
@@ -289,8 +289,8 @@ module NetHTTP
             format: 'snake',
             type: type.downcase
           )
-        rescue RuntimeError => error
-          raise error
+        rescue RuntimeError => err
+          raise err
         end
       end
 
@@ -300,13 +300,13 @@ module NetHTTP
           return false if json_doc.empty?
 
           JSON.parse(json_doc)
-        rescue JSON::ParserError => error
+        rescue JSON::ParserError => err
           if logger.nil? || logger.to_s.empty?
             puts 'WARNING - JSON syntax / parsing errors detected:'
-            puts error
+            puts err
           else
             logger.debug('WARNING - JSON syntax / parsing errors detected:')
-            logger.debug(error)
+            logger.debug(err)
           end
           return false
         end
@@ -362,8 +362,8 @@ module NetHTTP
             end
             return true
           end
-        rescue RuntimeError => error
-          raise error
+        rescue RuntimeError => err
+          raise err
         end
 
         true

data/lib/request/request.rb

@@ -41,6 +41,8 @@ module NetHTTP
       logger.debug('Request Host => ' + request_opts[:uri].scheme.to_s + '://' + request_opts[:uri].host.to_s)
       logger.debug('Request Port => ' + request_opts[:uri].port.to_s)
       logger.debug('Request Path => ' + path)
+      logger.debug('Request Headers =>')
+      logger.debug(Hash[request_opts[:headers].to_h.map { |k, v| [k.to_s, v] }])
       NetHTTP::Response.new(
         response: client.delete(
           path
@@ -65,7 +67,7 @@ module NetHTTP
       logger.debug('Request Port => ' + request_opts[:uri].port.to_s)
       logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
-      logger.debug(request_opts[:headers])
+      logger.debug(Hash[request_opts[:headers].to_h.map { |k, v| [k.to_s, v] }])
       NetHTTP::Response.new(
         response: client.get(
           path,
@@ -91,7 +93,7 @@ module NetHTTP
       logger.debug('Request Port => ' + request_opts[:uri].port.to_s)
       logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
-      logger.debug(request_opts[:headers])
+      logger.debug(Hash[request_opts[:headers].to_h.map { |k, v| [k.to_s, v] }])
       logger.debug('Request Body =>')
       logger.debug(request_opts[:body])
       NetHTTP::Response.new(
@@ -120,7 +122,7 @@ module NetHTTP
       logger.debug('Request Port => ' + request_opts[:uri].port.to_s)
       logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
-      logger.debug(request_opts[:headers])
+      logger.debug(Hash[request_opts[:headers].to_h.map { |k, v| [k.to_s, v] }])
       logger.debug('Request Body =>')
       logger.debug(URI.encode_www_form(request_opts[:body]))
       NetHTTP::Response.new(
@@ -151,7 +153,7 @@ module NetHTTP
       logger.debug('Request Port => ' + request_opts[:uri].port.to_s)
       logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
-      logger.debug(request_opts[:headers])
+      logger.debug(Hash[request_opts[:headers].to_h.map { |k, v| [k.to_s, v] }])
       logger.debug('Request Body =>')
       logger.debug(request_opts[:body])
       NetHTTP::Response.new(
@@ -171,12 +173,12 @@ module NetHTTP
         raise NetHTTP::Request::SchemaError.new(schema_results.to_s)
       end
 
-      request_method = opts[:method] ||= 'post'
+      request_method = opts[:method] || 'post'
       request_uri = Core::Utilities.parse_uri(opts[:uri] || opts[:url] || uri)
       request_path = (opts[:path] || request_uri.path || path).chomp('?')
       request_query = Core::Utilities.parse_query((opts[:query] || request_uri.query || query))
-      request_headers = opts[:headers] ||= {}
-      request_body = opts[:body] ||= nil
+      request_headers = opts[:headers] || {}
+      request_body = opts[:body] || nil
 
       {
         method: request_method,

data/lib/response/response.rb

@@ -32,52 +32,37 @@ module NetHTTP
       log_response
     end
 
-    alias resp response
-
     def body=
       @body = response.body
     end
 
-    alias resp_body body
-    alias response_body body
-
     def body_obj=
       @body_obj = {}
 
-      if valid_json?
-        begin
-          @body_obj = NetHTTP::Core::Utilities.json_2_hash(body, 'symbol', logger)
-        rescue JSON::ParserError => error
-          logger.debug(error)
-        end
-      elsif valid_xml? || valid_html?
-        begin
-          @body_obj = NetHTTP::Core::Utilities.xml_2_hash(body, 'symbol', logger)
-        rescue Nokogiri::XML::SyntaxError => error
-          logger.debug(error)
-        end
+      if content_type.to_s.downcase.include?('json')
+        @body_obj = parse_json(body, logger)
+      elsif content_type.to_s.downcase.include?('xml') || content_type.to_s.downcase.include?('html')
+        @body_boj = parse_xml(body, logger)
       end
-    end
 
-    alias resp_body_obj body_obj
-    alias response_body_obj body_obj
+      @body_obj
+    end
 
     def body_os=
       @body_os = JSON.parse(body_obj.to_json, object_class: OpenStruct)
     end
 
-    alias resp_body_os body_os
-    alias response_body_os body_os
-    alias body_open_struct body_os
-    alias resp_body_open_struct body_os
-    alias response_body_open_struct body_os
-
     def code=
       @code = response.code
     end
 
-    alias resp_code code
-    alias response_code code
+    def content_type
+      content_type = headers_hash.select { |k,v| k.to_s.downcase == 'content_type' }
+
+      return nil if content_type.empty?
+
+      content_type[:content_type]
+    end
 
     def headers=
       @headers = {}
@@ -86,35 +71,40 @@ module NetHTTP
       end
     end
 
-    alias resp_headers headers
-    alias response_headers headers
-
     def headers_hash=
-      @headers_hash = {}
-      NetHTTP::Core::Utilities.convert_hash_keys(
+      @headers_hash = NetHTTP::Core::Utilities.convert_hash_keys(
         object: headers,
         format: 'snake',
         type: 'symbol'
       )
     end
 
-    alias resp_headers_hash headers_hash
-    alias response_headers_hash headers_hash
-
     def headers_os=
       @headers_os = JSON.parse(headers_hash.to_json, object_class: OpenStruct)
     end
 
-    alias resp_headers_os headers_os
-    alias response_headers_os headers_os
-    alias headers_open_struct headers_os
-    alias resp_headers_struct headers_os
-    alias response_headers_open_struct headers_os
-
     def response=(response)
       @response = response
     end
 
+    def parse_json(body, logger)
+      begin
+        NetHTTP::Core::Utilities.json_2_hash(body, 'symbol', logger)
+      rescue JSON::ParserError => err
+        logger.debug(err)
+        return {}
+      end
+    end
+
+    def parse_xml(body, logger)
+      begin
+        NetHTTP::Core::Utilities.xml_2_hash(body, 'symbol', logger)
+      rescue Nokogiri::XML::SyntaxError => err
+        logger.debug(err)
+        return {}
+      end
+    end
+
     def valid_json?
       NetHTTP::Core::Utilities.valid_json?(body, logger)
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NetHTTP
-  VERSION = '1.1.5'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb-net_http-client
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Bostian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Simple Ruby HTTP Client