functions_framework 0.4.0 → 0.6.0

data/lib/functions_framework/testing.rb

@@ -100,7 +100,7 @@ module FunctionsFramework
     # be of type :cloud_event`.
     #
     # @param name [String] The name of the function to call
-    # @param event [FunctionsFramework::CloudEvets::Event] The event to send
+    # @param event [::CloudEvents::Event] The event to send
     # @return [nil]
     #
     def call_event name, event
@@ -174,23 +174,35 @@ module FunctionsFramework
     # @param source [String,URI] Event source (optional)
     # @param type [String] Event type (optional)
     # @param spec_version [String] Spec version (optional)
-    # @param data_content_type [String,FunctionsFramework::CloudEvents::ContentType]
+    # @param data_content_type [String,::CloudEvents::ContentType]
     #     Content type for the data (optional)
     # @param data_schema [String,URI] Data schema (optional)
     # @param subject [String] Subject (optional)
     # @param time [String,DateTime] Event timestamp (optional)
-    # @return [FunctionsFramework::CloudEvents::Event]
+    # @return [::CloudEvents::Event]
     #
     def make_cloud_event data,
-                         id: nil, source: nil, type: nil, spec_version: nil,
-                         data_content_type: nil, data_schema: nil, subject: nil, time: nil
+                         id: nil,
+                         source: nil,
+                         type: nil,
+                         spec_version: nil,
+                         data_content_type: nil,
+                         data_schema: nil,
+                         subject: nil,
+                         time: nil
       id ||= "random-id-#{rand 100_000_000}"
       source ||= "functions-framework-testing"
       type ||= "com.example.test"
       spec_version ||= "1.0"
-      CloudEvents::Event.new id: id, source: source, type: type, spec_version: spec_version,
-                             data_content_type: data_content_type, data_schema: data_schema,
-                             subject: subject, time: time, data: data
+      ::CloudEvents::Event.new id:                id,
+                               source:            source,
+                               type:              type,
+                               spec_version:      spec_version,
+                               data_content_type: data_content_type,
+                               data_schema:       data_schema,
+                               subject:           subject,
+                               time:              time,
+                               data:              data
     end
 
     extend self

data/lib/functions_framework/version.rb

@@ -17,5 +17,5 @@ module FunctionsFramework
   # Version of the Ruby Functions Framework
   # @return [String]
   #
-  VERSION = "0.4.0".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,142 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: functions_framework
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: cloud_events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: google-style
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.24.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.24.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-- !ruby/object:Gem::Dependency
-  name: minitest-focus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: minitest-rg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: toys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.24
-  type: :development
+        version: '2.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.24
-description: The Functions Framework implementation for Ruby.
+        version: '2.1'
+description: The Functions Framework is an open source framework for writing lightweight,
+  portable Ruby functions that run in a serverless environment. Functions written
+  to this Framework will run Google Cloud Google Cloud Functions, Google Cloud Run,
+  or any other Knative-based environment.
 email:
 - dazuma@google.com
 executables:
@@ -158,15 +77,6 @@ files:
 - docs/writing-functions.md
 - lib/functions_framework.rb
 - lib/functions_framework/cli.rb
-- lib/functions_framework/cloud_events.rb
-- lib/functions_framework/cloud_events/content_type.rb
-- lib/functions_framework/cloud_events/errors.rb
-- lib/functions_framework/cloud_events/event.rb
-- lib/functions_framework/cloud_events/event/field_interpreter.rb
-- lib/functions_framework/cloud_events/event/v0.rb
-- lib/functions_framework/cloud_events/event/v1.rb
-- lib/functions_framework/cloud_events/http_binding.rb
-- lib/functions_framework/cloud_events/json_format.rb
 - lib/functions_framework/function.rb
 - lib/functions_framework/legacy_event_converter.rb
 - lib/functions_framework/registry.rb
@@ -176,7 +86,11 @@ files:
 homepage: https://github.com/GoogleCloudPlatform/functions-framework-ruby
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://googlecloudplatform.github.io/functions-framework-ruby/v0.6.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/GoogleCloudPlatform/functions-framework-ruby
+  bug_tracker_uri: https://github.com/GoogleCloudPlatform/functions-framework-ruby/issues
+  documentation_uri: https://googlecloudplatform.github.io/functions-framework-ruby/v0.6.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -192,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Functions Framework for Ruby

data/lib/functions_framework/cloud_events.rb

@@ -1,45 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "functions_framework/cloud_events/content_type"
-require "functions_framework/cloud_events/errors"
-require "functions_framework/cloud_events/event"
-require "functions_framework/cloud_events/http_binding"
-require "functions_framework/cloud_events/json_format"
-
-module FunctionsFramework
-  ##
-  # CloudEvents implementation.
-  #
-  # This is a Ruby implementation of the [CloudEvents](https://cloudevents.io)
-  # specification. It supports both
-  # [CloudEvents 0.3](https://github.com/cloudevents/spec/blob/v0.3/spec.md) and
-  # [CloudEvents 1.0](https://github.com/cloudevents/spec/blob/v1.0/spec.md).
-  #
-  module CloudEvents
-    # @private
-    SUPPORTED_SPEC_VERSIONS = ["0.3", "1.0"].freeze
-
-    class << self
-      ##
-      # The spec versions supported by this implementation.
-      #
-      # @return [Array<String>]
-      #
-      def supported_spec_versions
-        SUPPORTED_SPEC_VERSIONS
-      end
-    end
-  end
-end

data/lib/functions_framework/cloud_events/content_type.rb

@@ -1,216 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module FunctionsFramework
-  module CloudEvents
-    ##
-    # A parsed content-type header.
-    #
-    # This object represents the information contained in a Content-Type,
-    # obtained by parsing the header according to RFC 2045.
-    #
-    # Case-insensitive fields, such as media_type and subtype, are normalized
-    # to lower case.
-    #
-    # If parsing fails, this class will try to get as much information as it
-    # can, and fill the rest with defaults as recommended in RFC 2045 sec 5.2.
-    # In case of a parsing error, the {#error_message} field will be set.
-    #
-    class ContentType
-      ##
-      # Parse the given header value.
-      #
-      # @param string [String] Content-Type header value in RFC 2045 format
-      #
-      def initialize string
-        @string = string
-        @media_type = "text"
-        @subtype_base = @subtype = "plain"
-        @subtype_format = nil
-        @params = []
-        @charset = "us-ascii"
-        @error_message = nil
-        parse consume_comments string.strip
-        @canonical_string = "#{@media_type}/#{@subtype}" +
-                            @params.map { |k, v| "; #{k}=#{v}" }.join
-      end
-
-      ##
-      # The original header content string.
-      # @return [String]
-      #
-      attr_reader :string
-      alias to_s string
-
-      ##
-      # A "canonical" header content string with spacing and capitalization
-      # normalized.
-      # @return [String]
-      #
-      attr_reader :canonical_string
-
-      ##
-      # The media type.
-      # @return [String]
-      #
-      attr_reader :media_type
-
-      ##
-      # The entire content subtype (which could include an extension delimited
-      # by a plus sign).
-      # @return [String]
-      #
-      attr_reader :subtype
-
-      ##
-      # The portion of the content subtype before any plus sign.
-      # @return [String]
-      #
-      attr_reader :subtype_base
-
-      ##
-      # The portion of the content subtype after any plus sign, or nil if there
-      # is no plus sign in the subtype.
-      # @return [String,nil]
-      #
-      attr_reader :subtype_format
-
-      ##
-      # An array of parameters, each element as a two-element array of the
-      # parameter name and value.
-      # @return [Array<Array(String,String)>]
-      #
-      attr_reader :params
-
-      ##
-      # The charset, defaulting to "us-ascii" if none is explicitly set.
-      # @return [String]
-      #
-      attr_reader :charset
-
-      ##
-      # The error message when parsing, or `nil` if there was no error message.
-      # @return [String,nil]
-      #
-      attr_reader :error_message
-
-      ##
-      # An array of values for the given parameter name
-      # @param key [String]
-      # @return [Array<String>]
-      #
-      def param_values key
-        key = key.downcase
-        @params.inject([]) { |a, (k, v)| key == k ? a << v : a }
-      end
-
-      ## @private
-      def == other
-        other.is_a?(ContentType) && canonical_string == other.canonical_string
-      end
-      alias eql? ==
-
-      ## @private
-      def hash
-        canonical_string.hash
-      end
-
-      ## @private
-      class ParseError < ::StandardError
-      end
-
-      private
-
-      def parse str
-        @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"
-        @subtype_base, @subtype_format = @subtype.split "+", 2
-        until str.empty?
-          str = consume_special str, ";"
-          name, str = consume_token str, downcase: true, error_message: "Faled to parse attribute name"
-          str = consume_special str, "=", error_message: "Failed to find value for attribute #{name}"
-          val, str = consume_token_or_quoted str, error_message: "Failed to parse value for attribute #{name}"
-          @params << [name, val]
-          @charset = val if name == "charset"
-        end
-      rescue ParseError => e
-        @error_message = e.message
-      end
-
-      def consume_token str, downcase: false, error_message: nil
-        match = /^([\w!#\$%&'\*\+\.\^`\{\|\}-]+)(.*)$/.match str
-        raise ParseError, error_message || "Expected token" unless match
-        token = match[1]
-        token.downcase! if downcase
-        str = consume_comments match[2].strip
-        [token, str]
-      end
-
-      def consume_special str, expected, error_message: nil
-        raise ParseError, error_message || "Expected #{expected.inspect}" unless str.start_with? expected
-        consume_comments str[1..-1].strip
-      end
-
-      def consume_token_or_quoted str, error_message: nil
-        return consume_token str unless str.start_with? '"'
-        arr = []
-        index = 1
-        loop do
-          char = str[index]
-          case char
-          when nil
-            raise ParseError, error_message || "Quoted-string never finished"
-          when "\""
-            break
-          when "\\"
-            char = str[index + 1]
-            raise ParseError, error_message || "Quoted-string never finished" unless char
-            arr << char
-            index += 2
-          else
-            arr << char
-            index += 1
-          end
-        end
-        index += 1
-        str = consume_comments str[index..-1].strip
-        [arr.join, str]
-      end
-
-      def consume_comments str
-        return str unless str.start_with? "("
-        index = 1
-        loop do
-          char = str[index]
-          case char
-          when nil
-            raise ParseError, "Comment never finished"
-          when ")"
-            break
-          when "\\"
-            index += 2
-          when "("
-            str = consume_comments str[index..-1]
-            index = 0
-          else
-            index += 1
-          end
-        end
-        index += 1
-        consume_comments str[index..-1].strip
-      end
-    end
-  end
-end