gruf 2.19.0 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15454c9930260897f5d2b7415a5fffcce9eea3430b4012ee0abea150a13b4ccd
-  data.tar.gz: 7f7bc1675756c4c6ca2ebf0ed7c154ced739bffc039486cbe7b6d61634677c18
+  metadata.gz: 321dd6bdff2f6c704c6129569d694f921e29a894eea19a4fff05f46f8900ef5b
+  data.tar.gz: 3a756651b5b4fce7212a0101edc86f9e83e3c95e559dc91587989ac1276bc368
 SHA512:
-  metadata.gz: '097f461c4837ffe3a0d971050771a052ebb258566861048329c001e935a05d4a7391fbb4de09b31443c3372ff32bae8773939884719f77d1c5c7b898a1c0fc44'
-  data.tar.gz: 7aa0ddb128a2aabe1b992735a98e99ec513be58420cd8ccac979f6195d34ce371b6f8af6ef873307daec2d4949b7cddcbddc70e7a38133624a937206c73f71ae
+  metadata.gz: 454f4579f37b896b34a89d33902eb9c14ec33e94ea408fcffc918922d23e0f56c0bcc287bac5533322a9fd3897e21a64d51eadc9982c3a781b91f97067157e0e
+  data.tar.gz: 3892aa18eecaa9aee049961cee2d3ba6695b3c695cc6f66e7eee03fae17de869043922e147d829e8f8b0d94058b99ce48abab2ed6ce00c0d5bba995ce7388a59

data/CHANGELOG.md

@@ -2,6 +2,16 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.20.1
+
+* [#208] Fix rails `clear_active_connections!` deprecation warning
+
+### 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

data/gruf.gemspec

@@ -43,13 +43,11 @@ Gem::Specification.new do |spec|
     'wiki_uri' => 'https://github.com/bigcommerce/gruf/wiki'
   }
 
-  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'
+  spec.add_dependency 'activesupport', '> 4'
+  spec.add_dependency 'concurrent-ruby', '> 1'
+  spec.add_dependency 'grpc', '~> 1.10'
+  spec.add_dependency 'grpc-tools', '~> 1.10'
+  spec.add_dependency 'json', '>= 2.3'
+  spec.add_dependency 'slop', '>= 4.6'
+  spec.add_dependency 'zeitwerk', '>= 2'
 end

data/lib/gruf/configuration.rb

@@ -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/interceptors/active_record/connection_reset.rb

@@ -24,16 +24,12 @@ module Gruf
       class ConnectionReset < ::Gruf::Interceptors::ServerInterceptor
         ##
         # Reset any ActiveRecord connections after a gRPC service is called. Because of the way gRPC manages its
-        # connection pool, we need to ensure that this is done to properly
+        # connection pool, we need to ensure that this is done 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?
+          target_classes.each { |klass| klass.connection_handler.clear_active_connections! } if enabled?
         end
 
         private

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/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.19.0'
+  VERSION = '2.20.1'
 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.19.0
+  version: 2.20.1
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-07-22 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
@@ -224,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: gRPC Ruby Framework