mirage 3.0.0.alpha.11 → 3.0.0.alpha.12

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'sinatra'
 gem 'childprocess'

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     backports (2.3.0)
     bouncy-castle-java (1.5.0146.1)

data/VERSION

@@ -1 +1 @@
-3.0.0.alpha.11
+3.0.0.alpha.12

data/features/.nav

@@ -0,0 +1,19 @@
+- commandline_interface (Commandline interface):
+  - help.feature
+  - start.feature
+  - stop.featre
+- templates (Templates):
+  - put.feature
+  - required_content.feature
+  - put_with_substitutions.feature
+  - get.feature
+  - delete.feature
+- requests:
+- get.feature
+- delete.feature
+- requests:
+- save_and_revert.feature (Snapshot)
+- prime.feature
+- logging.feature (Logs)
+- web_user_interface.feature
+- client (Ruby client):

data/features/client/clear.feature

@@ -11,11 +11,11 @@ Feature: The client can be used for clearing down Mirage.
 
     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:
+    And I send GET to '/responses/greeting' with parameters:
       | message | hello there |
     And a template for 'leaving' has been set with a value of 'Goodbye'
 
-    And I send GET to 'http://localhost:7001/mirage/responses/greeting' with parameters:
+    And I send GET to '/responses/greeting' with parameters:
       | message | I'm going |
 
 
@@ -24,14 +24,14 @@ Feature: The client can be used for clearing down Mirage.
     """
     Mirage::Client.new.templates(1).delete
     """
-    When GET is sent to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     Then a 404 should be returned
-    When GET is sent to 'http://localhost:7001/mirage/requests/1'
+    When GET is sent to '/requests/1'
     Then a 404 should be returned
 
-    When GET is sent to 'http://localhost:7001/mirage/responses/leaving'
+    When GET is sent to '/responses/leaving'
     Then a 200 should be returned
-    When GET is sent to 'http://localhost:7001/mirage/requests/2'
+    When GET is sent to '/requests/2'
     Then a 200 should be returned
 
 
@@ -40,9 +40,9 @@ Feature: The client can be used for clearing down Mirage.
     """
     Mirage::Client.new.requests(1).delete
     """
-    When GET is sent to 'http://localhost:7001/mirage/requests/1'
+    When GET is sent to '/requests/1'
     Then a 404 should be returned
-    When GET is sent to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     Then a 200 should be returned
 
 
@@ -51,16 +51,16 @@ Feature: The client can be used for clearing down Mirage.
     """
     Mirage::Client.new.templates.delete_all
     """
-    And GET is sent to 'http://localhost:7001/mirage/responses/greeting'
+    And GET is sent to '/responses/greeting'
     Then a 404 should be returned
 
-    When GET is sent to 'http://localhost:7001/mirage/requests/1'
+    When GET is sent to '/requests/1'
     Then a 404 should be returned
 
-    And GET is sent to 'http://localhost:7001/mirage/responses/leaving'
+    And GET is sent to '/responses/leaving'
     Then a 404 should be returned
 
-    When GET is sent to 'http://localhost:7001/mirage/requests/2'
+    When GET is sent to '/requests/2'
     Then a 404 should be returned
 
 
@@ -69,16 +69,8 @@ Feature: The client can be used for clearing down Mirage.
     """
     Mirage::Client.new.requests.delete_all
     """
-    When GET is sent to 'http://localhost:7001/mirage/requests/1'
+    When GET is sent to '/requests/1'
     Then a 404 should be returned
 
-    When GET is sent to 'http://localhost:7001/mirage/requests/2'
-    Then a 404 should be returned
-
-
-
-
-
-
-
-
+    When GET is sent to '/requests/2'
+    Then a 404 should be returned

data/features/client/configure.feature

@@ -11,17 +11,17 @@ Feature: The client can be configured with default settings to keep your mocking
   Scenario: configuring the client on instance
     Given I run
     """
-    client = Mirage::Client.new do |defaults|
-      defaults.method = :post
-      defaults.status = 202
-      defaults.default = true
-      defaults.delay = 2
-      defaults.content_type = "text/xml"
+    client = Mirage::Client.new do
+      http_method :post
+      status 202
+      default true
+      delay 2
+      content_type "text/xml"
     end
 
     client.put('greeting','hello')
     """
-    When POST is sent to 'http://localhost:7001/mirage/responses/greeting/for/someone'
+    When POST is sent to '/responses/greeting/for/someone'
     Then 'hello' should be returned
     And a 202 should be returned
     Then it should take at least '2' seconds
@@ -31,17 +31,17 @@ Feature: The client can be configured with default settings to keep your mocking
     Given I run
     """
     client = Mirage::Client.new
-    client.configure do |defaults|
-      defaults.method = :post
-      defaults.status = 202
-      defaults.default = true
-      defaults.delay = 2
-      defaults.content_type = "text/xml"
+    client.configure do
+      http_method :post
+      status 202
+      default false
+      delay 2
+      content_type "text/xml"
     end
 
     client.put('greeting','hello')
     """
-    When POST is sent to 'http://localhost:7001/mirage/responses/greeting/for/someone'
+    When POST is sent to '/responses/greeting'
     Then 'hello' should be returned
     And a 202 should be returned
     Then it should take at least '2' seconds
@@ -51,24 +51,20 @@ Feature: The client can be configured with default settings to keep your mocking
     Given I run
     """
     client = Mirage::Client.new
-    client.configure do |defaults|
-      defaults.method = :post
-      defaults.status = 202
-      defaults.default = true
-      defaults.delay = 2
-      defaults.content_type = "text/xml"
+    client.configure do
+      http_method :post
+      status 202
+      default true
+      delay 2
+      content_type "text/xml"
     end
 
     client.reset
-
-    client.configure do |defaults|
-      defaults.method.should == nil
-      defaults.status.should == nil
-      defaults.default.should == nil
-      defaults.delay.should == nil
-      defaults.content_type.should == nil
-    end
+    client.put('greeting','hello')
     """
+    When GET is sent to '/responses/greeting'
+    Then 'hello' should be returned
+
 
 
 

data/features/client/preview_responses.feature

@@ -9,21 +9,21 @@ Feature: the client can be used for peeking at responses hosted on Mirage.
     """
 
   Scenario: peeking a response
-    Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello'
+    Given a template for 'greeting' has been set with a value of 'Hello'
 
     When I run
     """
-      Mirage::Client.new.response(1).should == 'Hello'
+      Mirage::Client.new.templates(1).body.should == 'Hello'
     """
 
-    When I send GET to 'http://localhost:7001/mirage/requests/1'
+    When GET is sent to '/requests/1'
     Then a 404 should be returned
 
   Scenario: getting a response that does not exist
     Given I run
     """
     begin
-      Mirage::Client.new.response(2).should == 'this should not have happened'
+      Mirage::Client.new.templates(2).should == 'this should not have happened'
       fail("Error should have been thrown")
     rescue Exception => e
     puts e

data/features/client/put.feature

@@ -17,33 +17,33 @@ Feature: the Mirage client provides methods for setting responses and loading de
     """
     Mirage::Client.new.put('greeting','hello')
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     Then 'hello' should be returned
 
   Scenario: Setting the method that a response should be returned on
     Given I run
     """
-    Mirage::Client.new.put('greeting', 'Hello Leon') do |response|
-      response.method = 'POST'
+    Mirage::Client.new.put('greeting', 'Hello Leon') do
+      http_method 'POST'
     end
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     Then a 404 should be returned
-    When I send POST to 'http://localhost:7001/mirage/responses/greeting'
+    When POST is sent to '/responses/greeting'
     Then 'Hello Leon' should be returned
 
 
   Scenario: Setting a response with required body content
     Given I run
     """
-    Mirage::Client.new.put('greeting', 'Hello Leon') do |response|
-      response.method = 'POST'
-      response.add_body_content_requirement /leon/
+    Mirage::Client.new.put('greeting', 'Hello Leon') do
+      http_method 'POST'
+      required_body_content << /leon/
     end
     """
-    When I send POST to 'http://localhost:7001/mirage/responses/greeting'
+    When POST is sent to '/responses/greeting'
     Then a 404 should be returned
-    When I send POST to 'http://localhost:7001/mirage/responses/greeting' with request entity
+    When I send POST to '/responses/greeting' with request entity
     """
      <greetingRequest>
       <name>leon</name>
@@ -54,14 +54,14 @@ Feature: the Mirage client provides methods for setting responses and loading de
   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/
+    Mirage::Client.new.put('greeting', 'Hello Leon') do
+      http_method 'POST'
+      required_parameters[:name] = /leon/
     end
     """
-    When I send POST to 'http://localhost:7001/mirage/responses/greeting'
+    When POST is sent to '/responses/greeting'
     Then a 404 should be returned
-    When I send POST to 'http://localhost:7001/mirage/responses/greeting' with parameters:
+    When I send POST to '/responses/greeting' with parameters:
       | name | leon |
 
     Then 'Hello Leon' should be returned
@@ -69,59 +69,46 @@ Feature: the Mirage client provides methods for setting responses and loading de
   Scenario: setting a response as default
     Given I run
     """
-    Mirage::Client.new.put('greeting', 'default greeting') do |response|
-      response.default = true
+    Mirage.start.clear
+
+    Mirage::Client.new.put('greeting', 'default greeting') do
+      default true
     end
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting/for/joel'
+    When GET is sent to '/responses/greeting/for/joel'
     Then 'default greeting' should be returned
 
 
   Scenario: Setting the content type
     Given I run
     """
-    Mirage::Client.new.put('greeting', '<xml></xml>') do |response|
-      response.content_type = 'text/xml'
+    Mirage::Client.new.put('greeting', '<xml></xml>') do
+      content_type 'text/xml'
     end
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     And the response 'content-type' should be 'text/xml'
 
-  Scenario: Priming Mirage
-    Given Mirage is not running
-    And I run 'mirage start'
-
-    When the file 'responses/default_greetings.rb' contains:
-    """
-    prime do |mirage|
-      mirage.put('greeting', 'hello')
-      mirage.put('leaving', 'goodbye')
-    end
-    """
-    And I run
-    """
-    Mirage::Client.new.prime
-    """
-    And I send GET to 'http://localhost:7001/mirage/responses/greeting'
-    Then 'hello' should be returned
-
-    When I send GET to 'http://localhost:7001/mirage/responses/leaving'
-    Then 'goodbye' 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:
-    """
-    Something bad...
-    """
-    When I run
-    """
-    begin
-      Mirage::Client.new.prime
-      fail("Error should have been thrown")
-    rescue Exception => e
-      e.is_a?(Mirage::InternalServerException).should == true
-    end
-    """
+#  Scenario: Priming Mirage
+#    Given Mirage is not running
+#    And I run 'mirage start'
+#
+#    When the file 'responses/default_greetings.rb' contains:
+#    """
+#    prime do |mirage|
+#      mirage.put('greeting', 'hello')
+#      mirage.put('leaving', 'goodbye')
+#    end
+#    """
+#    And I run
+#    """
+#    Mirage::Client.new.prime
+#    """
+#    And GET is sent to '/responses/greeting'
+#    Then 'hello' should be returned
+#
+#    When GET is sent to '/responses/leaving'
+#    Then 'goodbye' should be returned
 
   Scenario: Setting a file as a response
     Given the file 'test_file.txt' contains:
@@ -130,24 +117,24 @@ Feature: the Mirage client provides methods for setting responses and loading de
     """
     And I run
     """
-    Mirage::Client.new.put('download', File.open('test_file.txt'))
+    Mirage::Client.new.put('download', File.read('test_file.txt'))
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/download'
+    When GET is sent to '/responses/download'
     Then the response should be the same as the content of 'test_file.txt'
 
   Scenario: Setting a response status code
     Given I run
     """
-    Mirage::Client.new.put('greeting', 'hello'){|response| response.status = 203}
+    Mirage::Client.new.put('greeting', 'hello'){status 203}
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     Then a 203 should be returned
 
 
   Scenario: Setting a response with a delay
     Given I run
     """
-    Mirage::Client.new.put('greeting', 'hello'){|response| response.delay = 2}
+    Mirage::Client.new.put('greeting', 'hello'){delay 2}
     """
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     Then it should take at least '2' seconds

data/features/client/requests.feature

@@ -10,7 +10,7 @@ Feature: Requests made to the Mirage Server can be retrieved using the Mirage cl
   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:
+    When I send GET to '/responses/greeting' with parameters:
       | name | leon  |
     Then I run
     """

data/features/client/running.feature

@@ -36,7 +36,7 @@ Feature: Use the mirage client api to check if Mirage is running either on the l
     Given I run 'mirage start -p 9001'
     Then I run
     """
-      Mirage.running? "http://localhost:9001/mirage"
+      Mirage.running? "http://localhost:9001"
     """
 
 
@@ -44,6 +44,6 @@ Feature: Use the mirage client api to check if Mirage is running either on the l
     Given I run 'mirage start -p 9001'
     Then I run
     """
-      client = Mirage::Client.new "http://localhost:9001/mirage"
+      client = Mirage::Client.new "http://localhost:9001"
       client.running?.should == true
     """

data/features/client/save_and_revert.feature

@@ -8,10 +8,7 @@ Feature: The Mirage client can be used to snaphsot and rollback the Mirage serve
     require 'rspec'
     require 'mirage/client'
     """
-    And I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
-    """
-    The default greeting
-    """
+    And a template for 'greeting' has been set with a value of 'The default greeting'
 
 
   Scenario: saving and reverting
@@ -19,12 +16,12 @@ Feature: The Mirage client can be used to snaphsot and rollback the Mirage serve
     """
     Mirage::Client.new.save
     """
-    And I send PUT to 'http://localhost:7001/mirage/templates/leaving' with request entity
+    And I send PUT to '/templates/leaving' with request entity
     """
     Goodbye
     """
 
-    And I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
+    And I send PUT to '/templates/greeting' with request entity
     """
     Changed
     """
@@ -33,8 +30,8 @@ Feature: The Mirage client can be used to snaphsot and rollback the Mirage serve
     """
     Mirage::Client.new.revert
     """
-    And I send GET to 'http://localhost:7001/mirage/responses/leaving'
+    And GET is sent to '/responses/leaving'
     Then a 404 should be returned
 
-    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    When GET is sent to '/responses/greeting'
     Then 'The default greeting' should be returned