mirage 2.0.8 → 2.0.9

data/HISTORY

@@ -1,4 +1,4 @@
-V2.0.8 - tidy up code, still a lot to do :)
+V2.0.8/9 - 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.8
+2.0.9

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "2.0.8"
+  s.version = "2.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2011-12-14"
+  s.date = "2011-12-15"
   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 = [
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     "mirage.gemspec",
     "mirage_server.rb",
     "rakefile",
+    "server/extensions/hash.rb",
     "server/extensions/object.rb",
     "server/mock_response.rb",
     "server/util.rb",

data/mirage_server.rb

@@ -7,6 +7,7 @@ $LOAD_PATH.unshift("#{ROOT_DIR}/server")
 require 'sinatra/base'
 
 require 'extensions/object'
+require 'extensions/hash'
 require 'mock_response'
 require 'util'
 
@@ -85,7 +86,7 @@ module Mirage
 
     get '/mirage/templates/:id' do
       response = MockResponse.find(response_id)
-      return 404 if response.is_a? Array
+      return 404 if response.nil? || response.is_a?(Array)
       send_response(response)
     end
 

data/server/extensions/hash.rb

@@ -0,0 +1,10 @@
+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

data/server/mock_response.rb

@@ -18,23 +18,11 @@ module Mirage
       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
+        response_set_containing(id).values.find { |response| response.response_id == id }
       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
+      def delete(id)
+        response_set_containing(id).delete_if { |http_method, response| response.response_id == id }
       end
 
       def clear
@@ -47,17 +35,13 @@ module Mirage
       end
 
       def revert
-        responses.clear and responses.replace(snapshot.deep_clone)
+        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
+        response_sets.each do |response_set|
+          response_set.values.each{|response|all_responses << response}
         end
         all_responses
       end
@@ -74,16 +58,19 @@ module Mirage
       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
+        response_set = response_set[body] || response_set[query_string] || response_set[:basic]
+        response_set[http_method.upcase] if response_set
+      end
+
+      def response_set_containing id
+        response_sets.each do |response_set|
+          return response_set if response_set.find { |key, response| response.response_id == id }
         end
-        record
+        {}
+      end
+
+      def response_sets
+        responses.values.collect { |response_sets| response_sets.values }.flatten
       end
 
       def find_default_responses(name)

data/test.rb

@@ -1,8 +1,22 @@
-hash = Hash.new do |hash, key|
-  hash[key] = Hash.new do |patterns_hash, pattern|
-    patterns_hash[pattern] = {:blah => 'foo'}
+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 =  hash['thing']['whatever']
+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]
 
-puts hash
+Marshal.dump(hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &21161500 !ruby/object:Gem::Requirement
+  requirement: &15932480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21161500
+  version_requirements: *15932480
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &21160920 !ruby/object:Gem::Requirement
+  requirement: &15931880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *21160920
+  version_requirements: *15931880
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &21160360 !ruby/object:Gem::Requirement
+  requirement: &15931260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21160360
+  version_requirements: *15931260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21159720 !ruby/object:Gem::Requirement
+  requirement: &15930660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21159720
+  version_requirements: *15930660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &21159100 !ruby/object:Gem::Requirement
+  requirement: &15929900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21159100
+  version_requirements: *15929900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21158480 !ruby/object:Gem::Requirement
+  requirement: &15929260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *21158480
+  version_requirements: *15929260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21157860 !ruby/object:Gem::Requirement
+  requirement: &15928640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *21157860
+  version_requirements: *15928640
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &21154260 !ruby/object:Gem::Requirement
+  requirement: &15839740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21154260
+  version_requirements: *15839740
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &21153660 !ruby/object:Gem::Requirement
+  requirement: &15838740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21153660
+  version_requirements: *15838740
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &21153000 !ruby/object:Gem::Requirement
+  requirement: &15838020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21153000
+  version_requirements: *15838020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &21152460 !ruby/object:Gem::Requirement
+  requirement: &15837380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,7 +131,7 @@ dependencies:
         version: 1.4.7
   type: :development
   prerelease: false
-  version_requirements: *21152460
+  version_requirements: *15837380
 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.
@@ -177,6 +177,7 @@ files:
 - mirage.gemspec
 - mirage_server.rb
 - rakefile
+- server/extensions/hash.rb
 - server/extensions/object.rb
 - server/mock_response.rb
 - server/util.rb
@@ -199,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2115174176244193400
+      hash: 3612992217465972196
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: