service_contract_webmock 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f46883b4ec5fe2bdebd19249e0461c52015e9b
-  data.tar.gz: fa761f30620e2c18e2168cfda5b353bc84ac805d
+  metadata.gz: 11e94ef90e0b95a1415b6d0340d3ea1ed0c3e537
+  data.tar.gz: ac56ce5e885f789f8bdabfd05251bdee55e6abf6
 SHA512:
-  metadata.gz: a7a4c6db34f1790f5e6ad99496ac19c7a813d2d5fde34baa7b172fe049fb206c852a7b14cb41708b41494a92470a62c788662ec11a0eb29b54a1d381f3ca76ba
-  data.tar.gz: 9843ea2e75a6284db12b32f25db06dbcbb8e44657f2cae321164800d25482f3e79b7b474e10ae22c1b0fb76f310e839d489da70433a570296705fe858afed145
+  metadata.gz: 668096ebf82b0320aad1163e53c3f36d532f09196d1430501b28b467989072379fff995e34365c35ed4ac17ec3a57323ff7246b1e827502c0f5a17b0d797c95a
+  data.tar.gz: 54dc1afd7046a5cbbe41220a042aef83c854ca7ba71934f44c571cf24ea72d707c52a20ea855f87b003daec0c98cbf469295ee82530f0118d51978fa025a3d63

data/lib/service_contract_webmock/contract_matcher.rb

@@ -13,19 +13,26 @@ module ServiceContractWebmock
     INT = Avro::Schema::PrimitiveSchema.new(:int)
 
     def to_regex
-      params = (fields + [Field.new('page', INT), Field.new('per_page', INT)]).map do |field|
+      params = fields_and_pagination.map do |field|
         "#{field.name}=#{field.value}&?"
       end.join("|")
       "(#{params})+"
     end
 
+    def fields_and_pagination
+      fields + pagination_fields
+    end
+
+    def pagination_fields
+      [Field.new('page', INT), Field.new('per_page', INT)]
+    end
 
     def fields
       @fields ||= endpoint.parameters.map do |param|
         param.type.definition.fields.map do |field|
-          Field.new(field.name, field.type)
+          Field.new(field.name, field.type) unless ['page', 'per_page'].include?(field.name)
         end
-      end.flatten
+      end.flatten.compact
     end
 
     def field_int?(name)

data/lib/service_contract_webmock/version.rb

@@ -1,3 +1,3 @@
 module ServiceContractWebmock
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: service_contract_webmock
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Donald Plummer