rails_twirp 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78af7d754c6fbaf90cbf22f5ef83b116c54840ab97fc2daffb09a5a37bcd7c91
-  data.tar.gz: '0078e09678ea09ccda0d2db94c1ff241222cf3074f4febd580197efc9d257cd1'
+  metadata.gz: 57a19d4ec190c08eaece39ae6867d9aee3f2b83a3196384f8b0a16c03fbf9739
+  data.tar.gz: 225ce5477525001c7c401af85a98e68d3fe7543bcf20e2fa9bdcd13f34a77a4b
 SHA512:
-  metadata.gz: fd943fdaa9b54614c268b6d7471bec3726bffb2125f5afa6992b9b30db2c03bbc2027869e1b23f449addf81cd2140d3abe97677f35d6a5ba924be515b01998b4
-  data.tar.gz: ab7b4e53cdfc9eb84a6f4875674b643c668adc15f103cf60ba367078393e23257477b13a0eb5355e69248eb1250feb73a37eb5e689a7a501cd9236c4630a600a
+  metadata.gz: 7991a7f8707e4f6b28055808edc662c1ec93a9723b059421621cdf0cc461704bc766abeea63e9881382675280f6321b4e3cba941527a684a920733be3ce7a977
+  data.tar.gz: ea05bca838330b1526da0a6844783d7b5f9ab6cd2403050c318670f2d7a96b8c892d017c2b052b99f5063dde40331cf7b4486b084764adf85613c84c6b8e0da0

data/lib/rails_twirp/base.rb

@@ -7,7 +7,9 @@ require "abstract_controller/asset_paths"
 require "abstract_controller/caching"
 require "abstract_controller/logger"
 require "abstract_controller/callbacks"
+require "action_controller/metal/helpers"
 require "rails_twirp/rescue"
+require "rails_twirp/url_for"
 
 module RailsTwirp
   class Base < AbstractController::Base
@@ -16,15 +18,18 @@ module RailsTwirp
     # The order of these includes matter.
     # The rendering modules extend each other, so need to be in this order.
     include AbstractController::Rendering
-    include ActionView::Rendering
-    include RenderPb
-    include Errors
 
     # These add helpers for the controller
+    include ActionController::Helpers
+    include UrlFor
     include AbstractController::AssetPaths
     include AbstractController::Caching
     include AbstractController::Logger
 
+    include ActionView::Rendering
+    include RenderPb
+    include Errors
+
     # These need to be last so errors can be handled as early as possible.
     include AbstractController::Callbacks
     include Rescue

data/lib/rails_twirp/engine.rb

@@ -15,25 +15,40 @@ module RailsTwirp
     end
 
     initializer "rails_twirp.logger" do
-      # This hook is called whenever a RailsTwirp::Base is initialized, and it sets the logger
+      # This hook is called when RailsTwirp::Base is initialized, and it sets the logger
       ActiveSupport.on_load(:rails_twirp) { self.logger ||= Rails.logger }
     end
 
     initializer :add_paths, before: :bootstrap_hook do |app|
       app.config.paths.add "config/twirp/routes.rb"
       app.config.paths.add "config/twirp/routes", glob: "**/*.rb"
-      app.config.paths.add "app/twirp/controllers", eager_load: true
       app.config.paths.add "proto", load_path: true
-      app.config.paths.add "app/twirp/views", load_path: true
     end
 
     initializer :set_controller_view_path do |app|
-      views = app.config.paths["app/twirp/views"].existent
+      views = app.config.paths["app/views"].existent
       unless views.empty?
         ActiveSupport.on_load(:rails_twirp) { prepend_view_path views }
       end
     end
 
+    initializer "rails_twirp.helpers" do |app|
+      ActiveSupport.on_load(:rails_twirp) do
+        # Load all the application helpers into the controller
+        include app.routes.mounted_helpers
+        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes, false)
+        extend ::ActionController::Railties::Helpers
+        define_singleton_method(:inherited) do |klass|
+          super(klass)
+
+          # Have to call this explicitely, because ::ActionController::Railties::Helpers
+          # checks if ActionController::Base is a parent class, which it isn't.
+          # If we don't call this, the helpers don't get loaded
+          klass.helper :all
+        end
+      end
+    end
+
     initializer :add_twirp do |app|
       # Here we add the 'twirp' method to application, which is accessible at Rails.application.twirp
       app.extend TwirpValue

data/lib/rails_twirp/testing/integration_test.rb

@@ -21,7 +21,9 @@ module RailsTwirp
       @request = request
       service = app.twirp.routes.services[service].to_service
 
-      rack_env = {}
+      rack_env = {
+        "HTTP_HOST" => "localhost"
+      }
       http_request = ActionDispatch::Request.new(rack_env)
       http_request.headers.merge! headers if headers.present?
       env = {rack_env: rack_env}

data/lib/rails_twirp/url_for.rb

@@ -0,0 +1,17 @@
+require "abstract_controller/url_for"
+
+module RailsTwirp
+  module UrlFor
+    extend ActiveSupport::Concern
+
+    include AbstractController::UrlFor
+
+    def url_options
+      @_url_options ||= {
+        host: http_request.host,
+        port: http_request.optional_port,
+        protocol: http_request.protocol
+      }.merge!(super).freeze
+    end
+  end
+end

data/lib/rails_twirp/version.rb

@@ -1,3 +1,3 @@
 module RailsTwirp
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

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

@@ -7,7 +7,8 @@ class PingsController < ApplicationTwirpController
   end
 
   def ping_render
-    response = RPC::DummyAPI::PingResponse.new(double_name: request.name * 2)
+    url = rails_twirp_engine_url
+    response = RPC::DummyAPI::PingResponse.new(double_name: "#{url} #{helpers.does_this_work(request.name)}")
     render pb: response
   end
 

data/test/dummy/app/helpers/random_helper.rb

@@ -0,0 +1,5 @@
+module RandomHelper
+  def does_this_work(n)
+    n * 2
+  end
+end

data/test/ping_controller_test.rb

@@ -11,7 +11,7 @@ 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 "BoukeBouke", response.double_name
+    assert_equal "http://localhost/twirp BoukeBouke", response.double_name
   end
 
   test "you can ping template" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_twirp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,6 +63,7 @@ files:
 - lib/rails_twirp/rescue.rb
 - lib/rails_twirp/route_set.rb
 - lib/rails_twirp/testing/integration_test.rb
+- lib/rails_twirp/url_for.rb
 - lib/rails_twirp/version.rb
 - rails_twirp.gemspec
 - test/dummy/Rakefile
@@ -76,15 +77,16 @@ files:
 - test/dummy/app/controllers/concerns/.keep
 - test/dummy/app/controllers/pings_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/random_helper.rb
 - test/dummy/app/javascript/packs/application.js
 - test/dummy/app/jobs/application_job.rb
 - test/dummy/app/mailers/application_mailer.rb
 - test/dummy/app/models/application_record.rb
 - test/dummy/app/models/concerns/.keep
-- test/dummy/app/twirp/views/pings/ping_template.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
+- test/dummy/app/views/pings/ping_template.pb.pbbuilder
 - test/dummy/bin/generate
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -162,15 +164,16 @@ test_files:
 - test/dummy/app/controllers/concerns/.keep
 - test/dummy/app/controllers/pings_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/random_helper.rb
 - test/dummy/app/javascript/packs/application.js
 - test/dummy/app/jobs/application_job.rb
 - test/dummy/app/mailers/application_mailer.rb
 - test/dummy/app/models/application_record.rb
 - test/dummy/app/models/concerns/.keep
-- test/dummy/app/twirp/views/pings/ping_template.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
+- test/dummy/app/views/pings/ping_template.pb.pbbuilder
 - test/dummy/bin/generate
 - test/dummy/bin/rails
 - test/dummy/bin/rake