mirage 2.0.2 → 2.0.3

data/Gemfile

@@ -12,5 +12,6 @@ group :development do
   gem 'mechanize', '1.0.0'
   gem 'gemcutter'
   gem "nokogiri", "1.4.7"
+  gem "waitforit", "0.0.1.pre8"
 end
   

data/HISTORY

@@ -0,0 +1,2 @@
+V2.0.1/2/3 - tidying up code
+V2.0.0 - Converted to restful interface

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/bin/mirage

@@ -1,12 +1,18 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
-require 'mirage/client'
 require 'childprocess'
+ROOT_DIR = File.dirname(__FILE__)
+$LOAD_PATH.unshift("#{ROOT_DIR}/../lib")
+$LOAD_PATH.unshift("#{ROOT_DIR}/../server")
+
+require 'mirage/client'
+require 'waitforit'
+require 'util'
+
+
 include Mirage::Util
 RUBY_CMD = RUBY_PLATFORM == 'java' ? 'jruby' : 'ruby'
 
-
 def start_mirage(args)
   puts "Starting Mirage"
 
@@ -52,7 +58,7 @@ if ARGV.include?('start')
   rescue Mirage::InternalServerException => e
     puts "WARN: #{e.message}"
   end
-
+  
 elsif ARGV.include?('stop')
   puts "Stopping Mirage"
   stop_mirage

data/features/support/env.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../server")
 require 'rubygems'
 require 'mirage/client'
+require 'util'
 require 'cucumber'
 require 'rspec'
 require 'mechanize'

data/lib/mirage/client.rb

@@ -1,8 +1,7 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
 require 'uri'
 require 'open-uri'
-require 'util'
-require 'web'
+require 'client/web'
 
 module Mirage
 

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mirage}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = %q{2011-08-14}
+  s.date = %q{2011-08-21}
   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"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".rvmrc",
     "Gemfile",
+    "HISTORY",
     "README.md",
     "VERSION",
     "bin/mirage",
@@ -46,15 +47,14 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "full_build.sh",
     "lib/mirage/client.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/mirage/client/web.rb",
     "mirage.gemspec",
     "mirage_server.rb",
     "rakefile",
-    "test.rb",
+    "server/extensions/object.rb",
+    "server/mock_response.rb",
+    "server/mock_responses.rb",
+    "server/util.rb",
     "views/index.erb"
   ]
   s.homepage = %q{https://github.com/lashd/mirage}
@@ -88,6 +88,7 @@ For more information go to: https://github.com/lashd/mirage/wiki
       s.add_development_dependency(%q<mechanize>, ["= 1.0.0"])
       s.add_development_dependency(%q<gemcutter>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, ["= 1.4.7"])
+      s.add_development_dependency(%q<waitforit>, ["= 0.0.1.pre8"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<childprocess>, ["~> 0.1"])
@@ -99,6 +100,7 @@ For more information go to: https://github.com/lashd/mirage/wiki
       s.add_dependency(%q<mechanize>, ["= 1.0.0"])
       s.add_dependency(%q<gemcutter>, [">= 0"])
       s.add_dependency(%q<nokogiri>, ["= 1.4.7"])
+      s.add_dependency(%q<waitforit>, ["= 0.0.1.pre8"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
@@ -111,6 +113,7 @@ For more information go to: https://github.com/lashd/mirage/wiki
     s.add_dependency(%q<mechanize>, ["= 1.0.0"])
     s.add_dependency(%q<gemcutter>, [">= 0"])
     s.add_dependency(%q<nokogiri>, ["= 1.4.7"])
+    s.add_dependency(%q<waitforit>, ["= 0.0.1.pre8"])
   end
 end
 

data/mirage_server.rb

@@ -1,21 +1,24 @@
 require 'rubygems'
 $0='Mirage Server'
 ROOT_DIR = File.dirname(__FILE__)
-$LOAD_PATH.unshift("#{ROOT_DIR}/lib/mirage")
+$LOAD_PATH.unshift("#{ROOT_DIR}/lib")
+$LOAD_PATH.unshift("#{ROOT_DIR}/server")
 
-require 'client'
 require 'sinatra/base'
-require 'object'
+
+require 'extensions/object'
 require 'mock_response'
-require 'mock_responses_collection'
+require 'mock_responses'
+require 'util'
+
+require 'mirage/client'
 
 include Mirage::Util
-              
 
 module Mirage
 
   class Server < Sinatra::Base
-    
+
     configure do
       options = parse_options(ARGV)
       set :defaults_directory, options[:defaults_directory]
@@ -58,7 +61,6 @@ module Mirage
     end
 
     delete '/mirage/templates/:id' do
-      response_id = params[:id].to_i
       MockResponses.delete(response_id)
       REQUESTS.delete(response_id)
     end
@@ -68,7 +70,7 @@ module Mirage
     end
 
     delete '/mirage/requests/:id' do
-      REQUESTS.delete(params[:id].to_i)
+      REQUESTS.delete(response_id)
     end
 
 
@@ -79,13 +81,13 @@ module Mirage
     end
 
     get '/mirage/templates/:id' do
-      response = MockResponses.find(params[:id].to_i)
+      response = MockResponses.find(response_id)
       return 404 if response.is_a? Array
       send_response(response)
     end
 
     get '/mirage/requests/:id' do
-      REQUESTS[params[:id].to_i] || 404
+      REQUESTS[response_id] || 404
     end
 
 
@@ -120,22 +122,24 @@ module Mirage
 #
     put '/mirage/backup' do
       MockResponses.backup
+      ""
     end
 
 
     put '/mirage' do
       MockResponses.revert
+      ""
     end
 
 
     helpers do
-      
-      def prime &block
-        yield Mirage::Client.new "http://localhost:#{settings.port}/mirage" 
+
+      def response_id
+        params[:id].to_i
       end
 
-      def response_value
-        return request['response'] unless request['response'].nil?
+      def prime &block
+        yield Mirage::Client.new "http://localhost:#{settings.port}/mirage"
       end
 
       def send_response(response, body='', request={}, query_string='')

data/{lib/mirage/mock_responses_collection.rb → server/mock_responses.rb}

@@ -49,6 +49,7 @@ module Mirage
             end
           end
         end
+        
       end
 
       def delete(response_id)

data/{lib/mirage → server}/util.rb

@@ -2,15 +2,6 @@ require 'optparse'
 module Mirage
   module Util
 
-    def wait_until time=45
-      start_time = Time.now
-      until Time.now >= start_time + time
-        sleep 0.1
-        return if yield
-      end
-      raise 'timeout waiting'
-    end
-
     def parse_options args
       options = {:port => 7001, :defaults_directory => 'responses', :root_directory => '.'}
 

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Leon Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +01:00
+date: 2011-08-21 00:00:00 +01:00
 default_executable: mirage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: waitforit
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1.pre8
+  type: :development
+  prerelease: false
+  version_requirements: *id011
 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: 
@@ -134,6 +145,7 @@ extra_rdoc_files:
 files: 
 - .rvmrc
 - Gemfile
+- HISTORY
 - README.md
 - VERSION
 - bin/mirage
@@ -161,15 +173,14 @@ files:
 - features/support/env.rb
 - full_build.sh
 - lib/mirage/client.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/mirage/client/web.rb
 - mirage.gemspec
 - mirage_server.rb
 - rakefile
-- test.rb
+- server/extensions/object.rb
+- server/mock_response.rb
+- server/mock_responses.rb
+- server/util.rb
 - views/index.erb
 has_rdoc: true
 homepage: https://github.com/lashd/mirage
@@ -191,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2214189456461539388
+      hash: 2910117652361580997
       segments: 
       - 0
       version: "0"

data/test.rb

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