rails_twirp 0.7.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d0f51ad8a5b177a88a6c83db754f4c067257116494bc0d271ee2868c59f8d2'
-  data.tar.gz: 8dfb8d26dabab4b4cb13140188b46153e685ec27a765e50dd92aff939c63b18c
+  metadata.gz: ff69015b104dada61abed7c68ad1f17c4f2f0d0ead6e05cf445060f69f4064aa
+  data.tar.gz: 00f4b9f8551e568d4887d4072adb3e0ba0e8465e412d9c419f45a19eb1a8725a
 SHA512:
-  metadata.gz: cddbc0862debf6fa1895d209d9a4c6bdf0a97d52e5329a44bb7b5163eaece5315e0bf4ec35b02aa60aedccd9397362f13cd55b3d81592599ed597b82f8e4ba2a
-  data.tar.gz: ef5bc2e82879b1326fe3375385ee0c7aeb5a671686df54305dafbbd42bee581763d1c8ded9998ce81cf91174f2d21899420cf47bc731369586120621e8df1869
+  metadata.gz: 75262234b40b10f6de6e4b650c7a7ad024c841d324acb44fadef6042f9725c1f1f1f423bb7d55c7ca300fcf54edf18f033a149331667c907f772ba7d1991e7e9
+  data.tar.gz: 50eb75a5f7b293d873f9b2014ec642779e7622da4ae25e6a79352f3ed61e3e93ea13c1b5f53dcdb4e8f34337cbb29b1b7d99753fe19755a3fbb89512091220c4

data/Gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 gemspec
 
 gem "sqlite3"
-gem "pbbuilder", "~> 0.3.0"
+gem "pbbuilder", "~> 0.10.0"
 gem "standard"
+gem "pry"

data/README.md

@@ -21,6 +21,21 @@ Or install it yourself as:
 $ gem install rails_twirp
 ```
 
+## Installing correct protobuf version for M1 Mac Chips
+
+If you run into an issue with protobuf universal-darwin version, please paste this in your Gemfile as recommended by @bouke :
+
+```ruby
+# HACK(bouk): Overwrite Bundler's platform matcher to ignore universal CPU
+# The protobuf and gRPC 'universal' macOS gems break on M1
+module Bundler::MatchPlatform
+  def match_platform(p)
+    return false if ::Gem::Platform === platform && platform.cpu == "universal"
+    Bundler::MatchPlatform.platforms_match?(platform, p)
+  end
+end
+```
+
 ## Contributing
 Contribution directions go here.
 

data/lib/rails_twirp/base.rb

@@ -37,7 +37,7 @@ module RailsTwirp
     include Rescue
     include Instrumentation
 
-    attr_internal :request, :env, :response_class
+    attr_internal :request, :env, :response_class, :rpc_name
     def initialize
       @_request = nil
       @_env = nil
@@ -49,10 +49,11 @@ module RailsTwirp
       @_http_request ||= ActionDispatch::Request.new(env[:rack_env])
     end
 
-    def dispatch(action, request, response_class, env = {})
+    def dispatch(action, request, response_class, rpc_name, env = {})
       self.request = request
       self.env = env
       self.response_class = response_class
+      self.rpc_name = rpc_name
 
       http_request.controller_instance = self
 
@@ -61,8 +62,8 @@ module RailsTwirp
       response_body
     end
 
-    def self.dispatch(action, request, response_class, env = {})
-      new.dispatch(action, request, response_class, env)
+    def self.dispatch(action, request, response_class, rpc_name, env = {})
+      new.dispatch(action, request, response_class, rpc_name, env)
     end
 
     # Used by the template renderer to figure out which template to use

data/lib/rails_twirp/log_subscriber.rb

@@ -17,7 +17,9 @@ module RailsTwirp
       info do
         code = payload.fetch(:code, :internal)
 
-        message = +"Completed #{code} in #{event.duration.round}ms (Allocations: #{event.allocations})"
+        message = +"Completed #{code}"
+        message << ": #{payload[:msg]}" if payload[:msg]
+        message << " in #{event.duration.round}ms (Allocations: #{event.allocations})"
         message << "\n\n" if defined?(Rails.env) && Rails.env.development?
 
         message

data/lib/rails_twirp/route_set.rb

@@ -56,8 +56,8 @@ module RailsTwirp
           handler.define_method(method_name) do |req, env|
             controller_name = mapping.controller.underscore
             const_name = controller_name.camelize << "Controller"
-            controller_class = ::ActiveSupport::Dependencies.constantize(const_name)
-            controller_class.dispatch(action_name, req, response_class, env)
+            controller_class = const_name.constantize
+            controller_class.dispatch(action_name, req, response_class, name, env)
           end
         end
 

data/lib/rails_twirp/testing/integration_test.rb

@@ -100,7 +100,7 @@ module RailsTwirp
     end
 
     def set_controller_from_rack_env(env)
-      @controller = ActionDispatch::Request.new(env).controller_class
+      @controller = ActionDispatch::Request.new(env).controller_instance
     end
   end
 end

data/lib/rails_twirp/version.rb

@@ -1,3 +1,3 @@
 module RailsTwirp
-  VERSION = "0.7.1"
+  VERSION = "0.9.1"
 end

data/rails_twirp.gemspec

@@ -14,4 +14,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", ">= 6.1.3"
   spec.add_dependency "twirp", "~> 1.7.2"
+  spec.required_ruby_version = ">= 3"
 end

data/test/dummy/app/controllers/dummy_controller.rb

@@ -0,0 +1,5 @@
+class DummyController < RailsTwirp::Base
+  def rpc_name_check
+    @rpc_name = rpc_name
+  end
+end

data/test/dummy/app/views/dummy/rpc_name_check.pb.pbbuilder

@@ -0,0 +1 @@
+pb.rpc_name @rpc_name

data/test/dummy/config/twirp/routes.rb

@@ -1,4 +1,4 @@
-require "api_twirp"
+require_relative "../../proto/api_twirp"
 
 Rails.application.twirp.routes.draw do
   service RPC::DummyAPI::DummyService do
@@ -9,6 +9,7 @@ Rails.application.twirp.routes.draw do
     rpc "RaiseError", to: "pings#raise_error"
     rpc "UncaughtError", to: "pings#uncaught_raise"
     rpc "BeforeError", to: "pings#before_error"
+    rpc "RpcNameCheck", to: "dummy#rpc_name_check"
   end
 
   scope module: :testmod do

data/test/dummy/proto/api.proto

@@ -13,6 +13,7 @@ service Dummy {
   rpc UncaughtError(PingRequest) returns (PingResponse);
   rpc BeforeError(PingRequest) returns (PingResponse);
   rpc Nested(PingRequest) returns (PingResponse);
+  rpc RpcNameCheck(RpcNameCheckRequest) returns (RpcNameCheckResponse);
 }
 
 message PingRequest {
@@ -22,3 +23,8 @@ message PingRequest {
 message PingResponse {
   string double_name = 2;
 }
+
+message RpcNameCheckRequest{}
+message RpcNameCheckResponse{
+  string rpc_name = 1;
+}

data/test/dummy/proto/api_pb.rb

@@ -11,6 +11,11 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "dummy.api.PingResponse" do
       optional :double_name, :string, 2
     end
+    add_message "dummy.api.RpcNameCheckRequest" do
+    end
+    add_message "dummy.api.RpcNameCheckResponse" do
+      optional :rpc_name, :string, 1
+    end
   end
 end
 
@@ -18,5 +23,7 @@ module RPC
   module DummyAPI
     PingRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("dummy.api.PingRequest").msgclass
     PingResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("dummy.api.PingResponse").msgclass
+    RpcNameCheckRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("dummy.api.RpcNameCheckRequest").msgclass
+    RpcNameCheckResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("dummy.api.RpcNameCheckResponse").msgclass
   end
 end

data/test/dummy/proto/api_twirp.rb

@@ -1,4 +1,4 @@
-# Code generated by protoc-gen-twirp_ruby 1.6.0, DO NOT EDIT.
+# Code generated by protoc-gen-twirp_ruby 1.8.0, DO NOT EDIT.
 require 'twirp'
 require_relative 'api_pb.rb'
 
@@ -15,6 +15,7 @@ module RPC
       rpc :UncaughtError, PingRequest, PingResponse, :ruby_method => :uncaught_error
       rpc :BeforeError, PingRequest, PingResponse, :ruby_method => :before_error
       rpc :Nested, PingRequest, PingResponse, :ruby_method => :nested
+      rpc :RpcNameCheck, RpcNameCheckRequest, RpcNameCheckResponse, :ruby_method => :rpc_name_check
     end
 
     class DummyClient < Twirp::Client

data/test/dummy_test.rb

@@ -0,0 +1,10 @@
+require "test_helper"
+
+class DummyControllerTest < RailsTwirp::IntegrationTest
+  test "controller gets rpc name" do
+    req = RPC::DummyAPI::RpcNameCheckRequest.new
+    rpc RPC::DummyAPI::DummyService, "RpcNameCheck", req
+    assert_instance_of RPC::DummyAPI::RpcNameCheckResponse, response
+    assert_equal "RpcNameCheck", response.rpc_name
+  end
+end

data/test/ping_controller_test.rb

@@ -61,4 +61,10 @@ class PingControllerTest < RailsTwirp::IntegrationTest
     assert_equal "yOuR ReQuEsT Is mAlFoRmEd", response.msg
     assert_equal :malformed, response.code
   end
+
+  test "controller is set to the controller that handled the request" do
+    req = RPC::DummyAPI::PingRequest.new(name: "Bouke")
+    rpc RPC::DummyAPI::DummyService, "Ping", req
+    assert_instance_of PingsController, controller
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_twirp
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,6 +79,7 @@ files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/application_twirp_controller.rb
 - test/dummy/app/controllers/concerns/.keep
+- test/dummy/app/controllers/dummy_controller.rb
 - test/dummy/app/controllers/pings_controller.rb
 - test/dummy/app/controllers/testmod/nested/other_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -88,6 +89,7 @@ files:
 - test/dummy/app/mailers/application_mailer.rb
 - test/dummy/app/models/application_record.rb
 - test/dummy/app/models/concerns/.keep
+- test/dummy/app/views/dummy/rpc_name_check.pb.pbbuilder
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/layouts/mailer.html.erb
 - test/dummy/app/views/layouts/mailer.text.erb
@@ -131,6 +133,7 @@ files:
 - test/dummy/public/apple-touch-icon-precomposed.png
 - test/dummy/public/apple-touch-icon.png
 - test/dummy/public/favicon.ico
+- test/dummy_test.rb
 - test/other_controller_test.rb
 - test/ping_controller_test.rb
 - test/rails_twirp_test.rb
@@ -147,14 +150,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: Integrate Twirp into Rails
@@ -168,6 +171,7 @@ test_files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/application_twirp_controller.rb
 - test/dummy/app/controllers/concerns/.keep
+- test/dummy/app/controllers/dummy_controller.rb
 - test/dummy/app/controllers/pings_controller.rb
 - test/dummy/app/controllers/testmod/nested/other_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -177,6 +181,7 @@ test_files:
 - test/dummy/app/mailers/application_mailer.rb
 - test/dummy/app/models/application_record.rb
 - test/dummy/app/models/concerns/.keep
+- test/dummy/app/views/dummy/rpc_name_check.pb.pbbuilder
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/layouts/mailer.html.erb
 - test/dummy/app/views/layouts/mailer.text.erb
@@ -220,6 +225,7 @@ test_files:
 - test/dummy/public/apple-touch-icon-precomposed.png
 - test/dummy/public/apple-touch-icon.png
 - test/dummy/public/favicon.ico
+- test/dummy_test.rb
 - test/other_controller_test.rb
 - test/ping_controller_test.rb
 - test/rails_twirp_test.rb