mirage 1.3.6 → 2.0.0.alpha1

data/Gemfile

@@ -1,15 +1,18 @@
-source "http://rubygems.org"
+source :rubygems
 
 gem 'rack', '~> 1.1.0'
-gem 'ramaze', '>= 2011.01.30'
-gem 'mechanize', '>= 1.0.0'
+gem 'sinatra'
 gem 'childprocess', '~> 0.1'
 
 group :development do
-  gem 'rake'
+  gem 'rake', '0.9.0'
   gem 'cucumber'
+  gem 'gherkin', '2.3.9'
   gem 'rspec'
   gem "jeweler", "~> 1.5.2"
   gem 'bundler'
+  gem 'sinatra-reloader'
+  gem 'mechanize', '>= 1.0.0'
+  gem 'gemcutter'
 end
   

data/VERSION

@@ -1 +1 @@
-1.3.6
+2.0.0.alpha1

data/bin/mirage

@@ -32,6 +32,8 @@ 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/client/clear.feature

@@ -7,36 +7,37 @@ Feature: The client can be used for clearing responses from Mirage
     require 'rspec'
     require 'mirage'
     """
-    And I hit 'http://localhost:7001/mirage/set/greeting' with parameters:
-      | response | Hello |
-
-    And I hit 'http://localhost:7001/mirage/get/greeting' with request body:
+    
+    And I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
     """
-    Hello there
+    Hello
     """
-    And I hit 'http://localhost:7001/mirage/set/leaving' with parameters:
-      | response | Goodbye |
-
-    And I hit 'http://localhost:7001/mirage/get/greeting' with request body:
+    And I send GET to 'http://localhost:7001/mirage/responses/greeting' with parameters:
+      | message | hello there |
+    
+    And I send PUT to 'http://localhost:7001/mirage/templates/leaving' with request entity
     """
-    I'm going
+    Goodbye
     """
+    And I send GET to 'http://localhost:7001/mirage/responses/greeting' with parameters:
+    | message | I'm going |
 
+    
   Scenario: Clearing everything
     When I run
     """
     Mirage::Client.new.clear
     """
-    And I hit 'http://localhost:7001/mirage/get/greeting'
+    And I send GET to 'http://localhost:7001/mirage/responses/greeting'
     Then a 404 should be returned
 
-    When I hit 'http://localhost:7001/mirage/check/1'
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
 
-    And I hit 'http://localhost:7001/mirage/get/leaving'
+    And I send GET to 'http://localhost:7001/mirage/responses/leaving'
     Then a 404 should be returned
 
-    When I hit 'http://localhost:7001/mirage/check/2'
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
     Then a 404 should be returned
 
 
@@ -45,29 +46,46 @@ Feature: The client can be used for clearing responses from Mirage
     """
     Mirage::Client.new.clear :requests
     """
-    When I hit 'http://localhost:7001/mirage/check/1'
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
 
-    When I hit 'http://localhost:7001/mirage/check/2'
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
     Then a 404 should be returned
+    
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 200 should be returned
+    
 
   Scenario: Clearning a response
     Given I run
     """
-    Mirage::Client.new.clear 1
+    Mirage::Client.new.clear 1 
     """
-    When I hit 'http://localhost:7001/mirage/get/greeting'
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
     Then a 404 should be returned
-    When I hit 'http://localhost:7001/mirage/check/1'
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
+    Then a 200 should be returned
+    
 
   Scenario: Clearning a request
     Given I run
     """
     Mirage::Client.new.clear :request => 1
     """
-    When I hit 'http://localhost:7001/mirage/check/1'
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
+    Then a 200 should be returned
 
 
 

data/features/client/peek.feature

@@ -8,17 +8,16 @@ Feature: the client can be used for peeking at responses hosted on Mirage.
     require 'mirage'
     """
 
-  Scenario: peeking a response
-    Given I hit 'http://localhost:7001/mirage/set/greeting' with parameters:
-      | response | Hello |
-
-    When I run
-    """
-      Mirage::Client.new.peek(1).should == 'Hello'
-    """
-
-    When I hit 'http://localhost:7001/mirage/check/1'
-    Then a 404 should be returned
+#  Scenario: peeking a response
+#    Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello'
+#
+#    When I run
+#    """
+#      Mirage::Client.new.peek(1).should == 'Hello'
+#    """
+#
+#    When I send GET to 'http://localhost:7001/mirage/requests/1'
+#    Then a 404 should be returned
 
   Scenario: getting a response that does not exist
     Given I run
@@ -27,6 +26,7 @@ Feature: the client can be used for peeking at responses hosted on Mirage.
       Mirage::Client.new.peek(2).should == 'this should not have happened'
       fail("Error should have been thrown")
     rescue Exception => e
+    puts e
       e.is_a?(Mirage::ResponseNotFound).should == true
     end
     """

data/features/client/save_and_revert.feature

@@ -8,8 +8,10 @@ Feature: The Mirage client can be used to snaphsot and rollback the Mirage serve
     require 'rspec'
     require 'mirage'
     """
-    And I hit 'http://localhost:7001/mirage/set/greeting' with parameters:
-      | response | The default greeting |
+    And I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
+    """
+    The default greeting
+    """
 
 
   Scenario: saving and reverting
@@ -17,18 +19,22 @@ Feature: The Mirage client can be used to snaphsot and rollback the Mirage serve
     """
     Mirage::Client.new.save
     """
-    And I hit 'http://localhost:7001/mirage/set/leaving' with parameters:
-      | response | Goodye |
+    And I send PUT to 'http://localhost:7001/mirage/templates/leaving' with request entity
+    """
+    Goodbye
+    """
 
-    And I hit 'http://localhost:7001/mirage/set/greeting' with parameters:
-      | response | Changed |
+    And I send PUT to 'http://localhost:7001/mirage/set/greeting' with request entity
+    """
+    Changed
+    """
 
     When I run
     """
     Mirage::Client.new.revert
     """
-    And I hit 'http://localhost:7001/mirage/get/leaving'
+    And I send GET to 'http://localhost:7001/mirage/responses/leaving'
     Then a 404 should be returned
 
-    When I hit 'http://localhost:7001/mirage/get/greeting'
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
     Then 'The default greeting' should be returned

data/features/client/set.feature

@@ -10,25 +10,40 @@ Feature: the Mirage client provides methods for setting responses and loading de
     require 'rspec'
     require 'mirage'
     """
-    
+
 
   Scenario: Setting a basic response
     Given I run
     """
     Mirage::Client.new.set('greeting','hello')
     """
-    When I hit 'http://localhost:7001/mirage/get/greeting'
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
     Then 'hello' should be returned
-    
+
+  Scenario: Setting the method that a response should be returned on
+    Given I run
+    """
+    Mirage::Client.new.set('greeting', 'Hello Leon') do |response|
+      response.method = 'POST'
+    end
+    """
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 404 should be returned
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting'
+    Then 'Hello Leon' should be returned
+
 
   Scenario Outline: Setting a response with a pattern
     Given I run
     """
-    Mirage::Client.new.set('greeting', 'Hello Leon', :pattern => <pattern>)
+    Mirage::Client.new.set('greeting', 'Hello Leon') do |response|
+      response.method = 'POST'
+      response.pattern = <pattern>
+    end
     """
-    When I hit 'http://localhost:7001/mirage/get/greeting'
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting'
     Then a 404 should be returned
-    When I hit 'http://localhost:7001/mirage/get/greeting' with request body:
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting' with request entity
     """
      <greetingRequest>
       <name>leon</name>
@@ -36,10 +51,20 @@ Feature: the Mirage client provides methods for setting responses and loading de
     """
     Then 'Hello Leon' should be returned
   Examples:
-    | pattern              |
+    | pattern             |
     | /.*?>leon<\\/name>/ |
     | 'leon'              |
-    
+
+
+  Scenario: Setting the content type
+    Given I run
+    """
+    Mirage::Client.new.set('greeting', '<xml></xml>') do |response|
+      response.content_type = 'text/xml'
+    end
+    """
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    And the response 'content-type' should be 'text/xml'
 
   Scenario: Priming Mirage
     Given Mirage is not running
@@ -56,12 +81,32 @@ Feature: the Mirage client provides methods for setting responses and loading de
     """
     Mirage::Client.new.prime
     """
-    And I hit 'http://localhost:7001/mirage/get/greeting'
+    And I send GET to 'http://localhost:7001/mirage/responses/greeting'
     Then 'hello' should be returned
 
-    When I hit 'http://localhost:7001/mirage/get/leaving'
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
     Then 'goodbye' should be returned
 
+  Scenario: A file is given to the client with substitution in it
+    Given the file 'response_file' contains:
+    """
+    Hello ${<firstname>(.*?)</firstname>} ${<surname>(.*?)</surname>}, how are you?
+    """
+    And I run
+    """
+    puts Dir.pwd
+    Mirage::Client.new.set('greeting', File.open('scratch/response_file')) do |response|
+      response.method = 'POST'
+    end
+    """
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting' with request entity
+    """
+    <grettingRequest>
+      <firstname>Leon</firstname>
+      <surname>Davis</surname>
+    </greetingRequest>
+    """
+    Then 'Hello Leon Davis, how are you?' should be returned
 
   Scenario: Priming Mirage when one of the response file has something bad in it
     Given the file 'responses/default_greetings.rb' contains:
@@ -77,12 +122,13 @@ Feature: the Mirage client provides methods for setting responses and loading de
       e.is_a?(Mirage::InternalServerException).should == true
     end
     """
-
+#
+#
 
   Scenario: Setting a file as a response
     Given I run
     """
     Mirage::Client.new.set('download', File.open('README.md'))
     """
-    When I hit 'http://localhost:7001/mirage/get/download'
-    Then the response should be a file the same as 'README.md'
+    When I send GET to 'http://localhost:7001/mirage/responses/download'
+    Then the response should be the same as the content of 'README.md'

data/features/client/track.feature

@@ -9,10 +9,12 @@ Feature: Requests made to the Mirage Server can be tracked using the Mirage clie
     """
 
   Scenario: The MockServer returns a response
-    Given I hit 'http://localhost:7001/mirage/set/greeting' with parameters:
-      | response | Hello |
+    Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
+    """
+    Hello
+    """
 
-    When I hit 'http://localhost:7001/mirage/get/greeting' with parameters:
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting' with parameters:
       | name | leon  |
     Then I run
     """

data/features/server/clear.feature

@@ -8,74 +8,86 @@ Feature: Responses and requests can be cleared.
   ${mirage_url}/clear/request/response_id - Clear request for a particular response
 
 
-
   Background: The MockServer has already got a response for greeting and leaving on it.
-    Given I post to 'http://localhost:7001/mirage/set/greeting' with parameters:
-      | response | Hello |
-
-    And I post to 'http://localhost:7001/mirage/set/leaving' with parameters:
-      | response | Goodbye |
+    Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello'
+    And I send GET to 'http://localhost:7001/mirage/responses/greeting'
 
+    And I send PUT to 'http://localhost:7001/mirage/templates/leaving' with body 'Goodbye'
+    And I send GET to 'http://localhost:7001/mirage/responses/leaving'
 
 
   Scenario: Clearing all responses
-    Given I hit 'http://localhost:7001/mirage/clear'
+    Given I send DELETE to 'http://localhost:7001/mirage/templates'
 
-    When I hit 'http://localhost:7001/mirage/get/greeting'
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
+    Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/templates/1'
     Then a 404 should be returned
 
-    When I hit 'http://localhost:7001/mirage/get/leaving'
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
+    Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/templates/2'
     Then a 404 should be returned
 
 
   Scenario: Clearing a particular response
-    Given I hit 'http://localhost:7001/mirage/clear/1'
+    Given I send DELETE to 'http://localhost:7001/mirage/templates/1'
 
-    When I hit 'http://localhost:7001/mirage/get/greeting'
+    When I send GET to 'http://localhost:7001/mirage/templates/1'
     Then a 404 should be returned
-
-    When I hit 'http://localhost:7001/mirage/check/1'
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
 
-    When I hit 'http://localhost:7001/mirage/get/leaving'
-    Then 'Goodbye' should be returned
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/templates/2'
+    Then a 200 should be returned
+    
 
 
   Scenario: Clearing all requests
-    Given I hit 'http://localhost:7001/mirage/get/greeting' with request body:
-    """
-    Say 'Hello' to me
-    """
-    And I hit 'http://localhost:7001/mirage/get/leaving' with request body:
-    """
-    Say 'Goodbye' to me
-    """
-    And I hit 'http://localhost:7001/mirage/clear'
-
-    When I hit 'http://localhost:7001/mirage/check/1'
-    Then a 404 should be returned
+    And I send DELETE to 'http://localhost:7001/mirage/requests'
 
-    When I hit 'http://localhost:7001/mirage/check/2'
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/templates/1'
+    Then a 200 should be returned
+    
 
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
+    Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/templates/2'
+    Then a 200 should be returned
+    
 
-  Scenario: Clearing a stored request request for a prticular response
-    Given I hit 'http://localhost:7001/mirage/get/leaving' with request body:
-    """
-    See you later
-    """
-
-    When I hit 'http://localhost:7001/mirage/clear/request/2'
-    Then I hit 'http://localhost:7001/mirage/check/2'
-    And a 404 should be returned
-
-
-    Scenario: Querying a response that has been cleared
-    Given I hit 'http://localhost:7001/mirage/get/greeting' with request body:
-    """
-    greet me :)
-    """
-    And I hit 'http://localhost:7001/mirage/clear/1'
 
-    When I hit 'http://localhost:7001/mirage/check/1'
-    Then a 404 should be returned
+  Scenario: Clearing a stored request for a prticular response
+    And I send DELETE to 'http://localhost:7001/mirage/requests/1'
+    
+    When I send GET to 'http://localhost:7001/mirage/requests/1'
+    Then a 404 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/templates/1'
+    Then a 200 should be returned
+    
+
+    When I send GET to 'http://localhost:7001/mirage/requests/2'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 200 should be returned
+    When I send GET to 'http://localhost:7001/mirage/templates/2'
+    Then a 200 should be returned
+