mirage 2.0.9 → 2.0.10

data/HISTORY

@@ -1,4 +1,4 @@
-V2.0.8/9 - tidy up code, still a lot to do :)
+V2.0.8/9/10 - tidy up code, still a lot to do :)
 V2.0.7 - fix missing dependency on waitforit gem
 V2.0.1/2/3 - tidying up code
 V2.0.0 - Converted to restful interface

data/VERSION

@@ -1 +1 @@
-2.0.9
+2.0.10

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "2.0.9"
+  s.version = "2.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2011-12-15"
+  s.date = "2011-12-17"
   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 = [

data/mirage_server.rb

@@ -25,6 +25,7 @@ module Mirage
       set :port, options[:port]
       set :show_exceptions, false
       set :logging, true
+      set :dump_errors, true
       set :server, 'webrick'
       set :views, "#{ROOT_DIR}/views"
 
@@ -38,25 +39,28 @@ module Mirage
 
     put '/mirage/templates/*' do |name|
       response = request.body.read
-
-      headers = request.env
-      http_method = headers['HTTP_X_MIRAGE_METHOD'] || 'GET'
-
-      pattern = headers['HTTP_X_MIRAGE_PATTERN'] ? /#{headers['HTTP_X_MIRAGE_PATTERN']}/ : :basic
-
-      mock_response = MockResponse.new(name, response, headers['CONTENT_TYPE'], http_method, pattern, headers['HTTP_X_MIRAGE_DELAY'].to_f, headers['HTTP_X_MIRAGE_DEFAULT'], headers['HTTP_X_MIRAGE_FILE'])
-      mock_response.response_id.to_s
+      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
     end
 
     ['get', 'post', 'delete', 'put'].each do |http_method|
       send(http_method, '/mirage/responses/*') do |name|
         body, query_string = Rack::Utils.unescape(request.body.read.to_s), request.query_string
-        record = MockResponse.get_response(name, http_method, body, query_string)
 
-        return 404 unless record
+        begin
+          record = MockResponse.find(body, query_string, name, http_method)
+        rescue ServerResponseNotFound
+          record = MockResponse.find_default(body, http_method, name, query_string)
+        end
+
         REQUESTS[record.response_id] = body.empty? ? query_string : body
 
-        sleep record.delay
         send_response(record, body, request, query_string)
       end
     end
@@ -77,24 +81,20 @@ module Mirage
       200
     end
 
-
     delete '/mirage/templates' do
-      [REQUESTS].each { |map| map.clear }
-      MockResponse.clear
+      REQUESTS.clear
+      MockResponse.delete_all
       200
     end
 
     get '/mirage/templates/:id' do
-      response = MockResponse.find(response_id)
-      return 404 if response.nil? || response.is_a?(Array)
-      send_response(response)
+      send_response(MockResponse.find_by_id(response_id))
     end
 
     get '/mirage/requests/:id' do
       REQUESTS[response_id] || 404
     end
 
-
     get '/mirage' do
       @responses = {}
 
@@ -109,7 +109,7 @@ module Mirage
 
 
     put '/mirage/defaults' do
-      MockResponse.clear
+      MockResponse.delete_all
 
       Dir["#{settings.defaults_directory}/**/*.rb"].each do |default|
         begin
@@ -132,6 +132,10 @@ module Mirage
       200
     end
 
+    error ServerResponseNotFound do
+      404
+    end
+
     error do
       erb request.env['sinatra.error'].message
     end
@@ -147,6 +151,7 @@ module Mirage
       end
 
       def send_response(response, body='', request={}, query_string='')
+        sleep response.delay
         content_type(response.content_type)
         response.value(body, request, query_string)
       end

data/server/mock_response.rb

@@ -1,31 +1,19 @@
 module Mirage
+  class ServerResponseNotFound < Exception
+    
+  end
   class MockResponse
     class << self
 
-      def add response
-        stored_response_sets = responses[response.name]||={}
-        stored_response_set = (stored_response_sets[response.pattern] ||= {})
-
-        old_response = stored_response_set.delete(response.http_method)
-        stored_response_set[response.http_method] = response
-
-        response.response_id = old_response ? old_response.response_id : next_id
-      end
-
-
-      def get_response name, http_method, body, query_string
-        find_response(body, query_string, responses[name], http_method) || default_response(body, http_method, name, query_string)
-      end
-
-      def find id
-        response_set_containing(id).values.find { |response| response.response_id == id }
+      def find_by_id id
+        response_set_containing(id).values.find { |response| response.response_id == id } || raise(ServerResponseNotFound)
       end
 
       def delete(id)
         response_set_containing(id).delete_if { |http_method, response| response.response_id == id }
       end
 
-      def clear
+      def delete_all
         responses.clear
         @next_id = 0
       end
@@ -35,7 +23,7 @@ module Mirage
       end
 
       def revert
-        clear and responses.replace(snapshot.deep_clone)
+        delete_all and responses.replace(snapshot.deep_clone)
       end
 
       def all
@@ -46,17 +34,32 @@ module Mirage
         all_responses
       end
 
-      def default_response(body, http_method, name, query_string)
+      def find_default(body, http_method, name, query_string)
         default_response_sets = find_default_responses(name)
 
         until default_response_sets.empty?
-          record = find_response(body, query_string, default_response_sets.delete_at(0), http_method)
+          record = find_in_response_set(body, query_string, default_response_sets.delete_at(0), http_method)
           return record if record && record.default?
         end
+
+        raise ServerResponseNotFound
+      end
+
+      def find(body, query_string, name, http_method)
+        find_in_response_set(body, query_string, responses[name], http_method) || raise(ServerResponseNotFound)
+      end
+
+      def add new_response
+        response_set = target_response_set(new_response)
+
+        old_response = response_set.delete(new_response.http_method)
+        response_set[new_response.http_method] = new_response
+        new_response.response_id = old_response ? old_response.response_id : next_id
       end
 
       private
-      def find_response(body, query_string, response_set, http_method)
+
+      def find_in_response_set(body, query_string, response_set, http_method)
         return unless response_set
         response_set = response_set[body] || response_set[query_string] || response_set[:basic]
         response_set[http_method.upcase] if response_set
@@ -78,6 +81,11 @@ module Mirage
         matches.collect { |key| responses[key] }
       end
 
+      def target_response_set response
+        responses_sets = responses[response.name]||={}
+        responses_sets[response.pattern] ||= {}
+      end
+
       def responses
         @responses ||={}
       end
@@ -97,7 +105,8 @@ module Mirage
     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, @pattern, @delay, @default, @file = name, value, content_type, http_method.to_s.upcase, pattern, delay, default, file
+      @name, @value, @content_type, @http_method, @delay, @default, @file = name, value, content_type, (http_method||'GET').upcase,  delay, default, file
+      @pattern = pattern ? /#{pattern}/ : :basic
       MockResponse.add self
     end
 
@@ -135,4 +144,4 @@ module Mirage
       string.scan(/#{regex}/).flatten.first
     end
   end
-end
+end

data/test.rb

@@ -1,22 +1,2 @@
-class Hash
-  alias_method :backup, :[]
 
-  def [] desired_key
-    result = backup(desired_key)
-    return result if result
-    key, value = find{|key, value| key.is_a?(Regexp) && desired_key.is_a?(String) && key.match(desired_key) }
-    value
-  end
-end
-hash = {/hello/ => 'hello', :foo => 'bar'}
-
-#def hash.[] desired_key
-#  key, value = find{|key, value| key.match(desired_key)}
-#  value
-#end
-
-
-puts hash['hello']
-puts hash[:foo]
-
-Marshal.dump(hash)
+puts 'hello' || raise(Exception)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2011-12-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &15932480 !ruby/object:Gem::Requirement
+  requirement: &16574020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15932480
+  version_requirements: *16574020
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &15931880 !ruby/object:Gem::Requirement
+  requirement: &16573200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *15931880
+  version_requirements: *16573200
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &15931260 !ruby/object:Gem::Requirement
+  requirement: &16572300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15931260
+  version_requirements: *16572300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15930660 !ruby/object:Gem::Requirement
+  requirement: &16571360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15930660
+  version_requirements: *16571360
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &15929900 !ruby/object:Gem::Requirement
+  requirement: &16567920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15929900
+  version_requirements: *16567920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15929260 !ruby/object:Gem::Requirement
+  requirement: &16567020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *15929260
+  version_requirements: *16567020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15928640 !ruby/object:Gem::Requirement
+  requirement: &16566280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *15928640
+  version_requirements: *16566280
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &15839740 !ruby/object:Gem::Requirement
+  requirement: &16565440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15839740
+  version_requirements: *16565440
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &15838740 !ruby/object:Gem::Requirement
+  requirement: &16564600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15838740
+  version_requirements: *16564600
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &15838020 !ruby/object:Gem::Requirement
+  requirement: &16563700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15838020
+  version_requirements: *16563700
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &15837380 !ruby/object:Gem::Requirement
+  requirement: &16562800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,7 +131,7 @@ dependencies:
         version: 1.4.7
   type: :development
   prerelease: false
-  version_requirements: *15837380
+  version_requirements: *16562800
 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.
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3612992217465972196
+      hash: -4415743956139999538
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: