opinionated_http 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6279db8b72fbf65adbc3e271ea079be89b2c54227a343c5dd252cf79799e7adf
-  data.tar.gz: 6951e99ac22b9237ed2a2220bc858cb2e1f1c05b0cd15a4793631226b296ced9
+  metadata.gz: e0b33ff41de4de2487017dcb16c8af1bd049d8f59b99af148c2782f5aadbf90f
+  data.tar.gz: fbb4ddce12a6aabb67827d124fd579e91d4a2b4def78d74c893dc82687519c96
 SHA512:
-  metadata.gz: a1139e62e3fcf12a4ed985d96a9d561c4f7a3b9859fb2296699d5b70942aa53448a50fc0a1a7f3fb97cd7a9ee1bff528c9ef9fdc704ae25ec42eee845e31dd39
-  data.tar.gz: 954fe864fef5772be8658bbf78f20ec43e0fc32ed6d456025c1ed3bffbd0b638dd880c6c4e1efc66e1a9e2034930410b0f25e41952508891b51c909ee1977589
+  metadata.gz: a3b31d0083666203057f05a38bdc0e7a5519af9757df935c9c772ca514bb7f8777c9b52a24edb960b201e5816bca356508d9470bfcd42fdcf83ee3bd622ec51b
+  data.tar.gz: b6b9ba368403e795fc19b81a759e30cd03de38fd436c52222db7f7e73f79d4ad38fb1054c7ad6a23a2cddf5c6f55654127e334c76b0f5fd5f0ab3deab606163d

data/README.md

@@ -36,6 +36,10 @@ Parameters:
     Required.
   logger:
     Default: SemanticLogger[OpinionatedHTTP]
+  format: [:json | nil]
+    Optionally set the format for http requests.
+    Currently only supports `:json`, which will format the request and response to/from JSON.
+    It will also set the `Content-Type` http header to `application/json`.
   Other options as supported by PersistentHTTP
   #TODO: Expand PersistentHTTP options here
 

data/Rakefile

@@ -1,23 +1,25 @@
 # Setup bundler to avoid having to run bundle exec all the time.
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-require 'rake/testtask'
-require_relative 'lib/opinionated_http/version'
+require "rake/testtask"
+require_relative "lib/opinionated_http/version"
 
 task :gem do
-  system 'gem build opinionated_http.gemspec'
+  system "gem build opinionated_http.gemspec"
 end
 
 task publish: :gem do
   system "git tag -a v#{OpinionatedHTTP::VERSION} -m 'Tagging #{OpinionatedHTTP::VERSION}'"
-  system 'git push --tags'
+  system "git push --tags"
   system "gem push opinionated_http-#{OpinionatedHTTP::VERSION}.gem"
   system "rm opinionated_http-#{OpinionatedHTTP::VERSION}.gem"
 end
 
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
   t.warning = false
 end
+
+task default: :test

data/lib/opinionated_http/client.rb

@@ -1,6 +1,6 @@
-require 'persistent_http'
-require 'secret_config'
-require 'semantic_logger'
+require "persistent_http"
+require "secret_config"
+require "semantic_logger"
 #
 # Client http implementation
 #
@@ -8,125 +8,159 @@ require 'semantic_logger'
 module OpinionatedHTTP
   class Client
     # 502 Bad Gateway, 503 Service Unavailable, 504 Gateway Timeout
-    HTTP_RETRY_CODES = %w[502 503 504]
-
-    attr_reader :secret_config_prefix, :logger, :metric_prefix, :error_class, :driver,
-                :retry_count, :retry_interval, :retry_multiplier, :http_retry_codes
-
-    def initialize(secret_config_prefix:, logger: nil, metric_prefix:, error_class:, **options)
-      @metric_prefix    = metric_prefix
-      @logger           = logger || SemanticLogger[self]
-      @error_class      = error_class
-      @retry_count      = SecretConfig.fetch("#{secret_config_prefix}/retry_count", type: :integer, default: 11)
-      @retry_interval   = SecretConfig.fetch("#{secret_config_prefix}/retry_interval", type: :float, default: 0.01)
-      @retry_multiplier = SecretConfig.fetch("#{secret_config_prefix}/retry_multiplier", type: :float, default: 1.8)
-      http_retry_codes  = SecretConfig.fetch("#{secret_config_prefix}/http_retry_codes", type: :string, default: HTTP_RETRY_CODES.join(","))
-      @http_retry_codes = http_retry_codes.split(",").collect { |str| str.strip }
+    HTTP_RETRY_CODES = %w[502 503 504].freeze
+
+    attr_reader :secret_config_prefix, :logger, :format, :metric_prefix, :error_class, :driver, :format,
+                :retry_count, :retry_interval, :retry_multiplier, :http_retry_codes,
+                :url, :pool_size, :keep_alive, :proxy, :force_retry, :max_redirects,
+                :open_timeout, :read_timeout, :idle_timeout, :pool_timeout, :warn_timeout,
+                :after_connect
+
+    # Any option supplied here can be overridden if that corresponding value is set in Secret Config.
+    def initialize(
+      secret_config_prefix:,
+      metric_prefix:,
+      error_class:,
+      logger: nil,
+      format: nil,
+      retry_count: 11,
+      retry_interval: 0.01,
+      retry_multiplier: 1.8,
+      http_retry_codes: HTTP_RETRY_CODES.join(","),
+      url: nil,
+      pool_size: 100,
+      open_timeout: 10,
+      read_timeout: 10,
+      idle_timeout: 300,
+      keep_alive: 300,
+      pool_timeout: 5,
+      warn_timeout: 0.25,
+      proxy: :ENV,
+      force_retry: true,
+      max_redirects: 10,
+      after_connect: nil,
+      verify_peer: false,  # TODO: PersistentHTTP keeps returning cert expired even when it is valid.
+      certificate: nil,
+      private_key: nil
+    )
+      @metric_prefix = metric_prefix
+      @logger        = logger || SemanticLogger[self]
+      @error_class   = error_class
+      @format        = format
+      @after_connect = after_connect
+      SecretConfig.configure(secret_config_prefix) do |config|
+        @retry_count      = config.fetch("retry_count", type: :integer, default: retry_count)
+        @retry_interval   = config.fetch("retry_interval", type: :float, default: retry_interval)
+        @retry_multiplier = config.fetch("retry_multiplier", type: :float, default: retry_multiplier)
+        @max_redirects    = config.fetch("max_redirects", type: :integer, default: max_redirects)
+        http_retry_codes  = config.fetch("http_retry_codes", type: :string, default: http_retry_codes)
+        @http_retry_codes = http_retry_codes.split(",").collect(&:strip)
+
+        @url = url.nil? ? config.fetch("url") : config.fetch("url", default: url)
+
+        @pool_size    = config.fetch("pool_size", type: :integer, default: pool_size)
+        @open_timeout = config.fetch("open_timeout", type: :float, default: open_timeout)
+        @read_timeout = config.fetch("read_timeout", type: :float, default: read_timeout)
+        @idle_timeout = config.fetch("idle_timeout", type: :float, default: idle_timeout)
+        @keep_alive   = config.fetch("keep_alive", type: :float, default: keep_alive)
+        @pool_timeout = config.fetch("pool_timeout", type: :float, default: pool_timeout)
+        @warn_timeout = config.fetch("warn_timeout", type: :float, default: warn_timeout)
+        @proxy        = config.fetch("proxy", type: :symbol, default: proxy)
+        @force_retry  = config.fetch("force_retry", type: :boolean, default: force_retry)
+        @certificate  = config.fetch("certificate", type: :string, default: certificate)
+        @private_key  = config.fetch("private_key", type: :string, default: private_key)
+        @verify_peer  = config.fetch("verify_peer", type: :boolean, default: verify_peer)
+      end
 
       internal_logger = OpinionatedHTTP::Logger.new(@logger)
-      new_options     = {
-        logger:       internal_logger,
-        debug_output: internal_logger,
-        name:         "",
-        pool_size:    SecretConfig.fetch("#{secret_config_prefix}/pool_size", type: :integer, default: 100),
-        open_timeout: SecretConfig.fetch("#{secret_config_prefix}/open_timeout", type: :float, default: 10),
-        read_timeout: SecretConfig.fetch("#{secret_config_prefix}/read_timeout", type: :float, default: 10),
-        idle_timeout: SecretConfig.fetch("#{secret_config_prefix}/idle_timeout", type: :float, default: 300),
-        keep_alive:   SecretConfig.fetch("#{secret_config_prefix}/keep_alive", type: :float, default: 300),
-        pool_timeout: SecretConfig.fetch("#{secret_config_prefix}/pool_timeout", type: :float, default: 5),
-        warn_timeout: SecretConfig.fetch("#{secret_config_prefix}/warn_timeout", type: :float, default: 0.25),
-        proxy:        SecretConfig.fetch("#{secret_config_prefix}/proxy", type: :symbol, default: :ENV),
-        force_retry:  SecretConfig.fetch("#{secret_config_prefix}/force_retry", type: :boolean, default: true),
-      }
-
-      url               = SecretConfig["#{secret_config_prefix}/url"]
-      new_options[:url] = url if url
-      @driver           = PersistentHTTP.new(new_options.merge(options))
+      @driver         = PersistentHTTP.new(
+        url:           @url,
+        logger:        internal_logger,
+        debug_output:  internal_logger,
+        name:          "",
+        pool_size:     @pool_size,
+        open_timeout:  @open_timeout,
+        read_timeout:  @read_timeout,
+        idle_timeout:  @idle_timeout,
+        keep_alive:    @keep_alive,
+        pool_timeout:  @pool_timeout,
+        warn_timeout:  @warn_timeout,
+        proxy:         @proxy,
+        force_retry:   @force_retry,
+        after_connect: @after_connect,
+        certificate:   @certificate,
+        private_key:   @private_key,
+        verify_mode:   @verify_peer ? OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT : OpenSSL::SSL::VERIFY_NONE
+      )
     end
 
-    # Perform an HTTP Get against the supplied path
-    def get(action:, path: "/#{action}", parameters: nil)
-      path = "/#{path}" unless path.start_with?("/")
-      path = "#{path}?#{URI.encode_www_form(parameters)}" if parameters
-
-      request  = generic_request(path: path, verb: 'Get')
-      response = request_with_retry(action: action, path: path, request: request)
-
-      response.body
+    def get(request: nil, **args)
+      request       ||= Request.new(**args)
+      request.verb  = "Get"
+      http_response = request(request)
+      Response.new(http_response, request)
     end
 
-    def post(action:, path: "/#{action}", headers: nil, body: nil, form_data: nil, username: nil, password: nil)
-      path    = "/#{path}" unless path.start_with?("/")
-      request = generic_request(path: path, verb: 'Post', headers: headers, body: body, form_data: form_data, auth: auth)
-
-      response = request_with_retry(action: action, path: path, request: request)
-
-      response.body
+    def post(request: nil, **args)
+      request       ||= Request.new(**args)
+      request.verb  = "Post"
+      http_response = request(request)
+      Response.new(http_response, request)
     end
 
-    def generic_request(path:, verb:, headers: nil, body: nil, form_data: nil, username: nil, password: nil)
-      raise(ArgumentError, 'setting form data will overwrite supplied content-type') unless headers_and_form_data_compatible? headers, form_data
-      raise(ArgumentError, 'setting form data will overwrite supplied body') if body && form_data
-
-      request = Net::HTTP.const_get(verb).new(path, headers)
-      request.body = body if body
-      request.set_form_data form_data if form_data
-      request.basic_auth(username, password) if username && password
-      request
+    # Returns [Response] after submitting the [Request]
+    def request(request)
+      request.metric_prefix ||= metric_prefix
+      request.format        ||= format
+      request.error_class   ||= error_class
+      request.logger        ||= logger
+      request_with_retry(action: request.action, request: request.http_request)
     end
 
     private
 
-    def request_with_retry(action:, path: "/#{action}", request:, try_count: 0)
+    def request_with_retry(action:, request:, try_count: 0)
       http_method = request.method.upcase
       response    =
         begin
           payload = {}
           if logger.trace?
-            payload[:parameters] = parameters
-            payload[:path]       = path
+            # payload[:parameters] = parameters
+            payload[:path] = request.path
           end
           message = "HTTP #{http_method}: #{action}" if logger.debug?
 
-          logger.benchmark_info(message: message, metric: "#{metric_prefix}/#{action}", payload: payload) { driver.request(request) }
-        rescue StandardError => exc
-          message = "HTTP #{http_method}: #{action} Failure: #{exc.class.name}: #{exc.message}"
-          logger.error(message: message, metric: "#{metric_prefix}/exception", exception: exc)
+          logger.benchmark_info(message: message, metric: "#{metric_prefix}/#{action}", payload: payload) do
+            driver.request(request)
+          end
+        rescue StandardError => e
+          message = "HTTP #{http_method}: #{action} Failure: #{e.class.name}: #{e.message}"
+          logger.error(message: message, metric: "#{metric_prefix}/exception", exception: e)
           raise(error_class, message)
         end
 
       # Retry on http 5xx errors except 500 which means internal server error.
-      if http_retry_codes.include?(response.code)
-        if try_count < retry_count
-          try_count = try_count + 1
-          duration  = retry_sleep_interval(try_count)
-          logger.warn(message: "HTTP #{http_method}: #{action} Failure: (#{response.code}) #{response.message}. Retry: #{try_count}", metric: "#{metric_prefix}/retry", duration: duration * 1_000)
-          sleep(duration)
-          response = request_with_retry(action: action, path: path, request: request, try_count: try_count)
-        else
-          message = "HTTP #{http_method}: #{action} Failure: (#{response.code}) #{response.message}. Retries Exhausted"
-          logger.error(message: message, metric: "#{metric_prefix}/exception")
-          raise(error_class, message)
-        end
-      elsif !response.is_a?(Net::HTTPSuccess)
-        message = "HTTP #{http_method}: #{action} Failure: (#{response.code}) #{response.message}"
+      return response unless http_retry_codes.include?(response.code)
+
+      if try_count >= retry_count
+        message = "HTTP #{http_method}: #{action} Failure: (#{response.code}) #{response.message}. Retries Exhausted"
         logger.error(message: message, metric: "#{metric_prefix}/exception")
         raise(error_class, message)
       end
 
-      response
+      try_count += 1
+      duration  = retry_sleep_interval(try_count)
+      logger.warn(message: "HTTP #{http_method}: #{action} Failure: (#{response.code}) #{response.message}. Retry: #{try_count}", metric: "#{metric_prefix}/retry", duration: duration * 1_000)
+      sleep(duration)
+      request_with_retry(action: action, request: request, try_count: try_count)
     end
 
     # First retry is immediate, next retry is after `retry_interval`,
     # each subsequent retry interval is 100% longer than the prior interval.
     def retry_sleep_interval(retry_count)
       return 0 if retry_count <= 1
-      (retry_multiplier ** (retry_count - 1)) * retry_interval
-    end
 
-    def headers_and_form_data_compatible?(headers, form_data)
-      return true if headers.nil? || form_data.nil?
-      !headers.keys.map(&:downcase).include? 'content-type'
+      (retry_multiplier ** (retry_count - 1)) * retry_interval
     end
   end
 end

data/lib/opinionated_http/request.rb

@@ -0,0 +1,77 @@
+module OpinionatedHTTP
+  # The request object
+  class Request
+    attr_accessor :action, :verb, :format, :path, :headers, :body, :form_data, :username, :password, :parameters,
+                  :metric_prefix, :error_class, :logger
+
+    def initialize(action:, verb: nil, path: nil, format: nil, headers: {}, body: nil, form_data: nil, username: nil, password: nil, parameters: nil)
+      @action     = action
+      @path       =
+        if path.nil?
+          "/#{action}"
+        elsif path.start_with?("/")
+          path
+        else
+          "/#{path}"
+        end
+      @verb       = verb
+      @format     = format
+      @headers    = headers
+      @body       = body
+      @form_data  = form_data
+      @username   = username
+      @password   = password
+      @parameters = parameters
+    end
+
+    def http_request
+      unless headers_and_form_data_compatible?(headers, form_data)
+        raise(ArgumentError, "Setting form data will overwrite supplied content-type")
+      end
+      raise(ArgumentError, "Cannot supply both form_data and a body") if body && form_data
+
+      path_with_params = parameters ? "#{path}?#{URI.encode_www_form(parameters)}" : path
+      body             = format_body if self.body
+      request          = Net::HTTP.const_get(verb).new(path_with_params, headers)
+
+      if body && !request.request_body_permitted?
+        raise(ArgumentError, "#{request.class.name} does not support a request body")
+      end
+
+      if parameters && !request.response_body_permitted?
+        raise(ArgumentError, ":parameters cannot be supplied for #{request.class.name}")
+      end
+
+      request.body     = body if body
+      request.set_form_data form_data if form_data
+      request.basic_auth(username, password) if username && password
+      request
+    end
+
+    private
+
+    def format_body
+      return if body.nil?
+
+      case format
+      when :json
+        headers["Content-Type"] = "application/json"
+        body.to_json #unless body.is_a?(String) || body.nil?
+      when nil
+        body
+      else
+        raise(ArgumentError, "Unknown format: #{format.inspect}")
+      end
+    rescue StandardError => exc
+      message = "Failed to serialize request body. #{exc.class.name}: #{exc.message}"
+      logger.error(message: message, metric: "#{metric_prefix}/exception", exception: exc)
+      raise(error_class, message)
+    end
+
+    def headers_and_form_data_compatible?(headers, form_data)
+      return true if headers.empty? || form_data.nil?
+
+      !headers.keys.map(&:downcase).include?("content-type")
+    end
+  end
+end

data/lib/opinionated_http/response.rb

@@ -0,0 +1,55 @@
+require "forwardable"
+module OpinionatedHTTP
+  # The response object
+  class Response
+    extend Forwardable
+
+    def_instance_delegators :@http_response, :code, :message
+    def_instance_delegators :@request, :verb, :action, :metric_prefix, :format, :path, :error_class, :logger
+
+    # :action used for logging the action in the error message
+    def initialize(http_response, request)
+      @http_response = http_response
+      @request       = request
+    end
+
+    def success?
+      @http_response.is_a?(Net::HTTPSuccess)
+    end
+
+    def body
+      @body ||= parse_body
+    end
+
+    # Raises an exception when the HTTP Response is not a success
+    def body!
+      return body if success?
+
+      error_message = "HTTP #{verb.upcase}: #{action} Failure: (#{code}) #{message}"
+      logger.error(message: error_message, metric: "#{metric_prefix}/exception")
+      raise(error_class, error_message)
+    end
+
+    private
+
+    attr_reader :http_response, :request
+
+    def parse_body
+      return unless http_response.class.body_permitted?
+
+      case format
+      when :json
+        JSON.parse(http_response.body)
+      when nil
+        http_response.body
+      else
+        raise(ArgumentError, "Unknown format: #{format.inspect}")
+      end
+
+    rescue StandardError => exc
+      message = "Failed to parse response body. #{exc.class.name}: #{exc.message}"
+      logger.error(message: message, metric: "#{metric_prefix}/exception", exception: exc)
+      raise(error_class, message)
+    end
+  end
+end

data/lib/opinionated_http/version.rb

@@ -1,3 +1,3 @@
 module OpinionatedHTTP
-  VERSION = "0.0.4".freeze
+  VERSION = "0.1.0".freeze
 end

data/lib/opinionated_http.rb

@@ -1,12 +1,14 @@
-require 'opinionated_http/version'
+require "opinionated_http/version"
 #
 # Opinionated HTTP
 #
 # An opinionated HTTP Client library using convention over configuration.
 #
 module OpinionatedHTTP
-  autoload :Client, 'opinionated_http/client'
-  autoload :Logger, 'opinionated_http/logger'
+  autoload :Client, "opinionated_http/client"
+  autoload :Logger, "opinionated_http/logger"
+  autoload :Request, "opinionated_http/request"
+  autoload :Response, "opinionated_http/response"
 
   #
   # Create a new Opinionated HTTP instance.

data/test/client_test.rb

@@ -1,109 +1,93 @@
-require 'net/http'
-require 'json'
-require_relative 'test_helper'
+require "net/http"
+require "json"
+require_relative "test_helper"
 
-module OpinionatedHTTP
-  class ClientTest < Minitest::Test
-    describe OpinionatedHTTP::Client do
-      class ServiceError < StandardError
-      end
+class ClientTest < Minitest::Test
+  describe OpinionatedHTTP::Client do
+    class ServiceError < StandardError
+    end
 
-      let :http do
-        OpinionatedHTTP.new(
-          secret_config_prefix: 'fake_service',
-          metric_prefix:        'FakeService',
-          logger:               SemanticLogger["FakeService"],
-          error_class:          ServiceError,
-          header:               {'Content-Type' => 'application/json'}
-        )
-      end
+    let :http do
+      OpinionatedHTTP.new(
+        secret_config_prefix: "fake_service",
+        metric_prefix:        "FakeService",
+        logger:               SemanticLogger["FakeService"],
+        error_class:          ServiceError,
+        header:               {"Content-Type" => "application/json"}
+      )
+    end
 
-      describe "get" do
-        it 'success' do
-          # output   = {zip: '12345', population: 54321}
-          # body     = output.to_json
-          # response = Net::HTTPSuccess.new(200, 'OK', body)
-          # http.driver.stub(:request, response) do
-          #   http.get(action: 'lookup', parameters: {zip: '12345'})
-          # end
+    describe "get" do
+      it "succeeds" do
+        output = {zip: "12345", population: 54_321}
+        body   = output.to_json
+        stub_request(Net::HTTPSuccess, 200, "OK", body) do
+          response = http.get(action: "lookup", parameters: {zip: "12345"})
+          assert_equal body, response.body!
         end
       end
 
-      describe "generic_request" do
-        let(:path) { '/fake_action' }
-        let(:post_verb) { 'Post' }
-        let(:get_verb) { 'Get' }
-
-        it 'creates a request corresponding to the supplied verb' do
-          req  = http.generic_request(path: path, verb: post_verb)
-          req2 = http.generic_request(path: path, verb: get_verb)
-
-          assert_kind_of Net::HTTP::Post, req
-          assert_kind_of Net::HTTP::Get, req2
-        end
-
-        it 'returns a request with supplied headers' do
-          test_headers = {'test1' => 'yes_test_1', 'test2' => 'yes_test_2'}
-          req          = http.generic_request(path: path, verb: get_verb, headers: test_headers)
-
-          assert_equal test_headers['test1'], req['test1']
-          assert_equal test_headers['test2'], req['test2']
-        end
-
-        it 'returns a request with supplied body' do
-          test_body = "nice bod"
-          req       = http.generic_request(path: path, verb: get_verb, body: test_body)
-
-          assert_equal test_body, req.body
+      it "fails" do
+        message = "HTTP GET: lookup Failure: (403) Forbidden"
+        error   = assert_raises ServiceError do
+          stub_request(Net::HTTPForbidden, 403, "Forbidden", "") do
+            response = http.get(action: "lookup", parameters: {zip: "12345"})
+            response.body!
+          end
         end
+        assert_equal message, error.message
+      end
+    end
 
-        it 'returns a request with supplied form data in x-www-form-urlencoded Content-Type' do
-          test_data = {test1: 'yes', test2: 'no'}
-          expected_string = "test1=yes&test2=no"
-          req = http.generic_request(path: path, verb: post_verb, form_data: test_data)
-
-          assert_equal expected_string, req.body
-          assert_equal 'application/x-www-form-urlencoded', req['Content-Type']
+    describe "post" do
+      it "succeeds with body" do
+        output = {zip: "12345", population: 54_321}
+        body   = output.to_json
+        stub_request(Net::HTTPSuccess, 200, "OK", body) do
+          response = http.post(action: "lookup", body: body)
+          assert_equal body, response.body!
         end
+      end
 
-        it 'add supplied authentication to the request' do
-          test_un = 'admin'
-          test_pw = 'hunter2'
-          req = http.generic_request(path: path, verb: get_verb, username: test_un, password: test_pw)
-          req2 = Net::HTTP::Get.new(path)
-          req2.basic_auth test_un, test_pw
-
-          assert_equal req2['authorization'], req['authorization']
+      it "with form data" do
+        output = {zip: "12345", population: 54_321}
+        body   = output.to_json
+        stub_request(Net::HTTPSuccess, 200, "OK", body) do
+          response = http.post(action: "lookup", form_data: output)
+          assert_equal body, response.body!
         end
+      end
 
-        it 'raise an error if supplied content-type header would be overwritten by setting form_data' do
-          downcase_headers    = {'unimportant' => 'blank', 'content-type' => 'application/json'}
-          capitalized_headers = {'Unimportant' => 'blank', 'Content-Type' => 'application/json'}
-          no_conflict_headers = {'whatever' => 'blank', 'irrelevant' => 'test'}
-          form_data           = {thing1: 1, thing2: 2}
-
-          assert_raises ArgumentError do
-            http.generic_request(path: path, verb: post_verb, headers: downcase_headers, form_data: form_data)
-          end
-
-          assert_raises ArgumentError do
-            http.generic_request(path: path, verb: post_verb, headers: capitalized_headers, form_data: form_data)
+      it "fails with body" do
+        message = "HTTP POST: lookup Failure: (403) Forbidden"
+        output  = {zip: "12345", population: 54_321}
+        body    = output.to_json
+        error   = assert_raises ServiceError do
+          stub_request(Net::HTTPForbidden, 403, "Forbidden", "") do
+            response = http.post(action: "lookup", body: body)
+            response.body!
           end
-
-          assert http.generic_request(path: path, verb: post_verb, headers: no_conflict_headers, form_data: form_data)
         end
+        assert_equal message, error.message
+      end
 
-        it 'raise an error if there is a collision between supplied body and form_data' do
-          form_data = {thing1: 1, thing2: 2}
-          body      = "not form data"
-
-          assert_raises ArgumentError do
-            http.generic_request(path: path, verb: post_verb, body: body, form_data: form_data)
+      it "fails with form data" do
+        output  = {zip: "12345", population: 54_321}
+        message = "HTTP POST: lookup Failure: (403) Forbidden"
+        error   = assert_raises ServiceError do
+          stub_request(Net::HTTPForbidden, 403, "Forbidden", "") do
+            response = http.post(action: "lookup", form_data: output)
+            response.body!
           end
-
-          assert http.generic_request(path: path, verb: post_verb, body: body)
-          assert http.generic_request(path: path, verb: post_verb, form_data: form_data)
         end
+        assert_equal message, error.message
+      end
+    end
+
+    def stub_request(klass, code, msg, body, &block)
+      response = klass.new("1.1", code, msg)
+      response.stub(:body, body) do
+        http.driver.stub(:request, response, &block)
       end
     end
   end

data/test/config/application.yml

@@ -1,4 +1,4 @@
 test:
-  fake_supplier:
+  fake_service:
     url: https://example.org
 

data/test/request_test.rb

@@ -0,0 +1,95 @@
+require "net/http"
+require "json"
+require_relative "test_helper"
+
+class RequestTest < Minitest::Test
+  describe OpinionatedHTTP::Request do
+    describe "http_request" do
+      let(:path) { "/fake_action" }
+      let(:post_verb) { "Post" }
+      let(:get_verb) { "Get" }
+      let(:action) { "fake_action" }
+      let :json_request do
+        {zip: "12345", population: 54_321}
+      end
+
+      it "creates a request corresponding to the supplied verb" do
+        req  = OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb).http_request
+        req2 = OpinionatedHTTP::Request.new(action: action, path: path, verb: get_verb).http_request
+
+        assert_kind_of Net::HTTP::Post, req
+        assert_kind_of Net::HTTP::Get, req2
+      end
+
+      it "creates a JSON request" do
+        req = OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, format: :json, body: json_request).http_request
+
+        assert_equal json_request.to_json, req.body
+        assert_equal "application/json", req["Content-Type"]
+      end
+
+      it "returns a request with supplied headers" do
+        test_headers = {"test1" => "yes_test_1", "test2" => "yes_test_2"}
+        req          = OpinionatedHTTP::Request.new(action: action, path: path, verb: get_verb, headers: test_headers).http_request
+
+        assert_equal test_headers["test1"], req["test1"]
+        assert_equal test_headers["test2"], req["test2"]
+      end
+
+      it "returns a request with supplied body" do
+        test_body = "nice bod"
+        req       = OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, body: test_body).http_request
+
+        assert_equal test_body, req.body
+      end
+
+      it "returns a request with supplied form data in x-www-form-urlencoded Content-Type" do
+        test_data       = {test1: "yes", test2: "no"}
+        expected_string = "test1=yes&test2=no"
+        req             = OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, form_data: test_data).http_request
+
+        assert_equal expected_string, req.body
+        assert_equal "application/x-www-form-urlencoded", req["Content-Type"]
+      end
+
+      it "add supplied authentication to the request" do
+        test_un = "admin"
+        test_pw = "hunter2"
+        req     = OpinionatedHTTP::Request.new(action: action, path: path, verb: get_verb, username: test_un, password: test_pw).http_request
+        req2    = Net::HTTP::Get.new(path)
+        req2.basic_auth test_un, test_pw
+
+        assert_equal req2["authorization"], req["authorization"]
+      end
+
+      it "raise an error if supplied content-type header would be overwritten by setting form_data" do
+        downcase_headers    = {"unimportant" => "blank", "content-type" => "application/json"}
+        capitalized_headers = {"Unimportant" => "blank", "Content-Type" => "application/json"}
+        no_conflict_headers = {"whatever" => "blank", "irrelevant" => "test"}
+        form_data           = {thing1: 1, thing2: 2}
+
+        assert_raises ArgumentError do
+          OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, headers: downcase_headers, form_data: form_data).http_request
+        end
+
+        assert_raises ArgumentError do
+          OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, headers: capitalized_headers, form_data: form_data).http_request
+        end
+
+        assert OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, headers: no_conflict_headers, form_data: form_data).http_request
+      end
+
+      it "raise an error if there is a collision between supplied body and form_data" do
+        form_data = {thing1: 1, thing2: 2}
+        body      = "not form data"
+
+        assert_raises ArgumentError do
+          OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, body: body, form_data: form_data).http_request
+        end
+
+        assert OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, body: body).http_request
+        assert OpinionatedHTTP::Request.new(action: action, path: path, verb: post_verb, form_data: form_data).http_request
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,14 +1,14 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-ENV['TZ'] = 'America/New_York'
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
+ENV["TZ"] = "America/New_York"
 
-require 'yaml'
-require 'minitest/autorun'
-require 'awesome_print'
-require 'secret_config'
-require 'semantic_logger'
-require 'opinionated_http'
+require "yaml"
+require "minitest/autorun"
+require "amazing_print"
+require "secret_config"
+require "semantic_logger"
+require "opinionated_http"
 
-SemanticLogger.add_appender(file_name: 'test.log', formatter: :color)
+SemanticLogger.add_appender(file_name: "test.log", formatter: :color)
 SemanticLogger.default_level = :debug
 
-SecretConfig.use :file, path: 'test', file_name: File.expand_path('config/application.yml', __dir__)
+SecretConfig.use :file, path: "test", file_name: File.expand_path("config/application.yml", __dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opinionated_http
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Reid Morrison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent_http
@@ -55,7 +55,6 @@ dependencies:
 description: HTTP Client with retries. Uses PersistentHTTP for http connection pooling,
   Semantic Logger for logging and metrics, and uses Secret Config for its configuration.
 email:
-- reidmo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -65,14 +64,17 @@ files:
 - lib/opinionated_http.rb
 - lib/opinionated_http/client.rb
 - lib/opinionated_http/logger.rb
+- lib/opinionated_http/request.rb
+- lib/opinionated_http/response.rb
 - lib/opinionated_http/version.rb
 - test/client_test.rb
 - test/config/application.yml
+- test/request_test.rb
 - test/test_helper.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,11 +89,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Opinionated HTTP Client
 test_files:
 - test/client_test.rb
 - test/config/application.yml
+- test/request_test.rb
 - test/test_helper.rb