rest-assured 0.1.1 → 0.1.2

data/Gemfile

@@ -14,4 +14,7 @@ gem RUBY_VERSION =~ /^1\.8/ ? 'ruby-debug' : 'ruby-debug19'
 gem 'awesome_print'
 gem 'interactive_editor'
 gem 'launchy'
-#gem 'akephalos', git: 'https://github.com/Nerian/akephalos.git'
+gem 'rake'
+gem "spork", "> 0.9.0.rc"
+gem "guard-spork"
+gem 'sinatra-activerecord'

data/Guardfile

@@ -0,0 +1,10 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'spork', :cucumber_env => { 'RACK_ENV' => 'test' }, :rspec_env => { 'RACK_ENV' => 'test' } do
+  watch('Gemfile')
+  watch('Gemfile.lock')
+  watch('spec/spec_helper.rb')
+  watch(%r{features/support/.+\.rb$})
+  watch(%r{^lib/.+\.rb$})
+end

data/README.markdown

@@ -13,14 +13,14 @@ There are three main use cases:
 
 You are going to need ruby >= 1.8.7. Install gem and run:
 
-    avetia01:~% sudo gem install rest-assured # omit sudo if using rvm
-    avetia01:~% rest-assured &
+    bash$ sudo gem install rest-assured # omit sudo if using rvm
+    bash$ rest-assured &
 
 Or clone from github and run:
 
-    avetia01:~% git clone git@github.com:BBC/rest-assured.git
-    avetia01:~% cd rest-assured && bundle install # `gem install bundler` if command not found
-    avetia01:~% ./bin/rest-assured &
+    bash$ git clone git@github.com:BBC/rest-assured.git
+    bash$ cd rest-assured && bundle install # `gem install bundler` if command not found
+    bash$ ./bin/rest-assured &
 
 This starts an instance of rest-assured on port 4578 (changable with --port option) and creates rest-assured.db (changable with --database option) in the current directory. You can now access it via REST or web interfaces on http://localhost:4578
 
@@ -28,10 +28,10 @@ This starts an instance of rest-assured on port 4578 (changable with --port opti
 
 Double is a stub/mock of a particular external call. There is the following rest API for setting up doubles:
 
-* `POST '/doubles', { request_fullpath: path, content: content, method: method }`
+* `POST '/doubles', { fullpath: path, content: content, method: method }`
   Creates double with the following parameters:
 
-  - __request_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.
+  - __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. Mandatory.
   - __method__ - one of http the following http verbs: GET, POST, PUT, DELETE. Optional. GET is default.
 

data/features/support/env.rb

@@ -1,53 +1,61 @@
 $:.push File.expand_path('../../../lib', __FILE__)
-require 'rspec/expectations'
-require 'rack/test'
-require 'capybara'
-require 'capybara/firebug'
-require 'capybara/cucumber'
-require 'database_cleaner'
-
-ENV['RACK_ENV'] = 'test'
-
-require 'rest-assured'
-
-module RackHeaderHack
-  def set_headers(headers)
-    browser = page.driver.browser
-    def browser.env
-      @env.merge(super)
+require 'rubygems'
+require 'spork'
+
+Spork.prefork do
+  require 'rspec/expectations'
+  require 'rack/test'
+  require 'capybara'
+  require 'capybara/firebug'
+  require 'capybara/cucumber'
+  require 'database_cleaner'
+
+  ENV['RACK_ENV'] = 'test'
+
+  module RackHeaderHack
+    def set_headers(headers)
+      browser = page.driver.browser
+      def browser.env
+        @env.merge(super)
+      end
+      def browser.env=(env)
+        @env = env
+      end
+      browser.env = headers
     end
-    def browser.env=(env)
-      @env = env
-    end
-    browser.env = headers
   end
-end
 
-def app
-  RestAssured::Application
-end
-Capybara.app = app
+  Capybara.register_driver :selenium do |app|
+    profile = Selenium::WebDriver::Firefox::Profile.new
+    profile.enable_firebug
 
-Capybara.register_driver :selenium do |app|
-  profile = Selenium::WebDriver::Firefox::Profile.new
-  profile.enable_firebug
+    Capybara::Selenium::Driver.new(app, :browser => :firefox, :profile => profile) 
+  end
 
-  Capybara::Selenium::Driver.new(app, :browser => :firefox, :profile => profile) 
+  World(Capybara, Rack::Test::Methods, RackHeaderHack)
 end
 
-World(Capybara, Rack::Test::Methods, RackHeaderHack)
 
-DatabaseCleaner.strategy = :truncation
+Spork.each_run do
+  require 'rest-assured'
 
-Before do
-  DatabaseCleaner.start
-end
+  def app
+    RestAssured::Application
+  end
+  Capybara.app = app
 
-Before "@ui" do
-  set_headers "HTTP_USER_AGENT" => 'Firefox'
-end
+  DatabaseCleaner.strategy = :truncation
+
+  Before do
+    DatabaseCleaner.start
+  end
 
-After do
-  DatabaseCleaner.clean
+  Before "@ui" do
+    set_headers "HTTP_USER_AGENT" => 'Firefox'
+  end
+
+  After do
+    DatabaseCleaner.clean
+  end
 end
 

data/features/support/selenium-fix.rb

@@ -0,0 +1,8 @@
+# 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/rest-assured.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'sinatra/base'
 require 'haml'
 require 'sass'
-require 'sinatra/static_assets'
 #require 'sinatra/reloader'
 require 'rack-flash'
 require 'sinatra/partials'
@@ -28,12 +27,11 @@ module RestAssured
     enable :sessions
     use Rack::Flash, :sweep => true
 
-    set :public, File.expand_path('../../public', __FILE__)
+    set :public_folder, File.expand_path('../../public', __FILE__)
     set :views, File.expand_path('../../views', __FILE__)
     set :haml, :format => :html5
 
     helpers Sinatra::Partials
-    register Sinatra::StaticAssets
 
     helpers do
       def browser?

data/lib/rest-assured/init.rb

@@ -1,6 +1,6 @@
-require 'sinatra/activerecord'
-require 'meta_where'
+require 'active_record'
 require 'rest-assured/config'
+require 'logger'
 
 $app_logger = Logger.new(AppConfig[:log_file])
 $app_logger.level = Logger::DEBUG
@@ -15,7 +15,8 @@ ActiveRecord::Base.logger = if AppConfig[:environment] == 'production'
 
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
-  :database => AppConfig[:database]
+  :database => AppConfig[:database],
+  :timeout => 10000
 )
 
 ActiveRecord::Migrator.migrate(

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

@@ -12,8 +12,10 @@ class Double < ActiveRecord::Base
 
   private
     def toggle_active
-      if active && Double.where(:fullpath => fullpath, :active => true, :id.ne => id).exists?
-        Double.where(:fullpath => fullpath, :id.ne => id).update_all :active => false
+      ne = id ? '!=' : 'IS NOT'
+
+      if active && Double.where("fullpath = ? AND active = ? AND id #{ne} ?", fullpath, true, id).exists?
+        Double.where("fullpath = ? AND id #{ne} ?", fullpath, id).update_all :active => false
       end
     end
 

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

@@ -70,7 +70,7 @@ module RestAssured
       end
 
       router.delete '/doubles/all' do
-        Double.delete_all
+        status Double.delete_all ? 200 : 500
       end
     end
   end

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/rest-assured.gemspec

@@ -20,17 +20,12 @@ Gem::Specification.new do |s|
   s.executables           = ['rest-assured']
   s.require_paths         = ['lib']
 
-  s.add_dependency 'sinatra'
-  s.add_dependency 'rack-flash'
+  s.add_dependency 'sinatra', '>= 1.3.1'
+  s.add_dependency 'rack-flash', '>= 0.1.2'
   #s.add_dependency 'sinatra-reloader'
-  s.add_dependency 'haml'
-  s.add_dependency 'sass'
-  s.add_dependency 'sinatra-static-assets'
-  s.add_dependency 'thin'
+  s.add_dependency 'haml', '>= 3.1.3'
+  s.add_dependency 'sass', '>= 3.1.8'
   s.add_dependency 'activerecord', '~> 3.0.0'
-  s.add_dependency 'sinatra-activerecord'
-  s.add_dependency 'sqlite3'
-  s.add_dependency 'rake'
-  s.add_dependency 'meta_where'
+  s.add_dependency 'sqlite3', '>= 1.3.4'
 end
 

data/spec/models/double_spec.rb

@@ -26,6 +26,7 @@ describe Double do
       f3 = Double.create valid_params.merge(:fullpath => '/some/other/api')
 
       f1.reload.active.should be false
+      f2.reload.active.should be true
       f3.reload.active.should be true
     end
   end

data/spec/spec_helper.rb

@@ -1,47 +1,54 @@
-ENV['RACK_ENV'] = 'test'
-
 require 'rubygems'
-require File.expand_path('../../lib/rest-assured', __FILE__)
-require 'rspec'
-require 'shoulda-matchers'
-require 'capybara/rspec'
-require 'rack/test'
-require 'database_cleaner'
+require 'spork'
 
-Capybara.app = RestAssured::Application
+Spork.prefork do
+  require 'capybara/rspec'
+  require 'rack/test'
+  require 'database_cleaner'
 
-def app
-  RestAssured::Application
-end
+  ENV['RACK_ENV'] = 'test'
+
+  module XhrHelpers
+    def xhr(path, params = {})
+      verb = params.delete(:as) || :get
+      send(verb,path, params, "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest")
+    end
+    alias_method :ajax, :xhr
+  end
+
+  RSpec.configure do |c|
+    c.include Capybara::DSL
+    c.include Rack::Test::Methods
+    c.include XhrHelpers
 
-DatabaseCleaner.strategy = :truncation
+    c.before(:each) do
+      DatabaseCleaner.start
+    end
 
-module XhrHelpers
-  def xhr(path, params = {})
-    verb = params.delete(:as) || :get
-    send(verb,path, params, "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest")
+    c.after(:each) do
+      DatabaseCleaner.clean
+    end
+
+    c.before(:each, :ui => true) do
+      header 'User-Agent', 'Firefox'
+    end
+
+    c.before(:each, :ui => false) do
+      header 'User-Agent', nil
+    end
   end
-  alias_method :ajax, :xhr
 end
 
-RSpec.configure do |c|
-  c.include Capybara::DSL
-  c.include Rack::Test::Methods
-  c.include XhrHelpers
+Spork.each_run do
+  require File.expand_path('../../lib/rest-assured', __FILE__)
+  require 'shoulda-matchers'
 
-  c.before(:each) do
-    DatabaseCleaner.start
-  end
+  DatabaseCleaner.strategy = :truncation
 
-  c.after(:each) do
-    DatabaseCleaner.clean
-  end
+  Capybara.app = RestAssured::Application
 
-  c.before(:each, :ui => true) do
-    header 'User-Agent', 'Firefox'
+  def app
+    RestAssured::Application
   end
 
-  c.before(:each, :ui => false) do
-    header 'User-Agent', nil
-  end
 end

data/views/doubles/index.haml

@@ -1,5 +1,5 @@
 %h2 Doubles index
-%a= link_to 'New double', '/doubles/new'
+%a{:href => '/doubles/new'} New double
 %table
   %thead
     %tr
@@ -17,7 +17,7 @@
           %td.label.text-center
             %input.active-double-toggle{:type => 'radio', :name => fullpath, :checked => f.active, :data => { :double_id => f.id }}
           %td.edit-link.text-center.white-space-nowrap
-            = link_to 'Edit', "/doubles/#{f.id}/edit"
+            %a{:href => "/doubles/#{f.id}/edit"} Edit
             |
             %a.delete_link{:href => "/doubles/#{f.id}"} Delete
 

data/views/layout.haml

@@ -2,20 +2,22 @@
 %html
   %head
     %title= request.path_info[1..-1] + ' - REST assured'
-    = stylesheet_link_tag '/css/inuit.css'
-    = stylesheet_link_tag '/css/grid.inuit.css'
-    = stylesheet_link_tag '/css/base.css'
-    = stylesheet_link_tag '/css/jquery.jgrowl.css'
-    = stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/themes/base/jquery-ui.css'
-    = javascript_script_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js'
-    = javascript_script_tag 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js'
-    = javascript_script_tag '/javascript/jquery.jgrowl_minimized.js'
-    = javascript_script_tag '/javascript/application.js'
+    %link{:rel => 'stylesheet', :href => url('/css/inuit.css'), :type => 'text/css'}
+    %link{:rel => 'stylesheet', :href => url('/css/grid.inuit.css'), :type => 'text/css'}
+    %link{:rel => 'stylesheet', :href => url('/css/base.css'), :type => 'text/css'}
+    %link{:rel => 'stylesheet', :href => url('/css/jquery.jgrowl.css'), :type => 'text/css'}
+    %link{:rel => 'stylesheet', :href => 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/themes/base/jquery-ui.css', :type => 'text/css'}
+    %script{:src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js', :type => 'text/javascript'}
+    %script{:src => 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js', :type => 'text/javascript'}
+    %script{:src => url('/javascript/jquery.jgrowl_minimized.js'), :type => 'text/javascript'}
+    %script{:src => url('/javascript/application.js'), :type => 'text/javascript'}
   %body.wrapper
     %ul.nav
-      %li= link_to 'Doubles', '/doubles'
+      %li
+        %a{:href => '/doubles'} Doubles
       %li |
-      %li= link_to 'Redirects', '/redirects'
+      %li
+        %a{:href => '/redirects'} Redirects
 
     - if flash[:notice]
       .message.success= flash[:notice]

data/views/redirects/index.haml

@@ -1,5 +1,5 @@
 %h2 Redirects index
-%a= link_to 'New redirect', '/redirects/new'
+%a{:href => '/redirects/new'} New redirect
 %table#redirects
   %thead
     %tr
@@ -15,7 +15,7 @@
         %td= r.pattern
         %td= r.to
         %td.edit-link.text-center.white-space-nowrap
-          = link_to 'Edit', "/redirects/#{r.id}/edit"
+          %a{:href => "/redirects/#{r.id}/edit"} Edit
           |
           %a.delete_link{:href => "/redirects/#{r.id}"} Delete
 

metadata

@@ -1,148 +1,131 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rest-assured
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - Artem Avetisyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000 +01:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &2168546540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2168546540
-- !ruby/object:Gem::Dependency
-  name: rack-flash
-  requirement: &2168545960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *2168545960
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &2168545440 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack-flash
   prerelease: false
-  version_requirements: *2168545440
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &2168544980 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: haml
   prerelease: false
-  version_requirements: *2168544980
-- !ruby/object:Gem::Dependency
-  name: sinatra-static-assets
-  requirement: &2168544440 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        - 3
+        version: 3.1.3
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sass
   prerelease: false
-  version_requirements: *2168544440
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &2168536860 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 1
+        - 8
+        version: 3.1.8
   type: :runtime
-  prerelease: false
-  version_requirements: *2168536860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2168536240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2168536240
-- !ruby/object:Gem::Dependency
-  name: sinatra-activerecord
-  requirement: &2168535700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2168535700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &2168535100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *2168535100
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2168534540 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
   type: :runtime
-  prerelease: false
-  version_requirements: *2168534540
-- !ruby/object:Gem::Dependency
-  name: meta_where
-  requirement: &2168534000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2168534000
+  version_requirements: *id006
 description: 
-email:
+email: 
 - artem.avetisyan@bbc.co.uk
-executables:
+executables: 
 - rest-assured
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -167,6 +150,7 @@ files:
 - features/step_definitions/redirect_rules_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
+- features/support/selenium-fix.rb
 - lib/rest-assured.rb
 - lib/rest-assured/config.rb
 - lib/rest-assured/init.rb
@@ -207,32 +191,42 @@ files:
 - views/redirects/edit.haml
 - views/redirects/index.haml
 - views/redirects/new.haml
-has_rdoc: true
 homepage: https://github.com/BBC/rest-assured
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: rest-assured
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A tool for high level mocking/stubbing HTTP based REST services
-test_files:
+test_files: 
 - features/doubles_via_api.feature
 - features/doubles_via_ui.feature
 - features/persistence.feature
@@ -243,6 +237,7 @@ test_files:
 - features/step_definitions/redirect_rules_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
+- features/support/selenium-fix.rb
 - spec/functional/double_routes_spec.rb
 - spec/functional/redirect_routes_spec.rb
 - spec/models/double_spec.rb