mirage 4.0.0.alpha6 → 4.0.0.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d515c9196308c045d6d8bfbba86ef54214e4994d
-  data.tar.gz: 4c8795fbae565b9f3c51baa5fcef5d1d0bcb52bf
+  metadata.gz: 8e664377381f5dc9cc7913777720dbcf8725ce74
+  data.tar.gz: a082d2793a96efded9c66d24319793415ef69558
 SHA512:
-  metadata.gz: 97438ad78627aa8f1198fdf56b41dbaf705ae52e228a085c9564114d770714fecb078eb142d0ac1c0cd1e8d7171eefb3411c2e90b32eaad775f169a8072842c2
-  data.tar.gz: 2ee6762d6d516771a446b6528a77cd9cef6af742a2d7fb616e44b07d4c9325b6d7195b81fba0834e47a81855b6add3b6b318e9cb5ff91d7b738820b1b8eb252a
+  metadata.gz: 4350871c5affaf2c92539110e6b1cc3bc3f53f670200ccd8b93e66dfa4074354630cf72395b9a9ac0fc6d9ee9bb7bc843cc7d645482109323fa749bdadafcbb4
+  data.tar.gz: 2f2120fbc55ac958b0c95fe3bce1ad7ca92b7ffd50ba6c8b6d0d448e049eb9907532084cfad607d618085ee487945337d0bb4b3b99d78ee1c23562c44ba211dd

data/lib/mirage/client/runner.rb

@@ -10,8 +10,8 @@ module Mirage
     # Example Usage:
     #
     #   Mirage.start :port => 9001 -> Configured MirageClient ready to use.
-    def start options={}
-      options={:port => 7001}.merge(options)
+    def start options = {}
+      options = {:port => 7001}.merge(options)
       Runner.new.invoke(:start, [], options)
       Mirage::Client.new(options)
     end
@@ -22,7 +22,7 @@ module Mirage
     #   Mirage.stop -> Will stop mirage if there is only instance running. Can be running on any port.
     #   Mirage.stop :port => port -> stop mirage on a given port
     #   Mirage.stop :port => [port1, port2...] -> stops multiple running instances of Mirage
-    def stop options={:port => []}
+    def stop options = {:port => []}
       options = {:port => :all} if options == :all
 
       if options[:port]
@@ -78,27 +78,29 @@ module Mirage
       end
 
 
-      command = command.concat(options.to_a).flatten.collect { |arg| arg.to_s }
+      command = command.concat(options.to_a).flatten.collect {|arg| arg.to_s}
       ChildProcess.build(*command).start
 
-      wait_until(:timeout_after => 30) { Mirage.running?(options) }
+      wait_until(:timeout_after => 30) {Mirage.running?(options)}
 
       begin
         Mirage::Client.new(options).prime
       rescue Mirage::InternalServerException => e
         puts "WARN: #{e.message}"
       end
+
+
     end
 
     desc "stop", "Stops mirage"
     method_option :port, :aliases => "-p", :type => :array, :default => [], :banner => "[port_1 port_2|all]", :desc => "port(s) of mirage instance(s). ALL stops all running instances"
 
     def stop
-      ports = options[:port].collect{|port| port=~/\d+/ ? port.to_i : port}
+      ports = options[:port].collect {|port| port =~ /\d+/ ? port.to_i : port}
       process_ids = mirage_process_ids(ports)
       raise ClientError.new("Mirage is running on ports #{process_ids.keys.sort.join(", ")}. Please run mirage stop -p [PORT(s)] instead") if (process_ids.size > 1 && ports.empty?)
-      process_ids.values.each { |process_id| kill process_id }
-      wait_until { mirage_process_ids(options[:port]).empty? }
+      process_ids.values.each {|process_id| kill process_id}
+      wait_until {mirage_process_ids(options[:port]).empty?}
     end
 
   end

data/mirage_server.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 ROOT_DIR = File.dirname(__FILE__)
-$LOAD_PATH.unshift("#{ROOT_DIR}/lib")
-$LOAD_PATH.unshift("#{ROOT_DIR}/server")
+$LOAD_PATH.unshift("#{ROOT_DIR}/lib", "#{ROOT_DIR}/server")
 
 require 'sinatra/base'
 require 'extensions/object'

data/server/mock_response_set.rb

@@ -1,14 +1,20 @@
 module Mirage
   class MockResponseSet < Hash
     def fuzzy_find desired_key, http_method
+      http_method = http_method.upcase
       result = self[desired_key]
-      return result unless result.nil?
-      result = find_all do |key, value|
-        key.is_a?(Regexp) && desired_key.is_a?(String) && key.match(desired_key) && value[http_method.upcase]
-      end.sort do |a,b|
+
+      results = find_all do |key, value|
+        key.is_a?(Regexp) && desired_key.is_a?(String) && key.match(desired_key) && value[http_method]
+      end.sort do |a, b|
         b.first.source.size <=> a.first.source.size
       end
-      result.first && result.first[1]
+
+      return result unless results && results.first
+
+      return results.first[1] unless result && result[http_method]
+
+      {http_method => result[http_method].concat(results.first[1][http_method])}
     end
   end
 end

data/server/routes/responses.rb

@@ -4,6 +4,7 @@ module Mirage
     %w(get post delete put options head).each do |http_method|
       send(http_method, '/responses/*') do |name|
         body, query_string = request.body.read.to_s, request.query_string
+        name = "/#{name}"
 
         options = {:body => body,
                    :http_method => http_method,

data/server/routes/templates.rb

@@ -15,11 +15,12 @@ module Mirage
 
     put '/templates/*' do |name|
       content_type :json
+      name = "/#{name}"
       mock_response = synchronize do
         MockResponse.new(name, JSON.parse(request.body.read))
       end
 
-      mock_response.requests_url = request.url.gsub("/templates/#{name}", "/requests/#{mock_response.response_id}")
+      mock_response.requests_url = request.url.gsub("/templates#{name}", "/requests/#{mock_response.response_id}")
       {:id => mock_response.response_id}.to_json
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha6
+  version: 4.0.0.alpha8
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra