mirage 2.0.0.alpha3 → 2.0.0.alpha4

data/features/server/{set_default_response.feature → templates/put/put_as_default.feature}

@@ -1,4 +1,4 @@
-Feature: Mirage can respond with a 'default' response when a when the response requested at a sub url is not found.
+Feature: A template can be configure as the default response for when there is no response found for a sub url.
   I.e.
   if a response is held for 'level1' and request comes in for 'level1/level2' the response for 'level1'
   can be returned if nothing is held for 'level1/level2'

data/features/server/{set_with_a_pattern.feature → templates/put/put_with_pattern.feature}

@@ -3,6 +3,9 @@ Feature: Mirage can be configured to return particular responses conditionally b
 
   Patterns can be either plain text or a regular expression
 
+  A response with a pattern is not considered the same a response at the same address that has either no pattern or a diffferent one.
+  This allows you to specify different behaviour depending on the request.
+
   Background: There is already a default response for 'greeting'
     Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello Stranger' and headers:
       | X-mirage-method | POST |
@@ -64,4 +67,14 @@ Feature: Mirage can be configured to return particular responses conditionally b
      </greetingRequest>
     """
 
-    Then 'Hello Stranger' should be returned
+    Then 'Hello Stranger' should be returned
+
+  Scenario: Templates with different patterns on the same address
+    When I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello Leon, how are you?' and headers:
+      | X-mirage-pattern | 2 |
+
+    When I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello Leon, how are you?' and headers:
+      | X-mirage-pattern | 3 |
+    Then '3' should be returned
+    
+      

data/features/step_definitions/my_steps.rb

@@ -24,7 +24,7 @@ end
 
 
 Then /^mirage should be running on '(.*)'$/ do |url|
-  get(url).code.to_i.should == 200
+  http_get(url).code.to_i.should == 200
 end
 
 Given /^I run '(.*)'$/ do |command|
@@ -42,7 +42,7 @@ end
 
 Then /^Connection should be refused to '(.*)'$/ do |url|
   begin
-    get(url)
+    http_get(url)
     fail "Mirage is still running"
   rescue Errno::ECONNREFUSED
   end
@@ -80,10 +80,10 @@ When /^I send (POST|PUT) to '(http:\/\/localhost:7001\/mirage\/(.*?))' with requ
   @response = case method
                 when 'POST'
                 then
-                  post(url, entity)
+                  http_post(url, entity)
                 when 'PUT'
                 then
-                  put(url, entity)
+                  http_put(url, entity)
               end
 end
 
@@ -91,17 +91,17 @@ When /^I send (GET|PUT|POST|OPTIONS|HEAD|DELETE) to '(http:\/\/localhost:7001\/m
   start_time = Time.now
   @response = case method
                 when 'GET' then
-                  get(url)
+                  http_get(url)
                 when 'PUT' then
-                  put(url, '')
+                  http_put(url, '')
                 when 'POST' then
-                  post(url, '')
+                  http_post(url, '')
                 when 'HEAD' then
-                  head(url)
+                  http_head(url)
                 when 'OPTIONS' then
-                  options(url)
+                  http_options(url)
                 when 'DELETE' then
-                  delete(url)
+                  http_delete(url)
               end
   @response_time = Time.now - start_time
 end
@@ -109,7 +109,7 @@ end
 
 When /^I send PUT to '(http:\/\/localhost:7001\/mirage\/([^']*))' with body '([^']*)'$/ do |url, endpoint, body|
   start_time = Time.now
-  @response = put(url, body)
+  @response = http_put(url, body)
   @response_time = Time.now - start_time
 end
 
@@ -119,7 +119,7 @@ When /^I send PUT to '(http:\/\/localhost:7001\/mirage\/([^']*))' with body '([^
     parameter, value = row[0], row[1]
     headers[parameter]=value
   end
-  @response = put(url, body, headers)
+  @response = http_put(url, body, headers)
 end
 
 Then /^I should see '(.*?)' on the command line$/ do |content|
@@ -158,9 +158,9 @@ When /^I send (GET|POST) to '(http:\/\/localhost:7001\/mirage\/(.*?))' with para
 
   @response = case http_method
                 when 'POST' then
-                  post(url, parameters)
+                  http_post(url, parameters)
                 when 'GET' then
-                  get(url, parameters)
+                  http_get(url, parameters)
               end
 end
 
@@ -174,7 +174,7 @@ Given /^I send PUT to '(http:\/\/localhost:7001\/mirage\/(.*?))' with file: ([^'
     parameter, value = row[0], row[1]
     headers[parameter]=value
   end
-  put(url, File.new(path), headers)
+  http_put(url, File.new(path), headers)
 end
 
 When /^the response '([^']*)' should be '([^']*)'$/ do |header, value|

data/features/support/env.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
 require 'rubygems'
-require 'mirage'
+require 'mirage/client'
 require 'cucumber'
 require 'rspec'
 require 'mechanize'

data/lib/mirage/client.rb

@@ -1,6 +1,8 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
 require 'uri'
 require 'open-uri'
-require 'mirage/web'
+require 'util'
+require 'web'
 
 module Mirage
 
@@ -15,7 +17,7 @@ module Mirage
   
   class Response
     
-    attr_accessor :method, :pattern, :content_type
+    attr_accessor :method, :pattern, :content_type, :default
     
   end
 
@@ -46,7 +48,7 @@ module Mirage
     #  Client.set('greeting', 'hello', :pattern => /regexp/)
     #  Client.set('greeting', 'hello', :pattern => 'text')
     #  Client.set('greeting', 'hello', :delay => 5) # number of seconds
-    def set endpoint, response_value, params={}
+    def put endpoint, response_value, params={}
       response = Response.new
       
       yield response if block_given?
@@ -55,15 +57,16 @@ module Mirage
       headers['X-mirage-method'] = response.method.to_s if response.method
       
       headers['X-mirage-pattern'] = response.pattern if response.pattern
+      headers['X-mirage-default'] = 'true' if response.default
       headers['Content-Type'] = response.content_type || 'text/plain'
       
-      response(put("#{@url}/templates/#{endpoint}",response_value, headers))
+      build_response(http_put("#{@url}/templates/#{endpoint}",response_value, headers))
     end
 
     # Use to look at what a response contains without actually triggering it.
     # Client.peek(response_id) => response held on the server as a String
-    def peek response_id
-      response = response(get("#{@url}/templates/#{response_id}"))
+    def response response_id
+      response = build_response(http_get("#{@url}/templates/#{response_id}"))
       case response
         when String then
           return response
@@ -86,14 +89,14 @@ module Mirage
       
       case thing
         when :requests
-          delete("#{@url}/requests")
+          http_delete("#{@url}/requests")
         when Numeric then
-          delete("#{@url}/templates/#{thing}")
+          http_delete("#{@url}/templates/#{thing}")
         when Hash then
           puts "deleteing request #{thing[:request]}"
-          delete("#{@url}/requests/#{thing[:request]}") if thing[:request]
+          http_delete("#{@url}/requests/#{thing[:request]}") if thing[:request]
         else NilClass
-          delete("#{@url}/templates")
+          http_delete("#{@url}/templates")
       end
       
     end
@@ -104,27 +107,27 @@ module Mirage
     #
     #   Example:
     #   Client.new.track(response_id) => Tracked request as a String
-    def track response_id
-      response(get("#{@url}/requests/#{response_id}"))
+    def request response_id
+      build_response(http_get("#{@url}/requests/#{response_id}"))
     end
 
     # Save the state of the Mirage server so that it can be reverted back to that exact state at a later time.
     def save
-      put("#{@url}/backup",'').code == 200
+      http_put("#{@url}/backup",'').code == 200
     end
 
 
     # Revert the state of Mirage back to the state that was last saved
     # If there is no snapshot to rollback to, nothing happens
     def revert
-      put("#{@url}",'').code == 200
+      http_put("#{@url}",'').code == 200
     end
 
 
     # Check to see if Mirage is up and running
     def running?
       begin
-        get(@url) and return true
+        http_get(@url) and return true
       rescue Errno::ECONNREFUSED
         return false
       end
@@ -132,11 +135,12 @@ module Mirage
 
     # Clear down the Mirage Server and load any defaults that are in Mirages default responses directory.
     def prime
-      response(put("#{@url}/defaults",''))
+      puts "#{@url}/defaults"
+      build_response(http_put("#{@url}/defaults",''))
     end
 
     private
-    def response response
+    def build_response response
       case response.code.to_i
         when 500 then
           raise ::Mirage::InternalServerException.new(response.body, response.code.to_i)

data/lib/mirage/core.rb

@@ -4,7 +4,16 @@ require 'sinatra/reloader'
 
 module Mirage
 
-  class MirageServer < Sinatra::Base
+  class Server < Sinatra::Base
+
+    
+    class << self
+      attr_reader :defaults_directory
+      
+      def configure options
+        @defaults_directory = options[:defaults_directory]
+      end
+    end
 
     REQUESTS= {}
 
@@ -76,7 +85,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
@@ -85,7 +94,7 @@ module Mirage
     put '/mirage/defaults' do
       MOCK_RESPONSES.clear
 
-      Dir["#{DEFAULT_RESPONSES_DIR}/**/*.rb"].each do |default|
+      Dir["#{Server.defaults_directory}/**/*.rb"].each do |default|
         begin
           load default
         rescue Exception

data/lib/mirage/server.rb

@@ -0,0 +1,17 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
+require 'object'
+require 'mock_response'
+require 'mock_responses_collection'
+require 'core'
+
+module Mirage
+  class << self
+    def prime
+      yield @client
+    end
+
+    def client= client
+      @client = client
+    end
+  end
+end

data/lib/mirage/web.rb

@@ -13,7 +13,7 @@ module Mirage
       end
     end
 
-    def put url, entity, headers={}
+    def http_put url, entity, headers={}
       uri = URI.parse(url)
       request = Net::HTTP::Put.new(uri.request_uri)
 
@@ -28,7 +28,7 @@ module Mirage
       Net::HTTP.new(uri.host, uri.port).request(request)
     end
 
-    def get url, params={}, headers={}
+    def http_get url, params={}, headers={}
       uri = URI.parse(url)
       request = Net::HTTP::Get.new(uri.request_uri)
       request.set_form_data params
@@ -36,7 +36,7 @@ module Mirage
       Net::HTTP.new(uri.host, uri.port).request(request)
     end
 
-    def post url, params={}, headers={}
+    def http_post url, params={}, headers={}
       uri = URI.parse(url)
       request = Net::HTTP::Post.new(uri.request_uri)
       
@@ -46,7 +46,7 @@ module Mirage
       Net::HTTP.new(uri.host, uri.port).request(request)
     end
 
-    def delete url, params={}, headers={}
+    def http_delete url, params={}, headers={}
       uri = URI.parse(url)
       request = Net::HTTP::Delete.new(uri.request_uri)
       params.is_a?(Hash) ? request.set_form_data(params) : request.body = params

data/lib/start_mirage.rb

@@ -1,24 +1,20 @@
 require 'rubygems'
-
 $0='Mirage Server'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'sinatra'
 require 'sinatra/base'
 
-require 'mirage/util'
-include Mirage::Util
-options = parse_options(ARGV)
-
 module Mirage
-  class MirageServer < Sinatra::Base
-    configure do
+  class Server < Sinatra::Base
+    configure do |config|
       require 'logger'
       enable :logging
       log_file = File.open('mirage.log', 'a')
       log_file.sync=true
       use Rack::CommonLogger, log_file
-      set :views, File.dirname(__FILE__) + '/views'
+      config.set :views, File.dirname(__FILE__) + '/views'
+      config.set(:show_exception, false)
+      config.set(:raise_errors, false)  
     end
 
     configure(:development) do |config|
@@ -30,14 +26,13 @@ module Mirage
 end
 
 
-require 'mirage'
+require 'mirage/server'
 
-
-DEFAULT_RESPONSES_DIR = "#{options[:defaults_directory]}"
-Mirage.client = Mirage::Client.new
-set(:show_exception, false)
-set(:raise_errors, true)
-
-Mirage::MirageServer.run! :port => options[:port], :show_exceptions => false, :logging => true, :server => 'webrick'
+require 'mirage/client'
+include Mirage::Util
+options = parse_options(ARGV)
+Mirage::Server.configure options
+Mirage.client = Mirage::Client.new "http://localhost:#{options[:port]}/mirage"
+Mirage::Server.run! :port => options[:port], :show_exceptions => false, :logging => true, :server => 'webrick'
 
 

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mirage}
-  s.version = "1.3.6"
+  s.version = "2.0.0.alpha4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = %q{2011-04-25}
+  s.date = %q{2011-08-11}
   s.default_executable = %q{mirage}
   s.description = %q{Mirage aids testing of your applications by hosting mock responses so that your applications do not have to talk to real endpoints. Its accessible via HTTP and has a RESTful interface.}
   s.executables = ["mirage"]
@@ -23,33 +23,34 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/mirage",
     "features/client/clear.feature",
-    "features/client/get.feature",
     "features/client/mirage_client.feature",
-    "features/client/peek.feature",
+    "features/client/put.feature",
+    "features/client/request.feature",
+    "features/client/response.feature",
     "features/client/save_and_revert.feature",
-    "features/client/set.feature",
-    "features/client/track_requests.feature",
-    "features/server/clear.feature",
     "features/server/command_line_iterface.feature",
-    "features/server/file_responses.feature",
     "features/server/logging.feature",
-    "features/server/peek.feature",
     "features/server/prime.feature",
-    "features/server/response_templates.feature",
+    "features/server/requests/delete.feature",
+    "features/server/requests/get.feature",
     "features/server/save_and_revert.feature",
-    "features/server/set.feature",
-    "features/server/set_default_response.feature",
-    "features/server/set_with_a_delay.feature",
-    "features/server/set_with_a_pattern.feature",
-    "features/server/track_requests.feature",
+    "features/server/templates/delete.feature",
+    "features/server/templates/get.feature",
+    "features/server/templates/put/put.feature",
+    "features/server/templates/put/put_as_default.feature",
+    "features/server/templates/put/put_with_delay.feature",
+    "features/server/templates/put/put_with_pattern.feature",
+    "features/server/templates/put/put_with_substitutions.feature",
     "features/server/web_user_interface.feature",
     "features/step_definitions/my_steps.rb",
     "features/support/env.rb",
     "full_build.sh",
-    "lib/config.ru",
-    "lib/mirage.rb",
     "lib/mirage/client.rb",
     "lib/mirage/core.rb",
+    "lib/mirage/mock_response.rb",
+    "lib/mirage/mock_responses_collection.rb",
+    "lib/mirage/object.rb",
+    "lib/mirage/server.rb",
     "lib/mirage/util.rb",
     "lib/mirage/web.rb",
     "lib/start_mirage.rb",
@@ -71,43 +72,49 @@ For more information go to: https://github.com/lashd/mirage/wiki
 ===============================================================================
 }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Mirage is a easy mock server for testing your applications}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<childprocess>, ["~> 0.1"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<gherkin>, ["= 2.3.9"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<sinatra-reloader>, [">= 0"])
+      s.add_development_dependency(%q<mechanize>, [">= 1.0.0"])
+      s.add_development_dependency(%q<gemcutter>, [">= 0"])
     else
-      s.add_dependency(%q<rack>, ["~> 1.1.0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_dependency(%q<childprocess>, ["~> 0.1"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<gherkin>, ["= 2.3.9"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<sinatra-reloader>, [">= 0"])
+      s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+      s.add_dependency(%q<gemcutter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rack>, ["~> 1.1.0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<mechanize>, [">= 1.0.0"])
     s.add_dependency(%q<childprocess>, ["~> 0.1"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<gherkin>, ["= 2.3.9"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<sinatra-reloader>, [">= 0"])
+    s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+    s.add_dependency(%q<gemcutter>, [">= 0"])
   end
 end