simple-http 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4c48df122f1e2d75e2646e7175e8356b3d29ed29090b7b2d50e5b045ac4c67
-  data.tar.gz: 377058a3745909a67b4cf51307fcc87743bf5e054e681541e72b668473a07933
+  metadata.gz: 1cb6ffe1146cced4e3a576fcb776e13143be9a51e04352b421bec43eb18ca495
+  data.tar.gz: d071d8653cc3b7ad160a3e556a045d4441b425a1830b1c60ddef64703feab641
 SHA512:
-  metadata.gz: 3bb65d9e2a2fe14e197fcab613fe587523fb932cd1f45b2648d2a160defe25762490223d66a338d342095abb83fafc3c564a6d3bd525c0dc5033728dad33dde8
-  data.tar.gz: 910e7c3e08cd98361067e79082496b972cb24e0b3bc64365807d058119696e23758a3ac2e166ebdbe1dd678c8a0c4b10dcfaeeaf1c5b105cb7613fe8dd6765da
+  metadata.gz: fa509ffb0416b20cbb3cde6820d69a4daa6560f741ce69088dda99ed55b61394ec6964608a7a3156fb8cd17cdae7fc48b5d3d912efb5981f6658ddfc429faedb
+  data.tar.gz: 4c1b2ce423984fe8c5c043360fd40196bc9e79007182b6b6d2fce605948ac2e166b8ef9d4a6028e7687044164b323a397f02573d3c6885e8b226e4c2e708d04f

data/lib/simple/http/content_type_parser.rb

@@ -0,0 +1,81 @@
+# The code in this module was originally taken from rack/media_type.rb
+# and modified. We don't include a rack dependency here, since we don't
+# want to use a server library in a client tool.
+
+# parses content_type to return media_type and charset.
+class Simple::HTTP::ContentTypeParser
+  SPLIT_PATTERN = %r{\s*[;,]\s*}
+
+  # The content_type value as being passed in.
+  attr_reader :content_type
+
+  # The media type (type/subtype) portion of the CONTENT_TYPE header
+  # without any media type parameters. e.g., when CONTENT_TYPE is
+  # "text/plain;charset=utf-8", the media-type is "text/plain".
+  #
+  # For more information on the use of media types in HTTP, see:
+  # http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
+  attr_reader :media_type
+
+  # The charset as embedded on the Content-Type header
+  attr_reader :charset
+
+  def initialize(content_type)
+    @content_type = content_type
+    @media_type   = content_type.split(SPLIT_PATTERN, 2).first.downcase if content_type
+    @charset      = extract_charset_from_content_type if content_type
+  end
+
+  # returns the encoding the body is supposed to be encoded as.
+  def encoding
+    resolve_encoding_name(charset || guess_encoding_name)
+  end
+
+  def reencode!(body)
+    body.force_encoding(encoding)
+    unless body.valid_encoding?
+      raise "Invalid payload: body is encoded invalid; encoding is #{content_type_parser.encoding.name}"
+    end
+
+    body
+  end
+
+  private
+
+  def resolve_encoding_name(str)
+    ::Encoding.find(str)
+  rescue ArgumentName
+    raise "Cannot resolve encoding name #{encoding_name.inspect} from Content-Type: #{content_type.inspect}"
+  end
+
+  # This method is being called when there is no charset value in the content_type header.
+  def guess_encoding_name
+    case media_type
+    when /^application\/json/, /^application\/xml/, /^text\// then "UTF-8"
+    else "ASCII-8BIT"
+    end
+  end
+
+  CHARSET_PARAMETER_NAME = "charset"
+
+  # The media type parameters provided in CONTENT_TYPE as a Hash, or
+  # an empty Hash if no CONTENT_TYPE or media-type parameters were
+  # provided.  e.g., when the CONTENT_TYPE is "text/plain;charset=utf-8",
+  # this method responds with the following Hash:
+  #   { 'charset' => 'utf-8' }
+  def extract_charset_from_content_type
+    content_type.split(SPLIT_PATTERN)[1..-1].each do |s|
+      k, v = s.split("=", 2)
+      next unless k.downcase == CHARSET_PARAMETER_NAME
+
+      return strip_double_quotes(v)
+    end
+
+    nil
+  end
+
+  def strip_double_quotes(str)
+    str = str[1..-2] if str[0] == '"' && str[-1] == '"'
+    str
+  end
+end

data/lib/simple/http/response.rb

@@ -1,4 +1,4 @@
-require_relative "./body_builder"
+require_relative "./content_type_parser"
 
 class Simple::HTTP::Response
   class << self
@@ -18,48 +18,35 @@ class Simple::HTTP::Response
     end
   end
 
-  BodyBuilder = Simple::HTTP::BodyBuilder
+  ContentTypeParser = Simple::HTTP::ContentTypeParser
 
   attr_reader :request
   attr_reader :status
   attr_reader :message
   attr_reader :headers
-  attr_reader :original_body
+  attr_reader :body
+
+  # e.g "text/plain"
+  attr_reader :media_type
 
   private
 
   def initialize(request, body, headers, status, message)
     @request = request
     @headers = headers
-    @status = status
+    @status  = status
     @message = message
-    @original_body = body
-
-    # adjust encoding on original_body
-    @body_builder = BodyBuilder.new(headers["Content-Type"])
 
-    if @original_body && (charset = @body_builder.charset)
-      @original_body.force_encoding(charset)
-    end
+    # evaluate content type header, set media_type and set body encoding.
+    ctp = ContentTypeParser.new(headers["Content-Type"])
+    @media_type = ctp.media_type
+    @body       = ctp.reencode!(body) if body
   end
 
   public
 
-  # e.g "text/plain"
-  def media_type
-    @body_builder.media_type
-  end
-
-  # returns the body
-  #
-  # This method reencodes the text body into UTF-8. Non-text bodies should be
-  # encoded as ASCII-8BIT (a.k.a. "BINARY")
-  def body
-    @body ||= @body_builder.reencode(@original_body)
-  end
-
   def bytes
-    @original_body&.bytesize || 0
+    @body ? @body.bytesize : 0
   end
 
   def to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-http
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expectation
@@ -39,9 +39,9 @@ files:
 - README.md
 - lib/simple-http.rb
 - lib/simple/http.rb
-- lib/simple/http/body_builder.rb
 - lib/simple/http/caching.rb
 - lib/simple/http/checked_response.rb
+- lib/simple/http/content_type_parser.rb
 - lib/simple/http/driver/default.rb
 - lib/simple/http/driver/faraday.rb
 - lib/simple/http/errors.rb
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Simple code for simple HTTP requests

data/lib/simple/http/body_builder.rb

@@ -1,71 +0,0 @@
-# This module originally was taken from rack/media_type.rb and modified:
-# we don't want to have a rack (which is a server toolset) dependency
-# in simple-http, which is a client after all.
-
-# parses content_type to return media_type and charset, and can reencode bodies.
-class Simple::HTTP::BodyBuilder
-  SPLIT_PATTERN = %r{\s*[;,]\s*}
-
-  def initialize(content_type)
-    @media_type = content_type.split(SPLIT_PATTERN, 2).first.downcase if content_type
-    @charset = fetch_content_type_param(content_type, "charset", default: nil)
-  end
-
-  # The media type (type/subtype) portion of the CONTENT_TYPE header
-  # without any media type parameters. e.g., when CONTENT_TYPE is
-  # "text/plain;charset=utf-8", the media-type is "text/plain".
-  #
-  # For more information on the use of media types in HTTP, see:
-  # http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
-  attr_reader :media_type
-
-  # The charset as embedded on the Content-Type header
-  attr_reader :charset
-
-  # returns the body
-  #
-  # This method reencodes the text body into UTF-8. Non-text bodies should be
-  # encoded as ASCII-8BIT (a.k.a. "BINARY")
-  def reencode(body)
-    body&.encode(best_encoding)
-  end
-
-  private
-
-  BINARY = ::Encoding.find "ASCII-8BIT"
-  UTF8 = ::Encoding.find "UTF-8"
-
-  # returns the encoding we want for the body.
-  #
-  # This method makes sure to reencode text bodies into UTF-8, and non-text
-  # bodies as ASCII-8BIT (a.k.a. "BINARY")
-  def best_encoding
-    case media_type
-    when /^application\/json/, /^application\/xml/, /^text\// then UTF8
-    else BINARY
-    end
-  end
-
-  # The media type parameters provided in CONTENT_TYPE as a Hash, or
-  # an empty Hash if no CONTENT_TYPE or media-type parameters were
-  # provided.  e.g., when the CONTENT_TYPE is "text/plain;charset=utf-8",
-  # this method responds with the following Hash:
-  #   { 'charset' => 'utf-8' }
-  def fetch_content_type_param(content_type, parameter_name, default:)
-    return default if content_type.nil?
-
-    parameter_name = parameter_name.downcase
-
-    content_type.split(SPLIT_PATTERN)[1..-1]
-                .each do |s|
-      k, v = s.split("=", 2)
-      return strip_doublequotes(v) if k.downcase == parameter_name
-    end
-
-    default
-  end
-
-  def strip_doublequotes(str)
-    str[0] == '"' && str[-1] == '"' ? str[1..-2] : str
-  end
-end