mirage 1.3.6 → 2.0.0.alpha1

data/lib/mirage/mock_response.rb

@@ -0,0 +1,49 @@
+module Mirage
+  class MockResponse
+    @@id_count = 0
+    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
+    end
+
+    def default?
+      'true' == @default
+    end
+
+    def file?
+      @file == 'true'
+    end
+
+
+    def value(body='', request_parameters={}, query_string='')
+      return @value if file?
+
+      value = @value
+      value.scan(/\$\{([^\}]*)\}/).flatten.each do |pattern|
+
+        if (parameter_match = request_parameters[pattern])
+          value = value.gsub("${#{pattern}}", parameter_match)
+        end
+
+        [body, query_string].each do |string|
+          if (string_match = find_match(string, pattern))
+            value = value.gsub("${#{pattern}}", string_match)
+          end
+        end
+
+      end
+      value
+    end
+
+    private
+    def find_match(string, regex)
+      string.scan(/#{regex}/).flatten.first
+    end
+  end
+end

data/lib/mirage/mock_responses_collection.rb

@@ -0,0 +1,109 @@
+module Mirage
+  class MockResponsesCollection
+    def initialize
+      @snapshot, @responses = {}, {}
+    end
+
+    def << response
+
+
+      stored_responses = @responses[response.name]||={}
+
+      stored_responses[response.pattern] ||= {}
+      old_response = stored_responses[response.pattern].delete(response.http_method)
+      stored_responses[response.pattern][response.http_method] = 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
+      responses = []
+      @responses.values.each do |response_sets|
+        response_sets.each do |pattern, response_set|
+          response_set.values.each do |response|
+            responses << response
+          end
+        end
+      end
+      responses
+    end
+
+    private
+    def find_response(body, query_string, stored_responses, http_method)
+      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
+
+  end
+  
+end

data/lib/mirage/object.rb

@@ -0,0 +1,5 @@
+class Object
+  def deep_clone
+    Marshal.load(Marshal.dump(self))
+  end
+end

data/lib/mirage/web.rb

@@ -1,6 +1,9 @@
+require 'net/http'
+require 'uri'
 module Mirage
   module Web
     class FileResponse
+      attr_reader :response
       def initialize response
         @response = response
       end
@@ -10,40 +13,46 @@ module Mirage
       end
     end
 
-    def http_get url, params={}
-      using_mechanize do |browser|
-        params[:body] ? browser.put(url, params[:body]) : browser.get(url, params)  
-      end
-    end
+    def put url, entity, headers={}
+      uri = URI.parse(url)
+      request = Net::HTTP::Put.new(uri.request_uri)
 
-    def http_post url, params={}
-      using_mechanize do |browser|
-        browser.post(url, params)
+      if entity.is_a? File
+        request.body_stream=entity
+        request.content_length=entity.lstat.size
+      else
+        request.body=entity
       end
+      headers.each { |field, value| request.add_field(field, value) }
+      
+      Net::HTTP.new(uri.host, uri.port).request(request)
     end
 
-    private
-    def using_mechanize
-      begin
-        browser = Mechanize.new
-        browser.keep_alive = false
-        response = yield browser
-
-        def response.code
-          @code.to_i
-        end
-      rescue Exception => e
-        response = e
+    def get url, params={}, headers={}
+      uri = URI.parse(url)
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request.set_form_data params
+      headers.each { |field, value| request.add_field(field, value) }
+      Net::HTTP.new(uri.host, uri.port).request(request)
+    end
 
-        def response.code
-          self.response_code.to_i
-        end
+    def post url, params={}, headers={}
+      uri = URI.parse(url)
+      request = Net::HTTP::Post.new(uri.request_uri)
+      
+      params.is_a?(Hash) ? request.set_form_data(params) : request.body = params
+        
+      headers.each { |field, value| request.add_field(field, value) }
+      Net::HTTP.new(uri.host, uri.port).request(request)
+    end
 
-        def response.body
-          ""
-        end
-      end
-      response
+    def delete url, params={}, headers={}
+      uri = URI.parse(url)
+      request = Net::HTTP::Delete.new(uri.request_uri)
+      params.is_a?(Hash) ? request.set_form_data(params) : request.body = params
+      headers.each { |field, value| request.add_field(field, value) }
+      Net::HTTP.new(uri.host, uri.port).request(request)
     end
+
   end
 end

data/lib/start_mirage.rb

@@ -1,16 +1,38 @@
 require 'rubygems'
+
 $0='Mirage Server'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'sinatra'
+require 'sinatra/base'
+require 'sinatra/reloader'
+
+
+module Mirage
+  class MirageServer < Sinatra::Base
+    configure do
+      require 'logger'
+      enable :logging
+      log_file = File.open('mirage.log', 'a')
+      log_file.sync=true
+      use Rack::CommonLogger, log_file
+      register Sinatra::Reloader
+      also_reload "**/*.rb"
+      set :views, File.dirname(__FILE__) + '/views'
+    end
+  end
+end
 require 'mirage'
 include Mirage::Util
-
-#puts "ARGV is " + ARGV
+#
 options = parse_options(ARGV)
 
+
 DEFAULT_RESPONSES_DIR = "#{options[:defaults_directory]}"
 Mirage.client = Mirage::Client.new
-Ramaze::Log.loggers = [Logger.new('mirage.log')]
-Ramaze::Log.level= Logger::WARN
-Ramaze.start :port => options[:port]
+set(:show_exception, false)
+set(:raise_errors, true)
+
+Mirage::MirageServer.run! :port => options[:port], :show_exceptions => false, :logging => true, :server => 'webrick'
 
 

data/lib/{view/mirage/index.xhtml → views/index.erb}

@@ -17,12 +17,12 @@
     <br/>
     <strong>Note:</strong> if requests or responses contain xml, you will need to view page source to see it properly.</p>
 
-<?r unless @responses.empty? ?>
+<% unless @responses.empty? %>
 <table border="1" width='100%'>
-    <?r @responses.each do |key, response| ?>
-        <tr><td><a id='peek_response_#{response.response_id}' href="/mirage/peek/#{response.response_id}">#{key}</a></td><td><a id='track_response_#{response.response_id}' href="/mirage/track/#{response.response_id}">track</a></td></tr>
-    <?r end ?>
+    <% @responses.each do |key, response| %>
+        <tr><td><a id='peek_response_<%=response.response_id%>' href="/mirage/templates/<%=response.response_id%>"><%=key%></a></td><td><a id='track_response_<%=response.response_id%>' href="/mirage/requests/<%=response.response_id%>">track</a></td></tr>
+    <% end %>
 </table>
-<?r end ?>
+<% end %>
 </body>
 </html>

data/mirage.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = %q{2011-04-06}
+  s.date = %q{2011-04-25}
   s.default_executable = %q{mirage}
   s.description = %q{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"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
     "features/client/peek.feature",
     "features/client/save_and_revert.feature",
     "features/client/set.feature",
-    "features/client/track.feature",
+    "features/client/track_requests.feature",
     "features/server/clear.feature",
     "features/server/command_line_iterface.feature",
     "features/server/file_responses.feature",
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     "features/server/set_default_response.feature",
     "features/server/set_with_a_delay.feature",
     "features/server/set_with_a_pattern.feature",
-    "features/server/track.feature",
+    "features/server/track_requests.feature",
     "features/server/web_user_interface.feature",
     "features/step_definitions/my_steps.rb",
     "features/support/env.rb",
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
     "lib/mirage/util.rb",
     "lib/mirage/web.rb",
     "lib/start_mirage.rb",
-    "lib/view/mirage/index.xhtml",
+    "lib/views/index.erb",
     "mirage.gemspec",
     "rakefile"
   ]
@@ -79,7 +79,7 @@ For more information go to: https://github.com/lashd/mirage/wiki
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<ramaze>, [">= 2011.01.30"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<childprocess>, ["~> 0.1"])
       s.add_development_dependency(%q<rake>, [">= 0"])
@@ -89,7 +89,7 @@ For more information go to: https://github.com/lashd/mirage/wiki
       s.add_development_dependency(%q<bundler>, [">= 0"])
     else
       s.add_dependency(%q<rack>, ["~> 1.1.0"])
-      s.add_dependency(%q<ramaze>, [">= 2011.01.30"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_dependency(%q<childprocess>, ["~> 0.1"])
       s.add_dependency(%q<rake>, [">= 0"])
@@ -100,7 +100,7 @@ For more information go to: https://github.com/lashd/mirage/wiki
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.1.0"])
-    s.add_dependency(%q<ramaze>, [">= 2011.01.30"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<mechanize>, [">= 1.0.0"])
     s.add_dependency(%q<childprocess>, ["~> 0.1"])
     s.add_dependency(%q<rake>, [">= 0"])

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mirage
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.3.6
+  prerelease: 6
+  version: 2.0.0.alpha1
 platform: ruby
 authors: 
 - Leon Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +01:00
+date: 2011-06-07 00:00:00 +01:00
 default_executable: mirage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,40 +25,40 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ramaze
+  name: sinatra
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2011.01.30
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mechanize
+  name: childprocess
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: "0.1"
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: childprocess
+  name: rake
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0.1"
-  type: :runtime
+        version: 0.9.0
+  type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: cucumber
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,13 +69,13 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: gherkin
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.3.9
   type: :development
   prerelease: false
   version_requirements: *id006
@@ -112,6 +112,39 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: sinatra-reloader
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: mechanize
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id012
 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.
 email: 
 executables: 
@@ -127,7 +160,6 @@ files:
 - VERSION
 - bin/mirage
 - features/client/clear.feature
-- features/client/get.feature
 - features/client/mirage_client.feature
 - features/client/peek.feature
 - features/client/save_and_revert.feature
@@ -135,7 +167,6 @@ files:
 - features/client/track.feature
 - features/server/clear.feature
 - features/server/command_line_iterface.feature
-- features/server/file_responses.feature
 - features/server/logging.feature
 - features/server/peek.feature
 - features/server/prime.feature
@@ -145,7 +176,7 @@ files:
 - features/server/set_default_response.feature
 - features/server/set_with_a_delay.feature
 - features/server/set_with_a_pattern.feature
-- features/server/track.feature
+- features/server/track_requests.feature
 - features/server/web_user_interface.feature
 - features/step_definitions/my_steps.rb
 - features/support/env.rb
@@ -154,10 +185,13 @@ files:
 - lib/mirage.rb
 - lib/mirage/client.rb
 - lib/mirage/core.rb
+- lib/mirage/mock_response.rb
+- lib/mirage/mock_responses_collection.rb
+- lib/mirage/object.rb
 - lib/mirage/util.rb
 - lib/mirage/web.rb
 - lib/start_mirage.rb
-- lib/view/mirage/index.xhtml
+- lib/views/index.erb
 - mirage.gemspec
 - rakefile
 has_rdoc: true
@@ -180,16 +214,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2067065448166583273
+      hash: 122609927051635249
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: