functions_framework 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7181bfabab004b16d032f16f2598fb80027422481c9ce5ee3c048f5331422d10
-  data.tar.gz: 73344235c945308d98a44bb7536bbc32d6fdb5b58ed0379696a09becdf2be016
+  metadata.gz: 1c6958234b00d6168c6756c7188b698d84984628d1ff6a1fcd3bbd46fbb6a876
+  data.tar.gz: 5ec49e5ea07c8416ac04a336a8581cf71d26c4b2fd1048d4dc35db3e7c497bbc
 SHA512:
-  metadata.gz: 4edeb7e9b2fbd5ab9ee3d28f442336363c32ab2faf928b81738b5c82a3c6b16b8e9dd0983417427db4145930eaf12b1f0d709e638999edba01c55c3b5cbdcf97
-  data.tar.gz: ffe0f772f40ff8d8c1a74e8cf6f2e5adfa663513290f88b4c9ad119dfb91b7b0caa3887337bad1736eb556b8d5312b376606b266602069db32fd75973867fa06
+  metadata.gz: 66f952df1cc33a829a48454a49508d56c8b5026e4b145cb0931c04801b85b5f5b6109d8564c54bbf2fa34bc3882d0adc6f944e22af07547de1743b5ac3a824b3
+  data.tar.gz: 81406729506f55f2ca5da840245f4323ca705022f877a31e28af22c41e679d5ea92f40dfca523b3e8c2a869225f5f5abe5a29aa5ff12e5e6ff0a6e9e7e0d9bea

data/CHANGELOG.md

@@ -1,48 +1,59 @@
 # Changelog
 
-## 1.1.0 (2022-01-17)
+### 1.3.0 (2023-04-05)
+
+#### Features
+
+* Support for Puma 6 and Rack 3
+
+### 1.2.0 (2022-08-25)
+
+* Update minimum Ruby version to 2.6
+* Increase default max thread pool size to 16
+
+### 1.1.0 (2022-01-18)
 
 * Increase default max thread pool size to 8.
 * Return 204 when a GET request is sent to an event function, to support health checks.
 * Flush stdout and stderr streams at the end of each request.
 * Format the error backtrace.
 
-## 1.0.1 (2021-09-10)
+### 1.0.1 (2021-09-10)
 
 * FIXED: Update legacy event conversion to set the correct types for firebase database events
 
-## 1.0.0 (2021-07-07)
+### 1.0.0 (2021-07-07)
 
 * Bumped the version to 1.0.
 * Removed the "preview" notices for Google Cloud Functions since the Ruby runtime is now GA.
 
-## v0.11.0 / 2021-06-28
+### v0.11.0 / 2021-06-28
 
 * UPDATED: Update CloudEvents dependency to 0.5 to get fixes for JSON formatting cases
 * FIXED: Updated Pub/Sub and Firebase event conversion logic to better align to Eventarc
 
-## v0.10.0 / 2021-06-01
+### v0.10.0 / 2021-06-01
 
 * ADDED: Support raw pubsub events sent by the pubsub emulator
 * FIXED: Set proper response content-type charset when a function returns a string (plain text) or hash (JSON)
 * FIXED: Properly handle conversion of non-ascii characters in legacy event strings
 
-## v0.9.0 / 2021-03-18
+### v0.9.0 / 2021-03-18
 
 * BREAKING CHANGE: Servers are configured as single-threaded in production by default, matching the current behavior of Google Cloud Functions.
 * FIXED: Fixed conversion of Firebase events to CloudEvents to conform to the specs used by Cloud Functions and Cloud Run.
 * FIXED: Fixed an error when reading a global set to a Minitest::Mock. This will make it easier to write tests that use mocks for global resources.
 
-## v0.8.0 / 2021-03-02
+### v0.8.0 / 2021-03-02
 
 * ADDED: Support for lazily-initialized globals
 
-## v0.7.1 / 2021-01-26
+### v0.7.1 / 2021-01-26
 
 * DOCS: Fixed several errors in the writing-functions doc samples
 * DOCS: Updated documentation to note public release of GCF support 
 
-## v0.7.0 / 2020-09-25
+### v0.7.0 / 2020-09-25
 
 * Now requires Ruby 2.5 or later.
 * BREAKING CHANGE: Renamed "context" hash to "globals" and made it read-only for normal functions.
@@ -56,33 +67,33 @@
 * DOCS: Expanded documentation on initialization, execution context, and shared resources.
 * DEPRECATED: The functions-framework executable is deprecated. Use functions-framework-ruby instead.
 
-## v0.6.0 / 2020-09-17
+### v0.6.0 / 2020-09-17
 
 * ADDED: You can use the --version flag to print the framework version
 * ADDED: You can use the --verify flag to verify that a given function is defined
 * ADDED: You can now define blocks that are executed at server startup
 
-## v0.5.2 / 2020-09-06
+### v0.5.2 / 2020-09-06
 
 * FIXED: Use global $stderr rather than STDERR for logger 
 * DOCS: Fix instructions for deployment to Google Cloud Functions 
 
-## v0.5.1 / 2020-07-20
+### v0.5.1 / 2020-07-20
 
 * Updated some documentation links. No functional changes.
 
-## v0.5.0 / 2020-07-09
+### v0.5.0 / 2020-07-09
 
 * Removed embedded CloudEvents classes and added the official CloudEvents SDK as a dependency. A `FunctionsFramework::CloudEvents` alias provides backward compatibility.
 
-## v0.4.1 / 2020-07-08
+### v0.4.1 / 2020-07-08
 
 * Fixed unsupported signal error on Windows.
 * Fixed several edge case errors in legacy event conversion.
 * Generated Content-Type headers now properly quote param values if needed.
 * Minor documentation updates.
 
-## v0.4.0 / 2020-06-29
+### v0.4.0 / 2020-06-29
 
 * Dropped the legacy and largely unsupported `:event` function type. All event functions should be of type `:cloud_event`.
 * Define the object context for function execution, and include an extensible context helper.
@@ -93,21 +104,21 @@
 * Removed redundant `_string` accessors from event classes since raw forms are already available via `[]`.
 * A variety of corrections to event-related class documentation.
 
-## v0.3.1 / 2020-06-27
+### v0.3.1 / 2020-06-27
 
 * Fixed crash when using "return" directly in a function block.
 * Added a more flexible request generation helper in the testing module.
 * Fixed several typos in the documentation.
 
-## v0.3.0 / 2020-06-26
+### v0.3.0 / 2020-06-26
 
 * Updated the CloudEvent data format for converted pubsub events to conform to Cloud Run's conversion.
 
-## v0.2.1 / 2020-06-25
+### v0.2.1 / 2020-06-25
 
 * The `--signature-type` check recognizes the legacy `event` type for `:cloud_event` functions.
 
-## v0.2.0 / 2020-06-24
+### v0.2.0 / 2020-06-24
 
 Significant changes:
 
@@ -126,11 +137,11 @@ Minor changes:
 * Renamed a few undocumented environment variables, and added support for a logging level environment variable. All CLI flags now have associated environment variables.
 * Several fixes to the example code, and added a new Sinatra example.
 
-## v0.1.1 / 2020-02-27
+### v0.1.1 / 2020-02-27
 
 * Server returns 404 when receiving a /favicon.ico or /robots.txt request.
 * Correct a rack constant name in Testing#make_post_request
 
-## v0.1.0 / 2020-01-30
+### v0.1.0 / 2020-01-30
 
 * Initial release

data/README.md

@@ -42,14 +42,14 @@ requiring an HTTP server or complicated request handling logic.
 
 ## Supported Ruby versions
 
-This library is supported on Ruby 2.5+.
+This library is supported on Ruby 2.6+.
 
 Google provides official support for Ruby versions that are actively supported
 by Ruby Core—that is, Ruby versions that are either in normal maintenance or
-in security maintenance, and not end of life. Currently, this means Ruby 2.5
-and later. Older versions of Ruby _may_ still work, but are unsupported and not
-recommended. See https://www.ruby-lang.org/en/downloads/branches/ for details
-about the Ruby support schedule.
+in security maintenance, and not end of life. Older versions of Ruby _may_
+still work, but are unsupported and not recommended. See
+https://www.ruby-lang.org/en/downloads/branches/ for details about the Ruby
+support schedule.
 
 ## Quickstart
 

data/docs/deploying-functions.md

@@ -147,8 +147,8 @@ command may ask you for permission to enable the Cloud Build API for the project
 if it isn't already enabled.
 
 Because you provide your own Docker image when deploying to Cloud Run, you can
-use any version of Ruby supported by the Functions Framework, from 2.5 through
-3.0.
+use any version of Ruby supported by the Functions Framework, from 2.6 through
+3.1.
 
 ### Deploying an image to Cloud Run
 

data/docs/overview.md

@@ -46,14 +46,14 @@ requiring an HTTP server or complicated request handling logic.
 
 ## Supported Ruby versions
 
-This library is supported on Ruby 2.5+.
+This library is supported on Ruby 2.6+.
 
 Google provides official support for Ruby versions that are actively supported
 by Ruby Core—that is, Ruby versions that are either in normal maintenance or
-in security maintenance, and not end of life. Currently, this means Ruby 2.5
-and later. Older versions of Ruby _may_ still work, but are unsupported and not
-recommended. See https://www.ruby-lang.org/en/downloads/branches/ for details
-about the Ruby support schedule.
+in security maintenance, and not end of life. Older versions of Ruby _may_
+still work, but are unsupported and not recommended. See
+https://www.ruby-lang.org/en/downloads/branches/ for details about the Ruby
+support schedule.
 
 ## Quickstart
 

data/lib/functions_framework/cli.rb

@@ -85,8 +85,8 @@ module FunctionsFramework
           @source = val
         end
         op.on "--signature-type TYPE",
-              "Asserts that the function has the given signature type." \
-              " Supported values are 'http' and 'cloudevent'." do |val|
+              "Asserts that the function has the given signature type. " \
+              "Supported values are 'http' and 'cloudevent'." do |val|
           @signature_type = val
         end
         op.on "-p", "--port PORT", "Set the port to listen to (defaults to 8080)" do |val|
@@ -196,8 +196,8 @@ module FunctionsFramework
       function = ::FunctionsFramework.global_registry[@target]
       raise "Undefined function: #{@target.inspect}" if function.nil?
       unless @signature_type.nil? ||
-             @signature_type == "http" && function.type == :http ||
-             ["cloudevent", "event"].include?(@signature_type) && function.type == :cloud_event
+             (@signature_type == "http" && function.type == :http) ||
+             (["cloudevent", "event"].include?(@signature_type) && function.type == :cloud_event)
         raise "Function #{@target.inspect} does not match type #{@signature_type}"
       end
       function

data/lib/functions_framework/server.rb

@@ -82,13 +82,24 @@ module FunctionsFramework
     def start
       synchronize do
         unless running?
-          @server = ::Puma::Server.new @app
-          @server.min_threads = @config.min_threads
-          @server.max_threads = @config.max_threads
-          @server.leak_stack_on_error = @config.show_error_details?
+          # Puma >= 6.0 interprets these settings from options
+          options = {
+            min_threads: @config.min_threads,
+            max_threads: @config.max_threads,
+            environment: @config.show_error_details? ? "development" : "production"
+          }
+          # Puma::Events.stdio for Puma < 6.0; otherwise nil for Puma >= 6.0
+          events = ::Puma::Events.stdio if ::Puma::Events.respond_to? :stdio
+          @server = ::Puma::Server.new @app, events, options
+          if @server.respond_to? :min_threads=
+            # Puma < 6.0 sets server attributes for these settings
+            @server.min_threads = @config.min_threads
+            @server.max_threads = @config.max_threads
+            @server.leak_stack_on_error = @config.show_error_details?
+          end
           @server.binder.add_tcp_listener @config.bind_addr, @config.port
-          @config.logger.info "FunctionsFramework: Serving function #{@function.name.inspect}" \
-                              " on port #{@config.port}..."
+          @config.logger.info "FunctionsFramework: Serving function #{@function.name.inspect} " \
+                              "on port #{@config.port}..."
           @server.run true
         end
       end
@@ -306,7 +317,7 @@ module FunctionsFramework
       # @return [Integer]
       #
       def max_threads
-        @max_threads || 8
+        @max_threads || 16
       end
 
       ##
@@ -377,8 +388,8 @@ module FunctionsFramework
           content_type = "#{content_type}; charset=#{string.encoding.name.downcase}"
         end
         headers = {
-          "Content-Type"   => content_type,
-          "Content-Length" => string.bytesize
+          "content-type"   => content_type,
+          "content-length" => string.bytesize
         }
         [status, headers, [string]]
       end

data/lib/functions_framework/testing.rb

@@ -367,8 +367,8 @@ module FunctionsFramework
           ::Rack::QUERY_STRING    => url.query,
           ::Rack::SERVER_NAME     => url.host,
           ::Rack::SERVER_PORT     => url.port,
+          ::Rack::SERVER_PROTOCOL => "HTTP/1.1",
           ::Rack::RACK_URL_SCHEME => url.scheme,
-          ::Rack::RACK_VERSION    => ::Rack::VERSION,
           ::Rack::RACK_LOGGER     => ::FunctionsFramework.logger,
           ::Rack::RACK_INPUT      => ::StringIO.new,
           ::Rack::RACK_ERRORS     => ::StringIO.new

data/lib/functions_framework/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: functions_framework
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloud_events
@@ -39,7 +39,7 @@ dependencies:
         version: 4.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.a
+        version: 7.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,21 +49,27 @@ dependencies:
         version: 4.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.a
+        version: 7.a
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.a
 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 on Google Cloud Functions, Google Cloud Run, or any other
@@ -100,10 +106,10 @@ homepage: https://github.com/GoogleCloudPlatform/functions-framework-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://googlecloudplatform.github.io/functions-framework-ruby/v1.1.0/file.CHANGELOG.html
+  changelog_uri: https://googlecloudplatform.github.io/functions-framework-ruby/v1.3.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/v1.1.0
+  documentation_uri: https://googlecloudplatform.github.io/functions-framework-ruby/v1.3.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -112,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.4.2
 signing_key: 
 specification_version: 4
 summary: Functions Framework for Ruby