rails_twirp 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34fc8b4e84ba8c456ac2fa01c3c35dd0fd11224360d6e21b832b5d17ed1f57a5
-  data.tar.gz: 9626b771c35bfdd034fa1dccad6ef5ed921aad0abdf3086bfe27a6b3b26f50b9
+  metadata.gz: 394816fb648167ae3e089e6e16e93c72f985b5eb540182ff026b8bb283bfa8d8
+  data.tar.gz: a86a22b695b81fcaf0d93e5df2c33dff327c4fe0c2b54a2cc36c8a5c9a5a4eba
 SHA512:
-  metadata.gz: e4621381feff50a031faf89079aa49054d246bd52f0e9d0fe4fe588f3014c2dd9a779f249aa16ac15340d9e259b61e273b393dd6a69ecaa15b5bf76c29578434
-  data.tar.gz: e91d714d2ef9c5e6a45e34911a29de4c1927d2e8442c5bf3538c5c43f137c10010b0282d9a5f2d4c5901d9c1733191cd0e7ff4e2764d8ae546233798ef81d64b
+  metadata.gz: 7d0c19ce26c7e5bf06cd9172b9e257dda0ac87f1dec2b6ba6c2b3ecda3aa26664c2319097dc7cf584e3e59316291ec5b7fef59be33ad0564719e2c59aba41ba9
+  data.tar.gz: 878e8240c50b77f737df1e0d950a4c74d16f06e5fdcd58edccaf00c8471f4f11d645c3e4f8eb5322a500426b4c259ebb028fb389d96608accc74e570e3843866

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/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

@@ -50,13 +50,13 @@ module RailsTwirp
           method_name = rpc_info[:ruby_method]
 
           # Stolen from Rails in ActionDispatch::Request#controller_class_for
-          controller_name = mapping.controller.underscore
-          const_name = controller_name.camelize << "Controller"
           action_name = mapping.action
           response_class = rpc_info[:output_class]
 
           handler.define_method(method_name) do |req, env|
-            controller_class = ::ActiveSupport::Dependencies.constantize(const_name)
+            controller_name = mapping.controller.underscore
+            const_name = controller_name.camelize << "Controller"
+            controller_class = const_name.constantize
             controller_class.dispatch(action_name, req, response_class, env)
           end
         end

data/lib/rails_twirp/testing/integration_test.rb

@@ -2,21 +2,40 @@ require "twirp/encoding"
 
 module RailsTwirp
   class IntegrationTest < ActiveSupport::TestCase
+    DEFAULT_HOST = "www.example.com"
     Response = Struct.new(:status, :body, :headers)
 
     attr_reader :response, :request, :controller
     attr_writer :mount_path
+    alias_method :mount_path!, :mount_path=
 
     def initialize(name)
       super
       reset!
       @before_rpc = []
-      @mount_path = "/twirp"
+    end
+
+    def host
+      @host || DEFAULT_HOST
+    end
+    attr_writer :host
+    alias_method :host!, :host=
+
+    def https?
+      @https
+    end
+
+    def https!(value = true)
+      @https = value
     end
 
     def reset!
       @request = nil
       @response = nil
+      @host = nil
+      @host = nil
+      @https = false
+      @mount_path = "/twirp"
     end
 
     def before_rpc(&block)
@@ -47,9 +66,13 @@ module RailsTwirp
     def build_rack_env(service, rpc, request, headers)
       env = {
         "CONTENT_TYPE" => request_content_type,
-        "HTTP_HOST" => "localhost",
+        "HTTPS" => https? ? "on" : "off",
+        "HTTP_HOST" => host,
         "PATH_INFO" => "#{@mount_path}/#{service.service_full_name}/#{rpc}",
-        "REQUEST_METHOD" => "POST"
+        "REQUEST_METHOD" => "POST",
+        "SERVER_NAME" => host,
+        "SERVER_PORT" => https? ? "443" : "80",
+        "rack.url_scheme" => https? ? "https" : "http"
       }
       if headers.present?
         http_request = ActionDispatch::Request.new(env)

data/lib/rails_twirp/version.rb

@@ -1,3 +1,3 @@
 module RailsTwirp
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/rails_twirp.gemspec

@@ -12,6 +12,6 @@ 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"
 end

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

data/test/ping_controller_test.rb

@@ -11,7 +11,16 @@ class PingControllerTest < RailsTwirp::IntegrationTest
     req = RPC::DummyAPI::PingRequest.new(name: "Bouke")
     rpc RPC::DummyAPI::DummyService, "PingRender", req
     refute_instance_of Twirp::Error, response
-    assert_equal "http://localhost/twirp BoukeBouke", response.double_name
+    assert_equal "http://www.example.com/twirp BoukeBouke", response.double_name
+  end
+
+  test "you can ping render with host and https" do
+    host! "localhost"
+    https!
+    req = RPC::DummyAPI::PingRequest.new(name: "Bouke")
+    rpc RPC::DummyAPI::DummyService, "PingRender", req
+    refute_instance_of Twirp::Error, response
+    assert_equal "https://localhost/twirp BoukeBouke", response.double_name
   end
 
   test "you can ping template" do

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rails_twirp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-10-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