rest-assured 1.1.1 → 1.1.2

data/.gitignore

@@ -5,5 +5,4 @@ bundle_bin
 *.db
 .sass-cache
 test.log
-Gemfile.lock
 coverage

data/.travis.yml

@@ -1,4 +1,4 @@
-bundler_args: --without local
+bundler_args: --without development
 rvm:
   - 1.8.7
   - 1.9.2

data/Gemfile

@@ -3,35 +3,37 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in rest-assured.gemspec
 gemspec
 
-gem 'awesome_print'
-gem 'cucumber'
-gem 'database_cleaner'
-gem 'rspec'
-gem 'shoulda-matchers'
-gem 'rack-test'
-gem 'capybara'
-gem 'capybara-firebug'
-gem 'rake'
-gem 'mysql2'
-gem 'sqlite3'
+gem 'pg'
 gem 'thin'
-gem 'relish'
-gem "spork", "> 0.9.0.rc"
-gem 'childprocess'
 
-group :local do
+# skipped for heroku
+group :test do
+  gem 'awesome_print'
+  gem 'cucumber'
+  gem 'database_cleaner'
+  gem 'rspec'
+  gem 'shoulda-matchers'
+  gem 'rack-test'
+  gem 'capybara'
+  gem 'capybara-firebug'
+  gem 'rake'
+  gem 'mysql2'
+  gem 'sqlite3'
+  gem 'relish'
+  gem 'sinatra-activerecord'
+  gem "spork", "> 0.9.0.rc"
+  gem 'simplecov', :platforms => :ruby_19
+end
+
+# skipped for heroku and travis
+group :development do
   gem 'ruby-debug', :platform => :mri_18
   gem 'ruby-debug19', :platform => :mri_19
-  gem 'awesome_print'
   gem 'interactive_editor'
   gem 'launchy'
   gem "guard-spork"
-  if RUBY_PLATFORM =~ /darwin/
-    gem 'growl'
-    gem 'rb-fsevent'
-    gem 'rb-readline'
-  end
-  gem 'sinatra-activerecord'
-  gem 'simplecov', :platforms => :ruby_19
+  gem 'growl'
+  gem 'rb-fsevent'
+  gem 'rb-readline'
 end
 

data/Gemfile.lock

@@ -0,0 +1,182 @@
+PATH
+  remote: .
+  specs:
+    rest-assured (1.1.2)
+      activerecord (~> 3.2.0)
+      activeresource (~> 3.2.0)
+      childprocess (~> 0.3.0)
+      haml (>= 3.1.3)
+      sinatra (~> 1.3.2)
+      sinatra-flash
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.7)
+    archive-tar-minitar (0.5.2)
+    arel (3.0.0)
+    awesome_print (1.0.2)
+    builder (3.0.0)
+    capybara (1.1.2)
+      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)
+    capybara-firebug (1.1.0)
+      capybara (~> 1.0)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    columnize (0.3.6)
+    cucumber (1.1.4)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.7.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    daemons (1.1.8)
+    database_cleaner (0.7.1)
+    diff-lcs (1.1.3)
+    eventmachine (0.12.10)
+    ffi (1.0.11)
+    gherkin (2.7.7)
+      json (>= 1.4.6)
+    growl (1.0.3)
+    guard (1.0.0)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-spork (0.5.2)
+      guard (>= 0.10.0)
+      spork (>= 0.8.4)
+    haml (3.1.4)
+    i18n (0.6.0)
+    interactive_editor (0.0.10)
+      spoon (>= 0.0.1)
+    json (1.6.5)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.13)
+      ruby_core_source (>= 0.1.4)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    mysql2 (0.3.11)
+    nokogiri (1.5.0)
+    pg (0.13.2)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rb-fsevent (0.9.0)
+    rb-readline (0.4.2)
+    rbx-require-relative (0.0.5)
+    relish (0.5.3)
+      archive-tar-minitar (>= 0.5.2)
+      json (>= 1.4.6)
+      rest-client (>= 1.6.1)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.26)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.19.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
+      rubyzip
+    shoulda-matchers (1.0.0)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    sinatra-activerecord (0.1.3)
+      sinatra (>= 0.9.4)
+    sinatra-flash (0.3.0)
+      sinatra (>= 1.0.0)
+    spoon (0.0.1)
+    spork (1.0.0rc2)
+    sqlite3 (1.3.5)
+    term-ansicolor (1.0.7)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    tzinfo (0.3.31)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  capybara
+  capybara-firebug
+  cucumber
+  database_cleaner
+  growl
+  guard-spork
+  interactive_editor
+  launchy
+  mysql2
+  pg
+  rack-test
+  rake
+  rb-fsevent
+  rb-readline
+  relish
+  rest-assured!
+  rspec
+  ruby-debug
+  ruby-debug19
+  shoulda-matchers
+  simplecov
+  sinatra-activerecord
+  spork (> 0.9.0.rc)
+  sqlite3
+  thin

data/Procfile

@@ -0,0 +1 @@
+web: bundle exec ./bin/heroku_runner

data/README.markdown

@@ -4,8 +4,8 @@
 
 ## Overview
 
-A tool for stubbing/spying on http(s) based services that your app under test interacts with. This is useful for blackbox/integration testing.
-There are three main use cases:
+Stub/spy http(s) based external dependencies in your integration/acceptance tests.
+In essense, here is what it could be useful for:
 
 * stub out external data sources with predefined data
 * verify requests to external services (aka spying)
@@ -15,11 +15,11 @@ There are three main use cases:
 
 You are going to need MRI ruby >= 1.8.7 on Linux/MacOS.
 
-Rest-assured requires a database to run. Either sqlite or mysql. So, make sure there is one and its backed with corresponding client gem:
+Rest-assured requires a database to run. Either sqlite, mysql or postgres. So, make sure there is one and its backed with corresponding client gem:
 
-    bash$ gem install sqlite3 # or mysql2
+    bash$ gem install sqlite3 # or mysql2 or pg
 
-If using mysql, 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.
+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):
 
@@ -30,7 +30,7 @@ Then install gem and run:
     bash$ gem install rest-assured
     bash$ rest-assured &
 
-Or clone from github and run:
+Or clone and run:
 
     bash$ git clone git@github.com:BBC/rest-assured.git
     bash$ cd rest-assured && bundle install
@@ -40,6 +40,17 @@ This starts up an instance of rest-assured on port 4578. It is accessible via RE
 
 Various options (such as ssl, port, db credentials, etc.) are available through command line options. Check out `rest-assured -h` to see what they are.
 
+You can also deploy it to heroku:
+
+    bash$ git clone git@github.com:BBC/rest-assured.git
+    bash$ cd rest-assured
+
+    bash$ gem install heroku
+    bash$ heroku login # assuming you already have an account
+    bash$ heroku create --stack cedar
+    
+    bash$ git push heroku master
+
 ## Doubles
 
 Double is a stub/spy of HTTP request. Create a double that has the same request fullpath and method as the one your app is sending to a dependant service and then convience your app that rest-assured is that dependency (hint: by making endpoints configurable).
@@ -82,6 +93,8 @@ Then let us assume that `http://localhost:4578/products` got POSTed as a result
 
 ```ruby
 @double.wait_for_requests(1, timeout: 10) # defaults to 5 seconds
+# or, if waiting for specific amount of requests does not suit the test, just
+@double.reload # before verifying
 
 req = @double.requests.first
 
@@ -191,6 +204,15 @@ Here is the rest API for managing redirects:
 ### Delete all redirects
 
   HTTP DELETE to `/redirects/all` deletes all redirects. Useful for cleaning up between tests.
+  
+## Running tests
+
+Tests require there to be mysql database `rest_assured_test` accessible by `root` with no password. Cucumber tests also need firefox.
+
+    bash$ git clone git@github.com:BBC/rest-assured.git
+    bash$ cd rest-assured && bundle install
+    bash$ bundle exec rspec spec
+    bash$ bundle exec cucumber
 
 ## Author
 
@@ -198,6 +220,11 @@ Here is the rest API for managing redirects:
 
 ## Changelog
 
+#### 1.1.2 (04 Mar 2012)
+
+* support postgres
+* heroku deployable
+
 #### 1.1.1 (01 Mar 2012)
 
 * Add 'verb' to UI

data/bin/heroku_runner

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+$:.push File.expand_path('../../lib', __FILE__)
+
+require 'rest-assured/config'
+require 'uri'
+
+# disable buffering to have log messages sent straight to Heroku’s logging infrastructure
+$stdout.sync = true
+
+db = URI.parse(ENV['DATABASE_URL'])
+
+opts = {
+      port: ENV['PORT'],
+   adapter: 'postgresql',
+    dbhost: db.host,
+      user: db.user,
+    dbpass: db.password,
+  database: db.path[1..-1],
+  encoding: 'utf8'
+}
+
+RestAssured::Config.build(opts)
+
+require 'rest-assured/application'
+RestAssured::Application.run!

data/bin/rest-assured

@@ -11,7 +11,7 @@ user_opts = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: rest-assured [options]"
 
-  opts.on('-a', '--adapter mysql|sqlite') do |adapter|
+  opts.on('-a', '--adapter mysql|sqlite|postgresql') do |adapter|
     user_opts[:adapter] = adapter
   end
 
@@ -19,23 +19,23 @@ OptionParser.new do |opts|
     user_opts[:database] = fname
   end
 
-  opts.on('-u', '--dbuser DBUSER', "Db username (mysql only)") do |user|
+  opts.on('-u', '--dbuser DBUSER', "Db username (mysql, postgresql only)") do |user|
     user_opts[:user] = user
   end
 
-  opts.on('--dbpass DBPASSWORD', 'Db password (mysql only). Defaults to empty') do |password|
+  opts.on('--dbpass DBPASSWORD', 'Db password (mysql, postgresql only). Defaults to empty') do |password|
     user_opts[:dbpass] = password
   end
 
-  opts.on('--dbhost DBHOST', 'Db host (mysql only). Defaults to mysql default host (localhost)') do |dbhost|
+  opts.on('--dbhost DBHOST', 'Db host (mysql, postgresql only). Defaults to mysql default host (localhost)') do |dbhost|
     user_opts[:dbhost] = dbhost
   end
 
-  opts.on('--dbport DBPORT', Integer, 'Db port (mysql only). Defaults to mysql default port (3306)') do |dbport|
+  opts.on('--dbport DBPORT', Integer, 'Db port (mysql, postgresql only). Defaults to adapters default port') do |dbport|
     user_opts[:dbport] = dbport
   end
 
-  opts.on('--dbencoding DBENCODING', 'Db encoding (mysql only). Defaults to mysql default encoding') do |dbencoding|
+  opts.on('--dbencoding DBENCODING', 'Db encoding (mysql, postgresql only). Defaults to adapters default encoding') do |dbencoding|
     user_opts[:dbencoding] = dbencoding
   end
 

data/features/command_line_options.feature

@@ -36,21 +36,39 @@ Feature: command line options
   Scenario Outline: mysql options
     When I start rest-assured with -a mysql <options>
     Then database options should be:
-      | dbname   | dbuser   | dbpass   | dbhost   | dbport   | dbencoding   | dbsocket   |
-      | <dbname> | <dbuser> | <dbpass> | <dbhost> | <dbport> | <dbencoding> | <dbsocket> |
+      | dbname   | dbuser   | dbpass   | dbhost   | dbport   | dbencoding   | dbsocket   | adapter    |
+      | <dbname> | <dbuser> | <dbpass> | <dbhost> | <dbport> | <dbencoding> | <dbsocket> | <adapter> |
 
     Examples:
-      | options                    | dbname       | dbuser | dbpass | dbhost | dbport | dbencoding | dbsocket        |
-      |                            | rest_assured | root   |        |        |        |            |                 |
-      | -d resta                   | resta        | root   |        |        |        |            |                 |
-      | --database resta           | resta        | root   |        |        |        |            |                 |
-      | -u bob                     | rest_assured | bob    |        |        |        |            |                 |
-      | --dbuser bob               | rest_assured | bob    |        |        |        |            |                 |
-      | --dbpass pswd              | rest_assured | root   | pswd   |        |        |            |                 |
-      | --dbhost remote            | rest_assured | root   |        | remote |        |            |                 |
-      | --dbport 5555              | rest_assured | root   |        |        | 5555   |            |                 |
-      | --dbencoding utf16le       | rest_assured | root   |        |        |        | utf16le    |                 |
-      | --dbsocket /tmp/mysql.sock | rest_assured | root   |        |        |        |            | /tmp/mysql.sock |
+      | options                    | dbname       | dbuser | dbpass | dbhost | dbport | dbencoding | dbsocket        | adapter |
+      |                            | rest_assured | root   |        |        |        |            |                 | mysql2  |
+      | -d resta                   | resta        | root   |        |        |        |            |                 | mysql2  |
+      | --database resta           | resta        | root   |        |        |        |            |                 | mysql2  |
+      | -u bob                     | rest_assured | bob    |        |        |        |            |                 | mysql2  |
+      | --dbuser bob               | rest_assured | bob    |        |        |        |            |                 | mysql2  |
+      | --dbpass pswd              | rest_assured | root   | pswd   |        |        |            |                 | mysql2  |
+      | --dbhost remote            | rest_assured | root   |        | remote |        |            |                 | mysql2  |
+      | --dbport 5555              | rest_assured | root   |        |        | 5555   |            |                 | mysql2  |
+      | --dbencoding utf16le       | rest_assured | root   |        |        |        | utf16le    |                 | mysql2  |
+      | --dbsocket /tmp/mysql.sock | rest_assured | root   |        |        |        |            | /tmp/mysql.sock | mysql2  |
+
+  Scenario Outline: postgresql options
+    When I start rest-assured with -a postgresql <options>
+    Then database options should be:
+      | dbname   | dbuser   | dbpass   | dbhost   | dbport   | dbencoding   | adapter   |
+      | <dbname> | <dbuser> | <dbpass> | <dbhost> | <dbport> | <dbencoding> | <adapter> |
+
+    Examples:
+      | options              | dbname       | dbuser | dbpass | dbhost | dbport | dbencoding | adapter    |
+      |                      | rest_assured | root   |        |        |        |            | postgresql |
+      | -d resta             | resta        | root   |        |        |        |            | postgresql |
+      | --database resta     | resta        | root   |        |        |        |            | postgresql |
+      | -u bob               | rest_assured | bob    |        |        |        |            | postgresql |
+      | --dbuser bob         | rest_assured | bob    |        |        |        |            | postgresql |
+      | --dbpass pswd        | rest_assured | root   | pswd   |        |        |            | postgresql |
+      | --dbhost remote      | rest_assured | root   |        | remote |        |            | postgresql |
+      | --dbport 5555        | rest_assured | root   |        |        | 5555   |            | postgresql |
+      | --dbencoding utf16le | rest_assured | root   |        |        |        | utf16le    | postgresql |
 
   Scenario Outline: use ssl option
     When I start rest-assured with <option>

data/features/ruby_api/create_double.feature

@@ -23,14 +23,14 @@ Feature: create double
   Scenario: specify response headers
     When I create a double:
     """
-    @double = RestAssured::Double.create(:fullpath => '/some/api', :response_headers => { 'Content-Type' => 'text/html' })
+    @double = RestAssured::Double.create(:fullpath => '/some/api', :response_headers => { 'Content-Type2' => 'text/html' })
     """
     Then the following should be true:
     """
-    @double.response_headers.should == { 'Content-Type' => 'text/html' }
+    @double.response_headers.should == { 'Content-Type2' => 'text/html' }
 
     get @double.fullpath
-    last_response.headers['Content-Type'].should == 'text/html'
+    last_response.headers['Content-Type2'].should == 'text/html'
     """
 
   Scenario: specify content

data/features/step_definitions/command_line_options_steps.rb

@@ -19,17 +19,17 @@ Then /^database options should be:$/ do |table|
   res = table.hashes.first
 
   empty_to_nil = lambda do |string|
-    string.empty? ? nil : string
+    string.try(:empty?) ? nil : string
   end
   
-  @app_config[:db_config][:adapter].should == 'mysql2'
+  @app_config[:db_config][:adapter].should  == res['adapter']
   @app_config[:db_config][:database].should == res['dbname']
-  @app_config[:db_config][:user].should == res['dbuser']
+  @app_config[:db_config][:username].should == res['dbuser']
   @app_config[:db_config][:password].should == empty_to_nil[res['dbpass']]
-  @app_config[:db_config][:host].should == empty_to_nil[res['dbhost']]
-  @app_config[:db_config][:port].should == empty_to_nil[res['dbport']].try(:to_i)
+  @app_config[:db_config][:host].should     == empty_to_nil[res['dbhost']]
+  @app_config[:db_config][:port].should     == empty_to_nil[res['dbport']].try(:to_i)
   @app_config[:db_config][:encoding].should == empty_to_nil[res['dbencoding']]
-  @app_config[:db_config][:socket].should == empty_to_nil[res['dbsocket']]
+  @app_config[:db_config][:socket].should   == empty_to_nil[res['dbsocket']]
 end
 
 Then /^ssl certificate used should be "([^"]*)" and ssl key should be "([^"]*)"$/ do |ssl_cert, ssl_key|

data/features/support/env.rb

@@ -40,7 +40,7 @@ Spork.prefork do
   World(Capybara, Rack::Test::Methods, RackHeaderHack, WorldHelpers)
 
   require 'rest-assured/config'
-  db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  db_opts = { :adapter => 'mysql' }
   RestAssured::Config.build(db_opts)
 
   require 'rest-assured'

data/lib/rest-assured/config.rb

@@ -138,7 +138,9 @@ module RestAssured
                                   :adapter => 'sqlite3',
                                   :database => AppConfig.database || default_database
                                 }
-                              elsif AppConfig.adapter =~ /mysql/i
+                              elsif AppConfig.adapter =~ /postgres|mysql/i
+                                adapter = $&.downcase
+
                                 default_database = if AppConfig.environment != 'production'
                                                      "rest_assured_#{AppConfig.environment}"
                                                    else
@@ -146,18 +148,24 @@ module RestAssured
                                                    end
 
                                 opts = {
-                                  :adapter => 'mysql2',
-                                  :reconnect => true,
-                                  :pool => 20,
-                                  :user => AppConfig.user || 'root',
+                                  :adapter  => 'postgresql',
+                                  :username => AppConfig.user || 'root',
                                   :database => AppConfig.database || default_database
                                 }
 
+                                if adapter =~ /mysql/
+                                  opts.merge!(
+                                    :adapter   => 'mysql2',
+                                    :reconnect => true,
+                                    :pool      => 20
+                                  )
+                                  opts[:socket] = AppConfig.dbsocket if AppConfig.dbsocket
+                                end
+
                                 opts[:password] = AppConfig.dbpass if AppConfig.dbpass
-                                opts[:host] = AppConfig.dbhost if AppConfig.dbhost
-                                opts[:port] = AppConfig.dbport if AppConfig.dbport
+                                opts[:host]     = AppConfig.dbhost if AppConfig.dbhost
+                                opts[:port]     = AppConfig.dbport if AppConfig.dbport
                                 opts[:encoding] = AppConfig.dbencoding if AppConfig.dbencoding
-                                opts[:socket] = AppConfig.dbsocket if AppConfig.dbsocket
                                 opts
                               else
                                 raise "Unsupported db adapter '#{AppConfig.adapter}'. Valid adapters are sqlite and mysql"

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

@@ -17,6 +17,7 @@ module RestAssured
       before_save :toggle_active
       before_validation :set_verb
       before_validation :set_status
+      before_validation :set_response_headers
       after_destroy :set_active
 
       has_many :requests, :dependent => :destroy
@@ -31,6 +32,10 @@ module RestAssured
           end
         end
 
+        def set_response_headers
+          self.response_headers = {} unless response_headers.present?
+        end
+
         def set_verb
           self.verb = 'GET' unless verb.present?
         end

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

@@ -1,4 +1,5 @@
 require 'json'
+require 'active_support/core_ext/hash/slice'
 
 module RestAssured
   module DoubleRoutes
@@ -36,15 +37,14 @@ module RestAssured
         begin
           data = request.body.read
           d = JSON.parse(data)['double']
+
+          # fix acitve resource dumbness
+          if d['response_headers'] and d['response_headers']['response_headers']
+            d['response_headers'] = d['response_headers']['response_headers']
+          end
         rescue
-          d = params['double'] || {
-            :fullpath               => params['fullpath'],
-            :content                => params['content'],
-            :description            => params['description'],
-            :verb                   => params['verb'],
-            :status                 => params['status']
-          }
-          d.merge!(:response_headers => params['response_headers']) if params['response_headers']
+          d = params['double'] ||
+            params.slice(*%w[fullpath content description verb status response_headers])
         end
 
         @double = Models::Double.create(d) 

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/rest-assured.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
   s.executables           = ['rest-assured']
   s.require_paths         = ['lib']
 
-  s.add_dependency 'sinatra', '>= 1.3.2'
+  s.add_dependency 'sinatra', '~> 1.3.2'
   s.add_dependency 'childprocess', '~> 0.3.0'
   s.add_dependency 'sinatra-flash'
   s.add_dependency 'haml', '>= 3.1.3'
-  s.add_dependency 'activerecord', '~> 3.1.0'
-  s.add_dependency 'activeresource', '~> 3.1.0'
+  s.add_dependency 'activerecord', '~> 3.2.0'
+  s.add_dependency 'activeresource', '~> 3.2.0'
 end
 

data/spec/functional/response_spec.rb

@@ -14,12 +14,12 @@ module RestAssured
     let(:env) { stub(:to_json => 'env').as_null_object }
     let(:request) {
       double('Request',
-             :request_method => 'GET',
-             :fullpath => '/api',
-             :env => env,
-             :body => stub(:read => 'body').as_null_object,
-             :params => stub(:to_json => 'params')
-            )
+        :request_method => 'GET',
+        :fullpath       => '/api',
+        :env            => env,
+        :body           => stub(:read    => 'body').as_null_object,
+        :params         => stub(:to_json => 'params')
+      )
     }
     let(:rest_assured_app) { double('App', :request => request).as_null_object }
 

data/spec/spec_helper.rb

@@ -63,7 +63,7 @@ Spork.prefork do
     end
   end
   require 'rest-assured/config'
-  DB_OPTS = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  DB_OPTS = { :adapter => 'mysql' }
   RestAssured::Config.build(DB_OPTS)
 
   require 'rest-assured'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157317900 !ruby/object:Gem::Requirement
+  requirement: &2162656220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157317900
+  version_requirements: *2162656220
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &2157317260 !ruby/object:Gem::Requirement
+  requirement: &2162671380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157317260
+  version_requirements: *2162671380
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
-  requirement: &2157316120 !ruby/object:Gem::Requirement
+  requirement: &2162670920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157316120
+  version_requirements: *2162670920
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2157338020 !ruby/object:Gem::Requirement
+  requirement: &2162669840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,29 +54,29 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157338020
+  version_requirements: *2162669840
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2157335780 !ruby/object:Gem::Requirement
+  requirement: &2162668460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157335780
+  version_requirements: *2162668460
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2157332420 !ruby/object:Gem::Requirement
+  requirement: &2162665360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157332420
+  version_requirements: *2162665360
 description: 
 email:
 - artem.avetisyan@bbc.co.uk
@@ -89,11 +89,14 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
+- Procfile
 - README.markdown
 - Rakefile
 - bin/console
+- bin/heroku_runner
 - bin/rest-assured
 - cucumber.yml
 - db/migrate/20110620161740_add_fixtures.rb
@@ -206,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2495133129201984062
+      hash: 4067297550795796735
 requirements: []
 rubyforge_project: rest-assured
 rubygems_version: 1.8.10