api_sim 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25876bf3d2f81e5cf254366d9a06c9af8b35901
-  data.tar.gz: 393cfbc364e26110599c9061a4243199fa5cf756
+  metadata.gz: c78fb49e9b8055b9c57b7d929f14e3ccdc550400
+  data.tar.gz: f366b4b136aa46472c39ec18e2be8e66032e01ac
 SHA512:
-  metadata.gz: 2469924022ed478e38dd51ca3877b1c2d971c9bbc5211bf402377a32d6af1fb899af105bc998d615541da320223b06f94a15f733809ad42a0edfaf519b6d7216
-  data.tar.gz: c4509486aeb1fd132f185c0d6baa08506e59e37a337a054088114ae0207e75b4484962582b6610600bf3fd807d7b5f7746f5a6707798b2bafcb64e14d29b9dcf
+  metadata.gz: 46122772e2556bc430916fa25d89f0cdbbb864ef1d980a6644674da31f7133038ca2b3af48ca393544e0d0077c686e7f811f54cbc0a363ba16827d6bfe639490
+  data.tar.gz: c42b0887edaed2dad8ffde3f39d6bf661607e89828041f2e6cda7729a927f55ec0374b21a6fe9761f7e01f9934b1bfb1c2c72942555be7db33e0acd592edf49a

data/examples/basic/Gemfile.lock

@@ -1,30 +1,32 @@
 PATH
-  remote: ../../
+  remote: ../..
   specs:
-    api_sim (2.2.0)
+    api_sim (5.0.0)
       json-schema (>= 2.5)
+      mustermann (~> 1.0.0.beta2)
       nokogiri (~> 1.6.7)
       sinatra (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
-    json-schema (2.6.2)
-      addressable (~> 2.3.8)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    json-schema (2.8.0)
+      addressable (>= 2.4)
     mini_portile2 (2.1.0)
-    nokogiri (1.6.8)
+    mustermann (1.0.0)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
-    rack (1.6.4)
+    public_suffix (2.0.5)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
-    sinatra (1.4.7)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    tilt (2.0.5)
+    tilt (2.0.7)
 
 PLATFORMS
   ruby
@@ -33,4 +35,4 @@ DEPENDENCIES
   api_sim!
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/examples/basic/config.ru

@@ -3,6 +3,7 @@ require 'api_sim'
 ENDPOINT_JSON_SCHEMA = {type: "object", properties: {a: {type: "integer"}}}.to_json
 
 app = ApiSim.build_app do
+  configure_endpoint 'GET', '/endpoint?queryParam=foo', 'Hi!', 200, {'X-CUSTOM-HEADER' => 'easy as abc'}, ENDPOINT_JSON_SCHEMA
   configure_endpoint 'GET', '/endpoint', 'Hi!', 200, {'X-CUSTOM-HEADER' => 'easy as abc'}, ENDPOINT_JSON_SCHEMA
   configure_endpoint 'GET', '/begin/:middle/end', 'You found an any-value path', 200, {'CONTENT-TYPE' => 'application/json'}
 

data/lib/api_sim/built_app.rb

@@ -16,8 +16,8 @@ module ApiSim
     end
 
     def self.endpoints(endpoints = nil)
-      return @endpoints if @endpoints
-      @endpoints = endpoints
+      @endpoints = endpoints if endpoints
+      return @endpoints
     end
 
     get '/' do
@@ -25,18 +25,18 @@ module ApiSim
     end
 
     get '/ui/response/:method/*' do
-      @config = matcher(faux_request(http_method, route, faux_body))
+      @config = matcher(faux_request(method: http_method, path: route, body: faux_body, query: request.query_string))
       erb :'responses/form.html', layout: :'layout.html'
     end
 
     get '/ui/requests/:method/*' do
-      @config = matcher(faux_request(http_method, route, faux_body))
+      @config = matcher(faux_request(method: http_method, path: route, body: faux_body, query: request.query_string))
 
       erb :'requests/index.html', layout: :'layout.html'
     end
 
     post '/ui/response/:method/*' do
-      @config = matcher(faux_request(http_method, route, faux_body))
+      @config = matcher(faux_request(method: http_method, path: route, body: faux_body, query: request.query_string))
       unless params['schema'].empty?
         @errors = JSON::Validator.fully_validate(JSON.parse(params['schema']), params['body'])
         if @errors.any?
@@ -72,7 +72,7 @@ module ApiSim
 
     get '/requests/*' do
       params = API_REQUEST_MATCHER.match(request.path) || halt(404)
-      endpoint = matcher(faux_request(params['method'], params['path']))
+      endpoint = matcher(faux_request(method: params['method'], path: params['path'], query: request.query_string))
 
       halt(404) unless endpoint
       endpoint.requests.to_json
@@ -112,7 +112,7 @@ module ApiSim
     end
 
     def mimicked_request
-      faux_request(http_method, route, request.body)
+      faux_request(method: http_method, path: route, body: request.body, query: request.query_string)
     end
 
     def http_method
@@ -127,9 +127,9 @@ module ApiSim
       self.class.endpoints.select { |matcher| matcher.matches?(request) }
     end
 
-    def faux_request(method='', path='', body=StringIO.new(''))
+    def faux_request(method: '', path: '', body: StringIO.new(''), query: '')
       body.rewind
-      Rack::Request.new({'rack.input' => body, 'REQUEST_METHOD' => method, 'PATH_INFO' => path})
+      Rack::Request.new({'rack.input' => body, 'REQUEST_METHOD' => method, 'PATH_INFO' => path, 'QUERY_STRING' => query})
     end
 
     def faux_body

data/lib/api_sim/version.rb

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

data/lib/api_sim/view_helpers.rb

@@ -8,6 +8,10 @@ module ApiSim
       endpoint.custom_matcher? ? '(Custom matcher)' : ''
     end
 
+    def endpoint_query_string(endpoint)
+      "?#{endpoint.query}" if endpoint.query != ''
+    end
+
     def config
       @config
     end

data/lib/api_sim/views/index.html.erb

@@ -12,7 +12,7 @@
   <tbody>
   <% endpoints.each do |endpoint| %>
     <tr>
-      <td><%= endpoint.http_method %> <%= endpoint.route %> <%= custom_matcher?(endpoint) %></td>
+      <td><%= endpoint.http_method %> <%= endpoint.route %><%= endpoint_query_string(endpoint) %> <%= custom_matcher?(endpoint) %></td>
       <td><%= endpoint_match endpoint %></td>
       <td>
         <% if endpoint.readonly? %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_sim
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-19 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.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A DSL on top of sinatra for building application simulators