webmock-twirp 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 165be6973cc98a0dcfb538746766610afa45c02a344bf3c79f0567c36ab92d4c
-  data.tar.gz: 65a3021683eff819b8a5e1ca6e54d8d4eed63ed9364fd2631cb5308772243ade
+  metadata.gz: 961de376102cbbb75708a544bb34e42c065beab4ad92ef4e4441036d47569d1d
+  data.tar.gz: 0de10400686561ba24d597d06ea23c4b77ca3445af78c7f7a98997e1bd32d86c
 SHA512:
-  metadata.gz: e5c02e2bfbe249a15af9aa36b1701e894550a330a72da318bec451a142e2d053ce40bc7c112e43057f1f216c8a0429dc3a670b8c112d136cd167ab482dbc9585
-  data.tar.gz: 6e1839bcd0cf51cb664cdda48408e8bcb89aec4dfbe60ba142cdd33f19b3462257ed56b5096fd9f338996257ec76b5121a2a8028f9e2ae848d2b1e79efd2d433
+  metadata.gz: e1edcd51eff12eb65d75dd96713ff202410447cdd9ef3ddfbf1fff7c090cc94d370ec381a6bf4966b7e1cd0034c59552f1ed1953e498f7b24b06df4bf1beaad9
+  data.tar.gz: b6a646485bc5d8a49f27229cddfc55d3045fb000a0d0186ed03216dbd8436331186d058dcd4257ca15ee5d6ebd757026d7fb5a9fb4be69f4c1d512e4efd0286e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+###  v0.1.0  (2022-10-09)
+- dynamic client/rpc lookup
+
 ###  v0.0.1  (2022-10-07)
 - stub_twirp_request
 

data/README.md

@@ -4,25 +4,35 @@ Twirp support for [WebMock](https://github.com/bblimke/webmock).  All our favori
 
 
 ```ruby
-require "webmock-twirp"
+require "webmock/twirp"
 
-stub_twirp_request(MyTwirpClient, :optional_rpc_method)
+it "stubs twirp calls" do 
+  stub_twirp_request
+  
+  client.my_rpc_method(request)
+end
+
+it "matches calls from specific twirp clients and rpc methods" do
+  stub_twirp_request(MyTwirpClient, :optional_rpc_method)
+end
 
-stub_twirp_request(...).with(my_request_message: /^foo/)
+# match parameters
+stub_twirp_request.with(my_request_message: /^foo/)
 
 # or use block mode
-stub_twirp_request(...).with do |request|
+stub_twirp_request.with do |request|
   request # the Twirp request, aka. proto message, used to initiate the request
   request.my_request_message == "hello"
 end
 
 
-stub_twirp_request(...).and_return(return_message: "yo yo")
-stub_twirp_request(...).and_return(404) # results in a Twirp::Error.not_found
+# stub responses
+stub_twirp_request.and_return(return_message: "yo yo")
+stub_twirp_request.and_return(404) # results in a Twirp::Error.not_found
 
 # or use block mode
-stub_twirp_request(...).and_return do |request|
-  { response_message: "oh hi" } # will get properly packaged up automagically
+stub_twirp_request.and_return do |request|
+  { response_message: "oh hi" } # will get properly packaged up
 end
 ```
 

data/lib/webmock/twirp/refinements.rb

@@ -0,0 +1,11 @@
+module WebMock
+  module Twirp
+    module Refinements
+      refine Array do
+        def snag(&block)
+          find(&block)&.tap { |x| delete(x) }
+        end
+      end
+    end
+  end
+end

data/lib/webmock/twirp/request_stub.rb

@@ -1,29 +1,59 @@
 module WebMock
   module Twirp
     class RequestStub < WebMock::RequestStub
-      def initialize(client_or_service, rpc_name = nil)
-        klass = client_or_service.is_a?(Class) ? client_or_service : client_or_service.class
+      using Refinements
 
-        unless klass < ::Twirp::Client || klass < ::Twirp::Service
-          raise TypeError, "expected Twirp Client or Service, found: #{client_or_service}"
+      def initialize(*filters)
+        rpc_name = filters.snag { |x| x.is_a?(Symbol) }
+
+        client = filters.snag { |x| x.is_a?(::Twirp::Client) }
+
+        klass = client&.class
+        klass ||= filters.snag do |x|
+          x.is_a?(Class) && (x < ::Twirp::Client || x < ::Twirp::Service)
+        end
+
+        unless filters.empty?
+          raise ArgumentError, "unexpected arguments: #{filters}"
         end
 
-        @rpcs = klass.rpcs
-        uri = "/#{klass.service_full_name}"
+        uri = ""
+
+        if client
+          conn = client.instance_variable_get(:@conn)
+          uri += conn.url_prefix.to_s if conn
+        end
+
+        if klass
+          @rpcs = klass.rpcs
+          uri += "/#{klass.service_full_name}"
+        else
+          uri += "/[^/]+"
+        end
 
         if rpc_name
-          rpc_info = rpcs.values.find do |x|
-            x[:rpc_method] == rpc_name.to_sym || x[:ruby_method] == rpc_name.to_sym
-          end
+          if klass
+            # kindly convert ruby method to rpc method name
+            rpc_info = klass.rpcs.values.find do |x|
+              x[:rpc_method] == rpc_name || x[:ruby_method] == rpc_name
+            end
 
-          raise ArgumentError, "invalid rpc method: #{rpc_name}" unless rpc_info
+            raise ArgumentError, "invalid rpc method: #{rpc_name}" unless rpc_info
 
-          uri += "/#{rpc_info[:rpc_method]}"
+            uri += "/#{rpc_info[:rpc_method]}"
+          else
+            uri += "/#{rpc_name}"
+          end
         else
           uri += "/[^/]+"
         end
 
         super(:post, /#{uri}$/)
+
+        # filter on Twirp header
+        @request_pattern.with(
+          headers: { "Content-Type" => ::Twirp::Encoding::PROTO },
+        )
       end
 
       def with(request = nil, **attrs, &block)
@@ -94,10 +124,24 @@ module WebMock
 
       private
 
-      attr_reader :rpcs
-
       def rpc_from_request(request_signature)
-        rpcs[request_signature.uri.path.split("/").last]
+        service_full_name, rpc_name = request_signature.uri.path.split("/").last(2)
+
+        rpcs = @rpcs || begin
+          # find matching client instance
+          client = ObjectSpace.each_object(::Twirp::Client).find do |client|
+            service_full_name == client.class.service_full_name && \
+              client.class.rpcs.key?(rpc_name)
+          end
+
+          unless client
+            raise "could not determine Twirp::Client for call to: #{service_full_name}/#{rpc_name}"
+          end
+
+          client.class.rpcs
+        end
+
+        rpcs[rpc_name]
       end
 
       def generate_http_response(msg_class, obj)

data/lib/webmock/twirp/version.rb

@@ -1,5 +1,5 @@
 module WebMock
   module Twirp
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/lib/webmock/twirp.rb

@@ -1,6 +1,7 @@
 require "google/protobuf"
 require "twirp"
 require "webmock"
+require "webmock/twirp/refinements"
 require "webmock/twirp/request_stub"
 require "webmock/twirp/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock-twirp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -105,6 +105,7 @@ files:
 - README.md
 - lib/webmock-twirp.rb
 - lib/webmock/twirp.rb
+- lib/webmock/twirp/refinements.rb
 - lib/webmock/twirp/request_stub.rb
 - lib/webmock/twirp/version.rb
 - webmock-twirp.gemspec