gruf 2.18.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de94291c905860137fbeb2be431f470af5929eddd3df869b602944dbe3253ea
-  data.tar.gz: 282cd45242df875e8c664a9434bb7364592a5062e4d3d4980972d9a314931996
+  metadata.gz: 2166dad751c35484b12695d4d7a733c7c629a9ed0ee6088d6135f261d248c787
+  data.tar.gz: 1787a34eefd69424a5c1902f0d8c097657e1dba36be761a238abc803bf3d4c02
 SHA512:
-  metadata.gz: d06b793680ecc5064ec5b4978b83a1a18903f9647b733b3e19ff32979044ab129130019780fafb7f09703f1d7e16ecd5983bf5fa0bd08b1906b4af6597f4c832
-  data.tar.gz: 7e37790c465cbbf80e1d02d1e71fc9a5e8276fb21d6fb894ae19f6eef663910e4df956293dc218b8de91d940d2586e65248f4f6aababd4d661fb4fdad10d37ce
+  metadata.gz: 8b3da76c05e413641d0be365bf717fddbe86767975eb9f69ffc7bfd3011af87569bb419ca0ccaa12bf4e49b6a80bc31baa3759e214f44617b87d94d2ef4f8cf2
+  data.tar.gz: d0457693dfb0d7bfe73675e3b0d3cdfc985a2d314c8a5027eb63cc44b254c5e9f4f196fa6101524cb6bb1f1f1f9bfa231b46b2f7b996737cb226bdb025ad4b30

data/CHANGELOG.md

@@ -2,6 +2,17 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.20.0
+
+* [#190] Remove unsued `e2mmap` and `thwait` gems from `runtime_dependency`.
+* [#194] Add interceptor to reload Rails app code accross requests
+* [#209] Removes manual `establish_connection` and active connection check for each request from `Gruf::Interceptors::ActiveRecord::ConnectionReset`.
+
+### 2.19.0
+
+* [#197] Add support for Ruby 3.3
+* Drop support for Ruby 2.x
+
 ### 2.18.0
 
 * Add `GRUF_USE_DEFAULT_INTERCEPTORS` ENV to dynamically enable/disable default interceptors

data/README.md

@@ -17,7 +17,7 @@ up fast and efficiently at scale. Some of its features include:
   still preserving gRPC BadStatus codes
 * Server and client execution timings in responses
 
-gruf currently has active support for gRPC 1.10.x+. gruf is compatible and tested with Ruby 2.7-3.2.
+gruf currently has active support for gRPC 1.10.x+. gruf is compatible and tested with Ruby 3.0-3.3.
 gruf is also not [Rails](https://github.com/rails/rails)-specific, and can be used in any Ruby framework
 (such as [Grape](https://github.com/ruby-grape/grape) or [dry-rb](https://dry-rb.org/), for instance).
 

data/gruf.gemspec

@@ -32,11 +32,11 @@ Gem::Specification.new do |spec|
   spec.executables << 'gruf'
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7', '< 3.3'
+  spec.required_ruby_version = '>= 3.0', '< 3.4'
 
   spec.metadata = {
     'bug_tracker_uri' => 'https://github.com/bigcommerce/gruf/issues',
-    'changelog_uri' => 'https://github.com/bigcommerce/gruf/CHANGELOG.md',
+    'changelog_uri' => 'https://github.com/bigcommerce/gruf/blob/main/CHANGELOG.md',
     'homepage_uri' => 'https://github.com/bigcommerce/gruf',
     'rubygems_mfa_required' => 'true',
     'source_code_uri' => 'https://github.com/bigcommerce/gruf',
@@ -45,11 +45,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '> 4'
   spec.add_runtime_dependency 'concurrent-ruby', '> 1'
-  spec.add_runtime_dependency 'e2mmap', '>= 0.1'
   spec.add_runtime_dependency 'grpc', '~> 1.10'
   spec.add_runtime_dependency 'grpc-tools', '~> 1.10'
   spec.add_runtime_dependency 'json', '>= 2.3'
   spec.add_runtime_dependency 'slop', '>= 4.6'
-  spec.add_runtime_dependency 'thwait', '>= 0.1'
   spec.add_runtime_dependency 'zeitwerk', '>= 2'
 end

data/lib/gruf/cli/executor.rb

@@ -182,7 +182,7 @@ module Gruf
         # next check CLI arguments
         services = @options[:services].to_s.split(',').map(&:strip).uniq
         # finally, if none, use global gruf autoloaded services
-        services = (::Gruf.services || []) unless services.any?
+        services = ::Gruf.services || [] unless services.any?
 
         services
       end

data/lib/gruf/configuration.rb

@@ -121,7 +121,7 @@ module Gruf
       }.freeze
     }.freeze
 
-    attr_accessor(* VALID_CONFIG_KEYS.keys)
+    attr_accessor(*VALID_CONFIG_KEYS.keys)
 
     ##
     # Whenever this is extended into a class, setup the defaults
@@ -164,7 +164,7 @@ module Gruf
     #
     def reset
       VALID_CONFIG_KEYS.each do |k, v|
-        send("#{k}=", v)
+        send(:"#{k}=", v)
       end
       self.server_binding_url = "#{::ENV.fetch('GRPC_SERVER_HOST',
                                                '0.0.0.0')}:#{::ENV.fetch('GRPC_SERVER_PORT', 9_001)}"
@@ -189,6 +189,9 @@ module Gruf
       self.use_default_interceptors = ::ENV.fetch('GRUF_USE_DEFAULT_INTERCEPTORS', 1).to_i.positive?
 
       if use_default_interceptors
+        if defined?(::Rails)
+          interceptors.use(::Gruf::Interceptors::Rails::Reloader, reloader: Rails.application.reloader)
+        end
         interceptors.use(::Gruf::Interceptors::ActiveRecord::ConnectionReset)
         interceptors.use(::Gruf::Interceptors::Instrumentation::OutputMetadataTimer)
       end

data/lib/gruf/error.rb

@@ -88,7 +88,7 @@ module Gruf
       @field_errors = []
       @metadata = {}
       args.each do |k, v|
-        send("#{k}=", v) if respond_to?(k)
+        send(:"#{k}=", v) if respond_to?(k)
       end
     end
 

data/lib/gruf/interceptors/active_record/connection_reset.rb

@@ -27,10 +27,6 @@ module Gruf
         # connection pool, we need to ensure that this is done to properly
         #
         def call
-          if enabled?
-            target_classes.each { |klass| klass.establish_connection unless klass.connection.active? }
-          end
-
           yield
         ensure
           target_classes.each(&:clear_active_connections!) if enabled?

data/lib/gruf/interceptors/instrumentation/request_logging/interceptor.rb

@@ -108,7 +108,7 @@ module Gruf
           # @return [::Gruf::Logger]
           #
           def logger
-            @logger ||= (options.fetch(:logger, nil) || Gruf.logger)
+            @logger ||= options.fetch(:logger, nil) || Gruf.logger
           end
 
           ##

data/lib/gruf/interceptors/rails/reloader.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2017-present, BigCommerce Pty. Ltd. All rights reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+module Gruf
+  module Interceptors
+    module Rails
+      ##
+      # Triggers rails code reloading between requests
+      #
+      class Reloader < ::Gruf::Interceptors::ServerInterceptor
+        def call(&block)
+          options[:reloader].wrap(&block)
+        end
+      end
+    end
+  end
+end

data/lib/gruf/server.rb

@@ -192,7 +192,7 @@ module Gruf
     # @return [Array<Class>]
     #
     def services
-      @services ||= (::Gruf.services || (options.fetch(:services, nil) || []))
+      @services ||= ::Gruf.services || (options.fetch(:services, nil) || [])
     end
 
     ##

data/lib/gruf/version.rb

@@ -16,5 +16,5 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Gruf
-  VERSION = '2.18.0'
+  VERSION = '2.20.0'
 end

data/lib/gruf.rb

@@ -24,12 +24,10 @@ require 'base64'
 
 # use Zeitwerk to lazily autoload all the files in the lib directory
 require 'zeitwerk'
-loader = ::Zeitwerk::Loader.new
-loader.tag = File.basename(__FILE__, '.rb')
-loader.inflector = ::Zeitwerk::GemInflector.new(__FILE__)
-loader.ignore("#{__dir__}/gruf/integrations/rails/railtie.rb")
-loader.ignore("#{__dir__}/gruf/controllers/health_controller.rb")
-loader.push_dir(__dir__)
+loader = Zeitwerk::Loader.for_gem
+lib = File.dirname(__FILE__)
+loader.ignore("#{lib}/gruf/integrations/rails/railtie.rb")
+loader.ignore("#{lib}/gruf/controllers/health_controller.rb")
 loader.setup
 
 require_relative 'gruf/integrations/rails/railtie' if defined?(::Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: e2mmap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.6'
-- !ruby/object:Gem::Dependency
-  name: thwait
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +155,7 @@ files:
 - lib/gruf/interceptors/instrumentation/request_logging/formatters/plain.rb
 - lib/gruf/interceptors/instrumentation/request_logging/interceptor.rb
 - lib/gruf/interceptors/instrumentation/statsd.rb
+- lib/gruf/interceptors/rails/reloader.rb
 - lib/gruf/interceptors/registry.rb
 - lib/gruf/interceptors/server_interceptor.rb
 - lib/gruf/interceptors/timer.rb
@@ -201,7 +174,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bigcommerce/gruf/issues
-  changelog_uri: https://github.com/bigcommerce/gruf/CHANGELOG.md
+  changelog_uri: https://github.com/bigcommerce/gruf/blob/main/CHANGELOG.md
   homepage_uri: https://github.com/bigcommerce/gruf
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/bigcommerce/gruf
@@ -214,17 +187,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: gRPC Ruby Framework