rails_twirp 0.14 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b7e742d4821b2a3745b2463d19aae223822eac419bd773d371f379143454d71
-  data.tar.gz: 1abf4446ebeea434ecdd7064a19e5ad7375c0e3e8f936af4afaf67a938923844
+  metadata.gz: 49a7d34d89a4dac62fb2125561c1b7aa3dc4fcbe429c13eb14d8cadc04d5ba39
+  data.tar.gz: '0491bab9e0a82bc44551047c4a1fe5969903e168e66cd1ab98635277a8e94013'
 SHA512:
-  metadata.gz: 6dfdf309ddc0f01d4da60b51205de47414fc11aff123a15f1e65fdbbd31d532c9c417fe7e73f5e5a4a9c0fb0d9f030c6a758bae1fc4a40df4f776167a64a2c84
-  data.tar.gz: 74840175fc2b2bac370dcddb5c906f89cebf072c7b5f678baca72f4c678d45c87ff15f0cfbe62c9e7d15ac3b8904eedc99ffd4d90fdb632439c18d575ad40a95
+  metadata.gz: 8320ba3215e7cdea0cf333611f3df86a5a134f8c2d61bac51b75a04cccd3f644f5b4cd690239ce4a4b42ad22429de88aacbfb5b40e8da67844145806625d675f
+  data.tar.gz: 0d6a125a57a4b709702c54db8d6ed1339d6f89f6c5e898b12136fb0ec1de3cb8ceeeede9bb9a040193240922fe00666aa5205b50c7075f118d989993c10d9620

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.3.0
           bundler-cache: true
 
       - name: Run tests

data/.ruby-version

@@ -1 +1 @@
-3.0.3
+3.3.0

data/.standard.yml

@@ -1,3 +1 @@
-ignore:
-  - '**/*':
-    - Lint/RescueException
+ruby_version: 2.7

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-### 0.14.0
+### 0.16
+
+* Ensure `decode_rack_response` always calls `#close` on the Rack body in tests, as some middleware might be applying a BodyProxy
+
+### 0.15
+
+* Exclude versions of Rails 7 which were incompatible with the pbbuilder ActionView handler, as pbbuilder cannot work there at all
+* Fix decode_rack_response to be compatible with Rack response body wrappers (and conform to the Rack SPEC)
+
+### 0.14
 * Adding frozen_string_literal: true to all files.
 
 ### 0.13.2
@@ -13,14 +22,14 @@
 * Include `ActionController::Caching` with Base controller/helpers
 
 
-### 0.12.0
+### 0.12
 
 * Allow a custom exception handling proc to be assigned using `RailsTwirp.unhandled_exception_handler`
 
-### 0.11.0
+### 0.11
 
 * Update configuration and tests for Rails 7 compatibility
 
-### 0.10.0
+### 0.10
 
 * Handle exceptions more like the Rails controllers do it, do not capture all of them as if they were Twirp exceptions

data/lib/rails_twirp/exception_handling.rb

@@ -10,7 +10,7 @@ module RailsTwirp
 
     def process_action(*)
       super
-    rescue Exception => e
+    rescue => e
       # Only the exceptions which are not captured by ActionController-like "rescue_from" end up here.
       # The idea is that any exception which is rescued by the controller is treated as part of the business
       # logic, and thus taking action on it is the responsibility of the controller which uses "rescue_from".

data/lib/rails_twirp/mapper.rb

@@ -59,10 +59,10 @@ module RailsTwirp
       @module = nil
     end
 
-    def service(service_definition, **options, &block)
+    def service(service_definition, **kwargs, &block)
       service_route_set = @route_set.services[service_definition]
       service_mapper = ServiceMapper.new(service_route_set, self)
-      scope(**options) { service_mapper.instance_exec(&block) }
+      scope(**kwargs) { service_mapper.instance_exec(&block) }
     end
 
     def scope(**options)

data/lib/rails_twirp/rescue.rb

@@ -9,8 +9,8 @@ module RailsTwirp
 
     def process_action(*)
       super
-    rescue Exception => exception
-      rescue_with_handler(exception) || raise
+    rescue => e
+      rescue_with_handler(e) || raise
     end
   end
 end

data/lib/rails_twirp/testing/integration_test.rb

@@ -91,14 +91,17 @@ module RailsTwirp
     end
 
     def decode_rack_response(service, rpc, status, headers, body)
-      body = body.join # body is an Enumerable
+      body_bytes = StringIO.new("".b)
+      body.each { |b| body_bytes << b }
 
       if status === 200
         output_class = service.rpcs[rpc][:output_class]
-        Twirp::Encoding.decode(body, output_class, headers["Content-Type"])
+        Twirp::Encoding.decode(body_bytes.string, output_class, headers["Content-Type"])
       else
-        Twirp::Client.error_from_response(Response.new(status, body, headers))
+        Twirp::Client.error_from_response(Response.new(status, body_bytes.string, headers))
       end
+    ensure
+      body.close if body.respond_to?(:close) # Comply with Rack API
     end
 
     def set_controller_from_rack_env(env)

data/lib/rails_twirp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsTwirp
-  VERSION = "0.14"
+  VERSION = "0.16"
 end

data/rails_twirp.gemspec

@@ -13,7 +13,10 @@ Gem::Specification.new do |spec|
 
   spec.files = `git ls-files`.split("\n")
 
-  spec.add_dependency "rails", ">= 6.1.3"
-  spec.add_dependency "twirp", ">= 1.9", "< 1.11"
+  # Rails has shipped an incompatible change in ActiveView, that was reverted in later versions
+  # but at this time has not been released as a 7.x version
+  # @see https://github.com/rails/rails/pull/51023
+  spec.add_runtime_dependency "rails", ">= 6.1.3", " < 7.1"
+  spec.add_runtime_dependency "twirp", ">= 1.9", "< 1.11"
   spec.required_ruby_version = ">= 3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_twirp
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.16'
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: twirp
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Integrate Twirp into Rails