mirage 2.0.7 → 2.0.8

data/HISTORY

@@ -1,2 +1,4 @@
+V2.0.8 - 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.7
+2.0.8

data/features/client/save_and_revert.feature

@@ -24,7 +24,7 @@ Feature: The Mirage client can be used to snaphsot and rollback the Mirage serve
     Goodbye
     """
 
-    And I send PUT to 'http://localhost:7001/mirage/set/greeting' with request entity
+    And I send PUT to 'http://localhost:7001/mirage/templates/greeting' with request entity
     """
     Changed
     """

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "2.0.7"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2011-12-13"
+  s.date = "2011-12-14"
   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 = [
@@ -53,8 +53,8 @@ Gem::Specification.new do |s|
     "rakefile",
     "server/extensions/object.rb",
     "server/mock_response.rb",
-    "server/mock_responses.rb",
     "server/util.rb",
+    "test.rb",
     "views/index.erb"
   ]
   s.homepage = "https://github.com/lashd/mirage"

data/mirage_server.rb

@@ -8,7 +8,6 @@ require 'sinatra/base'
 
 require 'extensions/object'
 require 'mock_response'
-require 'mock_responses'
 require 'util'
 
 require 'mirage/client'
@@ -44,13 +43,14 @@ module Mirage
 
       pattern = headers['HTTP_X_MIRAGE_PATTERN'] ? /#{headers['HTTP_X_MIRAGE_PATTERN']}/ : :basic
 
-      MockResponses << 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 = 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
     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.env['QUERY_STRING']
-        record = MockResponses.get_response(name, http_method, body, query_string)
+        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
         REQUESTS[record.response_id] = body.empty? ? query_string : body
@@ -61,31 +61,30 @@ module Mirage
     end
 
     delete '/mirage/templates/:id' do
-      MockResponses.delete(response_id)
+      MockResponse.delete(response_id)
       REQUESTS.delete(response_id)
-      ""
+      200
     end
 
     delete '/mirage/requests' do
       REQUESTS.clear
-      ""
+      200
     end
 
     delete '/mirage/requests/:id' do
       REQUESTS.delete(response_id)
-      ""
+      200
     end
 
 
     delete '/mirage/templates' do
       [REQUESTS].each { |map| map.clear }
-      MockResponses.clear
-      MockResponse.reset_count
-      ""
+      MockResponse.clear
+      200
     end
 
     get '/mirage/templates/:id' do
-      response = MockResponses.find(response_id)
+      response = MockResponse.find(response_id)
       return 404 if response.is_a? Array
       send_response(response)
     end
@@ -98,7 +97,7 @@ module Mirage
     get '/mirage' do
       @responses = {}
 
-      MockResponses.all.each do |response|
+      MockResponse.all.each do |response|
         pattern = response.pattern.is_a?(Regexp) ? "pattern = #{response.pattern.source}" : ''
         delay = response.delay > 0 ? "delay = #{response.delay}" : ''
         pattern << ' ,' unless pattern.empty? || delay.empty?
@@ -107,12 +106,9 @@ module Mirage
       erb :index
     end
 
-    error do
-      erb request.env['sinatra.error'].message
-    end
 
     put '/mirage/defaults' do
-      MockResponses.clear
+      MockResponse.clear
 
       Dir["#{settings.defaults_directory}/**/*.rb"].each do |default|
         begin
@@ -120,21 +116,24 @@ module Mirage
         rescue Exception => e
           raise "Unable to load default responses from: #{default}"
         end
-
       end
+      200
     end
 #
     put '/mirage/backup' do
-      MockResponses.backup
-      ""
+      MockResponse.backup
+      200
     end
 
 
     put '/mirage' do
-      MockResponses.revert
-      ""
+      MockResponse.revert
+      200
     end
 
+    error do
+      erb request.env['sinatra.error'].message
+    end
 
     helpers do
 

data/server/mock_response.rb

@@ -1,15 +1,117 @@
 module Mirage
   class MockResponse
-    @@id_count = 0
+    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
+        responses.values.each do |response_sets|
+          response_sets.values.each do |response_set|
+            response_set.values.each do |response|
+              return response if response.response_id == id
+            end
+          end
+        end
+      end
+
+      def delete(response_id)
+        responses.values.each do |response_sets|
+          response_sets.values.each do |response_set|
+            response_set.each do |method, response|
+              response_set.delete(method) if response.response_id == response_id
+            end
+          end
+        end
+      end
+
+      def clear
+        responses.clear
+        @next_id = 0
+      end
+
+      def backup
+        snapshot.clear and snapshot.replace(responses.deep_clone)
+      end
+
+      def revert
+        responses.clear and responses.replace(snapshot.deep_clone)
+      end
+
+      def all
+        all_responses = []
+        responses.values.each do |response_sets|
+          response_sets.values.each do |response_set|
+            response_set.values.each do |response|
+              all_responses << response
+            end
+          end
+        end
+        all_responses
+      end
+
+      def default_response(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)
+          return record if record && record.default?
+        end
+      end
+
+      private
+      def find_response(body, query_string, response_set, http_method)
+        return unless response_set
+        http_method = http_method.upcase
+        pattern_match = response_set.keys.find_all { |pattern| pattern != :basic }.find { |pattern| (body =~ pattern || query_string =~ pattern) }
+
+        if pattern_match
+          record = response_set[pattern_match][http_method]
+        else
+          record = response_set[:basic]
+          record = record[http_method] if record
+        end
+        record
+      end
+
+      def find_default_responses(name)
+        matches = responses.keys.find_all { |key| name.index(key) == 0 }.sort { |a, b| b.length <=> a.length }
+        matches.collect { |key| responses[key] }
+      end
+
+      def responses
+        @responses ||={}
+      end
+
+      def snapshot
+        @snapshot ||={}
+      end
+
+      def next_id
+        @next_id||= 0
+        @next_id+=1
+      end
+
+    end
+
     attr_reader :response_id, :delay, :name, :pattern, :http_method, :content_type
     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, @response_id, @delay, @default, @file = name, value, content_type, http_method, pattern, @@id_count+=1, delay, default, file
-    end
-
-    def self.reset_count
-      @@id_count = 0
+      @name, @value, @content_type, @http_method, @pattern, @delay, @default, @file = name, value, content_type, http_method.to_s.upcase, pattern, delay, default, file
+      MockResponse.add self
     end
 
     def default?
@@ -17,7 +119,7 @@ module Mirage
     end
 
     def file?
-      @file == 'true'
+      'true' == @file
     end
 
 
@@ -46,4 +148,4 @@ module Mirage
       string.scan(/#{regex}/).flatten.first
     end
   end
-end
+end

data/test.rb

@@ -0,0 +1,8 @@
+hash = Hash.new do |hash, key|
+  hash[key] = Hash.new do |patterns_hash, pattern|
+    patterns_hash[pattern] = {:blah => 'foo'}
+  end
+end
+hash =  hash['thing']['whatever']
+
+puts hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2011-12-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &19381300 !ruby/object:Gem::Requirement
+  requirement: &21161500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19381300
+  version_requirements: *21161500
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &19380760 !ruby/object:Gem::Requirement
+  requirement: &21160920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *19380760
+  version_requirements: *21160920
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &19380120 !ruby/object:Gem::Requirement
+  requirement: &21160360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19380120
+  version_requirements: *21160360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19379560 !ruby/object:Gem::Requirement
+  requirement: &21159720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19379560
+  version_requirements: *21159720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &19378960 !ruby/object:Gem::Requirement
+  requirement: &21159100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19378960
+  version_requirements: *21159100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19378180 !ruby/object:Gem::Requirement
+  requirement: &21158480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *19378180
+  version_requirements: *21158480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19377440 !ruby/object:Gem::Requirement
+  requirement: &21157860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *19377440
+  version_requirements: *21157860
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &19376420 !ruby/object:Gem::Requirement
+  requirement: &21154260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19376420
+  version_requirements: *21154260
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &19372420 !ruby/object:Gem::Requirement
+  requirement: &21153660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19372420
+  version_requirements: *21153660
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &19371840 !ruby/object:Gem::Requirement
+  requirement: &21153000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19371840
+  version_requirements: *21153000
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &19371180 !ruby/object:Gem::Requirement
+  requirement: &21152460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,7 +131,7 @@ dependencies:
         version: 1.4.7
   type: :development
   prerelease: false
-  version_requirements: *19371180
+  version_requirements: *21152460
 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.
@@ -179,8 +179,8 @@ files:
 - rakefile
 - server/extensions/object.rb
 - server/mock_response.rb
-- server/mock_responses.rb
 - server/util.rb
+- test.rb
 - views/index.erb
 homepage: https://github.com/lashd/mirage
 licenses:
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 79940138610282887
+      hash: 2115174176244193400
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/server/mock_responses.rb

@@ -1,119 +0,0 @@
-module Mirage
-  class MockResponses
-
-    class << self
-
-      def << response
-
-
-        stored_responses = responses[response.name]||={}
-
-        stored_responses[response.pattern] ||= {}
-        old_response = stored_responses[response.pattern].delete(response.http_method.upcase)
-        stored_responses[response.pattern][response.http_method.upcase] = response
-
-
-        # Right not an the main id count goes up by one even if the id is not used because the old id is reused from another response
-        response.response_id = old_response.response_id if old_response
-        response.response_id.to_s
-
-      end
-
-      def get_response name, http_method, body, query_string
-        stored_responses = responses[name]
-        record = nil
-
-        record = find_response(body, query_string, stored_responses, http_method) if stored_responses
-
-
-        unless record
-          default_responses, record = find_default_responses(name), nil
-
-          until record || default_responses.empty?
-            record = find_response(body, query_string, default_responses.delete_at(0), http_method)
-            if record
-              record = record.default? ? record : nil
-            end
-
-          end
-        end
-
-        record
-      end
-
-      def find id
-        responses.values.each do |response_sets|
-          response_sets.values.each do |response_set|
-            response_set.values.each do |response|
-              return response if response.response_id == id
-            end
-          end
-        end
-        
-      end
-
-      def delete(response_id)
-        responses.values.each do |response_sets|
-          response_sets.values.each do |response_set|
-            response_set.each do |method, response|
-              response_set.delete(method) if response.response_id == response_id
-            end
-          end
-        end
-      end
-
-      def clear
-        responses.clear
-      end
-
-      def backup
-        snapshot.clear and snapshot.replace(responses.deep_clone)
-      end
-
-      def revert
-        responses.clear and responses.replace(snapshot.deep_clone)
-      end
-
-      def all
-        all_responses = []
-        responses.values.each do |response_sets|
-          response_sets.each do |pattern, response_set|
-            response_set.values.each do |response|
-              all_responses << response
-            end
-          end
-        end
-        all_responses 
-      end
-
-      private
-      def find_response(body, query_string, stored_responses, http_method)
-        http_method = http_method.upcase
-        pattern_match = stored_responses.keys.find_all { |pattern| pattern != :basic }.find { |pattern| (body =~ pattern || query_string =~ pattern) }
-
-        if pattern_match
-          record = stored_responses[pattern_match][http_method]
-        else
-          record = stored_responses[:basic]
-          record = record[http_method] if record
-        end
-        record
-      end
-
-      def find_default_responses(name)
-        matches = responses.keys.find_all { |key| name.index(key) == 0 }.sort { |a, b| b.length <=> a.length }
-        matches.collect { |key| responses[key] }
-      end
-
-      private
-      def responses
-        @responses ||={}
-      end
-
-      def snapshot
-        @snapshot ||={}
-      end
-    end
-  end
-
-end