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

data/spec/client/templates_spec.rb

@@ -93,6 +93,8 @@ describe 'templates' do
         Class.new do
           extend Template::Model
           endpoint endpoint
+          def create
+          end
         end
       end
       before :each do
@@ -101,7 +103,14 @@ describe 'templates' do
       end
       it 'should take a model as a parameter' do
         template = model_class.new
-        template.should_receive(:create)
+        @templates.put template
+        template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
+      end
+
+      it 'should prepend base url to the endpoint unless it is set already' do
+        template = model_class.new
+        @templates.put template
+        template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
         @templates.put template
         template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
       end
@@ -126,7 +135,6 @@ describe 'templates' do
             Template.should_receive(:new).and_return template
             template.stub(:create).and_return(template)
             @templates.put('endpoint', 'value') do |response|
-              puts response
               outer_method_call
             end
           end
@@ -156,8 +164,6 @@ describe 'templates' do
       it 'should create a template' do
         @templates.put(endpoint, value)
       end
-
-
     end
 
     describe 'block parameter that can be used for template customisation' do

data/spec/server/server_spec.rb

@@ -19,15 +19,15 @@ describe "Mirage Server" do
       spec = {"somekeys" => 'some_values'}
 
       Mirage::MockResponse.should_receive(:new).with(endpoint, spec).and_return(@mock_response)
-      put('/mirage/templates/greeting', spec.to_json)
+      put('/templates/greeting', spec.to_json)
     end
 
     it 'should set the requests url against the template that is created' do
       method = 'post'
       response_id = 1
       Mirage::MockResponse.should_receive(:new).and_return(@mock_response)
-      put('/mirage/templates/greeting', {:request => {:http_method => method}}.to_json)
-      @mock_response.requests_url.should == "http://example.org/mirage/requests/#{response_id}"
+      put('/templates/greeting', {:request => {:http_method => method}}.to_json)
+      @mock_response.requests_url.should == "http://example.org/requests/#{response_id}"
     end
 
   end
@@ -43,14 +43,14 @@ describe "Mirage Server" do
       parameters = {"key" => 'value'}
 
       Mirage::MockResponse.should_receive(:find).with(@options.merge(:params => parameters)).and_return(Mirage::MockResponse.new(@endpoint, {:response => {:body => "hello"}}))
-      get("/mirage/responses/#{@endpoint}", parameters)
+      get("/responses/#{@endpoint}", parameters)
     end
 
     it 'should use the request body' do
       body = 'body'
 
       Mirage::MockResponse.should_receive(:find).with(@options.merge(:body => body)).and_return(Mirage::MockResponse.new(@endpoint, {:response => {:body => "hello"}}))
-      post("/mirage/responses/#{@endpoint}", body)
+      post("/responses/#{@endpoint}", body)
     end
 
     it 'should use headers' do
@@ -61,7 +61,7 @@ describe "Mirage Server" do
       end
 
       Mirage::MockResponse.should_receive(:find).with(@options.merge(:headers => headers)).and_return(Mirage::MockResponse.new(@endpoint, {:response => {:body => "hello"}}))
-      get("/mirage/responses/#{@endpoint}")
+      get("/responses/#{@endpoint}")
     end
 
     it 'should return the default response if a specific match is not found' do
@@ -76,8 +76,8 @@ describe "Mirage Server" do
               :body => "hello leon"
           }
       }
-      put("/mirage/templates/#{@endpoint}", response_template.to_json)
-      post("/mirage/responses/#{@endpoint}")
+      put("/templates/#{@endpoint}", response_template.to_json)
+      post("/responses/#{@endpoint}")
     end
   end
 
@@ -86,26 +86,26 @@ describe "Mirage Server" do
   describe "operations" do
     describe 'resolving responses' do
       it 'should return the default response' do
-        put('/mirage/templates/level1', {:response => {:body => Base64.encode64("level1")}}.to_json)
-        put('/mirage/templates/level1/level2', {:response => {:body => Base64.encode64("level2"), :default => true}}.to_json)
-        get('/mirage/responses/level1/level2/level3').body.should == "level2"
+        put('/templates/level1', {:response => {:body => Base64.encode64("level1")}}.to_json)
+        put('/templates/level1/level2', {:response => {:body => Base64.encode64("level2"), :default => true}}.to_json)
+        get('/responses/level1/level2/level3').body.should == "level2"
       end
 
       it 'should set any headers specified' do
         headers = {header: 'value'}
-        put('/mirage/templates/greeting', {:response => {headers: headers, :body => ''}}.to_json)
-        get('/mirage/responses/greeting').headers['header'].should == 'value'
+        put('/templates/greeting', {:response => {headers: headers, :body => ''}}.to_json)
+        get('/responses/greeting').headers['header'].should == 'value'
       end
     end
 
     describe 'checking templates' do
       it 'should return the descriptor for a template' do
         response_body = "hello"
-        response_id = JSON.parse(put('/mirage/templates/greeting', {:response => {:body => Base64.encode64(response_body)}}.to_json).body)['id']
-        template = JSON.parse(get("/mirage/templates/#{response_id}").body)
+        response_id = JSON.parse(put('/templates/greeting', {:response => {:body => Base64.encode64(response_body)}}.to_json).body)['id']
+        template = JSON.parse(get("/templates/#{response_id}").body)
         template.should == JSON.parse({:endpoint => "greeting",
                                        :id => response_id,
-                                       :requests_url => "http://example.org/mirage/requests/#{response_id}",
+                                       :requests_url => "http://example.org/requests/#{response_id}",
                                        :request => {:parameters => {}, :http_method => "get", :body_content => [], :headers => {}},
                                        :response => {:default => false,
                                                      :body => Base64.encode64(response_body),
@@ -117,25 +117,25 @@ describe "Mirage Server" do
     end
 
     it 'should return tracked request data' do
-      response_id = JSON.parse(put('/mirage/templates/greeting', {:request => {:http_method => :post}, :response => {:body => Base64.encode64("hello")}}.to_json).body)['id']
+      response_id = JSON.parse(put('/templates/greeting', {:request => {:http_method => :post}, :response => {:body => Base64.encode64("hello")}}.to_json).body)['id']
 
 
       header "MYHEADER", "my_header_value"
-      post("/mirage/responses/greeting?param=value", 'body')
-      request_data = JSON.parse(get("/mirage/requests/#{response_id}").body)
+      post("/responses/greeting?param=value", 'body')
+      request_data = JSON.parse(get("/requests/#{response_id}").body)
 
       request_data['parameters'].should == {'param' => 'value'}
       request_data['headers']["MYHEADER"].should == "my_header_value"
       request_data['body'].should == "body"
-      request_data['request_url'].should == "http://example.org/mirage/requests/#{response_id}"
+      request_data['request_url'].should == "http://example.org/requests/#{response_id}"
 
     end
 
 
     it 'should delete a template' do
-      response_id = JSON.parse(put('/mirage/templates/greeting', {:response => {:body => Base64.encode64("hello")}}.to_json).body)['id']
-      delete("/mirage/templates/#{response_id}")
-      expect { get("/mirage/templates/#{response_id}") }.to raise_error(Mirage::ServerResponseNotFound)
+      response_id = JSON.parse(put('/templates/greeting', {:response => {:body => Base64.encode64("hello")}}.to_json).body)['id']
+      delete("/templates/#{response_id}")
+      expect { get("/templates/#{response_id}") }.to raise_error(Mirage::ServerResponseNotFound)
     end
   end
 end

data/test.rb

@@ -1,20 +1,3 @@
-require './lib/mirage/client'
+require '/home/team/Projects/mirage/lib/mirage/client'
 
-
-Mirage.stop
-mirage = Mirage.start
-
-
-mirage.put('FindCis.do', 'value1') do
-  http_method :post
-  content_type "text/xml"
-  required_body_content ['value']
-  status 200
-end
-
-mirage.put('FindCis.do', 'value2') do
-  http_method :post
-  content_type "text/xml"
-  required_body_content ['value']
-  status 200
-end
+puts "{\"id\":1,\"endpoint\":\"greeting\",\"requests_url\":\"http://localhost:7001/requests/1\",\"response\":{\"default\":false,\"body\":\"Hello\",\"delay\":0,\"content_type\":\"text/plain\",\"status\":200},\"request\":{\"parameters\":{},\"body_content\":[],\"http_method\":\"get\",\"headers\":{}}}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.11
+  version: 3.0.0.alpha.12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -253,6 +253,7 @@ files:
 - README.md
 - VERSION
 - bin/mirage
+- features/.nav
 - features/client/clear.feature
 - features/client/configure.feature
 - features/client/preview_responses.feature
@@ -262,26 +263,29 @@ files:
 - features/client/save_and_revert.feature
 - features/client/start.feature
 - features/client/stop.feature
-- features/server/commandline_interface/help.feature
-- features/server/commandline_interface/start.feature
-- features/server/commandline_interface/stop.feature
-- features/server/logging.feature
-- features/server/prime.feature
-- features/server/requests/delete.feature
-- features/server/requests/get.feature
-- features/server/save_and_revert.feature
-- features/server/templates/delete.feature
-- features/server/templates/get.feature
-- features/server/templates/put/put.feature
-- features/server/templates/put/put_with_substitutions.feature
-- features/server/templates/put/required_content.feature
-- features/server/web_user_interface.feature
+- features/commandline_interface/help.feature
+- features/commandline_interface/readme.md
+- features/commandline_interface/start.feature
+- features/commandline_interface/stop.feature
+- features/logging.feature
+- features/prime.feature
+- features/readme.md
+- features/requests/delete.feature
+- features/requests/get.feature
+- features/save_and_revert.feature
 - features/step_definitions/my_steps.rb
 - features/support/command_line.rb
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/mirage.rb
 - features/support/web.rb
+- features/templates/delete.feature
+- features/templates/get.feature
+- features/templates/put.feature
+- features/templates/put_with_substitutions.feature
+- features/templates/readme.md
+- features/templates/required_content.feature
+- features/web_user_interface.feature
 - full_build.sh
 - lib/mirage/client.rb
 - lib/mirage/client/cli_bridge.rb
@@ -349,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -378399899441393951
+      hash: 158416820586937306
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -358,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Mirage is a easy mock server for testing your applications

data/features/server/commandline_interface/help.feature

@@ -1,16 +0,0 @@
-@command_line
-Feature: Mirage is started from the command line.
-  Mirage logs to mirage.log at the path where Mirage is started from
-
-
-  Background: Mirage usage
-    Given usage information:
-      | Tasks:                                                                                       |
-      | mirage help [TASK]                           # Describe available tasks or one specific task |
-#      | mirage start                                 # Starts mirage                                 |
-#      | mirage stop -p, --port=[port_1 port_2\|all]  # stops mirage                                  |
-
-
-  Scenario: Starting with help option
-    Given I run 'mirage help'
-    Then the usage information should be displayed

data/features/server/requests/delete.feature

@@ -1,47 +0,0 @@
-Feature: Tracked request data can be deleted
-
-  Background: The MockServer has already got a response for greeting and leaving on it.
-    Given the following template template:
-    """
-      {
-         "response":{
-            "body":"Hello"
-         }
-      }
-    """
-    And 'response.body' is base64 encoded
-    And the template is sent using PUT to 'http://localhost:7001/mirage/templates/greeting'
-
-    Given the following template template:
-    """
-      {
-         "response":{
-            "body":"Goodbye"
-         }
-      }
-    """
-    And 'response.body' is base64 encoded
-    And the template is sent using PUT to 'http://localhost:7001/mirage/templates/leaving'
-
-
-    And GET is sent to 'http://localhost:7001/mirage/responses/greeting'
-    And GET is sent to 'http://localhost:7001/mirage/responses/leaving'
-
-    
-  Scenario: Deleting all requests
-    And DELETE is sent to 'http://localhost:7001/mirage/requests'
-
-    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/requests/2'
-    Then a 404 should be returned
-
-
-
-  Scenario: Deleting a stored request for a particular response
-    And DELETE is sent to 'http://localhost:7001/mirage/requests/1'
-
-    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/requests/2'
-    Then a 200 should be returned

data/features/server/templates/delete.feature

@@ -1,44 +0,0 @@
-Feature: When a template is deleted, any tracked request data is also removed.
-
-  Background: The MockServer has already got a response for greeting and leaving on it.
-    Given the following template template:
-    """
-      {
-         "response":{
-            "body":"Hello"
-         }
-      }
-    """
-    And 'response.body' is base64 encoded
-    And the template is sent using PUT to 'http://localhost:7001/mirage/templates/greeting'
-
-    Given the following template template:
-    """
-      {
-         "response":{
-            "body":"Goodbye"
-         }
-      }
-    """
-    And 'response.body' is base64 encoded
-    And the template is sent using PUT to 'http://localhost:7001/mirage/templates/leaving'
-
-
-  Scenario: Deleting all templates
-    Given DELETE is sent to 'http://localhost:7001/mirage/templates'
-    When GET is sent to 'http://localhost:7001/mirage/responses/greeting'
-    Then a 404 should be returned
-    When GET is sent to 'http://localhost:7001/mirage/responses/leaving'
-    Then a 404 should be returned
-
-
-  Scenario: Deleting a particular template
-    Given DELETE is sent to 'http://localhost:7001/mirage/templates/1'
-
-    When GET is sent to 'http://localhost:7001/mirage/responses/greeting'
-    Then a 404 should be returned
-
-    When GET is sent to 'http://localhost:7001/mirage/responses/leaving'
-    Then a 200 should be returned
-
-    

data/features/server/templates/put/put.feature

@@ -1,62 +0,0 @@
-Feature: Mirage can be configured with templates that are returned when addressed from ${mirage_url}/responses
-  On setting a template, a unique id is returned. This is a key that can be used to manage the template.
-
-  Templates can be configured to respond to either, GET, POST, PUT, or DELETE. If you put more than one template to the same resource address
-  but configure them to respond to different HTTP methods, then they are held as seperate resources and are assigned different ids.
-
-  The following can be configured as required in order to invoke a response:
-  * request parameters
-  * body content - defaults to text/plain
-  * HTTP Headers
-  * HTTP Method - defaults to HTTP GET
-
-  The following attributes of a response can be configured
-  * HTTP status code - defaults to 200
-  * Whether this template is to be treated as the default response if a match is not found for a sub URI
-  * A delay before the response is returned to the client. This is in seconds, floats are accepted
-  * Content-Type
-
-  Request defaults
-  |required request parameters | none |
-  |required body content       | none |
-  |require HTTP headers        | none |
-  |required HTTP method        | GET  |
-
-  Response defaults
-  | HTTP status code | 200        |
-  | treat as default | false      |
-  | delay            | 0          |
-  | Content-Type     | text/plain |
-
-
-  Scenario: Setting a template on mirage
-    Given the following template template:
-    """
-      {
-         "request":{
-            "parameters":{},
-            "http_method":"get",
-            "headers": {},
-            "body_content":[]
-         },
-         "response":{
-            "default":false,
-            "body":"Hello",
-            "delay":0,
-            "content_type":"text/plain",
-            "status":200
-         }
-      }
-    """
-    And 'response.body' is base64 encoded
-    And the template is sent using PUT to 'http://localhost:7001/mirage/templates/greeting'
-    And '{"id":1}' should be returned
-
-    When GET is sent to 'http://localhost:7001/mirage/responses/greeting'
-    Then 'Hello' should be returned
-    And a 200 should be returned
-
-  Scenario: Making a request that is unmatched
-    When GET is sent to 'http://localhost:7001/mirage/responses/unmatched'
-    Then a 404 should be returned
-