mirage 3.0.4 → 3.0.5

data/Gemfile

@@ -11,9 +11,9 @@ gem 'hashie'
 
 group :test do
   gem 'cucumber'
-  gem 'rspec'
+  gem 'rspec', require: 'rspec/core/rake_task'
   gem 'rack-test'
-  gem 'simplecov'
+  gem 'simplecov', require: false
 end
 
 group :development do

data/Rakefile

@@ -1,81 +1,10 @@
-$LOAD_PATH.unshift('lib')
-require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-require 'rspec/core/rake_task'
-
-task :specs
-
-%w(client server).each do |type|
-  public_task_name = "#{type}_specs"
-  private_task_name = "_#{public_task_name}"
-
-  RSpec::Core::RakeTask.new(private_task_name) do |task|
-    task.pattern = "spec/#{type}/**/*_spec.rb"
-  end
-
-  desc "specs for: #{type}"
-  task public_task_name do
-    ENV['coverage'] = type
-    Rake::Task[private_task_name].invoke
-  end
-
-  Rake::Task["specs"].prerequisites << public_task_name
-end
-
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "mirage"
-  gem.homepage = "https://github.com/lashd/mirage"
-  gem.license = "MIT"
-  gem.summary = "Mirage is a easy mock server for testing your applications"
-  gem.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.'
-  gem.authors = ["Leon Davis"]
-  gem.executables = ['mirage']
-  gem.post_install_message = %{
-===============================================================================
-Mirage v3:
-
-Mirage has just gone up a major version from 2 to 3. If you're project uses
-a previous version take a look at https://github.com/lashd/mirage to see
-what's changed
-===============================================================================
-}
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-
-require 'cucumber'
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "mode=regression features --format pretty"
-end
-
-task :clean do |task|
-  if system "gem list -i mirage"
-    puts "cleaning"
-    system "gem uninstall -x mirage"
-  end
-  Dir['*.gem'].each { |gem| FileUtils.rm_f(gem) }
-  task.reenable
-end
-
-task :start do
-  `RACK_ENV='development' && ruby ./bin/mirage start`
-end
+Bundler.setup(:default, :development)
+Bundler.require(:test, :development)
 
-task :stop do
-  `RACK_ENV='development' && ruby ./bin/mirage stop`
+Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].each do |tasks|
+  import tasks
 end
 
 task :default => [:specs, :install, :features, :clean]

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.5

data/features/client/configure.feature

@@ -3,7 +3,7 @@ Feature: Configuring Templates
   If you find yourself setting the same basic http settings for templates, the client can be configured to preset these.
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
     require 'rspec/expectations'

data/features/client/model.feature

@@ -18,7 +18,7 @@ Feature: Template Models
 
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
     require 'mirage/client'

data/features/client/preview_responses.feature

@@ -3,7 +3,7 @@ Feature: Inspecting Templates
   The client can be used to retrieve a template stored on Mirage.
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
     require 'rspec/expectations'

data/features/client/prime.feature

@@ -3,7 +3,7 @@ Feature: Priming Mirage
   The client can be used to prime Mirage with Templates found in the templates directory that was configured when Mirage was started.
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
     require 'rspec/expectations'

data/features/client/put.feature

@@ -7,7 +7,7 @@ Feature: Adding Templates
   Body, Header, and Parameter requirements can be specified as either a String or Regexp
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
     require 'rspec/expectations'

data/features/client/running.feature

@@ -5,7 +5,7 @@ Feature: How to check if Mirage is running
 
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
     require 'rspec/expectations'

data/features/client/save_and_revert.feature

@@ -4,7 +4,7 @@ Feature: Creating snapshots
 
 
   Background:
-    Given the following gems are required to run the Mirage client test code:
+    Given the following require statements are needed:
     """
     require 'rubygems'
     require 'rspec/expectations'

data/features/client/stop.feature

@@ -16,7 +16,7 @@ Feature: Stopping Mirage
     """
     Mirage.stop
     """
-    Then Connection should be refused to 'http://localhost:7001'
+    Then mirage should not be running on 'http://localhost:7001'
 
 
   Scenario: Stopping Mirage on custom port

data/features/step_definitions/my_steps.rb

@@ -1,32 +1,3 @@
-require 'base64'
-require 'hashie'
-Then /^'([^']*)' should be returned$/ do |expected_response|
-  response_text = @response.body
-  if response_text != expected_response
-    expected_response.split('&').each { |param_value_pair| response_text.should =~ /#{param_value_pair}/ }
-    expected_response.length.should == response_text.length
-  end
-end
-
-Then /^a (\d+) should be returned$/ do |error_code|
-  @response.code.to_i.should == error_code.to_i
-end
-
-Then /^it should take at least '(.*)' seconds$/ do |time|
-  (@response_time).should >= time.to_f
-end
-
-
-Then /^mirage (should|should not) be running on '(.*)'$/ do |should, url|
-  running = false
-  begin
-    running = http_get(url).code.to_i.should == 200
-  rescue
-  end
-
-  should == "should" ? running.should == true : running.should == false
-end
-
 Given /^I run '(.*)'$/ do |command|
   if ENV['mode'] == 'regression' && ChildProcess.windows?
     command.gsub!(/^mirage/, MIRAGE_CMD)
@@ -37,36 +8,8 @@ Given /^I run '(.*)'$/ do |command|
   @commandline_output = normalise(run("#{path}#{command}"))
 end
 
-Given /^Mirage (is|is not) running$/ do |running|
-  if running == 'is'
-    start_mirage_in_scratch_dir unless Mirage.running?
-  else
-    Mirage.stop :all
-  end
-end
-
-Then /^Connection should be refused to '(.*)'$/ do |url|
-  begin
-    http_get(url)
-    fail "Mirage is still running"
-  rescue Errno::ECONNREFUSED
-  end
-end
-
 Given /^the file '(.*)' contains:$/ do |file_path, content|
-  file_path = "#{SCRATCH}/#{file_path}" unless file_path =~ /^\//
-
-  FileUtils.rm_rf(file_path) if File.exists?(file_path)
-  FileUtils.mkdir_p(File.dirname(file_path))
-
-  File.open("#{file_path}", 'w') do |file|
-    file.write(content)
-  end
-
-end
-
-Then /^the usage information should be displayed$/ do
-  @usage.each_line { |line| @commandline_output.should include(line) }
+  write_to_file file_path, content
 end
 
 Given /^usage information:$/ do |usage|
@@ -84,87 +27,32 @@ Given /^the following require statements are needed:$/ do |text|
   @code_snippet = text.gsub("\"", "\\\\\"")
 end
 
-Given /^the following gems are required to run the Mirage client test code:$/ do |text|
-  @code_snippet = text.gsub("\"", "\\\\\"")
-end
-
 When /^I send (POST|PUT) to '(.*)' with request entity$/ do |method, endpoint, entity|
   url = "http://localhost:7001#{endpoint}"
   @response = case method
                 when 'POST'
-                then
-                  http_post(url, entity)
+                  post(url, body: entity)
                 when 'PUT'
-                then
-                  http_put(url, entity)
+                  put(url, body: entity)
               end
 end
 
-When /^(GET|PUT|POST|OPTIONS|HEAD|DELETE) is sent to '([^']*)'$/ do |method, endpoint|
+When /^(GET|PUT|POST|DELETE) is sent to '([^']*)'$/ do |method, endpoint|
   start_time = Time.now
   url = "http://localhost:7001#{endpoint}"
   @response = case method
                 when 'GET' then
-                  http_get(url)
+                  get(url)
                 when 'PUT' then
-                  http_put(url, '')
+                  put(url, body: '')
                 when 'POST' then
-                  http_post(url, '')
-                when 'HEAD' then
-                  http_head(url)
-                when 'OPTIONS' then
-                  http_options(url)
+                  post(url, body: '')
                 when 'DELETE' then
-                  http_delete(url)
-              end
-  @response_time = Time.now - start_time
-end
-
-
-When /^I send (PUT|POST) to '(.*)' with body '(.*)'$/ do |method, endpoint, body|
-  url = "http://localhost:7001#{endpoint}"
-  start_time = Time.now
-  @response = case method
-                when 'PUT'
-                  http_put(url, body)
-                when 'POST'
-                  http_post(url, body)
+                  delete(url)
               end
-
   @response_time = Time.now - start_time
 end
 
-When /^I send PUT to '(.*)' with body '([^']*)' and headers:$/ do |endpoint, body, table|
-  url = "http://localhost:7001#{endpoint}"
-  headers = {}
-  table.raw.each do |row|
-    parameter, value = row[0], row[1]
-    headers[parameter]=value
-  end
-  @response = http_put(url, body, :headers => headers)
-end
-
-Then /^I should see '(.*?)' on the command line$/ do |content|
-  @commandline_output.should include(content)
-end
-
-Then /^'(.*)' should exist$/ do |path|
-  File.exists?("#{SCRATCH}/#{path}").should == true
-end
-
-Then /^mirage.log should contain '(.*)'$/ do |content|
-  log_file_content = @mirage_log_file.readlines.to_s
-  fail("#{content} not found in mirage.log: #{log_file_content}") unless log_file_content.index(content)
-end
-
-Given /^I goto '(.*)'$/ do |url|
-  @page = Mechanize.new.get url
-end
-
-Then /^I should see '(.*)'$/ do |text|
-  @page.body.index(text).should_not == nil
-end
-
 When /^I click '(.*)'$/ do |thing|
   @page = @page.links.find { |link| link.attributes['id'] == thing }.click
 end
@@ -179,103 +67,32 @@ When /^I send (GET|POST) to '(.*)' with parameters:$/ do |http_method, endpoint,
     value = File.exists?(value) ? File.open(value, 'rb') : value
     parameters[parameter]=value
   end
+  puts parameters
 
   @response = case http_method
                 when 'POST' then
-                  http_post(url, parameters)
+                  post(url, query: parameters, headers: {'Content-length' => '0'})
                 when 'GET' then
-                  http_get(url, parameters)
+                  get(url, query: parameters)
               end
 end
 
-Then /^the following should be returned:$/ do |text|
-  text.gsub("\n","").gsub(" ", "").should == @response.body
-end
-
-Given /^I send PUT to '(http:\/\/localhost:7001\/mirage\/(.*?))' with file: ([^']*) and headers:$/ do |url, endpoint, path, table|
-  headers = {}
-  table.raw.each do |row|
-    parameter, value = row[0], row[1]
-    headers[parameter]=value
-  end
-
-  Dir.chdir SCRATCH do
-    http_put(url, File.new(path), :headers => headers)
-  end
-end
-
-Given /^I send PUT to '(.*?)' with body '([^']*)' and parameters:$/ do |endpoint, body, table|
-  url = "http://localhost:7001#{endpoint}"
-  headers = {}
-  table.raw.each do |row|
-    parameter, value = row[0], row[1]
-    headers[parameter]=value
-  end
-
-  Dir.chdir SCRATCH do
-    http_put(url, File.new("/home/team/Projects/mirage/pkg/mirage-2.1.2.gem"), :parameters => headers)
-  end
-end
-
-
-When /^the response '([^']*)' should be '([^']*)'$/ do |header, value|
-  @response.response[header].should include(value)
-end
-
-Then /^the response should be the same as the content of '([^']*)'$/ do |path|
-  Dir.chdir SCRATCH do
-    @response.body.should == File.read(path)
-  end
-end
 Given /^the following template template:$/ do |text|
   @response_template = Hashie::Mash.new(JSON.parse(text))
 end
+
 When /^'(.*)' is base64 encoded$/ do |template_component|
   @response_template.send(:eval, "#{template_component}=Base64.encode64(#{template_component})")
 end
-When /^the template is sent using PUT to '(.*?)'$/ do |endpoint|
 
-  @response = http_put("http://localhost:7001#{endpoint}", @response_template.to_hash.to_json, :headers => {"Content-Type" => "application/json"})
+When /^the template is sent using PUT to '(.*?)'$/ do |endpoint|
+  @response = put("http://localhost:7001#{endpoint}", body: @response_template.to_hash.to_json, :headers => {"Content-Type" => "application/json"})
 end
+
 Given /^a template for '(.*)' has been set with a value of '(.*)'$/ do |endpoint, value|
-  $mirage.templates.put(endpoint, value)
-end
-Then /^request data should have been retrieved$/ do
-  puts @response.body
-  request_data = JSON.parse(@response.body)
-  request_data.include?('parameters').should == true
-  request_data.include?('headers').should == true
-  request_data.include?('body').should == true
-  request_data.include?('request_url').should == true
+  mirage.templates.put(endpoint, value)
 end
+
 Given(/^the following Template JSON:$/) do |text|
   @response_template = Hashie::Mash.new(JSON.parse(text))
-end
-Then(/^the template (request|response) specification should have the following set:$/) do |spec, table|
-  template_json = JSON.parse(http_get("http://localhost:7001/templates/#{JSON.parse(@response.body)['id']}").body)
-  request_specification = template_json[spec]
-  request_specification.size.should==table.hashes.size
-  table.hashes.each do |hash|
-    default = request_specification[hash['Setting'].downcase.gsub(' ', '_')]
-    case required_default = hash['Default']
-      when 'none'
-        case default
-          when Array
-            default.should == []
-          when Hash
-            default.should == {}
-          else
-            default.should == ""
-
-        end
-      else
-        default.to_s.downcase.should == required_default.downcase
-    end
-  end
-end
-Then(/^the following json should be returned:$/) do |text|
-  JSON.parse(text).should == JSON.parse(@response.body)
-end
-When(/^the content-type should be '(.*)'$/) do |content_type|
-  @response.content_type.should == content_type
 end

data/features/step_definitions/observation_steps.rb

@@ -0,0 +1,102 @@
+Then /^'([^']*)' should be returned$/ do |expected_response|
+  response_text = @response.body
+  if response_text != expected_response
+    expected_response.split('&').each { |param_value_pair| response_text.should =~ /#{param_value_pair}/ }
+    expected_response.length.should == response_text.length
+  end
+end
+
+Then /^a (\d+) should be returned$/ do |error_code|
+  @response.code.to_i.should == error_code.to_i
+end
+
+Then /^it should take at least '(.*)' seconds$/ do |time|
+  (@response_time).should >= time.to_f
+end
+
+Then /^mirage (should|should not) be running on '(.*)'$/ do |should, url|
+  running = begin
+    get(url).code.to_i.should == 200
+  rescue
+    false
+  end
+
+  should == "should" ? running.should == true : running.should == false
+end
+
+Given /^Mirage (is|is not) running$/ do |running|
+  if running == 'is'
+    start_mirage_in_scratch_dir unless Mirage.running?
+  else
+    Mirage.stop :all
+  end
+end
+
+Then /^the usage information should be displayed$/ do
+  @usage.each_line { |line| @commandline_output.should include(line) }
+end
+
+Then /^I should see '(.*?)' on the command line$/ do |content|
+  @commandline_output.should include(content)
+end
+
+Then /^'(.*)' should exist$/ do |path|
+  File.exists?("#{SCRATCH}/#{path}").should == true
+end
+
+Then /^mirage.log should contain '(.*)'$/ do |content|
+  log_file_content = @mirage_log_file.readlines.to_s
+  fail("#{content} not found in mirage.log: #{log_file_content}") unless log_file_content.index(content)
+end
+
+Given /^I goto '(.*)'$/ do |url|
+  @page = Mechanize.new.get url
+end
+
+Then /^I should see '(.*)'$/ do |text|
+  @page.body.index(text).should_not == nil
+end
+
+When /^the response '([^']*)' should be '([^']*)'$/ do |header, value|
+  @response.response[header].should include(value)
+end
+
+Then /^request data should have been retrieved$/ do
+  puts @response.body
+  request_data = JSON.parse(@response.body)
+  request_data.include?('parameters').should == true
+  request_data.include?('headers').should == true
+  request_data.include?('body').should == true
+  request_data.include?('request_url').should == true
+end
+
+Then(/^the template (request|response) specification should have the following set:$/) do |spec, table|
+  template_json = JSON.parse(get("http://localhost:7001/templates/#{JSON.parse(@response.body)['id']}").body)
+  request_specification = template_json[spec]
+  request_specification.size.should==table.hashes.size
+  table.hashes.each do |hash|
+    default = request_specification[hash['Setting'].downcase.gsub(' ', '_')]
+    case required_default = hash['Default']
+      when 'none'
+        case default
+          when Array
+            default.should == []
+          when Hash
+            default.should == {}
+          else
+            default.should == ""
+
+        end
+      else
+        default.to_s.downcase.should == required_default.downcase
+    end
+  end
+end
+
+Then(/^the following json should be returned:$/) do |text|
+  JSON.parse(text).should == JSON.parse(@response.body)
+end
+
+When(/^the content-type should be '(.*)'$/) do |content_type|
+  @response.content_type.should == content_type
+end

data/features/support/command_line.rb

@@ -16,6 +16,17 @@ module CommandLine
   def normalise text
     text.gsub(/[\n]/, ' ').gsub(/\s+/, ' ').strip
   end
+
+  def write_to_file file_path, content
+    file_path = "#{SCRATCH}/#{file_path}" unless file_path =~ /^\//
+
+    FileUtils.rm_rf(file_path) if File.exists?(file_path)
+    FileUtils.mkdir_p(File.dirname(file_path))
+
+    File.open("#{file_path}", 'w') do |file|
+      file.write(content)
+    end
+  end
 end
 
 World CommandLine

data/features/support/env.rb

@@ -1,14 +1,10 @@
 ROOT_DIR = File.expand_path("#{File.dirname(__FILE__)}/../..")
 SOURCE_PATH = "#{ROOT_DIR}/lib"
-
+Bundler.require
 
 $LOAD_PATH.unshift(SOURCE_PATH)
-require 'rubygems'
+require 'base64'
 require 'mirage/client'
-require 'cucumber'
-require 'rspec'
-require 'mechanize'
-require 'childprocess'
 
 SCRATCH = "#{ROOT_DIR}/scratch"
 RUBY_CMD = ChildProcess.jruby? ? 'jruby' : 'ruby'

data/features/support/hooks.rb

@@ -1,8 +1,7 @@
 Before do
   FileUtils.mkdir_p(SCRATCH)
 
-  $mirage = start_mirage_in_scratch_dir
-  $mirage.templates.delete_all
+  mirage.templates.delete_all
 
   Dir["#{SCRATCH}/*"].each do |file|
     FileUtils.rm_rf(file) unless file == "#{SCRATCH}/mirage.log"

data/features/support/mirage.rb

@@ -4,5 +4,9 @@ module Mirage
       Mirage.start
     end
   end
+
+  def mirage
+    @mirage ||= Mirage.running? ? Mirage::Client.new : start_mirage_in_scratch_dir
+  end
 end
-include Mirage
+World Mirage

data/features/support/web.rb

@@ -1,69 +1,20 @@
-require 'net/http'
-require 'uri'
+require 'httparty'
 module Mirage
   module Web
-    class FileResponse
-      attr_reader :response
-      def initialize response
-        @response = response
-      end
-
-      def save_as path
-        @response.save_as(path)
-      end
-    end
-
-    def http_put url, entity, options={}
-      if options[:parameters]
-        url << "?#{options[:parameters].to_a.collect{|pair|pair.join("=")}.join("&")}"
-      end
-      uri = URI.parse(url)
-      request = Net::HTTP::Put.new(uri.request_uri)
-
-      if entity.is_a? File
-        request.body_stream=entity
-        request.content_length=entity.lstat.size
-      else
-        request.body=entity
-      end
-
-      if options[:headers]
-        options[:headers].each { |field, value| request.add_field(field, value) }
-      end
-
-      #if options[:parameters]
-      #  request.set_form_data options[:parameters]
-      #end
-
-      Net::HTTP.new(uri.host, uri.port).request(request)
+    def get *args
+      HTTParty.get(*args)
     end
-
-    def http_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)
+    def put *args
+      HTTParty.put(*args)
     end
-
-    def http_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)
+    def post *args
+      puts "running this one"
+      HTTParty.post(*args)
     end
-
-    def http_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)
+    def delete *args
+      HTTParty.delete(*args)
     end
-
   end
 end
+
 World(Mirage::Web)

data/features/templates/required_content.feature

@@ -102,7 +102,10 @@ Feature: Placing requirements on requests
     And 'response.body' is base64 encoded
     And the template is sent using PUT to '/templates/greeting'
 
-    When I send POST to '/responses/greeting' with body '{"username":"Joe Blogs"}'
+    When I send POST to '/responses/greeting' with request entity
+    """
+    {"username":"Joe Blogs"}
+    """
     Then 'Hello Joe' should be returned
 
 

data/lib/mirage/client/helpers/method_builder.rb

@@ -6,7 +6,7 @@ module Mirage
         method_names.each do |method_name|
           method_name = method_name.to_sym
           define_method method_name do |arg=nil|
-            return instance_variable_get("@#{method_name}".to_sym) unless arg
+            return instance_variable_get("@#{method_name}".to_sym) if arg.nil?
             instance_variable_set("@#{method_name}".to_sym, arg)
             self
           end

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "3.0.4"
+  s.version = "3.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2013-11-18"
+  s.date = "2014-01-19"
   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|
     "features/requests/get.feature",
     "features/save_and_revert.feature",
     "features/step_definitions/my_steps.rb",
+    "features/step_definitions/observation_steps.rb",
     "features/support/command_line.rb",
     "features/support/env.rb",
     "features/support/hooks.rb",
@@ -107,6 +108,9 @@ Gem::Specification.new do |s|
     "spec/server/mock_response_spec.rb",
     "spec/server/server_spec.rb",
     "spec/spec_helper.rb",
+    "tasks/application.rake",
+    "tasks/packaging.rake",
+    "tasks/tests.rake",
     "views/index.haml",
     "views/response.haml"
   ]

data/spec/client/helpers/method_builder_spec.rb

@@ -1,32 +1,40 @@
 require 'spec_helper'
 
 describe Helpers::MethodBuilder do
-  it 'should give a builder_method builder method' do
-    model_class = Class.new do
-      extend Helpers::MethodBuilder
 
-      builder_method :name
-      builder_method :age
+  describe 'a builder method' do
+    let :model do
+      model_class = Class.new do
+        extend Helpers::MethodBuilder
+
+        builder_method :name
+      end
+      model_class.new
     end
-    name, age = 'Joe', 25
 
-    person = model_class.new
-    person.name(name).age(age)
-    person.name.should == name
-    person.age.should == age
+    it 'should set a value' do
+      model.name(:joe)
+      model.name.should == :joe
+    end
+
+    it 'should chain' do
+      model.name(:joe).should == model
+    end
+
+    it 'should work with booleans' do
+      model.name(false)
+      model.name.should == false
+    end
   end
 
+
   it 'should let you define more than one builder method at a time' do
     model_class = Class.new do
       extend Helpers::MethodBuilder
-
-      builder_methods :name, :age
+      builder_methods :foo, :bar
     end
-    name, age = 'Joe', 25
-
-    person = model_class.new
-    person.name(name).age(age)
-    person.name.should == name
-    person.age.should == age
+    model = model_class.new
+    model.respond_to?(:foo).should be_true
+    model.respond_to?(:bar).should be_true
   end
 end

data/spec/client/runner_spec.rb

@@ -131,7 +131,7 @@ describe Mirage do
       runner.stub(:mirage_process_ids).with([7001]).and_return({})
 
       Mirage::Runner.should_receive(:new).and_return(runner)
-      expect { runner.invoke(:stop, [], options) }.not_to raise_error(Mirage::ClientError)
+      expect { runner.invoke(:stop, [], options) }.not_to raise_error
     end
 
   end

data/spec/client/template_spec.rb

@@ -67,7 +67,7 @@ describe Mirage::Template do
 
     it 'should raise an error if the template is not found' do
       template_url = 'url'
-      response = mock(code: 404)
+      response = double(code: 404)
       Template.should_receive(:backedup_get).with(template_url, :format => :json).and_return response
       expect{Template.get(template_url)}.to raise_error Mirage::TemplateNotFound
     end

data/spec/server/binary_data_checker_spec.rb

@@ -3,7 +3,6 @@ require 'binary_data_checker'
 
 
 describe Mirage::BinaryDataChecker do
-  BinaryDataChecker = Mirage::BinaryDataChecker
   include_context :resources
   it 'should find binary data' do
     BinaryDataChecker.contains_binary_data?(File.read("#{resources_dir}/binary.file")).should == true

data/spec/server/mock_response_spec.rb

@@ -4,9 +4,7 @@ require 'extensions/hash'
 require 'mock_response'
 
 describe Mirage::MockResponse do
-  MockResponse = Mirage::MockResponse
-  ServerResponseNotFound = Mirage::ServerResponseNotFound
-  BinaryDataChecker = Mirage::BinaryDataChecker
+
   before :each do
     MockResponse.delete_all
   end

data/tasks/application.rake

@@ -0,0 +1,7 @@
+task :start do
+  `RACK_ENV='development' && ruby ./bin/mirage start`
+end
+
+task :stop do
+  `RACK_ENV='development' && ruby ./bin/mirage stop`
+end

data/tasks/packaging.rake

@@ -0,0 +1,28 @@
+task :clean do |task|
+  if system "gem list -i mirage"
+    puts "cleaning"
+    system "gem uninstall -x mirage"
+  end
+  Dir['*.gem'].each { |gem| FileUtils.rm_f(gem) }
+  task.reenable
+end
+
+Jeweler::Tasks.new do |gem|
+  gem.name = "mirage"
+  gem.homepage = "https://github.com/lashd/mirage"
+  gem.license = "MIT"
+  gem.summary = "Mirage is a easy mock server for testing your applications"
+  gem.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.'
+  gem.authors = ["Leon Davis"]
+  gem.executables = ['mirage']
+  gem.post_install_message = %{
+===============================================================================
+Mirage v3:
+
+Mirage has just gone up a major version from 2 to 3. If you're project uses
+a previous version take a look at https://github.com/lashd/mirage to see
+what's changed
+===============================================================================
+}
+end
+Jeweler::RubygemsDotOrgTasks.new

data/tasks/tests.rake

@@ -0,0 +1,25 @@
+task :specs
+
+%w(client server).each do |type|
+  public_task_name = "#{type}_specs"
+  private_task_name = "_#{public_task_name}"
+
+  RSpec::Core::RakeTask.new(private_task_name) do |task|
+    task.pattern = "spec/#{type}/**/*_spec.rb"
+  end
+
+  desc "specs for: #{type}"
+  task public_task_name do
+    ENV['coverage'] = type
+    Rake::Task[private_task_name].invoke
+  end
+
+  Rake::Task["specs"].prerequisites << public_task_name
+end
+
+
+require 'cucumber'
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "mode=regression features --format pretty"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -280,6 +280,7 @@ files:
 - features/requests/get.feature
 - features/save_and_revert.feature
 - features/step_definitions/my_steps.rb
+- features/step_definitions/observation_steps.rb
 - features/support/command_line.rb
 - features/support/env.rb
 - features/support/hooks.rb
@@ -336,6 +337,9 @@ files:
 - spec/server/mock_response_spec.rb
 - spec/server/server_spec.rb
 - spec/spec_helper.rb
+- tasks/application.rake
+- tasks/packaging.rake
+- tasks/tests.rake
 - views/index.haml
 - views/response.haml
 homepage: https://github.com/lashd/mirage
@@ -368,7 +372,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2506463001240153653
+      hash: -158737056239506774
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: