mirage 2.0.0.alpha2 → 2.0.0.alpha3

data/VERSION

@@ -1 +1 @@
-2.0.0.alpha2
+2.0.0.alpha3

data/bin/mirage

@@ -33,7 +33,6 @@ end
 def stop_mirage
   mirage_process_ids.each { |process_id| windows? ? `taskkill /F /T /PID #{process_id}` : `kill -9 #{process_id}` }
   wait_until{ mirage_process_ids.size == 0 }
-  
 end
 
 if ARGV.include?('start')

data/features/server/command_line_iterface.feature

@@ -8,7 +8,6 @@ Feature: Mirage is started from the command line.
       | Usage: mirage start\|stop [options] |
       | -p, --port PORT                     |
       | -d, --defaults DIR                  |
-      | --debug                             |
 
 
   Scenario: Starting with help option

data/features/server/set.feature

@@ -11,7 +11,7 @@ Feature: Mirage can be configured with responses to be returned with the correct
   delay (optional) = the amount of time in seconds that mirage should wait for before responding (defaults to 0)
   method (optional) = http method that this response applies to. (defaults to get if not supplied)
   default (optional) = set whether the reponse can act as a default response, see set_default_response.feature (defaults to false)
-  content-type = Set the content type to be returned
+  content-type (optional) = Set the content type to be returned
 
 
   Scenario: Setting a response without any selection criteria

data/features/step_definitions/my_steps.rb

@@ -36,7 +36,7 @@ Given /^Mirage (is|is not) running$/ do |running|
   if running == 'is'
     start_mirage unless $mirage.running?
   else
-    stop_mirage if $mirage.running?
+    stop_mirage if $mirage.running?                                                   
   end
 end
 

data/lib/mirage/core.rb

@@ -24,7 +24,7 @@ module Mirage
     ['get', 'post', 'delete', 'put'].each do |http_method|
       send(http_method, '/mirage/responses/*') do |name|
         body, query_string = Rack::Utils.unescape(request.body.read.to_s), request.env['QUERY_STRING']
-        record = MOCK_RESPONSES.get_response(name, http_method.upcase, body, query_string)
+        record = MOCK_RESPONSES.get_response(name, http_method, body, query_string)
 
         return 404 unless record
         REQUESTS[record.response_id] = body.empty? ? query_string : body
@@ -76,7 +76,7 @@ module Mirage
         @responses["#{response.name}#{'/*' if response.default?}: #{pattern} #{delay}"] = response
       end
       erb :index
-    end
+    end         
 
     error do
       erb request.env['sinatra.error'].message

data/lib/mirage/mock_responses_collection.rb

@@ -10,8 +10,8 @@ module Mirage
       stored_responses = @responses[response.name]||={}
 
       stored_responses[response.pattern] ||= {}
-      old_response = stored_responses[response.pattern].delete(response.http_method)
-      stored_responses[response.pattern][response.http_method] = response
+      old_response = stored_responses[response.pattern].delete(response.http_method.upcase)
+      stored_responses[response.pattern][response.http_method.upcase] = response
 
 
       # Right not an the main id count goes up by one even if the id is not used because the old id is reused from another response
@@ -88,6 +88,7 @@ module Mirage
 
     private
     def find_response(body, query_string, stored_responses, http_method)
+      http_method = http_method.upcase
       pattern_match = stored_responses.keys.find_all { |pattern| pattern != :basic }.find { |pattern| (body =~ pattern || query_string =~ pattern) }
 
       if pattern_match

data/lib/start_mirage.rb

@@ -10,8 +10,6 @@ require 'mirage/util'
 include Mirage::Util
 options = parse_options(ARGV)
 
-$debug = options[:debug]
-
 module Mirage
   class MirageServer < Sinatra::Base
     configure do
@@ -20,14 +18,14 @@ module Mirage
       log_file = File.open('mirage.log', 'a')
       log_file.sync=true
       use Rack::CommonLogger, log_file
-
-      if $debug
-        require 'sinatra/reloader'
-        register Sinatra::Reloader
-        also_reload "**/*.rb"
-      end
       set :views, File.dirname(__FILE__) + '/views'
     end
+
+    configure(:development) do |config|
+      require 'sinatra/reloader'
+      register Sinatra::Reloader
+      config.also_reload "**/*.rb"
+    end
   end
 end
 

data/rakefile

@@ -50,5 +50,13 @@ task :clean do |task|
   task.reenable
 end
 
+task :start do
+  `RACK_ENV='development' && ruby ./bin/mirage start`
+end
+
+task :stop do
+  `RACK_ENV='development' && ruby ./bin/mirage stop`
+end
+
 
 task :default => [:install,:features,:clean]

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.alpha2
+  version: 2.0.0.alpha3
 platform: ruby
 authors: 
 - Leon Davis
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3094995407678883381
+      hash: 4414235670568771214
       segments: 
       - 0
       version: "0"