rb-net_http-client 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b3cdc38ddadcecc511dd7a354829600cb24508403d8a8acc2901cf2b1f8e0c3
-  data.tar.gz: 0e4c2c646e2bdfe6e0f77810292d9bf4f7e5a5277e6b8957161930a26ff8d3a2
+  metadata.gz: dca512c41b7ef3a50b1bcaeb52c5f4a24fc516f78f616ecefa336f7c1d840c43
+  data.tar.gz: ccd78d9a1c8a7be03f7542650bf1051ebaa4fd74d131dc464db1705d65b1f7c9
 SHA512:
-  metadata.gz: 4a4fe6a7b7ac48cb71c6ab98f3b3ea2f907604dee229b5a160989b57aeaa99003048f56c8c774945a0ec0df8621cc164714609ffd4fcadaed0f62721b2bfd7ef
-  data.tar.gz: f16e89e2c4fdd38cdce09c896bfb743690ce7792403ef0cc88bf9d8f702d5cc3df61b3831baddc55da2bbc4079b0da74dce7796e205473f37630ed7c9216947b
+  metadata.gz: fcb564bae3120591d9ebedf8177e1ebc723421548e76ab98ffb61196cf3e1de61cdc8486ac8bd938dcf3bad1546b03b5e4d2c10c32fada1f92d05b676caf6e64
+  data.tar.gz: 5ed36d3dd20e8505970ef371dcf4747c8b061f97a880af9567b324d1bcaf3f434ea269033f1e09eaf1ed03fb5708e51a8ffdcc8ec6f441365aa4081866b17173

data/lib/client/ext.rb

@@ -12,6 +12,8 @@ module NetHTTP
           @proxy_uri = Core::Utilities.parse_uri(
             Core::Utilities.construct_uri(
               scheme: opts[:proxy_uri_scheme],
+              user: opts[:proxy_uri_user],
+              password: opts[:proxy_uri_password],
               host: opts[:proxy_uri_host],
               port: opts[:proxy_uri_port],
               path: opts[:proxy_uri_path],
@@ -34,6 +36,8 @@ module NetHTTP
           @uri = Core::Utilities.parse_uri(
             Core::Utilities.construct_uri(
               scheme: opts[:scheme],
+              user: opts[:user],
+              password: opts[:password],
               host: opts[:host],
               port: opts[:port],
               path: opts[:path],

data/lib/core/utilities.rb

@@ -35,18 +35,39 @@ module NetHTTP
           end
         end
 
+        if uri[:user].to_s.empty? || uri[:password].to_s.empty?
+          user_pass = nil
+        else
+          user_pass = "#{uri[:user]}:#{uri[:password]}@"
+        end
+
         scheme = "#{scheme}://"
         host = uri[:host]
         port = ":#{port}"
         path = uri[:path]
-        query = "?#{uri[:query]}"
+        query = parse_query(uri[:query])
 
         scheme = nil if scheme.to_s.empty?
         port = nil if port.to_s.empty?
         path = nil if uri[:path].to_s.empty?
         query = nil if uri[:query].to_s.empty?
 
-        URI("#{scheme}#{host}#{port}#{path}#{query}").to_s
+        URI("#{scheme}#{user_pass}#{host}#{port}#{path}#{query}").to_s
+      end
+
+      def self.parse_query(query)
+        # todo: may need to update this as URI.escape is considered obsolete
+        case query
+        when String
+          query = query[1..-1] if query.start_with?('?')
+          URI.escape("?#{query}")
+        when Hash
+          query = query.map { |k, v| "#{k}=#{v}" }
+          query = query.join('&')
+          URI.escape("?#{query}")
+        else
+          nil
+        end
       end
 
       def self.parse_uri(uri)

data/lib/request/request.rb

@@ -31,13 +31,19 @@ module NetHTTP
 
       opts[:method] = 'delete'
       request_opts = request_opts(opts)
+      path = if request_opts[:query]
+               request_opts[:path] + request_opts[:query]
+             else
+               request_opts[:path]
+             end
+
       logger.debug('Request Method => ' + request_opts[:method].to_s.upcase)
       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 => ' + request_opts[:path])
+      logger.debug('Request Path => ' + path)
       NetHTTP::Response.new(
         response: client.delete(
-          request_opts[:path]
+          path
         ),
         logger: logger
       )
@@ -48,15 +54,21 @@ module NetHTTP
 
       opts[:method] = 'get'
       request_opts = request_opts(opts)
+      path = if request_opts[:query]
+               request_opts[:path] + request_opts[:query]
+             else
+               request_opts[:path]
+             end
+
       logger.debug('Request Method => ' + request_opts[:method].to_s.upcase)
       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 => ' + request_opts[:path])
+      logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
       logger.debug(request_opts[:headers])
       NetHTTP::Response.new(
         response: client.get(
-          request_opts[:path],
+          path,
           request_opts[:headers]
         ),
         logger: logger
@@ -68,17 +80,23 @@ module NetHTTP
 
       opts[:method] = 'post'
       request_opts = request_opts(opts)
+      path = if request_opts[:query]
+               request_opts[:path] + request_opts[:query]
+             else
+               request_opts[:path]
+             end
+
       logger.debug('Request Method => ' + request_opts[:method].to_s.upcase)
       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 => ' + request_opts[:path])
+      logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
       logger.debug(request_opts[:headers])
       logger.debug('Request Body =>')
       logger.debug(request_opts[:body])
       NetHTTP::Response.new(
         response: client.post(
-          request_opts[:path],
+          path,
           request_opts[:body],
           request_opts[:headers]
         ),
@@ -91,17 +109,23 @@ module NetHTTP
 
       opts[:method] = 'post_form'
       request_opts = request_opts(opts)
+      path = if request_opts[:query]
+               request_opts[:path] + request_opts[:query]
+             else
+               request_opts[:path]
+             end
+
       logger.debug('Request Method => ' + request_opts[:method].to_s.upcase)
       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 => ' + request_opts[:path])
+      logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
       logger.debug(request_opts[:headers])
       logger.debug('Request Body =>')
       logger.debug(URI.encode_www_form(request_opts[:body]))
       NetHTTP::Response.new(
         response: client.post(
-          uri,
+          path,
           URI.encode_www_form(request_opts[:body]),
           request_opts[:headers]
         ),
@@ -116,17 +140,23 @@ module NetHTTP
 
       opts[:method] = 'put'
       request_opts = request_opts(opts)
+      path = if request_opts[:query]
+               request_opts[:path] + request_opts[:query]
+             else
+               request_opts[:path]
+             end
+
       logger.debug('Request Method => ' + request_opts[:method].to_s.upcase)
       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 => ' + request_opts[:path])
+      logger.debug('Request Path => ' + path)
       logger.debug('Request Headers =>')
       logger.debug(request_opts[:headers])
       logger.debug('Request Body =>')
       logger.debug(request_opts[:body])
       NetHTTP::Response.new(
         response: client.put(
-          request_opts[:path],
+          path,
           request_opts[:body],
           request_opts[:headers]
         ),
@@ -143,10 +173,8 @@ module NetHTTP
 
       request_method = opts[:method] ||= 'post'
       request_uri = Core::Utilities.parse_uri(opts[:uri] || opts[:url] || uri)
-      request_path = request_path(
-        path: (opts[:path] || request_uri.path || path),
-        query: (opts[:query] || request_uri.query || query)
-      )
+      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
 
@@ -154,27 +182,10 @@ module NetHTTP
         method: request_method,
         uri: request_uri,
         path: request_path,
+        query: request_query,
         headers: request_headers,
         body: request_body
       }
     end
-
-    def request_path(opts)
-      # i.e. URI('https://www.google.com')
-      # uri.path defaults to "" if empty / not set
-      # uri.query defaults to nil if empty / not set
-      path = opts[:path].to_s.chomp('?')
-      if opts[:query].to_s.start_with?('?')
-        query = opts[:query][1..-1]
-      else
-        query = opts[:query].to_s
-      end
-
-      return '' if path.empty? && query.empty?
-      return path if query.empty?
-      return '/' + query if path.empty?
-
-      path + '?' + query
-    end
   end
 end

data/lib/request/schema.rb

@@ -14,7 +14,7 @@ module NetHTTP
       required(:method).filled(type?: String)
       optional(:headers).maybe(type?: Hash)
       optional(:body).maybe
-      optional(:query).filled(type?: String)
+      optional(:query).filled
 
       rule(if_url_and_uri_are_nil_must_provide_path: [:uri, :url, :path]) do |uri, url, path|
         uri.empty?.then(url.empty?.then(path.filled?))

data/lib/response/response.rb

@@ -61,8 +61,6 @@ module NetHTTP
       end
     end
 
-    # TODO: remove this eventually
-    alias body_hash body_obj
     alias resp_body_obj body_obj
     alias response_body_obj body_obj
 

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb-net_http-client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ryan Bostian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport