cloud_events 0.7.0 → 0.8.0

data/lib/cloud_events/event/utils.rb

@@ -8,37 +8,37 @@ module CloudEvents
     #
     module Utils
       class << self
-        def deep_freeze obj
+        def deep_freeze(obj)
           case obj
           when ::Hash
             obj.each do |key, val|
-              deep_freeze key
-              deep_freeze val
+              deep_freeze(key)
+              deep_freeze(val)
             end
           when ::Array
             obj.each do |val|
-              deep_freeze val
+              deep_freeze(val)
             end
           else
             obj.instance_variables.each do |iv|
-              deep_freeze obj.instance_variable_get iv
+              deep_freeze(obj.instance_variable_get(iv))
             end
           end
           obj.freeze
         end
 
-        def deep_dup obj
+        def deep_dup(obj)
           case obj
           when ::Hash
-            obj.each_with_object({}) { |(key, val), hash| hash[deep_dup key] = deep_dup val }
+            obj.each_with_object({}) { |(key, val), hash| hash[deep_dup(key)] = deep_dup(val) }
           when ::Array
-            obj.map { |val| deep_dup val }
+            obj.map { |val| deep_dup(val) }
           else
             obj.dup
           end
         end
 
-        def keys_to_strings hash
+        def keys_to_strings(hash)
           result = {}
           hash.each do |key, val|
             result[key.to_s] = val

data/lib/cloud_events/event/v0.rb

@@ -75,20 +75,20 @@ module CloudEvents
       #     (Also available using the deprecated keyword `attributes`.)
       # @param args [keywords] The data and attributes, as keyword arguments.
       #
-      def initialize set_attributes: nil, attributes: nil, **args
-        interpreter = FieldInterpreter.new set_attributes || attributes || args
-        @spec_version = interpreter.spec_version ["specversion", "spec_version"], accept: /^0\.3$/
-        @id = interpreter.string ["id"], required: true
-        @source = interpreter.uri ["source"], required: true
-        @type = interpreter.string ["type"], required: true
-        @data = interpreter.data_object ["data"]
+      def initialize(set_attributes: nil, attributes: nil, **args)
+        interpreter = FieldInterpreter.new(set_attributes || attributes || args)
+        @spec_version = interpreter.spec_version(["specversion", "spec_version"], accept: /^0\.3$/)
+        @id = interpreter.string(["id"], required: true)
+        @source = interpreter.uri(["source"], required: true)
+        @type = interpreter.string(["type"], required: true)
+        @data = interpreter.data_object(["data"])
         @data = nil if @data == FieldInterpreter::UNDEFINED
-        @data_content_encoding = interpreter.string ["datacontentencoding", "data_content_encoding"]
-        @data_content_type = interpreter.content_type ["datacontenttype", "data_content_type"]
-        @schema_url = interpreter.uri ["schemaurl", "schema_url"]
-        @subject = interpreter.string ["subject"]
-        @time = interpreter.rfc3339_date_time ["time"]
-        @attributes = interpreter.finish_attributes
+        @data_content_encoding = interpreter.string(["datacontentencoding", "data_content_encoding"])
+        @data_content_type = interpreter.content_type(["datacontenttype", "data_content_type"])
+        @schema_url = interpreter.uri(["schemaurl", "schema_url"])
+        @subject = interpreter.string(["subject"])
+        @time = interpreter.rfc3339_date_time(["time"])
+        @attributes = interpreter.finish_attributes(requires_lc_start: true)
         freeze
       end
 
@@ -101,9 +101,9 @@ module CloudEvents
       # @param changes [keywords] See {#initialize} for a list of arguments.
       # @return [FunctionFramework::CloudEvents::Event]
       #
-      def with **changes
-        attributes = @attributes.merge changes
-        V0.new set_attributes: attributes
+      def with(**changes)
+        attributes = @attributes.merge(changes)
+        V0.new(set_attributes: attributes)
       end
 
       ##
@@ -125,7 +125,7 @@ module CloudEvents
       # @param key [String,Symbol] The attribute name.
       # @return [String,nil]
       #
-      def [] key
+      def [](key)
         @attributes[key.to_s]
       end
 
@@ -136,7 +136,7 @@ module CloudEvents
       # @return [Hash]
       #
       def to_h
-        Utils.deep_dup @attributes
+        Utils.deep_dup(@attributes)
       end
 
       ##
@@ -225,7 +225,7 @@ module CloudEvents
       attr_reader :time
 
       ## @private
-      def == other
+      def ==(other)
         other.is_a?(V0) && @attributes == other.instance_variable_get(:@attributes)
       end
       alias eql? ==

data/lib/cloud_events/event/v1.rb

@@ -136,24 +136,24 @@ module CloudEvents
       #     (Also available using the deprecated keyword `attributes`.)
       # @param args [keywords] The data and attributes, as keyword arguments.
       #
-      def initialize set_attributes: nil, attributes: nil, **args
-        interpreter = FieldInterpreter.new set_attributes || attributes || args
-        @spec_version = interpreter.spec_version ["specversion", "spec_version"], accept: /^1(\.|$)/
-        @id = interpreter.string ["id"], required: true
-        @source = interpreter.uri ["source"], required: true
-        @type = interpreter.string ["type"], required: true
-        @data_encoded = interpreter.string ["data_encoded"], allow_empty: true
-        @data = interpreter.data_object ["data"]
+      def initialize(set_attributes: nil, attributes: nil, **args)
+        interpreter = FieldInterpreter.new(set_attributes || attributes || args)
+        @spec_version = interpreter.spec_version(["specversion", "spec_version"], accept: /^1(\.|$)/)
+        @id = interpreter.string(["id"], required: true)
+        @source = interpreter.uri(["source"], required: true)
+        @type = interpreter.string(["type"], required: true)
+        @data_encoded = interpreter.string(["data_encoded"], allow_empty: true)
+        @data = interpreter.data_object(["data"])
         if @data == FieldInterpreter::UNDEFINED
           @data = @data_encoded
           @data_decoded = false
         else
           @data_decoded = true
         end
-        @data_content_type = interpreter.content_type ["datacontenttype", "data_content_type"]
-        @data_schema = interpreter.uri ["dataschema", "data_schema"]
-        @subject = interpreter.string ["subject"]
-        @time = interpreter.rfc3339_date_time ["time"]
+        @data_content_type = interpreter.content_type(["datacontenttype", "data_content_type"])
+        @data_schema = interpreter.uri(["dataschema", "data_schema"])
+        @subject = interpreter.string(["subject"])
+        @time = interpreter.rfc3339_date_time(["time"])
         @attributes = interpreter.finish_attributes
         freeze
       end
@@ -167,15 +167,15 @@ module CloudEvents
       # @param changes [keywords] See {#initialize} for a list of arguments.
       # @return [FunctionFramework::CloudEvents::Event]
       #
-      def with **changes
-        changes = Utils.keys_to_strings changes
+      def with(**changes)
+        changes = Utils.keys_to_strings(changes)
         attributes = @attributes.dup
         if changes.key?("data") || changes.key?("data_encoded")
-          attributes.delete "data"
-          attributes.delete "data_encoded"
+          attributes.delete("data")
+          attributes.delete("data_encoded")
         end
-        attributes.merge! changes
-        V1.new set_attributes: attributes
+        attributes.merge!(changes)
+        V1.new(set_attributes: attributes)
       end
 
       ##
@@ -197,7 +197,7 @@ module CloudEvents
       # @param key [String,Symbol] The attribute name.
       # @return [String,nil]
       #
-      def [] key
+      def [](key)
         @attributes[key.to_s]
       end
 
@@ -208,7 +208,7 @@ module CloudEvents
       # @return [Hash]
       #
       def to_h
-        Utils.deep_dup @attributes
+        Utils.deep_dup(@attributes)
       end
 
       ##
@@ -330,7 +330,7 @@ module CloudEvents
       attr_reader :time
 
       ## @private
-      def == other
+      def ==(other)
         other.is_a?(V1) && @attributes == other.instance_variable_get(:@attributes)
       end
       alias eql? ==

data/lib/cloud_events/event.rb

@@ -58,14 +58,14 @@ module CloudEvents
       # @param spec_version [String] The required `specversion` field.
       # @param kwargs [keywords] Additional parameters for the event.
       #
-      def create spec_version:, **kwargs
+      def create(spec_version:, **kwargs)
         case spec_version
         when "0.3"
-          V0.new spec_version: spec_version, **kwargs
+          V0.new(spec_version: spec_version, **kwargs)
         when /^1(\.|$)/
-          V1.new spec_version: spec_version, **kwargs
+          V1.new(spec_version: spec_version, **kwargs)
         else
-          raise SpecVersionError, "Unrecognized specversion: #{spec_version}"
+          raise(SpecVersionError, "Unrecognized specversion: #{spec_version}")
         end
       end
       alias new create

data/lib/cloud_events/format.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "base64"
 require "json"
 
 module CloudEvents
@@ -80,7 +79,7 @@ module CloudEvents
     # @return [Hash] if accepting the request and returning a result
     # @return [nil] if declining the request.
     #
-    def decode_event **_kwargs
+    def decode_event(**_kwargs)
       nil
     end
 
@@ -117,7 +116,7 @@ module CloudEvents
     # @return [Hash] if accepting the request and returning a result
     # @return [nil] if declining the request.
     #
-    def encode_event **_kwargs
+    def encode_event(**_kwargs)
       nil
     end
 
@@ -156,7 +155,7 @@ module CloudEvents
     # @return [Hash] if accepting the request and returning a result
     # @return [nil] if declining the request.
     #
-    def decode_data **_kwargs
+    def decode_data(**_kwargs)
       nil
     end
 
@@ -195,7 +194,7 @@ module CloudEvents
     # @return [Hash] if accepting the request and returning a result
     # @return [nil] if declining the request.
     #
-    def encode_data **_kwargs
+    def encode_data(**_kwargs)
       nil
     end
 
@@ -213,7 +212,7 @@ module CloudEvents
       #     format's result as an argument, and returns either the result to
       #     indicate acceptability, or `nil` to indicate not.
       #
-      def initialize formats = [], &result_checker
+      def initialize(formats = [], &result_checker)
         @formats = formats
         @result_checker = result_checker
       end
@@ -228,10 +227,10 @@ module CloudEvents
       ##
       # Implements {Format#decode_event}
       #
-      def decode_event **kwargs
+      def decode_event(**kwargs)
         @formats.each do |elem|
           result = elem.decode_event(**kwargs)
-          result = @result_checker.call result if @result_checker
+          result = @result_checker.call(result) if @result_checker
           return result if result
         end
         nil
@@ -240,10 +239,10 @@ module CloudEvents
       ##
       # Implements {Format#encode_event}
       #
-      def encode_event **kwargs
+      def encode_event(**kwargs)
         @formats.each do |elem|
           result = elem.encode_event(**kwargs)
-          result = @result_checker.call result if @result_checker
+          result = @result_checker.call(result) if @result_checker
           return result if result
         end
         nil
@@ -252,10 +251,10 @@ module CloudEvents
       ##
       # Implements {Format#decode_data}
       #
-      def decode_data **kwargs
+      def decode_data(**kwargs)
         @formats.each do |elem|
           result = elem.decode_data(**kwargs)
-          result = @result_checker.call result if @result_checker
+          result = @result_checker.call(result) if @result_checker
           return result if result
         end
         nil
@@ -264,10 +263,10 @@ module CloudEvents
       ##
       # Implements {Format#encode_data}
       #
-      def encode_data **kwargs
+      def encode_data(**kwargs)
         @formats.each do |elem|
           result = elem.encode_data(**kwargs)
-          result = @result_checker.call result if @result_checker
+          result = @result_checker.call(result) if @result_checker
           return result if result
         end
         nil