cloud_events 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7449de71a0d20b1c7fa726bbb850080c977299ebb92c3c52ecc04c3acaa65a0c
-  data.tar.gz: 60c0bfa47f39b3c4a10d12122c57d2ee2b26e75f4a82bc0622033275a5866946
+  metadata.gz: ae042efe6c2ccd066620bf2e4f548d6f0470fff3426e92442e5f403c8e06273a
+  data.tar.gz: f8d1fbbb00faa1d2b72db8c1e9ac016580951884e78cc6129eeec7fb8d844d5a
 SHA512:
-  metadata.gz: ba15c5d5fd8fd432b39a861297c57f04c659f0329783ad8a02f30c60f839836438df4371937d4d063f14bef326e45741140690be854dc2f8865c3defbb948074
-  data.tar.gz: 05cca16a9b8436a8cf7e7a23189d6873fbc322dbd177cd5d71886081a2a116d75ccb2215bc8c112a013976d769691ab0be96ab41b2d16e4acb57948c9aa7b8fc
+  metadata.gz: 06a156c8448d1c7b59ef683e90ecba1d22dfbe4564574a9355ee110c31f91240137295c437933ed6038fe8e1a9e9e5b19067ef82ee11affd38c6c2f41dac2b50
+  data.tar.gz: 9d8b7c3745261e6addd427b9b4d24b3873014f998f0f0844889315a6ea59ab3c11e44cbc25abfdffdb758357545c8c62eeca4f5d5138e6bd2179d700e1dd60c6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### v0.4.0 / 2021-05-26
+
+* ADDED: ContentType can take an optional default charset 
+* FIXED: Binary HTTP format parses quoted tokens according to RFC 7230 section 3.2.6 
+* FIXED: When encoding structured events for HTTP transport, the content-type now includes the charset
+
 ### v0.3.1 / 2021-04-25
 
 * FIXED: Fixed exception when decoding from a rack source that uses InputWrapper 

data/lib/cloud_events/content_type.rb

@@ -21,14 +21,16 @@ module CloudEvents
     # Parse the given header value.
     #
     # @param string [String] Content-Type header value in RFC 2045 format
+    # @param default_charset [String] Optional. The charset to use if none is
+    #     specified. Defaults to `us-ascii`.
     #
-    def initialize string
+    def initialize string, default_charset: nil
       @string = string
       @media_type = "text"
       @subtype_base = @subtype = "plain"
       @subtype_format = nil
       @params = []
-      @charset = "us-ascii"
+      @charset = default_charset || "us-ascii"
       @error_message = nil
       parse consume_comments string.strip
       @canonical_string = "#{@media_type}/#{@subtype}" +

data/lib/cloud_events/http_binding.rb

@@ -183,7 +183,10 @@ module CloudEvents
       handlers = @structured_formatters[format] || []
       handlers.reverse_each do |handler|
         content = handler.encode event, **format_args
-        return [{ "Content-Type" => "application/cloudevents+#{format}" }, content] if content
+        if content
+          content_type = "application/cloudevents+#{format}; charset=#{charset_of content}"
+          return [{ "Content-Type" => content_type }, content]
+        end
       end
       raise HttpContentError, "Unknown cloudevents format: #{format.inspect}"
     end
@@ -206,7 +209,10 @@ module CloudEvents
       handlers = @batched_formatters[format] || []
       handlers.reverse_each do |handler|
         content = handler.encode_batch events, **format_args
-        return [{ "Content-Type" => "application/cloudevents-batch+#{format}" }, content] if content
+        if content
+          content_type = "application/cloudevents-batch+#{format}; charset=#{charset_of content}"
+          return [{ "Content-Type" => content_type }, content]
+        end
       end
       raise HttpContentError, "Unknown cloudevents format: #{format.inspect}"
     end
@@ -254,6 +260,7 @@ module CloudEvents
     # @return [String] Resulting decoded string in UTF-8.
     #
     def percent_decode str
+      str = str.gsub(/"((?:[^"\\]|\\.)*)"/) { ::Regexp.last_match(1).gsub(/\\(.)/, '\1') }
       decoded_str = str.gsub(/%[0-9a-fA-F]{2}/) { |m| [m[1..-1].to_i(16)].pack "C" }
       decoded_str.force_encoding ::Encoding::UTF_8
     end
@@ -271,7 +278,7 @@ module CloudEvents
       arr = []
       utf_str = str.to_s.encode ::Encoding::UTF_8
       utf_str.each_byte do |byte|
-        if byte >= 33 && byte <= 126 && byte != 37
+        if byte >= 33 && byte <= 126 && byte != 34 && byte != 37
           arr << byte
         else
           hi = byte / 16
@@ -292,18 +299,28 @@ module CloudEvents
         begin
           str.force_encoding charset
         rescue ::ArgumentError
-          # Do nothing for now if the charset is unrecognized
+          # Use binary for now if the charset is unrecognized
+          str.force_encoding ::Encoding::ASCII_8BIT
         end
       end
       str
     end
 
     def string_content_type str
-      if str.encoding == ::Encoding.ASCII_8BIT
+      if str.encoding == ::Encoding::ASCII_8BIT
         "application/octet-stream"
       else
         "text/plain; charset=#{str.encoding.name.downcase}"
       end
     end
+
+    def charset_of str
+      encoding = str.encoding
+      if encoding == ::Encoding::ASCII_8BIT
+        "binary"
+      else
+        encoding.name.downcase
+      end
+    end
   end
 end

data/lib/cloud_events/version.rb

@@ -5,5 +5,5 @@ module CloudEvents
   # Version of the Ruby CloudEvents SDK
   # @return [String]
   #
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_events
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies: []
 description: The official Ruby implementation of the CloudEvents Specification. Provides
   data types for events, and HTTP/JSON bindings for marshalling and unmarshalling
@@ -38,10 +38,10 @@ homepage: https://github.com/cloudevents/sdk-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://cloudevents.github.io/sdk-ruby/v0.3.1/file.CHANGELOG.html
+  changelog_uri: https://cloudevents.github.io/sdk-ruby/v0.4.0/file.CHANGELOG.html
   source_code_uri: https://github.com/cloudevents/sdk-ruby
   bug_tracker_uri: https://github.com/cloudevents/sdk-ruby/issues
-  documentation_uri: https://cloudevents.github.io/sdk-ruby/v0.3.1
+  documentation_uri: https://cloudevents.github.io/sdk-ruby/v0.4.0
 post_install_message: 
 rdoc_options: []
 require_paths: