cloud_events 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac5d146b0b5adbac5c05de9af2e135046f0178baea94dea90005b22934c5b49
-  data.tar.gz: efce8edc6fcc07014e0183c87d955ea16ff5a44a5fac197e45a30f730981c939
+  metadata.gz: 2a711fe27eaab25a87e694f6436b2c34506b3a776457a77583c3f0f4bb0744ed
+  data.tar.gz: 01e81b176023ca2369999d2257c3157d4cef267ff0951e09a2df09f2848af0f5
 SHA512:
-  metadata.gz: 03c3c93e3ca7e49a67a8366c29f502466848a6e28f418c1ab9621f3dcc3dc050556148bab50e27109337f7bba70dc5c7ddb17e08729e79bbedd599b19f0be11c
-  data.tar.gz: d0fa89577d80fd1be5ab8d48689371a033da8b19439c24b1750b5ddc0c4d115e642bc19cc2b04f34ccca82b519f186e41f52e94a885c05a50a2387873ae1d4fb
+  metadata.gz: 96e2b1892b58bd5944d506ffff3e30a899fcb1bc03c31018637788cc8772def582e258b31f35786ebad8d054f22bfcbf2fdbe98e573ff098c2f89e2d8da4e1a0
+  data.tar.gz: e058c5c54f57224d02d42c9f52d7a320ef319b72573aa0d162f2362e06a0294bdd1f81f7705d55f47b40d8eadf418de85efb09c68c797978fcf0e5b49c91c1f4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.8.3 / 2026-01-15
+
+* FIXED: Fixed default charset behavior for various non-text/plain content types
+
 ### v0.8.2 / 2025-11-30
 
 * DOCS: Fixed a few typos in documentation and error messages

data/lib/cloud_events/content_type.rb

@@ -22,17 +22,15 @@ module CloudEvents
     #
     # @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`.
+    #     specified. Defaults to `utf-8` for all types other than `text/plain`
+    #     for which it defaults to `us-ascii`.
     #
     def initialize(string, default_charset: nil)
       @string = string.to_s
-      @media_type = "text"
-      @subtype_base = @subtype = "plain"
-      @subtype_format = nil
+      @media_type = @subtype = @subtype_base = @subtype_format = @charset = nil
       @params = []
-      @charset = default_charset || "us-ascii"
       @error_message = nil
-      parse(consume_comments(@string.strip))
+      parse(consume_comments(@string.strip), default_charset)
       @canonical_string = "#{@media_type}/#{@subtype}" +
                           @params.map { |k, v| "; #{k}=#{maybe_quote(v)}" }.join
       full_freeze
@@ -86,8 +84,10 @@ module CloudEvents
     attr_reader :params
 
     ##
-    # The charset, defaulting to "us-ascii" if none is explicitly set.
-    # @return [String]
+    # Returns the charset, which may be an appropriate default (e.g. `us-ascii`
+    # for `text/plain`, or `utf-8` for `application/json`), or may be nil for
+    # non-text cases.
+    # @return [String,nil]
     #
     attr_reader :charset
 
@@ -124,7 +124,7 @@ module CloudEvents
 
     private
 
-    def parse(str)
+    def parse(str, default_charset)
       @media_type, str = consume_token(str, downcase: true, error_message: "Failed to parse media type")
       str = consume_special(str, "/")
       @subtype, str = consume_token(str, downcase: true, error_message: "Failed to parse subtype")
@@ -139,6 +139,13 @@ module CloudEvents
       end
     rescue ParseError => e
       @error_message = e.message
+    ensure
+      unless @subtype
+        @media_type = "text"
+        @subtype_base = @subtype = "plain"
+        @subtype_format = nil
+      end
+      @charset ||= default_charset || choose_default_charset
     end
 
     def consume_token(str, downcase: false, error_message: nil)
@@ -210,6 +217,14 @@ module CloudEvents
       "\"#{str}\""
     end
 
+    def choose_default_charset
+      if @media_type == "text" && @subtype == "plain"
+        "us-ascii"
+      elsif @media_type == "text" || @subtype_base == "json" || @subtype_format == "json"
+        "utf-8"
+      end
+    end
+
     def full_freeze
       instance_variables.each do |iv|
         instance_variable_get(iv).freeze

data/lib/cloud_events/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_events
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Daniel Azuma
@@ -42,10 +42,10 @@ homepage: https://github.com/cloudevents/sdk-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://cloudevents.github.io/sdk-ruby/v0.8.2/file.CHANGELOG.html
+  changelog_uri: https://cloudevents.github.io/sdk-ruby/v0.8.3/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.8.2
+  documentation_uri: https://cloudevents.github.io/sdk-ruby/v0.8.3
 rdoc_options: []
 require_paths:
 - lib
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby SDK for CloudEvents
 test_files: []