api_sim 4.2.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41575a14132a1b2470aa099534aa545b2adbd0b6
-  data.tar.gz: 527e676491d88348720564aac06f4933202c3307
+  metadata.gz: f25876bf3d2f81e5cf254366d9a06c9af8b35901
+  data.tar.gz: 393cfbc364e26110599c9061a4243199fa5cf756
 SHA512:
-  metadata.gz: 9d5998dd5a4aaaba866eb5150e501ee8cacda17068fda2220510ac0f166d6e312bd3290dae821449cc8e39fa6a2c1e7f09e12383e2bb557febeafbcf3382a215
-  data.tar.gz: '092d59402a7599b6da24d2ef9e8f913357d7f76918aa434f395396f456d35d313e24d6b497f818783357157e640068afc6a16b0c5c96f353d9777bf2f765e00e'
+  metadata.gz: 2469924022ed478e38dd51ca3877b1c2d971c9bbc5211bf402377a32d6af1fb899af105bc998d615541da320223b06f94a15f733809ad42a0edfaf519b6d7216
+  data.tar.gz: c4509486aeb1fd132f185c0d6baa08506e59e37a337a054088114ae0207e75b4484962582b6610600bf3fd807d7b5f7746f5a6707798b2bafcb64e14d29b9dcf

data/lib/api_sim/matchers/dynamic_request_matcher.rb

@@ -6,7 +6,7 @@ require 'api_sim/matchers/base_matcher'
 module ApiSim
   module Matchers
     class DynamicRequestMatcher < BaseMatcher
-      attr_reader :response_generator, :route, :http_method, :default, :matcher
+      attr_reader :response_generator, :route, :http_method, :default, :matcher, :query
 
       def initialize(http_method:, route:, response_generator:, default: false, matcher: ALWAYS_TRUE_MATCHER)
         @matcher = matcher

data/lib/api_sim/matchers/request_body_matcher.rb

@@ -5,7 +5,7 @@ require 'api_sim/matchers/base_matcher'
 module ApiSim
   module Matchers
     class RequestBodyMatcher < BaseMatcher
-      attr_reader :http_method, :route, :headers, :response_code, :matcher, :response_body, :default, :schema
+      attr_reader :http_method, :route, :headers, :response_code, :matcher, :response_body, :default, :schema, :query
 
       def initialize(http_method:, route:, response_code: 200, response_body: '', headers: {}, default: false, body_matches:, schema: nil)
         @default = default

data/lib/api_sim/matchers/static_request_matcher.rb

@@ -5,7 +5,7 @@ require 'api_sim/matchers/base_matcher'
 module ApiSim
   module Matchers
     class StaticRequestMatcher < BaseMatcher
-      attr_reader :http_method, :route, :headers, :response_code, :matcher, :response_body, :default, :schema
+      attr_reader :http_method, :route, :headers, :response_code, :matcher, :response_body, :default, :schema, :query
 
       def initialize(**args)
         @default = args.fetch(:default, false)
@@ -13,14 +13,19 @@ module ApiSim
         @headers = args.fetch(:headers, {})
         @response_body = args.fetch(:response_body, '')
         @response_code = args.fetch(:response_code, 200)
-        @route = Mustermann.new(args.fetch(:route))
+        route, @query = args.fetch(:route).split('?')
+        @query ||= args.fetch(:query, '')
+        @route = Mustermann.new(route)
         @http_method = args.fetch(:http_method)
         @schema = args.fetch(:schema, nil)
         @request_schema = args.fetch(:request_schema, nil)
       end
 
       def matches?(request)
-        matches_route_pattern?(request) && request.request_method == http_method && matcher.call(request)
+        matches_route_pattern?(request) &&
+          (query.empty? ? true : request.query_string == query) &&
+          request.request_method == http_method &&
+          matcher.call(request)
       end
 
       def overridden!

data/lib/api_sim/matchers.rb

@@ -13,7 +13,7 @@ module ApiSim
     def self.dupe_and_reconfigure(old_matcher, overrides)
       if old_matcher.match_on_body?
         Matchers::RequestBodyMatcher.new(
-          route: old_matcher.route,
+          route: old_matcher.route.to_s,
           http_method: old_matcher.http_method,
           response_code: overrides.fetch(:response_code),
           headers: overrides.fetch(:headers),
@@ -22,7 +22,8 @@ module ApiSim
         )
       else
         Matchers::StaticRequestMatcher.new(
-          route: old_matcher.route,
+          route: old_matcher.route.to_s,
+          query: old_matcher.query.to_s,
           http_method: old_matcher.http_method,
           response_code: overrides.fetch(:response_code),
           headers: overrides.fetch(:headers),

data/lib/api_sim/version.rb

@@ -1,3 +1,3 @@
 module ApiSim
-  VERSION = "4.2.0"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_sim
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A DSL on top of sinatra for building application simulators