rest-assured 1.1.10 → 1.2.0

data/.travis.yml

@@ -1,13 +1,12 @@
 bundler_args: --without development
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
 env: DISPLAY=:99.0
 before_script:
   - "mysql -e 'create database rest_assured_test;'"
   - "sh -e /etc/init.d/xvfb start"
-script: "bundle exec rspec --color spec && bundle exec cucumber --format progress"
+script: "bundle exec rspec spec && bundle exec cucumber --format progress"
 branches:
   only:
     - master

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.2.0 (20 Mar 2013)
+
+- always use thin
+
 1.1.10 (09 Jan 2013)
 
 - support jruby versions of sqlite and myslq gems

data/Gemfile

@@ -1,10 +1,8 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in rest-assured.gemspec
 gemspec
 
 gem 'pg'
-gem 'thin'
 
 # skipped for heroku
 group :test do

data/Gemfile.lock

@@ -1,115 +1,116 @@
 PATH
   remote: .
   specs:
-    rest-assured (1.1.10)
+    rest-assured (1.2.0)
       activerecord (~> 3.2.0)
       activeresource (~> 3.2.0)
-      childprocess (~> 0.3.0)
-      haml (>= 3.1.3)
-      json
-      sinatra (~> 1.3.2)
+      childprocess (~> 0.3)
+      haml (~> 4.0)
+      sinatra (~> 1.4.0)
       sinatra-flash
+      thin (~> 1.5)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.3)
     anticipate (0.0.2)
     archive-tar-minitar (0.5.2)
     arel (3.0.2)
     awesome_print (1.1.0)
-    binding_of_caller (0.6.8)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
+    binding_of_caller (0.7.1)
+      debug_inspector (>= 0.0.1)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
     builder (3.0.4)
-    capybara (1.1.2)
+    capybara (1.1.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (0.0.5)
       nokogiri
-    coderay (1.0.8)
+    coderay (1.0.9)
     columnize (0.3.6)
-    cucumber (1.2.1)
+    cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
     daemons (1.1.9)
     database_cleaner (0.9.1)
-    debugger (1.2.3)
+    debug_inspector (0.0.2)
+    debugger (1.5.0)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.5)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.6)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0)
-    ffi (1.3.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    guard (1.6.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
+    diff-lcs (1.2.1)
+    eventmachine (1.0.3)
+    ffi (1.4.0)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
+    guard (1.6.2)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-spork (1.4.1)
+    guard-spork (1.5.0)
       childprocess (>= 0.2.3)
       guard (>= 1.1)
       spork (>= 0.8.4)
-    haml (3.1.7)
+    haml (4.0.0)
+      tilt
     i18n (0.6.1)
-    json (1.7.6)
-    launchy (2.1.2)
+    json (1.7.7)
+    launchy (2.2.0)
       addressable (~> 2.3)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    listen (0.7.1)
-    lumberjack (1.0.2)
+    listen (0.7.3)
+    lumberjack (1.0.3)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (1.19)
-    mocha (0.10.5)
+    mime-types (1.21)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
+    multi_json (1.7.1)
     mysql2 (0.3.11)
-    nokogiri (1.5.6)
+    nokogiri (1.5.8)
     pg (0.14.1)
-    pry (0.9.10)
+    pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    pry-debugger (0.2.1)
-      debugger (~> 1.2.0)
+      slop (~> 3.4)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
       pry (~> 0.9.10)
     pry-doc (0.4.4)
       pry (>= 0.9.9.6)
       yard (~> 0.8.1)
-    pry-stack_explorer (0.4.7)
-      binding_of_caller (~> 0.6.8)
-    rack (1.4.3)
-    rack-protection (1.3.2)
+    pry-stack_explorer (0.4.9)
+      binding_of_caller (>= 0.7)
+      pry (~> 0.9.11)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -120,47 +121,48 @@ GEM
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    shoulda-matchers (1.4.2)
+      websocket (~> 1.0.4)
+    shoulda-matchers (1.5.2)
       activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
+      bourne (~> 1.3)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
+    sinatra (1.4.1)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
-    slop (3.3.3)
+    slop (3.4.4)
     spork (1.0.0rc3)
-    sqlite3 (1.3.6)
-    thin (1.5.0)
+    sqlite3 (1.3.7)
+    terminal-table (1.4.5)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    tzinfo (0.3.35)
-    websocket (1.0.6)
+    thor (0.17.0)
+    tilt (1.3.6)
+    tzinfo (0.3.37)
+    websocket (1.0.7)
     xpath (0.1.4)
       nokogiri (~> 1.3)
-    yard (0.8.3)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby
@@ -189,4 +191,3 @@ DEPENDENCIES
   simplecov
   spork (> 0.9.0.rc)
   sqlite3
-  thin

data/README.markdown

@@ -1,6 +1,6 @@
 # REST assured
 
-[![Build status](https://secure.travis-ci.org/artemave/REST-assured.png)](https://secure.travis-ci.org/artemave/REST-assured)
+[![Build status](https://secure.travis-ci.org/artemave/REST-assured.png)](https://travis-ci.org/artemave/REST-assured)
 
 ## Overview
 
@@ -28,7 +28,6 @@ You are going to need ruby >= 1.8.7 on Linux/MacOS. Also, one of sqlite3, postgr
 gem 'sqlite3' # or mysql2 or pg
 # for jruby, use 'jdbcsqlite3' and 'jdbcmysql'
 
-gem 'thin'    # to make it faster; optional
 gem 'rest-assured'
 
 # env.rb/spec_helper.rb
@@ -47,10 +46,6 @@ Install db client gem:
 
 If using mysql/postgres, rest-assured expects database `rest_assured` to be accessible by user `root` with no password. Those are defaults and can be changed with cli options.
 
-It is also recommended to have thin installed. This improves startup time (over default webrick) and also it works with in-memory sqlite (which webrick does not):
-
-    $ gem install thin
-
 Then install gem and run:
 
     $ gem install rest-assured
@@ -131,7 +126,7 @@ For those using REST-assured from non-ruby environments.
 
   - __fullpath__ - e.g., `/some/api/object`, or with parameters in query string (useful for doubling GETs) - `/some/other/api/object?a=2&b=c`. Mandatory.
   - __content__ - whatever you want this double to respond with. Optional.
-  - __verb__ - one of http the following http verbs: `GET`, `POST`, `PUT`, `DELETE`. Optional. `GET` is default.
+  - __verb__ - one of http the following http verbs: `GET`, `POST`, `PUT`, `PATCH`, `DELETE`. Optional. `GET` is default.
   - __status__ - status returned when double is requested. Optional. `200` is default.
   - __response_headers__ - key/value map of headers. Optional.
   

data/bin/heroku_runner

@@ -16,6 +16,7 @@ opts = {
     dbhost: db.host,
       user: db.user,
     dbpass: db.password,
+    dbport: db.port,
   database: db.path[1..-1],
   encoding: 'utf8'
 }

data/bin/rest-assured

@@ -15,7 +15,7 @@ OptionParser.new do |opts|
     user_opts[:adapter] = adapter
   end
 
-  opts.on('-d', '--database FILENAME', "Either path to database file (sqlite, defaults to ./rest-assured.db) or db name (defaults to rest_assured)") do |fname|
+  opts.on('-d', '--database FILENAME', "Either path to database file (sqlite, defaults to ./rest-assured.db) or db name (defaults to rest_assured) or :memory: for in-memory sqlite") do |fname|
     user_opts[:database] = fname
   end
 
@@ -72,4 +72,12 @@ end.parse!
 RestAssured::Config.build(user_opts)
 
 require 'rest-assured/application'
-RestAssured::Application.run!
+RestAssured::Application.run!(:threaded => false, :server => 'thin') do |server|
+  ssl_options = {
+    :cert_chain_file => AppConfig.ssl_cert,
+    :private_key_file => AppConfig.ssl_key,
+    :verify_peer => false
+  }
+  server.ssl = AppConfig.ssl
+  server.ssl_options = ssl_options
+end

data/features/step_definitions/doubles_steps.rb

@@ -16,7 +16,7 @@ end
 
 Then /^I should be able to get json representation of that double from response$/ do
   d = RestAssured::Models::Double.last
-  JSON.parse( @create_a_double_response ).should == JSON.parse( d.to_json )
+  MultiJson.load( @create_a_double_response ).should == MultiJson.load( d.to_json )
 end
 
 Then /^I should get (#{CAPTURE_A_NUMBER}) in response status$/ do |status|

data/features/support/env.rb

@@ -29,9 +29,9 @@ Spork.prefork do
     end
   end
 
-  Capybara.register_driver :selenium do |app|
-    Capybara::Selenium::Driver.new(app, :browser => :chrome)
-  end
+  # Capybara.register_driver :selenium do |app|
+  #   Capybara::Selenium::Driver.new(app, :browser => :chrome)
+  # end
 
   World(Capybara, Rack::Test::Methods, RackHeaderHack, WorldHelpers, Anticipate)
 

data/features/support/world_helpers.rb

@@ -8,7 +8,7 @@ module WorldHelpers
 
     code.sub!(/(.*)/, "\\1\nENV['RACK_ENV'] = 'production'")
     code.sub!(/require 'rest-assured\/application'/, '')
-    code.sub!(/RestAssured::Application.run!/, 'puts AppConfig.to_yaml')
+    code.sub!(/RestAssured::Application.run!.*/m, 'puts AppConfig.to_yaml')
 
     new_exec = "#{rest_assured_exec}_temp"
     File.open(new_exec, 'w') do |file|

data/lib/rest-assured/application.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'sinatra/handler_options_patch'
 require 'haml'
 require 'sinatra/flash'
 require 'sinatra/partials'

data/lib/rest-assured/config.rb

@@ -1,8 +1,6 @@
 require 'logger'
 require 'active_record'
 require 'active_support/core_ext/kernel/reporting'
-require 'webrick'
-require 'webrick/https'
 
 module RestAssured
   module Config
@@ -46,7 +44,6 @@ module RestAssured
     def self.included(klass)
       init_logger
       setup_db
-      setup_ssl(klass) if AppConfig.ssl
 
       klass.set :port, AppConfig.port
       klass.set :environment, AppConfig.environment
@@ -69,19 +66,6 @@ module RestAssured
 
     private
 
-      def self.setup_ssl(klass)
-        ssl_config = {
-          :SSLEnable => true,
-          :SSLCertificate => OpenSSL::X509::Certificate.new( File.read( AppConfig.ssl_cert ) ),
-          :SSLPrivateKey => OpenSSL::PKey::RSA.new( File.read( AppConfig.ssl_key ) ),
-          :SSLCertName => [ ["CN", WEBrick::Utils::getservername] ],
-          :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE 
-        }
-
-        klass.set :server, %[webrick]
-        klass.set :webrick, ssl_config
-      end
-
       def self.setup_db
         setup_db_logging
         connect_db

data/lib/rest-assured/routes/double.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'active_support/core_ext/hash/slice'
 
 module RestAssured
@@ -44,7 +43,7 @@ module RestAssured
       router.post /^\/doubles(\.json)?$/ do
         begin
           data = request.body.read
-          d = JSON.parse(data)['double']
+          d = MultiJson.load(data)['double']
 
           # fix acitve resource dumbness
           if d['response_headers'] and d['response_headers']['response_headers']

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '1.1.10'
+  VERSION = '1.2.0'
 end

data/rest-assured.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version               = RestAssured::VERSION
   s.platform              = Gem::Platform::RUBY
   s.authors               = ['Artem Avetisyan']
-  s.email                 = ['artem.avetisyan@bbc.co.uk']
+  s.email                 = ['artemave@gmail.com']
   s.homepage              = "https://github.com/artemave/rest-assured"
   s.summary               = %q{Real stubs and spies for HTTP(S) services}
   #s.description          = %q{TODO: Write a gem description}
@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
   s.executables           = ['rest-assured']
   s.require_paths         = ['lib']
 
-  s.add_dependency 'sinatra', '~> 1.3.2'
-  s.add_dependency 'childprocess', '~> 0.3.0'
+  s.add_dependency 'sinatra', '~> 1.4.0'
+  s.add_dependency 'childprocess', '~> 0.3'
   s.add_dependency 'sinatra-flash'
-  s.add_dependency 'haml', '>= 3.1.3'
+  s.add_dependency 'haml', '~> 4.0'
   s.add_dependency 'activerecord', '~> 3.2.0'
   s.add_dependency 'activeresource', '~> 3.2.0'
-  s.add_dependency 'json'
+  s.add_dependency 'thin', '~> 1.5'
 end
 

data/spec/config_spec.rb

@@ -1,8 +1,4 @@
 require File.expand_path('../../lib/rest-assured/config', __FILE__)
-require 'rack'
-require 'openssl'
-require 'webrick'
-require 'enumerator'
 
 module RestAssured
   describe Config do
@@ -14,122 +10,7 @@ module RestAssured
       #this is thoroughly covered in cucumber (since there it also serves documentation purposes)
     end
 
-    context 'when included in Application' do
-      let(:app) { mock(:app).as_null_object }
-
-      it 'initializes logger' do
-        Config.stub(:setup_db)
-        logger = double(:logger).as_null_object
-        AppConfig.stub(:logfile).and_return('test.log')
-
-        Logger.should_receive(:new).with('test.log').and_return(logger)
-
-        Config.included(app)
-      end
-
-      context 'db setup' do
-        it 'connects db' do
-          Config.stub(:init_logger)
-          Config.stub(:migrate_db) # so it does not complain
-          AppConfig.stub(:db_config).and_return('db_config')
-
-          ActiveRecord::Base.should_receive(:establish_connection).with('db_config')
-
-          Config.included(app)
-        end
-
-        context 'active_record logging' do
-          let(:logger) { double(:logger).as_null_object }
-
-          before do
-            Config.stub(:migrate_db)
-            Config.stub(:connect_db)
-          end
-
-          it 'is silenced in production' do
-            AppConfig.stub(:environment).and_return('production')
-            Logger.should_receive(:new).with(Config.dev_null).and_return(logger)
-
-            ActiveRecord::Base.should_receive(:logger=).with(logger)
-
-            Config.setup_db
-          end
-
-          it 'is set to app logger for non production' do
-            AppConfig.stub(:environment).and_return('test')
-            AppConfig.stub(:logger).and_return(logger)
-
-            ActiveRecord::Base.should_receive(:logger=).with(logger)
-
-            Config.setup_db
-          end
-        end
-
-        it 'runs migrations' do
-          Config.stub(:connect_db) # so it does not complain
-
-          ActiveRecord::Migrator.should_receive(:migrate)
-
-          Config.setup_db
-        end
-      end
-
-      it 'sets up environment' do
-        app.should_receive(:set).with(:environment, AppConfig.environment)
-        Config.included(app)
-      end
-
-      it 'sets up port' do
-        app.should_receive(:set).with(:port, AppConfig.port)
-        Config.included(app)
-      end
-
-      it 'connects logger to application' do
-        logger = double(:logger).as_null_object
-        AppConfig.stub(:logger).and_return(logger)
-
-        app.should_receive(:enable).with(:logging)
-        app.should_receive(:use).with(Rack::CommonLogger, logger)
-
-        Config.included(app)
-      end
-
-      context 'when ssl true' do
-        before do
-          AppConfig.stub(:ssl).and_return(true)
-        end
-
-        it 'makes sure only webrick can be used' do
-          app.should_receive(:set).with(:server, %[webrick])
-          Config.included(app)
-        end
-
-        it 'sets up webrick ssl' do
-          OpenSSL::X509::Certificate.stub(:new).with( File.read( AppConfig.ssl_cert ) ).and_return('ssl_cert')
-          OpenSSL::PKey::RSA.stub(:new).with( File.read( AppConfig.ssl_key ) ).and_return('ssl_key')
-
-          ssl_config = {
-            :SSLEnable => true,
-            :SSLCertificate => 'ssl_cert',
-            :SSLPrivateKey  => 'ssl_key',
-            :SSLCertName => [ ["CN", WEBrick::Utils::getservername] ],
-            :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE 
-          }
-
-          app.should_receive(:set).with(:webrick, hash_including(ssl_config))
-          Config.included(app)
-        end
-
-        it 'does all that only if ssl true' do
-          AppConfig.stub(:ssl).and_return(false)
-
-          app.should_not_receive(:set).with(:webrick, anything)
-          Config.included(app)
-        end
-      end
-    end
-    
-    context 'cmd args array conversion' do
+    describe 'cmd args array conversion' do
       it 'converts true values in form of "value" => ["--#{value}"]' do
         Config.build(:ssl => true)
         Config.to_cmdargs.should == ['--ssl']

data/spec/functional/double_routes_spec.rb

@@ -167,7 +167,7 @@ module RestAssured
 
         get '/doubles.json'
 
-        json = JSON.parse(last_response.body)
+        json = MultiJson.load(last_response.body)
 
         json.first['double']['verb'].should == 'POST'
         json.last['double']['verb'].should == 'GET'

data/views/doubles/index.haml

@@ -24,7 +24,7 @@
           %td= f.status
           %td.label.text-center
             - if fs.size > 1
-              %input.active-double-toggle{:type => 'radio', :name => group, :checked => f.active, :data => { :double_id => f.id }}
+              %input.active-double-toggle{:type => 'radio', :name => group, :checked => f.active, :data => { 'double-id' => f.id }}
             - else
               yes
           %td.edit-link.text-center.white-space-nowrap
@@ -42,11 +42,9 @@
         e.stopPropagation();
 
         $.post(
-          '/doubles/' + this.getAttribute('data-double_id'),
+          '/doubles/' + $(this).data('doubleId'),
           { _method: 'put', active: 't' },
-          function(data) {
-            $.jGrowl(data);
-          }
+          function(data) { $.jGrowl(data) }
         );
     });
   });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -108,24 +108,24 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 description: 
 email:
-- artem.avetisyan@bbc.co.uk
+- artemave@gmail.com
 executables:
 - rest-assured
 extensions: []
@@ -174,7 +174,6 @@ files:
 - features/step_definitions/ruby_api_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
-- features/support/selenium-fix.rb
 - features/support/test-server.rb
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature
@@ -194,7 +193,6 @@ files:
 - lib/rest-assured/routes/response.rb
 - lib/rest-assured/utils/port_explorer.rb
 - lib/rest-assured/version.rb
-- lib/sinatra/handler_options_patch.rb
 - lib/sinatra/partials.rb
 - public/css/base.css
 - public/css/grid.inuit.css
@@ -257,9 +255,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2865940547805814270
 requirements: []
 rubyforge_project: rest-assured
 rubygems_version: 1.8.23
@@ -282,7 +277,6 @@ test_files:
 - features/step_definitions/ruby_api_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
-- features/support/selenium-fix.rb
 - features/support/test-server.rb
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature

data/features/support/selenium-fix.rb

@@ -1,8 +0,0 @@
-# details are here http://carol-nichols.com/2011/07/seleniumwebdrivererrorunhandlederror-ns_error_illegal_value/
-class Capybara::Selenium::Driver
-  def find(selector)
-    browser.find_elements(:xpath, selector).map { |node| Capybara::Selenium::Node.new(self, node) }
-  rescue Selenium::WebDriver::Error::InvalidSelectorError => e
-    e.message =~ /nsIDOMXPathEvaluator.createNSResolver/ ? retry : raise
-  end
-end

data/lib/sinatra/handler_options_patch.rb

@@ -1,25 +0,0 @@
-module Sinatra
-  class Base
-    class << self
-      def run!(options={})
-        set options
-        handler      = detect_rack_handler
-        handler_name = handler.name.gsub(/.*::/, '')
-        # handler specific options use the lower case handler name as hash key, if present
-        handler_opts = begin
-                         send(handler_name.downcase)
-                       rescue NoMethodError
-                         {}
-                       end
-        puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
-          "on #{port} for #{environment} with backup from #{handler_name}" unless handler_name =~/cgi/i
-        handler.run self, handler_opts.merge(:Host => bind, :Port => port) do |server|
-          [:INT, :TERM].each { |sig| trap(sig) { quit!(server, handler_name) } }
-          set :running, true
-        end
-      rescue Errno::EADDRINUSE => e
-        puts "== Someone is already performing on port #{port}!"
-      end
-    end
-  end
-end