rspec-httpd 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39e7f534f32be091cf91b9a86482a7f6ad77edb2f23f900135e5c3b39f10e390
-  data.tar.gz: b8c93f5a2f115ed3095bd474bc9a2c63fac4a3324a7c04930b4b0b87b6e9e51e
+  metadata.gz: 428238b3dd716da074b3038797776712343d204dd0b15b0aed8dcc92729dbaab
+  data.tar.gz: c3df40165e1460560725838e9ac392e4088a1168a8ce27f1ccf383e90facc6a9
 SHA512:
-  metadata.gz: 724693c35daa22840ff5a3871ac39fbecad5fdb22a38621e8e704b647683f28c953cdffe454a33a3b86434e6f8b2968528067e7b10c1008bac7b67bd537755f5
-  data.tar.gz: 28f7cf7303b11c67ebde228ec1a323f4ad88cca6891c6d46881b2fbebaeeed844f5cae2b3cd227dd1f4680e6ac85e8f7cbd36c71e86ff13c4f8dcf114d8665f7
+  metadata.gz: '08cd0cccda74339ee925a188a201b8d06136f92c659f5d6e17e4fc68e6b5c3a43f9c4aea07e5957b4c3b2f520a2ab1f9ab90ed26c28db834da356c014cb5f735'
+  data.tar.gz: e919cfb7a3ff2ec67fc9dac460642da31bd1351e28aeb2c97de102243bebfa3c119884d7ad7f023b38ed6d8ebe25dc58bfd4b6b2ca89e64f533650a645c55203

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.17

data/lib/rspec/httpd/client.rb

@@ -1,135 +1,22 @@
-require "net/http"
-require "json"
-
-class Net::HTTPResponse
-  def headers
-    @headers ||= HeadersHash.new(self)
-  end
-
-  class HeadersHash < Hash
-    def initialize(response)
-      response.each_header do |k, v|
-        case self[k]
-        when Array then self[k].concat v
-        when nil   then self[k] = v
-        else            self[k].concat(v)
-        end
-      end
-    end
-
-    def [](key)
-      super key.downcase
-    end
-
-    private
-
-    def []=(key, value)
-      super key.downcase, value
-    end
-  end
-end
+require "simple-http"
 
 module RSpec::Httpd
-  class Client
-    # host and port. Set at initialization
-    attr_reader :host
-    attr_reader :port
-
+  class Client < Simple::HTTP
     def initialize(host:, port:)
-      @host, @port = host, port
+      super()
+      self.base_url = "http://#{host}:#{port}"
     end
 
-    # request, response, and status, set during a request/response cycle
-    attr_reader :request
     attr_reader :response
 
-    def status
-      Integer(response.code)
-    end
-
-    # returns the parsed response of the latest request
-    def result
-      @result ||= ResponseParser.parse(response)
-    end
-
-    # A GET request
-    def get(url, headers: {})
-      run_request(::Net::HTTP::Get, url, body: nil, headers: headers)
-    end
-
-    # A HEAD request
-    def head(url, headers: {})
-      run_request(::Net::HTTP::Head, url, body: nil, headers: headers)
-    end
-
-    # A POST request
-    def post(url, body, headers: {})
-      run_request(::Net::HTTP::Post, url, body: body, headers: headers)
-    end
-
-    # A PUT request
-    def put(url, body, headers: {})
-      run_request(::Net::HTTP::Put, url, body: body || {}, headers: headers)
-    end
-
-    # A DELETE request
-    def delete(url, headers: {})
-      run_request(::Net::HTTP::Delete, url, body: nil, headers: headers)
+    def content
+      @response.content
     end
 
     private
 
-    def run_request(request_klass, url, body:, headers:)
-      # reset all results from previous run
-      @request = @response = @headers = @result = nil
-
-      @response = Net::HTTP.start(host, port) do |http|
-        @request = build_request(request_klass, url, body: body, headers: headers)
-
-        log_request(request)
-        http.request(request)
-      end
-    end
-
-    def build_request(request_klass, url, body:, headers:)
-      request_klass.new(url, headers).tap do |request|
-        if body
-          request["Content-Type"] = "application/json"
-          request.body = JSON.generate(body)
-        end
-      end
-    end
-
-    def log_request(request)
-      if request.body
-        RSpec::Httpd.logger.info "#{request.method} #{request.path} #{request.body.inspect[0..100]}"
-      else
-        RSpec::Httpd.logger.info "#{request.method} #{request.path}"
-      end
-    end
-
-    module ResponseParser
-      def self.parse(response)
-        return nil if response.body.nil?
-
-        content_type = response["content-type"]
-
-        result = if content_type&.include?("application/json")
-                   JSON.parse(response.body)
-                 else
-                   response.body.force_encoding("utf-8").encode
-                 end
-
-        result.extend(self)
-        result.__response__ = response
-        result
-      end
-
-      attr_accessor :__response__
-
-      def status
-        Integer(__response__.code)
-      end
+    def execute_request(request, max_redirections: 10)
+      @response = super(request, max_redirections: max_redirections)
     end
   end
 end

data/lib/rspec/httpd/config.rb

@@ -2,10 +2,12 @@ class RSpec::Httpd::Config
   attr_accessor :host
   attr_accessor :port
   attr_accessor :command
+  attr_accessor :logger
 
   def initialize
     self.host = "127.0.0.1"
     self.port = 12_345
     self.command = "bundle exec rackup -E test -p 12345"
+    self.logger = Logger.new(STDERR).tap { |logger| logger.level = Logger::INFO }
   end
 end

data/lib/rspec/httpd/expectation_failed.rb

@@ -1,16 +1,20 @@
 # rubocop:disable Metrics/AbcSize
 
 class RSpec::Httpd::ExpectationFailed < RuntimeError
-  attr_reader :original_error, :request, :response
+  attr_reader :original_error, :response
 
-  def initialize(original_error, request:, response:)
-    @original_error, @request, @response = original_error, request, response
+  def initialize(original_error, response:)
+    @original_error, @response = original_error, response
+  end
+
+  def request
+    response.request
   end
 
   def to_s
     parts = []
     parts.push(original_error.to_s)
-    parts.push("=== #{request.method} #{request.path} =====================")
+    parts.push("=== #{request} =====================")
     parts.push("> " + request.body.gsub("\n", "\n> ")) if request.body
     parts.push("--- response ------------------------------------")
     parts.push("< " + response.body.gsub("\n", "\n< ")) if response.body

data/lib/rspec/httpd/server.rb

@@ -3,26 +3,45 @@
 require "socket"
 require "timeout"
 
+module RSpec
+end
+
 module RSpec::Httpd
   module Server
     MAX_STARTUP_TIME = 10
 
     extend self
 
+    def logger
+      # If this file is required as-is, without loading all of rspec/httpd,
+      #  ::RSpec::Httpd does not provide a logger. In that case we polyfill
+      # a default logger to STDERR.
+      #
+      # Doing so lets use this file as is; which lets one use the
+      #
+      #   RSpec::Httpd::Server.start! ...
+      #
+      # method.
+      if ::RSpec::Httpd.respond_to?(:logger)
+        ::RSpec::Httpd.logger
+      else
+        @logger ||= ::Logger.new(STDERR, level: :info)
+      end
+    end
+
     # builds and returns a server object.
     #
     # You can use this method to retrieve a client connection to a server
     # specified via host:, port:, and, optionally, a command.
-    def start!(host:, port:, command:)
+    def start!(host: "0.0.0.0", port:, command:, logger: nil)
       @servers ||= {}
       @servers[[host, port, command]] ||= do_start(host, port, command)
+      @logger = logger if logger
     end
 
     private
 
     def do_start(host, port, command)
-      logger = RSpec::Httpd.logger
-
       if port_open?(host, port)
         logger.error "A process is already running on #{host}:#{port}"
         exit 2

data/lib/rspec/httpd.rb

@@ -1,5 +1,4 @@
 require "rspec/core"
-require "forwardable"
 require "logger"
 require "expectation"
 
@@ -29,7 +28,7 @@ module RSpec::Httpd
   end
 
   def logger #:nodoc:
-    @logger ||= Logger.new(STDERR).tap { |logger| logger.level = Logger::INFO }
+    @config.logger
   end
 
   # builds and returns a client.
@@ -73,18 +72,19 @@ module RSpec::Httpd
     #
     expected_status = expected.is_a?(Integer) && status.nil? ? expected : status || 200
 
-    request, response = client.request, client.response
+    response = client.response
+    request  = response.request
 
-    expect(client.status).to eq(expected_status), 
-      "status should be #{expected_status}, but is #{client.status}, on '#{request.method} #{request.path}'"
+    expect(response.status).to eq(expected_status), 
+      "status should be #{expected_status}, but is #{response.status}, on '#{request}'"
 
     return if expected.nil? || expected.is_a?(Integer)
 
     begin
       # expect! comes from the expectation gem
-      expect! client.result => expected
+      expect! response.content => expected
     rescue ::Expectation::Matcher::Mismatch => e
-      raise ExpectationFailed.new(e, request: request, response: response), cause: nil
+      raise ExpectationFailed.new(e, response: response), cause: nil
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-httpd
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Enrico Thierbach
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: simple-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: RSpec testing for HTTP requests