mirage 2.0.1 → 2.0.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/bin/mirage

@@ -11,9 +11,9 @@ def start_mirage(args)
   puts "Starting Mirage"
 
   if windows?
-    command = ["cmd", "/C", "start", "\"mirage server\"", RUBY_CMD, "#{File.dirname(__FILE__)}/../lib/start_mirage.rb"]
+    command = ["cmd", "/C", "start", "\"mirage server\"", RUBY_CMD, "#{File.dirname(__FILE__)}/../mirage_server.rb"]
   else
-    command = [RUBY_CMD, "#{File.dirname(__FILE__)}/../lib/start_mirage.rb"]
+    command = [RUBY_CMD, "#{File.dirname(__FILE__)}/../mirage_server.rb"]
   end
   ChildProcess.build(*(command.concat(args))).start
   Mirage::Client.new "http://localhost:#{parse_options(ARGV)[:port]}/mirage"
@@ -24,7 +24,7 @@ def mirage_process_ids
   if windows?
     [`tasklist /V | findstr "mirage\\ server"`.split(' ')[1]].compact
   else
-    ["Mirage Server", 'start_mirage'].collect do |process_name|
+    ["Mirage Server", 'mirage_server'].collect do |process_name|
       `ps aux | grep "#{process_name}" | grep -v grep`.split(' ')[1]
     end.find_all { |process_id| process_id != $$.to_s }.compact
   end

data/features/client/put.feature

@@ -83,7 +83,7 @@ Feature: the Mirage client provides methods for setting responses and loading de
 
     When the file 'responses/default_greetings.rb' contains:
     """
-    Mirage.prime do |mirage|
+    prime do |mirage|
       mirage.put('greeting', 'hello')
       mirage.put('leaving', 'goodbye')
     end

data/features/server/prime.feature

@@ -11,7 +11,7 @@ Feature: Mirage can be primed with a set of responses.
   Scenario: Mirage is started with the responses to be used for priming located in ./responses
     Given the file 'responses/default_greetings.rb' contains:
     """
-    Mirage.prime do |mirage|
+    prime do |mirage|
       mirage.put('greeting', 'hello')
       mirage.put('leaving', 'goodbye')
     end
@@ -26,7 +26,7 @@ Feature: Mirage can be primed with a set of responses.
   Scenario: Mirage is started pointing with a relative path given for the responses directory
     Given the file './custom_responses_location/default_greetings.rb' contains:
     """
-    Mirage.prime do |mirage|
+    prime do |mirage|
       mirage.put('greeting', 'hello')
     end
     """
@@ -38,7 +38,7 @@ Feature: Mirage can be primed with a set of responses.
   Scenario: Mirage is started pointing with a full path for the responses
     Given the file '/tmp/responses/default_greetings.rb' contains:
     """
-    Mirage.prime do |mirage|
+    prime do |mirage|
       mirage.put('greeting', 'hello')
     end
     """
@@ -51,7 +51,7 @@ Feature: Mirage can be primed with a set of responses.
   Scenario: Priming mirage after its state has been modified
     Given the file 'responses/default_greetings.rb' contains:
     """
-    Mirage.prime do |mirage|
+    prime do |mirage|
       mirage.put('greeting', 'hello')
     end
     """
@@ -85,11 +85,4 @@ Feature: Mirage can be primed with a set of responses.
     A file with a mistake in it
     """
     And I send PUT to 'http://localhost:7001/mirage/defaults'
-    Then a 500 should be returned
-
-
-
-
-
-
-
+    Then a 500 should be returned

data/lib/mirage/mock_responses_collection.rb

@@ -1,110 +1,118 @@
 module Mirage
-  class MockResponsesCollection
-    def initialize
-      @snapshot, @responses = {}, {}
-    end
+  class MockResponses
 
-    def << response
+    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
+        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
+        # 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
 
-    def get_response name, http_method, body, query_string
-      stored_responses = @responses[name]
-      record = nil
+      end
 
-      record = find_response(body, query_string, stored_responses, http_method) if stored_responses
+      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
+        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
-      end
 
-      record
-    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
+      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
-    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
+      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
-    end
 
-    def clear
-      @responses.clear
-    end
+      def clear
+        responses.clear
+      end
 
-    def backup
-      @snapshot.clear and @snapshot.replace(@responses.deep_clone)
-    end
+      def backup
+        snapshot.clear and snapshot.replace(responses.deep_clone)
+      end
 
-    def revert
-      @responses.clear and @responses.replace(@snapshot.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
+      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
-      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) }
+      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
+        if pattern_match
+          record = stored_responses[pattern_match][http_method]
+        else
+          record = stored_responses[:basic]
+          record = record[http_method] if record
+        end
+        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 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

data/mirage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mirage}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
@@ -46,17 +46,16 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "full_build.sh",
     "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/server.rb",
     "lib/mirage/util.rb",
     "lib/mirage/web.rb",
-    "lib/start_mirage.rb",
-    "lib/views/index.erb",
     "mirage.gemspec",
-    "rakefile"
+    "mirage_server.rb",
+    "rakefile",
+    "test.rb",
+    "views/index.erb"
   ]
   s.homepage = %q{https://github.com/lashd/mirage}
   s.licenses = ["MIT"]

data/{lib/mirage/core.rb → mirage_server.rb}

@@ -1,15 +1,38 @@
+require 'rubygems'
+$0='Mirage Server'
+ROOT_DIR = File.dirname(__FILE__)
+$LOAD_PATH.unshift("#{ROOT_DIR}/lib/mirage")
+
+require 'client'
 require 'sinatra/base'
-require 'sinatra/reloader'
+require 'object'
+require 'mock_response'
+require 'mock_responses_collection'
 
+include Mirage::Util
+              
 
 module Mirage
 
   class Server < Sinatra::Base
+    
+    configure do
+      options = parse_options(ARGV)
+      set :defaults_directory, options[:defaults_directory]
+      set :port, options[:port]
+      set :show_exceptions, false
+      set :logging, true
+      set :server, 'webrick'
+      set :views, "#{ROOT_DIR}/views"
+
+      log_file = File.open('mirage.log', 'a')
+      log_file.sync=true
+      use Rack::CommonLogger, log_file
+      enable :logging
+    end
 
     REQUESTS= {}
 
-    MOCK_RESPONSES = MockResponsesCollection.new
-
     put '/mirage/templates/*' do |name|
       response = request.body.read
 
@@ -18,13 +41,13 @@ module Mirage
 
       pattern = headers['HTTP_X_MIRAGE_PATTERN'] ? /#{headers['HTTP_X_MIRAGE_PATTERN']}/ : :basic
 
-      MOCK_RESPONSES << 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'])
+      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'])
     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 = MOCK_RESPONSES.get_response(name, http_method, body, query_string)
+        record = MockResponses.get_response(name, http_method, body, query_string)
 
         return 404 unless record
         REQUESTS[record.response_id] = body.empty? ? query_string : body
@@ -36,7 +59,7 @@ module Mirage
 
     delete '/mirage/templates/:id' do
       response_id = params[:id].to_i
-      MOCK_RESPONSES.delete(response_id)
+      MockResponses.delete(response_id)
       REQUESTS.delete(response_id)
     end
 
@@ -51,12 +74,12 @@ module Mirage
 
     delete '/mirage/templates' do
       [REQUESTS].each { |map| map.clear }
-      MOCK_RESPONSES.clear
+      MockResponses.clear
       MockResponse.reset_count
     end
 
     get '/mirage/templates/:id' do
-      response = MOCK_RESPONSES.find(params[:id].to_i)
+      response = MockResponses.find(params[:id].to_i)
       return 404 if response.is_a? Array
       send_response(response)
     end
@@ -69,7 +92,7 @@ module Mirage
     get '/mirage' do
       @responses = {}
 
-      MOCK_RESPONSES.all.each do |response|
+      MockResponses.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?
@@ -83,12 +106,12 @@ module Mirage
     end
 
     put '/mirage/defaults' do
-      MOCK_RESPONSES.clear
+      MockResponses.clear
 
       Dir["#{settings.defaults_directory}/**/*.rb"].each do |default|
         begin
-          load default
-        rescue Exception
+          eval File.read(default)
+        rescue Exception => e
           raise "Unable to load default responses from: #{default}"
         end
 
@@ -96,16 +119,20 @@ module Mirage
     end
 #
     put '/mirage/backup' do
-      MOCK_RESPONSES.backup
+      MockResponses.backup
     end
 
 
     put '/mirage' do
-      MOCK_RESPONSES.revert
+      MockResponses.revert
     end
 
 
     helpers do
+      
+      def prime &block
+        yield Mirage::Client.new "http://localhost:#{settings.port}/mirage" 
+      end
 
       def response_value
         return request['response'] unless request['response'].nil?
@@ -117,4 +144,7 @@ module Mirage
       end
     end
   end
-end
+end
+
+
+Mirage::Server.run!

data/test.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'mirage/client'
+
+
+client = Mirage::Client.new
+client.put('greeting', 'hello')
+client.save
+client.put('leaving', 'goodbye')
+

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Leon Davis
@@ -161,17 +161,16 @@ files:
 - features/support/env.rb
 - full_build.sh
 - 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/server.rb
 - lib/mirage/util.rb
 - lib/mirage/web.rb
-- lib/start_mirage.rb
-- lib/views/index.erb
 - mirage.gemspec
+- mirage_server.rb
 - rakefile
+- test.rb
+- views/index.erb
 has_rdoc: true
 homepage: https://github.com/lashd/mirage
 licenses: 
@@ -192,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2984992030017044050
+      hash: -2214189456461539388
       segments: 
       - 0
       version: "0"

data/lib/mirage/server.rb

@@ -1,17 +0,0 @@
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
-require 'object'
-require 'mock_response'
-require 'mock_responses_collection'
-require 'core'
-
-module Mirage
-  class << self
-    def prime
-      yield @client
-    end
-
-    def client= client
-      @client = client
-    end
-  end
-end

data/lib/start_mirage.rb

@@ -1,34 +0,0 @@
-require 'rubygems'
-$0='Mirage Server'
-ROOT_DIR = File.dirname(__FILE__)
-$LOAD_PATH.unshift(ROOT_DIR)
- 
-
-require 'sinatra'
-require 'mirage/server'
-require 'mirage/client'
-
-include Mirage::Util
-
-module Mirage
-  class Server < Sinatra::Base
-    configure do 
-      
-      set :defaults_directory, parse_options(ARGV)[:defaults_directory] 
-      require 'logger'
-      enable :logging
-      log_file = File.open('mirage.log', 'a')
-      log_file.sync=true
-      use Rack::CommonLogger, log_file
-      set :views, "#{ROOT_DIR}/views"
-      set :show_exception, false
-      set :raise_errors, false  
-    end
-  end
-end
-
-options = parse_options(ARGV)
-Mirage.client = Mirage::Client.new "http://localhost:#{options[:port]}/mirage"
-Mirage::Server.run! :port => options[:port], :show_exceptions => false, :logging => true, :server => 'webrick'
-
-