mirage 2.0.16 → 2.1.2

data/Gemfile

@@ -11,7 +11,6 @@ group :development do
   gem "jeweler"
   gem 'sinatra-contrib'
   gem 'mechanize'
-  gem 'gemcutter'
   gem "nokogiri"
 
   platform :jruby do

data/Gemfile.lock

@@ -19,7 +19,6 @@ GEM
     eventmachine (0.12.10-java)
     ffi (1.0.11)
     ffi (1.0.11-java)
-    gemcutter (0.7.1)
     gherkin (2.7.2)
       json (>= 1.4.6)
     gherkin (2.7.2-java)
@@ -86,7 +85,6 @@ PLATFORMS
 DEPENDENCIES
   childprocess
   cucumber
-  gemcutter
   jeweler
   jruby-openssl
   mechanize

data/HISTORY

@@ -1,3 +1,5 @@
+V2.1.2 - rename status_code to status
+V2.1.1 - Set response code and tidy ups
 V2.0.16 - minor typo fix for window command window title in windows
 V2.0.15 - fix uploading files from client and fix starting mirage on windows
 V2.0.12/13/14 - updating gem versions

data/VERSION

@@ -1 +1 @@
-2.0.16
+2.1.2

data/features/client/put.feature

@@ -120,3 +120,11 @@ Feature: the Mirage client provides methods for setting responses and loading de
     """
     When I send GET to 'http://localhost:7001/mirage/responses/download'
     Then the response should be the same as the content of 'README.md'
+
+  Scenario: Setting a response status code
+    Given I run
+    """
+    Mirage::Client.new.put('greeting', 'hello'){|response| response.status = 203}
+    """
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 203 should be returned

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

@@ -9,6 +9,7 @@ Feature: Mirage can be configured with templates that are returned when addresse
   X-mirage-delay (optional) = the amount of time in seconds that mirage should wait for before responding (defaults to 0)
   X-mirage-method (optional) = http method that this response applies to. Can be set to GET, POST, PUT or DELETE. Templates are configured to respond to GET requests by default
   X-mirage-default (optional) = set whether the reponse can act as a default response, see put_as_default.feature (defaults to false)
+  X-mirage-status-code (optional) = set the http status that is returned, defaults to 200
   content-type (optional) = Set the content type to be returned
 
 
@@ -17,6 +18,7 @@ Feature: Mirage can be configured with templates that are returned when addresse
 
     When I send GET to 'http://localhost:7001/mirage/responses/greeting'
     Then 'Hello' should be returned
+    And a 200 should be returned
     
 
   Scenario: A template put under a deeper address
@@ -41,6 +43,12 @@ Feature: Mirage can be configured with templates that are returned when addresse
 
     Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hi'
     Then '1' should be returned
+
+  Scenario: Setting the http status code to be returned
+    Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello' and headers:
+      | X-mirage-status | 202 |
+    When I send GET to 'http://localhost:7001/mirage/responses/greeting'
+    Then a 202 should be returned
     
     
 

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

@@ -6,6 +6,7 @@ Feature: Parts of a response can be substitued for values found in the request b
   matching group which is what is put in to the response.
 
 
+
   Scenario: A response template populated from matches found in the request body using a regex
     Given I send PUT to 'http://localhost:7001/mirage/templates/greeting' with body 'Hello ${<firstname>(.*?)</firstname>} ${<surname>(.*?)</surname>}, how are you?' and headers:
       | X-mirage-method | POST |

data/features/step_definitions/my_steps.rb

@@ -14,7 +14,7 @@ Then /^'([^']*)' should be returned$/ do |expected_response|
   end
 end
 
-Then /^a (200|404|500) should be returned$/ do |error_code|
+Then /^a (\d+) should be returned$/ do |error_code|
   @response.code.to_i.should == error_code.to_i
 end
 

data/lib/mirage/client.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
 require 'uri'
-require 'open-uri'
 require 'client/web'
+require 'ostruct'
 
 module Mirage
 
@@ -14,10 +14,26 @@ module Mirage
     end
   end
   
-  class Response
-    
-    attr_accessor :method, :pattern, :content_type, :default
-    
+  class Response < OpenStruct
+
+    attr_accessor :content_type
+    attr_reader :value
+    def initialize response
+      @content_type = 'text/plain'
+      @value = response
+      super({})
+    end
+
+    def headers
+      headers = {}
+
+      @table.each{|header, value| headers["X-mirage-#{header.to_s.gsub('_', '-')}"] = value}
+      headers['Content-Type']=@content_type
+      headers['X-mirage-file'] = 'true' if @response.kind_of?(IO)
+
+      headers
+    end
+
   end
 
   class InternalServerException < MirageError;
@@ -39,37 +55,28 @@ module Mirage
     end
 
 
-    # Set a text or file based response, to be hosted at a given end point optionally with a given pattern and delay
-    # Client.set(endpoint, response, params) => unique id that can be used to call back to the server
+    # Set a text or file based response template, to be hosted at a given end point. A block can be specified to configure the template
+    # Client.set(endpoint, response, &block) => unique id that can be used to call back to the server
+    #
+    # Examples:
+    # Client.put('greeting', 'hello')
     #
-    #  Examples:
-    #  Client.set('greeting', 'hello':)
-    #  Client.set('greeting', 'hello', :pattern => /regexp/)
-    #  Client.set('greeting', 'hello', :pattern => 'text')
-    #  Client.set('greeting', 'hello', :delay => 5) # number of seconds
-    def put endpoint, response_value, params={}
-      response = Response.new
+    # Client.put('greeting', 'hello') do |response|
+    #   response.pattern = 'pattern' #regex or string literal applied against the request querystring and body
+    #   response.method = :post #By default templates will respond to get requests
+    #   response.content_type = 'text/html' #defaults text/plain
+    #   response.default = true # defaults to false. setting to true will allow this template to respond to request made to sub resources should it match.
+    # end
+    def put endpoint, response_value, &block
+      response = Response.new response_value
       
       yield response if block_given?
-      
-      headers = {}
-      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'
-
-      if response_value.kind_of?(IO)
-        headers['X-mirage-file'] = 'true'
-      else
-        response_value = response_value.to_s
-      end
 
-      build_response(http_put("#{@url}/templates/#{endpoint}",response_value, headers))
+      build_response(http_put("#{@url}/templates/#{endpoint}",response.value, response.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
+    # client.response(response_id) => response held on the server as a String
     def response response_id
       response = build_response(http_get("#{@url}/templates/#{response_id}"))
       case response

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "2.0.16"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2012-01-11"
+  s.date = "2012-04-29"
   s.description = "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"]
   s.extra_rdoc_files = [
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.post_install_message = "\n===============================================================================\nThanks you for installing mirage.   \n\nRun Mirage with:\n\nmirage start                                   \n\nFor more information go to: https://github.com/lashd/mirage/wiki\n===============================================================================\n"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.17"
   s.summary = "Mirage is a easy mock server for testing your applications"
 
   if s.respond_to? :specification_version then
@@ -78,7 +78,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<sinatra-contrib>, [">= 0"])
       s.add_development_dependency(%q<mechanize>, [">= 0"])
-      s.add_development_dependency(%q<gemcutter>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
     else
@@ -91,7 +90,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sinatra-contrib>, [">= 0"])
       s.add_dependency(%q<mechanize>, [">= 0"])
-      s.add_dependency(%q<gemcutter>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
     end
@@ -105,7 +103,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sinatra-contrib>, [">= 0"])
     s.add_dependency(%q<mechanize>, [">= 0"])
-    s.add_dependency(%q<gemcutter>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<jruby-openssl>, [">= 0"])
   end

data/mirage_server.rb

@@ -39,14 +39,16 @@ module Mirage
 
     put '/mirage/templates/*' do |name|
       response = request.body.read
+
       MockResponse.new(name,
                        response,
-                       @env['CONTENT_TYPE'],
-                       @env['HTTP_X_MIRAGE_METHOD'],
-                       @env['HTTP_X_MIRAGE_PATTERN'],
-                       @env['HTTP_X_MIRAGE_DELAY'].to_f,
-                       @env['HTTP_X_MIRAGE_DEFAULT'],
-                       @env['HTTP_X_MIRAGE_FILE']).response_id.to_s
+                       :content_type => @env['CONTENT_TYPE'],
+                       :http_method => @env['HTTP_X_MIRAGE_METHOD'],
+                       :status => @env['HTTP_X_MIRAGE_STATUS'],
+                       :pattern => @env['HTTP_X_MIRAGE_PATTERN'],
+                       :delay => @env['HTTP_X_MIRAGE_DELAY'].to_f,
+                       :default => @env['HTTP_X_MIRAGE_DEFAULT'],
+                       :file => @env['HTTP_X_MIRAGE_FILE']).response_id.to_s
     end
 
     ['get', 'post', 'delete', 'put'].each do |http_method|
@@ -153,6 +155,7 @@ module Mirage
       def send_response(response, body='', request={}, query_string='')
         sleep response.delay
         content_type(response.content_type)
+        status response.status
         response.value(body, request, query_string)
       end
     end

data/server/mock_response.rb

@@ -101,24 +101,26 @@ module Mirage
 
     end
 
-    attr_reader :response_id, :delay, :name, :pattern, :http_method, :content_type
+    attr_reader  :name
     attr_accessor :response_id
 
-    def initialize name, value, content_type, http_method, pattern=nil, delay=0, default=false, file=false
-      @name, @value, @content_type, @http_method, @delay, @default, @file = name, value, content_type, (http_method||'GET').upcase,  delay, default, file
-      @pattern = pattern ? /#{pattern}/ : :basic
+    def initialize name, value,options
+      @name, @value = name, value
+      @options = {:pattern => :basic, :http_method => 'GET', :delay => 0.0, :status => 200}.merge(options){|key, old_value, new_value| new_value || old_value}
+      @options[:http_method].upcase!
       MockResponse.add self
     end
 
-    def default?
-      'true' == @default
+    def method_missing *args
+      method_name = args.first
+      key = method_name.to_s.gsub(/\?$/, '').to_sym
+      method_name.to_s.end_with?('?') ? 'true' == @options[key] : @options[key]
     end
 
-    def file?
-      'true' == @file
+    def pattern
+      @options[:pattern] == :basic ? :basic : /#{@options[:pattern]}/
     end
 
-
     def value(body='', request_parameters={}, query_string='')
       return @value if file?
 

data/test.rb

@@ -1 +1 @@
-puts File.open('rakefile', 'r').kind_of?(IO)
+a change another

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &27575680 !ruby/object:Gem::Requirement
+  requirement: &16709080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27575680
+  version_requirements: *16709080
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &27575080 !ruby/object:Gem::Requirement
+  requirement: &16708560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27575080
+  version_requirements: *16708560
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &27574440 !ruby/object:Gem::Requirement
+  requirement: &16708060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27574440
+  version_requirements: *16708060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &27573820 !ruby/object:Gem::Requirement
+  requirement: &16673860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27573820
+  version_requirements: *16673860
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &27562100 !ruby/object:Gem::Requirement
+  requirement: &16673060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27562100
+  version_requirements: *16673060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27561500 !ruby/object:Gem::Requirement
+  requirement: &16672340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27561500
+  version_requirements: *16672340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27560900 !ruby/object:Gem::Requirement
+  requirement: &16671580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27560900
+  version_requirements: *16671580
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &27560300 !ruby/object:Gem::Requirement
+  requirement: &16670800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27560300
+  version_requirements: *16670800
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &27559620 !ruby/object:Gem::Requirement
+  requirement: &16670040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,21 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27559620
-- !ruby/object:Gem::Dependency
-  name: gemcutter
-  requirement: &27559000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *27559000
+  version_requirements: *16670040
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &27558420 !ruby/object:Gem::Requirement
+  requirement: &16669340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27558420
+  version_requirements: *16669340
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
-  requirement: &27557920 !ruby/object:Gem::Requirement
+  requirement: &16668600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27557920
+  version_requirements: *16668600
 description: 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.
@@ -211,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4466543541330693367
+      hash: -2084322877409170050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Mirage is a easy mock server for testing your applications