mirage 2.4.2 → 3.0.0.alpha.1

data/.simplecov

@@ -0,0 +1,6 @@
+SimpleCov.start do
+  command_name "spec:#{ENV['coverage']}"
+  add_filter "/spec/"
+  add_group "Server", "server"
+  add_group "Client", "lib"
+end

data/Gemfile

@@ -4,12 +4,20 @@ gem 'sinatra'
 gem 'childprocess'
 gem "waitforit"
 gem "thor"
+gem "ptools"
+gem "httparty"
+gem "haml"
 
-group :development do
-  gem "thin"
-  gem 'rake'
+group :test do
   gem 'cucumber'
   gem 'rspec'
+  gem 'rack-test'
+  gem 'simplecov'
+  gem 'hashie'
+end
+
+group :development do
+  gem 'rake'
   gem "jeweler"
   gem 'sinatra-contrib'
   gem 'mechanize'

data/Gemfile.lock

@@ -12,7 +12,6 @@ GEM
       gherkin (~> 2.7.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    daemons (1.1.8)
     diff-lcs (1.1.3)
     domain_name (0.5.1)
       unf (~> 0.0.3)
@@ -28,6 +27,12 @@ GEM
     gherkin (2.7.2-x86-mingw32)
       json (>= 1.4.6)
     git (1.2.5)
+    haml (4.0.1)
+      tilt
+    hashie (2.0.3)
+    httparty (0.9.0)
+      multi_json (~> 1.0)
+      multi_xml
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -43,26 +48,35 @@ GEM
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (~> 0.0, >= 0.0.9)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
     net-http-digest_auth (1.2)
     net-http-persistent (2.3.3)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
     nokogiri (1.5.0-x86-mingw32)
     ntlm-http (0.1.1)
+    ptools (1.2.2)
+    ptools (1.2.2-x86-mingw32)
+      win32-file (>= 0.5.4)
     rack (1.4.0)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -75,10 +89,6 @@ GEM
       sinatra (~> 1.3.0)
       tilt (~> 1.3)
     term-ansicolor (1.0.7)
-    thin (1.4.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.15.4)
     tilt (1.3.3)
     unf (0.0.4)
@@ -88,6 +98,18 @@ GEM
     waitforit (0.0.1)
     webrobots (0.0.12)
       nokogiri (>= 1.4.4)
+    win32-api (1.4.8-x86-mingw32)
+    win32-file (0.6.8)
+      win32-api (>= 1.2.1)
+      win32-file-stat (>= 1.3.2)
+      windows-pr (>= 1.0.8)
+    win32-file-stat (1.3.6)
+      windows-pr (>= 1.0.0)
+    windows-api (0.4.2)
+      win32-api (>= 1.4.5)
+    windows-pr (1.2.2)
+      win32-api (>= 1.4.5)
+      windows-api (>= 0.3.0)
 
 PLATFORMS
   java
@@ -97,14 +119,19 @@ PLATFORMS
 DEPENDENCIES
   childprocess
   cucumber
+  haml
+  hashie
+  httparty
   jeweler
   jruby-openssl
   mechanize
   nokogiri
+  ptools
+  rack-test
   rake
   rspec
+  simplecov
   sinatra
   sinatra-contrib
-  thin
   thor
   waitforit

data/VERSION

@@ -1 +1 @@
-2.4.2
+3.0.0.alpha.1

data/features/client/clear.feature

@@ -1,91 +1,82 @@
-Feature: The client can be used for clearing response templates from Mirage
+Feature: The client can be used for clearing down Mirage.
+
+  As with the restful interface, clearing a template also clears any associated request data
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
-    require 'rspec'
     require 'mirage/client'
     """
 
-    And I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
-    """
-    Hello
-    """
+    And a template for 'greeting' has been set with a value of 'Hello'
+
     And I send GET to 'http://localhost:7001/mirage/responses/greeting' with parameters:
       | message | hello there |
+    And a template for 'leaving' has been set with a value of 'Goodbye'
 
-    And I send PUT to 'http://localhost:7001/mirage/templates/leaving' with request entity
-    """
-    Goodbye
-    """
     And I send GET to 'http://localhost:7001/mirage/responses/greeting' with parameters:
       | message | I'm going |
 
 
-  Scenario: Clearing everything
-    When I run
+  Scenario: Clearing a template
+    Given I run
     """
-    Mirage::Client.new.clear
+    Mirage::Client.new.templates(1).delete
     """
-    And I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to 'http://localhost:7001/mirage/responses/greeting'
     Then a 404 should be returned
-
-    When I send GET to 'http://localhost:7001/mirage/requests/1'
+    When GET is sent to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
 
-    And I send GET to 'http://localhost:7001/mirage/responses/leaving'
-    Then a 404 should be returned
+    When GET is sent to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 200 should be returned
+    When GET is sent to 'http://localhost:7001/mirage/requests/2'
+    Then a 200 should be returned
 
-    When I send GET to 'http://localhost:7001/mirage/requests/2'
+
+  Scenario: Clearning a request
+    Given I run
+    """
+    Mirage::Client.new.requests(1).delete
+    """
+    When GET is sent to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
+    When GET is sent to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 200 should be returned
 
 
-  Scenario: Clearing all requests
+  Scenario: Clearing everything
     When I run
     """
-    Mirage::Client.new.clear :requests
+    Mirage::Client.new.templates.delete_all
     """
-    When I send GET to 'http://localhost:7001/mirage/requests/1'
+    And GET is sent to 'http://localhost:7001/mirage/responses/greeting'
     Then a 404 should be returned
 
-    When I send GET to 'http://localhost:7001/mirage/requests/2'
+    When GET is sent 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
+    And GET is sent to 'http://localhost:7001/mirage/responses/leaving'
+    Then a 404 should be returned
 
+    When GET is sent to 'http://localhost:7001/mirage/requests/2'
+    Then a 404 should be returned
 
-  Scenario: Clearning a response
-    Given I run
+
+  Scenario: Clearing all request data
+    When I run
     """
-    Mirage::Client.new.clear 1 
+    Mirage::Client.new.requests.delete_all
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to 'http://localhost:7001/mirage/requests/1'
     Then a 404 should be returned
-    When I send GET to 'http://localhost:7001/mirage/requests/1'
+
+    When GET is sent 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/requests/2'
-    Then a 200 should be returned
 
 
-  Scenario: Clearning a request
-    Given I run
-    """
-    Mirage::Client.new.clear :request => 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/configure.feature

@@ -21,7 +21,7 @@ Feature: The client can be configured with default settings to keep your mocking
 
     client.put('greeting','hello')
     """
-    When I send POST to 'http://localhost:7001/mirage/responses/greeting/for/someone'
+    When POST is sent to 'http://localhost:7001/mirage/responses/greeting/for/someone'
     Then 'hello' should be returned
     And a 202 should be returned
     Then it should take at least '2' seconds
@@ -41,7 +41,7 @@ Feature: The client can be configured with default settings to keep your mocking
 
     client.put('greeting','hello')
     """
-    When I send POST to 'http://localhost:7001/mirage/responses/greeting/for/someone'
+    When POST is sent to 'http://localhost:7001/mirage/responses/greeting/for/someone'
     Then 'hello' should be returned
     And a 202 should be returned
     Then it should take at least '2' seconds

data/features/client/put.feature

@@ -33,12 +33,12 @@ Feature: the Mirage client provides methods for setting responses and loading de
     Then 'Hello Leon' should be returned
 
 
-  Scenario Outline: Setting a response with a pattern
+  Scenario: Setting a response with required body content
     Given I run
     """
     Mirage::Client.new.put('greeting', 'Hello Leon') do |response|
       response.method = 'POST'
-      response.pattern = <pattern>
+      response.add_body_content_requirement /leon/
     end
     """
     When I send POST to 'http://localhost:7001/mirage/responses/greeting'
@@ -50,10 +50,21 @@ Feature: the Mirage client provides methods for setting responses and loading de
      </greetingRequest>
     """
     Then 'Hello Leon' should be returned
-  Examples:
-    | pattern             |
-    | /.*?>leon<\\/name>/ |
-    | 'leon'              |
+
+  Scenario: Setting a response with a request parameter requirement
+    Given I run
+    """
+    Mirage::Client.new.put('greeting', 'Hello Leon') do |response|
+      response.method = 'POST'
+      response.add_request_parameter_requirement :name, /leon/
+    end
+    """
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 404 should be returned
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting' with parameters:
+      | name | leon |
+
+    Then 'Hello Leon' should be returned
 
   Scenario: setting a response as default
     Given I run

data/features/client/requests.feature

@@ -1,22 +1,18 @@
-Feature: Requests made to the Mirage Server can be tracked using the Mirage client
+Feature: Requests made to the Mirage Server can be retrieved using the Mirage client
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
-    require 'rspec'
     require 'mirage/client'
     """
 
-  Scenario: The MockServer returns a response
-    Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
-    """
-    Hello
-    """
+  Scenario: Retrieving request data
+    Given a template for 'greeting' has been set with a value of 'Hello'
 
     When I send GET to 'http://localhost:7001/mirage/responses/greeting' with parameters:
       | name | leon  |
     Then I run
     """
-       Mirage::Client.new.request(1).should == 'name=leon'
+       Mirage::Client.new.requests(1).parameters.should == {'name' => 'leon'}
     """

data/features/client/start.feature

@@ -1,18 +1,19 @@
-Feature: The Mirage client provides a programmatic interface equivalent to the command line interface. This gives an
-  easy method for bringing a local instance of Mirage in situ inside a test suite.
+@command_line
+Feature: The client API can be used to start Mirage.
+
+  Both the port and default templates directory can be specified
+
+  On starting Mirage a client is returned.
 
-  The client can only be used to stop Mirage if it is was used to start the running instance.
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
-    require 'rspec'
     require 'mirage/client'
     """
 
-
-  Scenario: Starting mirage with defaults
+  Scenario: Starting Mirage on the default port
     When I run
     """
     Mirage.start
@@ -21,16 +22,23 @@ Feature: The Mirage client provides a programmatic interface equivalent to the c
 
 
   Scenario: Starting Mirage on a custom port
-    Given Mirage is not running
+    When I run
+    """
+    Mirage.start :port => 9001
+    """
+    Then mirage should be running on 'http://localhost:9001/mirage'
+
+
+  Scenario: Specifying a custom templates directory.
     And the file './custom_responses_location/default_greetings.rb' contains:
     """
     prime do |mirage|
-      mirage.put('greeting', 'hello')
+      mirage.templates.put('greeting', 'hello')
     end
     """
     When I run
     """
-    Mirage.start :port => 9001, :defaults => './custom_responses_location'
+    Mirage.start :defaults => './custom_responses_location'
     """
-    And I send GET to 'http://localhost:9001/mirage/responses/greeting'
+    And GET is sent to 'http://localhost:7001/mirage/responses/greeting'
     Then 'hello' should be returned

data/features/client/stop.feature

@@ -1,40 +1,32 @@
-Feature: The Mirage client provides a programmatic interface equivalent to the command line interface. This gives an
-  easy method for bringing a local instance of Mirage in situ inside a test suite.
-
-  The client can only be used to stop Mirage if it is was used to start the running instance.
+@command_line
+Feature:The client API can be used to stop instances of Mirage running on localhost.
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
-    require 'rspec'
     require 'mirage/client'
     """
 
-
   Scenario: Stopping Mirage
-    Given Mirage is not running
+    Given Mirage is running
     When I run
     """
-    Mirage.start
-    Mirage.stop :port => 7001
+    Mirage.stop
     """
     Then Connection should be refused to 'http://localhost:7001/mirage'
 
+
   Scenario: Stopping Mirage on custom port
-    Given Mirage is not running
-    And I run 'mirage start -p 7001'
     And I run 'mirage start -p 9001'
     When I run
     """
     Mirage.stop :port => 9001
     """
-    Then mirage should be running on 'http://localhost:7001/mirage'
     Then mirage should not be running on 'http://localhost:9001/mirage'
 
   Scenario: Stopping multiple instances of Mirage
-    Given Mirage is not running
-    And I run 'mirage start -p 7001'
+    Given I run 'mirage start -p 7001'
     And I run 'mirage start -p 9001'
     And I run 'mirage start -p 10001'
     When I run
@@ -45,9 +37,9 @@ Feature: The Mirage client provides a programmatic interface equivalent to the c
     Then mirage should not be running on 'http://localhost:9001/mirage'
     Then mirage should not be running on 'http://localhost:10001/mirage'
 
+
   Scenario: Stopping all instances of Mirage
-    Given Mirage is not running
-    And I run 'mirage start -p 7001'
+    Given I run 'mirage start -p 7001'
     And I run 'mirage start -p 9001'
     And I run 'mirage start -p 10001'
     When I run
@@ -56,30 +48,4 @@ Feature: The Mirage client provides a programmatic interface equivalent to the c
     """
     Then mirage should not be running on 'http://localhost:7001/mirage'
     Then mirage should not be running on 'http://localhost:9001/mirage'
-    Then mirage should not be running on 'http://localhost:10001/mirage'
-
-
-
-  Scenario: Using client to stop mirage
-    Given Mirage is not running
-    And I run 'mirage start -p 7001'
-    And I run 'mirage start -p 9001'
-    When I run
-    """
-    begin
-      Mirage.stop
-      raise "should have errored"
-    rescue Mirage::ClientError => ce
-    end
-    """
-    Then mirage should be running on 'http://localhost:7001/mirage'
-    And mirage should be running on 'http://localhost:9001/mirage'
-
-  Scenario: Stopping Mirage without specifying the port when more than one instance of Mirage is running
-    Given Mirage is not running
-    When I run
-    """
-    client = Mirage.start
-    client.stop
-    """
-    Then Connection should be refused to 'http://localhost:7001/mirage'
+    Then mirage should not be running on 'http://localhost:10001/mirage'