webmock-twirp 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2e3419ce5ddc60c10c14e7cb33e806b6ee92c0f93787b5209a0e3eeb47638e
-  data.tar.gz: 84b5215a00b57a531f24fde3298b0720bba7de7fd0553523af3ac3bd3df83cbf
+  metadata.gz: ed732ed69f67c95c98dc20b493dfbc245a74ceb6c78e2380143ddff10217d57b
+  data.tar.gz: 976107bf4aedebdfc5731f5478883b84f0f8c3a2f5883696e2063a41364ae153
 SHA512:
-  metadata.gz: 59acbce84012d937a66f6fe601a2ec0b49f9a56c384113c35371362b603907f201dea384f54e343e8759b9b397c732f8c03e185d2a72ab88f7bfb33ba5e3fa4b
-  data.tar.gz: 536a0a49c744b98d3973e56c18e02ec0e968f14f71639ee4164808b6a07f545a6df416ee1b7e36b11bf877e8febad5163b634fe10a4d7fc3bfe9ddf6c1624f52
+  metadata.gz: 3956dac3ed361e4900b32396e0976b9b4e8e3fef29181805a6b7659c5f5d5deb5cf1fe873696b103ab3dd71d92fe406bca61bcd7338647c6cd7f25a214186b50
+  data.tar.gz: 61b1c56d28ad599dd70a35ef060a39a80fe65b9e443dabbcbf4ba162f0afee131e36d3dc1765505577ac3dcad12a37bb4c4a13c15c7d6beae4e466b1e36abb48

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+###  0.6.2  (2026-11-09)
+- Requires Ruby 3.3 or newer.
+
+###  0.6.1  (2026-11-08)
+- Requires Ruby 3.2 or newer.
+- Fix nested matchers like `with(date: include(year: 0))` not matching default-valued fields on google-protobuf 4.
+
 ###  0.6.0  (2025-02-11)
 - rspec matcher support
 - debug gem

data/lib/webmock/twirp/refinements.rb

@@ -1,6 +1,25 @@
 module WebMock
   module Twirp
     module Refinements
+      # Message#to_h, but keeping default-valued fields, which google-protobuf 4 drops
+      def self.to_h_with_defaults(value)
+        case value
+        when Google::Protobuf::MessageExts
+          value.class.descriptor.to_h do |field|
+            [ field.name.to_sym, to_h_with_defaults(field.get(value)) ]
+          end
+        when Google::Protobuf::RepeatedField
+          value.map { |x| to_h_with_defaults(x) }
+        when Google::Protobuf::Map
+          # Map#to_h ignores a block
+          res = {}
+          value.each { |k, v| res[k] = to_h_with_defaults(v) }
+          res
+        else
+          value
+        end
+      end
+
       refine Array do
         def snag(&block)
           find(&block)&.tap { |x| delete(x) }
@@ -45,8 +64,7 @@ module WebMock
               if expected_value.is_a?(Hash)
                 matches ||= actual_value.match?(**expected_value)
               else
-                matches ||= expected_value === actual_value.to_h
-                # matches ||= expected_value === actual_value.normalized_hash
+                matches ||= expected_value === Refinements.to_h_with_defaults(actual_value)
               end
             end
 

data/lib/webmock/twirp/version.rb

@@ -1,5 +1,5 @@
 module WebMock
   module Twirp
-    VERSION = "0.6.0"
+    VERSION = "0.6.2"
   end
 end

data/webmock-twirp.gemspec

@@ -1,24 +1,24 @@
 require_relative "lib/webmock/twirp/version"
-package = WebMock::Twirp
 
 Gem::Specification.new do |s|
   s.authors     = ["Daniel Pepper"]
   s.description = "Twirp support for WebMock"
-  s.files       = `git ls-files * ':!:spec'`.split("\n")
+  s.files       = `git ls-files * ':!:spec' ':!:gemfiles' ':!:Gemfile*' ':!:service.rb'`.split("\n")
   s.homepage    = "https://github.com/dpep/webmock-twirp"
   s.license     = "MIT"
-  s.name        = File.basename(__FILE__).split(".")[0]
-  s.summary     = package.to_s
-  s.version     = package.const_get "VERSION"
+  s.name        = "webmock-twirp"
+  s.summary     = "WebMock::Twirp"
+  s.version     = WebMock::Twirp::VERSION
 
-  s.required_ruby_version = ">= 3"
+  s.required_ruby_version = ">= 3.3"
 
   s.add_dependency "webmock", ">= 3"
   s.add_dependency "twirp", ">= 1"
 
   s.add_development_dependency "debug"
   s.add_development_dependency "rack"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "simplecov"
+  s.add_development_dependency "simplecov", ">= 1"
   s.add_development_dependency "webrick"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: webmock-twirp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Daniel Pepper
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -66,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,6 +93,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -113,8 +127,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - lib/webmock-twirp.rb
@@ -129,7 +141,6 @@ files:
 - lib/webmock/twirp/request_stub.rb
 - lib/webmock/twirp/stub_request_snippet.rb
 - lib/webmock/twirp/version.rb
-- service.rb
 - webmock-twirp.gemspec
 homepage: https://github.com/dpep/webmock-twirp
 licenses:
@@ -142,14 +153,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: WebMock::Twirp
 test_files: []

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/Gemfile.lock

@@ -1,96 +0,0 @@
-PATH
-  remote: .
-  specs:
-    webmock-twirp (0.6.0)
-      twirp (>= 1)
-      webmock (>= 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    bigdecimal (3.1.9)
-    crack (1.0.0)
-      bigdecimal
-      rexml
-    date (3.4.1)
-    debug (1.10.0)
-      irb (~> 1.10)
-      reline (>= 0.3.8)
-    diff-lcs (1.5.1)
-    docile (1.4.1)
-    faraday (2.12.1)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    google-protobuf (3.25.3)
-    hashdiff (1.1.2)
-    io-console (0.8.0)
-    irb (1.15.1)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.9.0)
-    logger (1.6.2)
-    net-http (0.6.0)
-      uri
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.2.3)
-      date
-      stringio
-    public_suffix (6.0.1)
-    rack (3.1.9)
-    rdoc (6.12.0)
-      psych (>= 4.0.0)
-    reline (0.6.0)
-      io-console (~> 0.5)
-    rexml (3.4.0)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
-    simplecov_json_formatter (0.1.4)
-    stringio (3.1.2)
-    twirp (1.13.0)
-      faraday (< 3)
-      google-protobuf (>= 3.25, < 5.a)
-      rack (>= 2.2.3)
-    uri (1.0.2)
-    webmock (3.25.0)
-      addressable (>= 2.8.0)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  debug
-  rack
-  rspec
-  simplecov
-  webmock-twirp!
-  webrick
-
-BUNDLED WITH
-   2.4.20

data/service.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require "google/protobuf"
-require "rack"
-require "twirp"
-require "webrick"
-Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
-
-server = WEBrick::HTTPServer.new(Port: 3000)
-
-handler = EchoHandler.new
-service = EchoService.new(handler)
-path_prefix = "/twirp/" + service.full_name
-server.mount path_prefix, Rack::Handler::WEBrick, service
-
-# handler = ComplexHandler.new
-# service = ComplexService.new(handler)
-# path_prefix = "/twirp/" + service.full_name
-# server.mount path_prefix, Rack::Handler::WEBrick, service
-
-server.start
-
-# client = EchoClient.new("http://localhost:3000/twirp")
-# client = ComplexClient.new("http://localhost:3000/twirp")
-# resp = client.echo(msg: "World")
-# puts resp.data