api_sim 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39744282ba52dd613a6cd9481717892a39482f3b
-  data.tar.gz: 67e3e2d58c0e5e2110521924ddc5c99114a5ce83
+  metadata.gz: 3ac439cdf5117d5e307c6fd4f3bc9720af5f60fc
+  data.tar.gz: 6ab64d5c0d40d03a94af5590a76b1a9657379d26
 SHA512:
-  metadata.gz: a88815795d88e7c6f6adc25dfff2b2e7f79c1eda450079d212e7f7fddab4adb20ffc29e2a5b9aa50aee4bbc81c14f67c9ebf92ca1d842740c3ff8394c9dc0348
-  data.tar.gz: 738f62d178070ebebe67302d4762aae8c40c34eb8c74834520a3654e2b9bc3139f67edda7c9ad5a9902f56bff186f25a7674f540875eb89450f3e693bed29a40
+  metadata.gz: 01e1097d28d79c7c41ebd0944ed0fb53aa5e90fc4553a91d1e9838f343f403ba9d1de7c4614171382cb3db73e822c6bd4ad7511a485fd84a09feba3f83839aeb
+  data.tar.gz: cd9378a7e9431b6aafa3003c1f0483493aede7adad063372db27605035e57455c6f49c19f8d88cfef6c95d8c5c26a3d7bd51fcdbc936e2d2e5d82c9a7bc13241

data/api_sim.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra", '~> 1.0'
   spec.add_dependency "nokogiri", '~> 1.6.7'
   spec.add_dependency "json-schema", '>= 2.5'
+  spec.add_dependency "mustermann", '~> 1.0.0.beta2'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/api_sim/built_app.rb

@@ -4,9 +4,11 @@ require 'json'
 require 'tilt/erb'
 require 'api_sim/view_helpers'
 require 'json-schema'
+require 'mustermann'
 
 module ApiSim
   class BuiltApp < Sinatra::Base
+    API_REQUEST_MATCHER = Mustermann.new('/requests/:method{+path}')
     use Rack::MethodOverride
 
     helpers do
@@ -69,9 +71,8 @@ module ApiSim
     end
 
     get '/requests/*' do
-      endpoint_name = parse_endpoint_from_request(request) || halt(404)
-      http_method = params.fetch('method', 'GET')
-      endpoint = find_matching_endpoint(endpoint_name, http_method)
+      params = API_REQUEST_MATCHER.match(request.path) || halt(404)
+      endpoint = matcher(faux_request(params['method'], params['path']))
 
       halt(404) unless endpoint
       endpoint.requests.to_json
@@ -88,21 +89,6 @@ module ApiSim
 
     private
 
-    def find_matching_endpoint(endpoint_name, http_method)
-      matching_endpoints = active_endpoints.select do |endpoint|
-        endpoint.route == "/#{endpoint_name}"
-      end
-
-      case matching_endpoints.size
-      when 0
-        nil
-      when 1
-        matching_endpoints.first
-      else
-        matching_endpoints.find { |endpoint| endpoint.http_method =~ /#{http_method}/i }
-      end
-    end
-
     def active_endpoints
       self.class.endpoints.reject(&:overridden?)
     end
@@ -171,11 +157,6 @@ module ApiSim
       @response_body.empty? ? {} : @response_body
     end
 
-    def parse_endpoint_from_request(request)
-      path_matcher = request.path.match(/\/requests\/([\w\/_-]*)/)
-      path_matcher.size == 2 ? path_matcher[1] : nil
-    end
-
     def schema_validates?(endpoint)
       if blank?(endpoint.request_schema) || request.env['CONTENT_TYPE'] != 'application/json'
         true

data/lib/api_sim/matchers/base_matcher.rb

@@ -54,14 +54,7 @@ module ApiSim
       protected
 
       def matches_route_pattern?(request)
-        route_tokens = route.split('/')
-        request_tokens = request.path.split('/')
-
-        return false if route_tokens.count != request_tokens.count && !route_tokens.include?('*')
-        route_tokens.zip(request_tokens).all? do |matcher_part, request_part|
-          break true if matcher_part == '*'
-          matcher_part == request_part || matcher_part.start_with?(':')
-        end
+        route.match(request.path)
       end
     end
   end

data/lib/api_sim/matchers/dynamic_request_matcher.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'mustermann'
 require 'api_sim/recorded_request'
 require 'api_sim/matchers/base_matcher'
 
@@ -9,7 +10,7 @@ module ApiSim
 
       def initialize(http_method:, route:, response_generator:, default: false, matcher: ALWAYS_TRUE_MATCHER)
         @matcher = matcher
-        @route = route
+        @route = Mustermann.new(route)
         @http_method = http_method
         @default = default
         @response_generator = response_generator
@@ -42,9 +43,7 @@ module ApiSim
     end
 
     def [](requested_part)
-      @matcher.route.split('/').zip(path.split('/')).find { |matcher_part, path_part|
-        ":#{requested_part}" == matcher_part and break path_part
-      } || super
+      @matcher.route.match(path)[requested_part]
     end
   end
 end

data/lib/api_sim/matchers/request_body_matcher.rb

@@ -1,3 +1,4 @@
+require 'mustermann'
 require 'api_sim/recorded_request'
 require 'api_sim/matchers/base_matcher'
 
@@ -12,7 +13,7 @@ module ApiSim
         @headers = headers
         @response_body = response_body
         @response_code = response_code
-        @route = route
+        @route = Mustermann.new(route)
         @http_method = http_method
         @schema = schema
       end
@@ -21,7 +22,7 @@ module ApiSim
         request.body.rewind
         body = request.body.read
         request.body.rewind
-        request.path == route && request.request_method == http_method && matcher.match(body)
+        route.match(request.path) && request.request_method == http_method && matcher.match(body)
       end
 
       def match_on_body?

data/lib/api_sim/matchers/static_request_matcher.rb

@@ -1,3 +1,4 @@
+require 'mustermann'
 require 'api_sim/recorded_request'
 require 'api_sim/matchers/base_matcher'
 
@@ -12,7 +13,7 @@ module ApiSim
         @headers = args.fetch(:headers, {})
         @response_body = args.fetch(:response_body, '')
         @response_code = args.fetch(:response_code, 200)
-        @route = args.fetch(:route)
+        @route = Mustermann.new(args.fetch(:route))
         @http_method = args.fetch(:http_method)
         @schema = args.fetch(:schema, nil)
         @request_schema = args.fetch(:request_schema, nil)

data/lib/api_sim/version.rb

@@ -1,3 +1,3 @@
 module ApiSim
-  VERSION = "3.2.0"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_sim
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: mustermann
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement