api_sim 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78fb49e9b8055b9c57b7d929f14e3ccdc550400
-  data.tar.gz: f366b4b136aa46472c39ec18e2be8e66032e01ac
+  metadata.gz: d28ccc19a3eaa578a47a72156ae7506b1c0c629d
+  data.tar.gz: 5008b1738a71153aa9933abd54b92da4b54fab8f
 SHA512:
-  metadata.gz: 46122772e2556bc430916fa25d89f0cdbbb864ef1d980a6644674da31f7133038ca2b3af48ca393544e0d0077c686e7f811f54cbc0a363ba16827d6bfe639490
-  data.tar.gz: c42b0887edaed2dad8ffde3f39d6bf661607e89828041f2e6cda7729a927f55ec0374b21a6fe9761f7e01f9934b1bfb1c2c72942555be7db33e0acd592edf49a
+  metadata.gz: d0f04ea1e7d633fcde25d0edcd2aefe28664eb954a086b1b0a8cb01c2b22517a1ca40d903459e64cf164ef3c31c19b1b228d2ac21c55f3a0548e8e2938c11f67
+  data.tar.gz: 3f830c93e9579f75381dd3ee2961dcf83746b451ae53ecf44ce53d5aa32d153354484e0ee28a618ec33f3a8206329913f17cecc36b0941554a571b215c70db43

data/lib/api_sim/app_builder.rb

@@ -9,9 +9,15 @@ module ApiSim
       config = self
       Sinatra.new(BuiltApp) do
         endpoints config.endpoint_configurations
+        ui_root config.ui_root || '/ui'
       end
     end
 
+    def ui_root(root = nil)
+      @ui_root = root if root
+      @ui_root
+    end
+
     def configure_endpoint(http_method, route, response_body, response_code=200, headers={}, schema_string='', request_schema: nil)
       endpoint_configurations.push(
         Matchers::StaticRequestMatcher.new(
@@ -58,4 +64,4 @@ module ApiSim
       @endpoint_configurations ||= []
     end
   end
-end
+end

data/lib/api_sim/built_app.rb

@@ -2,59 +2,27 @@ require 'sinatra/base'
 require 'nokogiri'
 require 'json'
 require 'tilt/erb'
-require 'api_sim/view_helpers'
 require 'json-schema'
 require 'mustermann'
+require 'api_sim/view_helpers'
+require 'api_sim/ui_app'
 
 module ApiSim
   class BuiltApp < Sinatra::Base
     API_REQUEST_MATCHER = Mustermann.new('/requests/:method{+path}')
     use Rack::MethodOverride
 
-    helpers do
-      include ViewHelpers
-    end
-
     def self.endpoints(endpoints = nil)
       @endpoints = endpoints if endpoints
       return @endpoints
     end
 
-    get '/' do
-      erb :'index.html', layout: :'layout.html'
-    end
-
-    get '/ui/response/:method/*' do
-      @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(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(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?
-          return erb :'responses/form.html', layout: :'layout.html'
-        end
+    def self.ui_root(root = nil)
+      if root
+        @ui_root = root
+        self.register UiApp.with_root(root)
       end
-      new_config = create_matcher_override(mimicked_request)
-
-      self.class.endpoints.unshift(new_config)
-      redirect to '/'
-    end
-
-    delete '/ui/response/:method/*' do
-      all_matching_matchers = matchers(mimicked_request)
-      all_matching_matchers.each &:reset!
-      non_default_matchers = all_matching_matchers.reject(&:default)
-      self.class.endpoints.delete_if { |endpoint| non_default_matchers.include?(endpoint) }
-      redirect to '/'
+      @ui_root
     end
 
     put '/response/*' do
@@ -165,6 +133,10 @@ module ApiSim
       end
     end
 
+    def route
+      "/#{params[:splat].first}"
+    end
+
     def blank?(item)
       item.nil? || item.empty?
     end

data/lib/api_sim/ui_app.rb

@@ -0,0 +1,50 @@
+require 'sinatra/base'
+require 'api_sim/view_helpers'
+
+module ApiSim
+  module UiApp
+    def self.with_root(root)
+      Module.new do
+        def self.registered(app)
+          app.helpers ViewHelpers
+          app.get "#{app.ui_root}" do
+            erb :'index.html', layout: :'layout.html'
+          end
+
+          app.get "#{app.ui_root}/response/:method/*" do
+            @config = matcher(faux_request(method: http_method, path: route, body: faux_body, query: request.query_string))
+            erb :'responses/form.html', layout: :'layout.html'
+          end
+
+          app.get "#{app.ui_root}/requests/:method/*" do
+            @config = matcher(faux_request(method: http_method, path: route, body: faux_body, query: request.query_string))
+
+            erb :'requests/index.html', layout: :'layout.html'
+          end
+
+          app.post "#{app.ui_root}/response/:method/*" do
+            @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?
+                return erb :'responses/form.html', layout: :'layout.html'
+              end
+            end
+            new_config = create_matcher_override(mimicked_request)
+
+            self.class.endpoints.unshift(new_config)
+            redirect to app.ui_root
+          end
+
+          app.delete "#{app.ui_root}/response/:method/*" do
+            all_matching_matchers = matchers(mimicked_request)
+            all_matching_matchers.each &:reset!
+            non_default_matchers = all_matching_matchers.reject(&:default)
+            self.class.endpoints.delete_if {|endpoint| non_default_matchers.include?(endpoint)}
+            redirect to app.ui_root
+          end
+        end
+      end
+    end
+  end
+end

data/lib/api_sim/version.rb

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

data/lib/api_sim/view_helpers.rb

@@ -16,14 +16,10 @@ module ApiSim
       @config
     end
 
-    def route
-      "/#{params[:splat].first}"
-    end
-
     def link_to_response_edit(endpoint)
       match = endpoint.match_on_body? ? endpoint.matcher.source : ''
       <<-HTML
-      <a href="/ui/response/#{endpoint.http_method}#{endpoint.route}?match=#{match}">
+      <a href="#{ui_root}/response/#{endpoint.http_method}#{endpoint.route}?match=#{match}">
         #{endpoint.route}
       </a>
       HTML
@@ -36,7 +32,7 @@ module ApiSim
     def link_to_read_requests(endpoint)
       match = endpoint.match_on_body? ? endpoint.matcher.source : ''
       <<-HTML
-        <a href="/ui/requests/#{endpoint.http_method}#{endpoint.route}?match=#{match}">
+        <a href="#{ui_root}/requests/#{endpoint.http_method}#{endpoint.route}?match=#{match}">
           #{endpoint.requests.count}
         </a>
       HTML
@@ -49,5 +45,9 @@ module ApiSim
         ''
       end
     end
+
+    def ui_root
+      self.class.ui_root
+    end
   end
-end
+end

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

@@ -25,7 +25,7 @@
         <%= link_to_read_requests endpoint %>
       </td>
       <td>
-        <form action="/ui/response/<%= endpoint.http_method %><%= endpoint.route %>" method="post">
+        <form action="<%= ui_root %>/response/<%= endpoint.http_method %><%= endpoint.route %>" method="post">
           <input type="hidden" value="delete" name="_method">
           <input type="hidden" value="<%= endpoint_match endpoint %>" name="match">
           <button class='btn-link' type="submit">Reset</button>
@@ -34,4 +34,4 @@
     </tr>
   <% end %>
   </tbody>
-</table>
+</table>

data/lib/api_sim/views/responses/form.html.erb

@@ -2,7 +2,7 @@
   <h1>Simulators</h1>
   <h2>Response for <%= config.http_method %> <%= config.route %></h2>
 </div>
-<form action="/ui/response/<%= config.http_method %><%= config.route %>" method="post">
+<form action="<%= ui_root %>/response/<%= config.http_method %><%= config.route %>" method="post">
   <div class="row">
     <% if @errors %>
       <div class="alert alert-danger">
@@ -51,4 +51,4 @@
       <button class='btn btn-primary' type="submit">Save</button>
     </div>
   </div>
-</form>
+</form>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_sim
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -163,6 +163,7 @@ files:
 - lib/api_sim/public/app.js
 - lib/api_sim/public/favicon.ico
 - lib/api_sim/recorded_request.rb
+- lib/api_sim/ui_app.rb
 - lib/api_sim/version.rb
 - lib/api_sim/view_helpers.rb
 - lib/api_sim/views/index.html.erb
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A DSL on top of sinatra for building application simulators