rails_twirp 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed88410115867b689de324aeaf99b91ba473d3aa573915d9bec5de1142b7986
-  data.tar.gz: dadc45ad3c6ed38f6791e8a45573127c69297772a7b0ae4861a2867dadf26d09
+  metadata.gz: e1ac2840887dd15ea43114d7b0d25901c05e3288fa10d6cdcd8d00d4dabc8e74
+  data.tar.gz: 59ff25b65ad6bd62f1ebc537bc11017da58b6ce6e1f4a74cae9e1c7f35454508
 SHA512:
-  metadata.gz: 976f3755035c22c65db62aa4b82e8019bf816e5e30cec968e19c5345630aa1b7c6d51d38439e267fde4d9696ce05667c5a2ed2566953bbe87a175ac2ea9df93f
-  data.tar.gz: f3c1460d7cd0ae988e8aabbb516afd1983b975e8aee872f295eb3017061a51500667ee1ecbd226f2260c03f179ad94560227710fc98095e0e60749288271d406
+  metadata.gz: fd193ba67f59a313b463a2745418329d33585505164124810abdbd556ce808717064e6dde4c249cd50865951a9e1155f085adc0b556860eb1a83d5714206833a
+  data.tar.gz: 2795b73a1cf25688ff7abea8db81af893b23374297dbd9128e6d9b642ee3bce4d4026d83d660aa3158367fd0e357987e2d71717e8b4dabe5e2b86720fbd4b74a

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

@@ -7,7 +7,7 @@ module RailsTwirp
 
     attr_reader :response, :request, :controller
     attr_writer :mount_path
-    alias :mount_path! :mount_path=
+    alias_method :mount_path!, :mount_path=
 
     def initialize(name)
       super
@@ -19,7 +19,7 @@ module RailsTwirp
       @host || DEFAULT_HOST
     end
     attr_writer :host
-    alias :host! :host=
+    alias_method :host!, :host=
 
     def https?
       @https

data/lib/rails_twirp/version.rb

@@ -1,3 +1,3 @@
 module RailsTwirp
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

data/rails_twirp.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files`.split("\n")
   spec.test_files = `git ls-files -- test/*`.split("\n")
 
-  spec.add_dependency "rails", "~> 6.1.3"
+  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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rails_twirp
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3
 - !ruby/object:Gem::Dependency
@@ -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,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -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