mirage 3.0.0.alpha.17 → 3.0.0

data/server/extensions/hash.rb

@@ -3,7 +3,7 @@ class Hash
 
   def [] desired_key
     result = backup(desired_key)
-    return result if result
+    return result unless result.nil?
     key, value = find{|key, value| key.is_a?(Regexp) && desired_key.is_a?(String) && key.match(desired_key) }
     value
   end

data/spec/client/cli_bridge_spec.rb

@@ -14,11 +14,11 @@ describe CLIBridge do
     Hashie::Mash.new({
                          :windows => {
                              :kill_string => "taskkill /F /T /PID %d",
-                             :set_ps_cmd_expectation => proc{bridge.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(tasklist_output)}
+                             :set_ps_cmd_expectation => proc{bridge.stub(:`).with(/tasklist.*/).and_return(tasklist_output)}
                          },
                          :linux => {
                              :kill_string => "kill -9 %d",
-                             :set_ps_cmd_expectation => proc{IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(tasklist_output)}
+                             :set_ps_cmd_expectation => proc{IO.stub(:popen).with(/ps aux.*/).and_return(tasklist_output)}
                          }
                      })
   end

data/spec/client/client_spec.rb

@@ -5,7 +5,7 @@ describe Mirage::Client do
 
 
   before :each do
-    @response = mock('response').as_null_object
+    @response = double('response').as_null_object
   end
 
   describe 'configuration' do
@@ -63,7 +63,7 @@ describe Mirage::Client do
   end
 
   it 'should clear mirage' do
-    templates_mock = mock('templates')
+    templates_mock = double('templates')
     Templates.should_receive(:new).and_return(templates_mock)
     templates_mock.should_receive(:delete_all)
     Client.new.clear
@@ -93,7 +93,7 @@ describe Mirage::Client do
     it 'should find a template' do
       id = 1
       mirage = Client.new
-      mock_template = mock('template')
+      mock_template = double('template')
       Template.should_receive(:get).with("#{mirage.url}/templates/#{id}").and_return(mock_template)
       mirage.templates(1).should == mock_template
     end
@@ -103,7 +103,7 @@ describe Mirage::Client do
       it "should put a response on mirage by passing args on to template's put method "  do
         endpoint, value, block = 'greeting', 'hello', Proc.new{}
 
-        templates_mock = mock('templates')
+        templates_mock = double('templates')
         Templates.should_receive(:new).and_return(templates_mock)
 
       templates_mock.should_receive(:put).with(endpoint, value, &block)

data/spec/client/runner_spec.rb

@@ -6,7 +6,7 @@ describe Mirage do
 
   describe 'starting' do
     before(:each) do
-      @runner = mock
+      @runner = double
       Runner.should_receive(:new).and_return(@runner)
     end
 
@@ -25,7 +25,7 @@ describe Mirage do
 
   describe 'stopping' do
     before(:each) do
-      @runner = mock
+      @runner = double
       Runner.stub(:new).and_return(@runner)
     end
 
@@ -51,11 +51,12 @@ describe Mirage do
       runner = Mirage::Runner.new
       runner.options = options
 
-      runner.should_receive(:mirage_process_ids).with([]).any_number_of_times.and_return({"7001" => "18901"})
+      runner.stub(:mirage_process_ids).with([]).and_return({"7001" => "18901"})
+
 
       runner.should_receive(:kill).with("18901") do
-        runner.rspec_reset
-        runner.should_receive(:mirage_process_ids).with([]).any_number_of_times.and_return({})
+        RSpec.reset
+        runner.stub(:mirage_process_ids).with([]).and_return({})
       end
 
       Mirage::Runner.should_receive(:new).and_return(runner)
@@ -67,11 +68,11 @@ describe Mirage do
       runner = Mirage::Runner.new
       runner.options = options
 
-      runner.should_receive(:mirage_process_ids).with([]).any_number_of_times.and_return({"7001" => "18901", "7002" => "18902", "7003" => "18903"})
+      runner.stub(:mirage_process_ids).with([]).and_return({"7001" => "18901", "7002" => "18902", "7003" => "18903"})
       runner.should_not_receive(:kill)
       Mirage::Runner.should_receive(:new).and_return(runner)
 
-      expect { runner.invoke(:stop, [], options) }.to raise_error(Mirage::ClientError)
+      expect{ runner.invoke(:stop, [], options) }.to raise_error(Mirage::ClientError)
     end
 
 
@@ -82,7 +83,7 @@ describe Mirage do
 
       runner.should_receive(:mirage_process_ids).with([7001]).and_return({"7001" => "18901"})
       runner.should_receive(:kill).with("18901") do
-        runner.rspec_reset
+        RSpec.reset
         runner.stub(:mirage_process_ids).with([7001]).and_return({})
       end
 
@@ -98,7 +99,7 @@ describe Mirage do
       runner.should_receive(:mirage_process_ids).with([7001, 7002]).and_return({"7001" => "18901", "7002" => "18902"})
       runner.should_receive(:kill).with("18901")
       runner.should_receive(:kill).with("18902") do
-        runner.rspec_reset
+        RSpec.reset
         runner.stub(:mirage_process_ids).with([7001, 7002]).and_return({})
       end
 
@@ -114,7 +115,7 @@ describe Mirage do
       runner.should_receive(:mirage_process_ids).with([:all]).and_return({"7001" => "18901", "7002" => "18902"})
       runner.should_receive(:kill).with("18901")
       runner.should_receive(:kill).with("18902") do
-        runner.rspec_reset
+        RSpec.reset
         runner.stub(:mirage_process_ids).with([:all]).and_return({})
       end
 
@@ -127,10 +128,10 @@ describe Mirage do
       options = {:port => [7001]}
       runner = Mirage::Runner.new
       runner.options = options
-      runner.should_receive(:mirage_process_ids).with([7001]).any_number_of_times.and_return({})
+      runner.stub(:mirage_process_ids).with([7001]).and_return({})
 
       Mirage::Runner.should_receive(:new).and_return(runner)
-      expect { runner.invoke(:stop, [], options) }.to_not raise_error(Mirage::ClientError)
+      expect { runner.invoke(:stop, [], options) }.not_to raise_error(Mirage::ClientError)
     end
 
   end

data/spec/client/template/model/instance_methods_spec.rb

@@ -137,7 +137,7 @@ describe Template::Model::InstanceMethods do
 
     describe 'response as default' do
       it 'should be false by default' do
-        JSON.parse(instance.to_json)["response"]["default"].should == false
+        JSON.parse(instance.to_json, symbolize_names: true)[:response][:default].should == false
       end
 
       it 'should set the default value' do

data/spec/client/template_spec.rb

@@ -69,7 +69,7 @@ describe Mirage::Template do
       template_url = 'url'
       response = mock(code: 404)
       Template.should_receive(:backedup_get).with(template_url, :format => :json).and_return response
-      expect{Template.get(template_url)}.to raise_error Mirage::ResponseNotFound
+      expect{Template.get(template_url)}.to raise_error Mirage::TemplateNotFound
     end
   end
 

data/spec/client/templates_spec.rb

@@ -7,7 +7,7 @@ describe 'templates' do
   describe 'deleting' do
     it 'should delete all templates and associated request data' do
       base_url = "base_url"
-      requests = mock('requests')
+      requests = double('requests')
       Requests.should_receive(:new).with(base_url).and_return(requests)
 
       Templates.should_receive(:delete).with("#{base_url}/templates")
@@ -111,11 +111,11 @@ describe 'templates' do
       end
 
       it 'should prepend base url to the endpoint unless it is set already' do
-        template = model_class.new
-        template = @templates.put template
-        template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
-        template = @templates.put template
-        template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
+        original_template = model_class.new
+        stored_template = @templates.put original_template
+        stored_template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
+        stored_template = @templates.put original_template
+        stored_template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
       end
 
       it 'should fall over to methods on the caller if the method does not exist on the template object' do
@@ -159,7 +159,7 @@ describe 'templates' do
         @base_url = "base_url"
         @templates = Templates.new(@base_url)
 
-        @template_mock = mock('template')
+        @template_mock = double('template')
         Template.should_receive(:new).with("#{@base_url}/templates/#{endpoint}", value, @templates.default_config).and_return(@template_mock)
         @template_mock.should_receive(:create)
       end

data/spec/server/server_spec.rb

@@ -70,7 +70,7 @@ describe "Mirage Server" do
     it 'should use headers' do
       headers = {"HEADER" => 'VALUE'}
       application_expectations do |app|
-        app.should_receive(:env).any_number_of_times.and_return(headers)
+        app.stub(:env).and_return(headers)
         app.should_receive(:extract_http_headers).with(headers).and_return(headers)
       end
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 ROOT_DIR = "#{File.dirname(__FILE__)}/.."
 $LOAD_PATH.unshift "#{ROOT_DIR}/lib"
 $LOAD_PATH.unshift "#{ROOT_DIR}/server"
-require 'simplecov' if ENV['coverage']
+require 'simplecov' if ENV['coverage'] && RUBY_PLATFORM != 'java'
 require 'mirage/client'
 require 'rspec'
 require 'json'
@@ -24,7 +24,7 @@ shared_context :windows do
   end
 
   before :each do
-    ChildProcess.should_receive(:windows?).any_number_of_times.and_return(true)
+    ChildProcess.stub(:windows?).and_return(true)
   end
 end
 
@@ -34,7 +34,7 @@ shared_context :linux do
   end
 
   before :each do
-    ChildProcess.should_receive(:windows?).any_number_of_times.and_return(false)
+    ChildProcess.stub(:windows?).and_return(false)
   end
 end
 shared_context :resources do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.17
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -245,19 +245,25 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .simplecov
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - HISTORY
 - README.md
+- Rakefile
 - VERSION
 - bin/mirage
 - features/.nav
 - features/client/clear.feature
 - features/client/configure.feature
+- features/client/model.feature
 - features/client/preview_responses.feature
+- features/client/prime.feature
 - features/client/put.feature
+- features/client/readme.md
 - features/client/requests.feature
 - features/client/running.feature
 - features/client/save_and_revert.feature
@@ -305,9 +311,6 @@ files:
 - lib/mirage/client/templates.rb
 - mirage.gemspec
 - mirage_server.rb
-- profiles.rb
-- rakefile
-- responses/default_responses.rb
 - server/app.rb
 - server/binary_data_checker.rb
 - server/extensions/hash.rb
@@ -333,9 +336,7 @@ files:
 - spec/server/mock_response_spec.rb
 - spec/server/server_spec.rb
 - spec/spec_helper.rb
-- test.html
-- test.rb
-- todo.lst
+- todo.list
 - views/index.haml
 - views/response.haml
 homepage: https://github.com/lashd/mirage
@@ -355,13 +356,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -286461807850956295
+      hash: -1516076441970440795
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create use 1.9.3@mirage

data/profiles.rb

@@ -1 +0,0 @@
-Profile.create

data/test.html

@@ -1,12 +0,0 @@
-<HTML>
-<HEAD><TITLE>Internal Server Error</TITLE></HEAD>
-<BODY>
-<H1>Internal Server Error</H1>
-invalid %-encoding (\n&quot;,&quot;status&quot;:200,&quot;default&quot;:false,&quot;content_type&quot;:&quot;text/plain&quot;},&quot;request&quot;:{&quot;parameters&quot;:{},&quot;headers&quot;:{&quot;custom-header&quot;:&quot;%r{.eon}&quot;},&quot;body_content&quot;:[],&quot;http_method&quot;:&quot;get&quot;},&quot;delay&quot;:0})
-<HR>
-<ADDRESS>
-    WEBrick/1.3.1 (Ruby/1.9.2/2012-04-20) at
-    localhost:7001
-</ADDRESS>
-</BODY>
-</HTML>

data/test.rb

@@ -1,5 +0,0 @@
-require 'mirage/client'
-
-Mirage.start.put('greeting', 'hello') do
-  content_type "text/html"
-end

data/todo.lst

@@ -1,2 +0,0 @@
-TODO - Get cucumber suite passing again
-TODO - make all request data come back when checking a request, e.g. headers etc...