rest-assured 0.1.0 → 0.1.1

data/README.markdown

@@ -13,13 +13,14 @@ There are three main use cases:
 
 You are going to need ruby >= 1.8.7. Install gem and run:
 
-    sudo gem install rest-assured # omit sudo if using rvm
-    rest-assured &
+    avetia01:~% sudo gem install rest-assured # omit sudo if using rvm
+    avetia01:~% rest-assured &
 
 Or clone from github and run:
 
-    git clone git@github.com:BBC/rest-assured.git
-    ./rest-assured/bin/rest-assured &
+    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 &
 
 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
 
@@ -47,7 +48,7 @@ Double is a stub/mock of a particular external call. There is the following rest
 
 ### Redirects
 
-It is sometimes desirable to only double certain calls while letting others through to the 'real' services. Meet Redirects. Kind of "rewrite rules" for requests that didn't match any double. Here is the resp API for managing redirects:
+It is sometimes desirable to only double certain calls while letting others through to the 'real' services. Meet Redirects. Kind of "rewrite rules" for requests that didn't match any double. Here is the rest API for managing redirects:
 
 * `POST '/redirects', { pattern: pattern, to: uri }` Creates redirect with the following parameters:
 
@@ -65,6 +66,10 @@ It is sometimes desirable to only double certain calls while letting others thro
 
 By default when you start rest-assured it creates (unless already exists) sqlite database and stores it into file in the current directory. This is good for using it for development - when you want doubles/redirects to persist across restarts - but may not be so desirable for using with tests, where you want each test run to start from blank slate. For that reason, you can specify `--database :memory:` so that database is kept in memory.
 
+### Logging
+
+It is sometimes useful to see what requests rest-assured is being hit. Either to explore what requests your app is making or to check that test setup is right and doubles indeed get returned. By default, when started, rest-assured creates log file in the current directory. This is configurable with `--logfile` option.
+
 ## TODO
 
 * Implement expectations

data/bin/rest-assured

@@ -17,6 +17,10 @@ OptionParser.new do |opts|
     AppConfig[:port] = port
   end
 
+  opts.on('-l', '--logfile FILENAME', "Path to logfile. Defaults to ./rest-assured.log") do |log_file|
+    AppConfig[:log_file] = log_file
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit

data/features/redirect_rules_via_ui.feature

@@ -41,8 +41,7 @@ Feature: manage redirects via ui
       | pattern  | to                    |
       | /some/remote.* | http://google.com/api |
 
-  # XXX This does not pass due to Capybara/Selelium broken drag and drop support
-  @javascript @pending
+  @javascript
   Scenario: reorder redirects
     Given the following redirects exist:
       | pattern  | to                     |

data/features/step_definitions/redirect_rules_steps.rb

@@ -57,6 +57,8 @@ When /^I reorder second redirect to be the first one$/ do
 end
 
 Then /^"([^"]*)" should be redirected to "([^"]*)"$/ do |missing_request, url|
+  pending('This does not pass due to Capybara/Selelium broken drag and drop support')
+
   get missing_request
   follow_redirect!
 

data/features/support/env.rb

@@ -5,7 +5,6 @@ require 'capybara'
 require 'capybara/firebug'
 require 'capybara/cucumber'
 require 'database_cleaner'
-require 'logger'
 
 ENV['RACK_ENV'] = 'test'
 
@@ -24,23 +23,6 @@ module RackHeaderHack
   end
 end
 
-def setup_logger
-  Logger.class_eval do
-     alias_method :write, :<<
-  end
-
-  logger = Logger.new(File.expand_path("../../../test.log", __FILE__))
-  logger.level = Logger::DEBUG
-
-  RestAssured::Application.class_eval do
-    use Rack::CommonLogger, logger
-  end
-
-  ActiveRecord::Base.logger = logger
-end
-
-setup_logger
-
 def app
   RestAssured::Application
 end

data/lib/rest-assured.rb

@@ -19,7 +19,11 @@ module RestAssured
 
     enable :method_override
 
+    Logger.class_eval do
+      alias_method :write, :<<
+    end
     enable :logging
+    use Rack::CommonLogger, $app_logger
 
     enable :sessions
     use Rack::Flash, :sweep => true

data/lib/rest-assured/config.rb

@@ -3,9 +3,14 @@ AppConfig = {
   :environment => ENV['RACK_ENV'] || 'production'
 }
 
-AppConfig[:database] = case AppConfig[:environment]
-                       when 'production'
+AppConfig[:database] = if AppConfig[:environment] == 'production'
                          './rest-assured.db'
                        else
                          File.expand_path("../../../db/#{AppConfig[:environment]}.db", __FILE__)
                        end
+
+AppConfig[:log_file] = if AppConfig[:environment] == 'production'
+                         './rest-assured.log'
+                       else
+                         File.expand_path("../../../#{AppConfig[:environment]}.log", __FILE__)
+                       end

data/lib/rest-assured/init.rb

@@ -2,6 +2,17 @@ require 'sinatra/activerecord'
 require 'meta_where'
 require 'rest-assured/config'
 
+$app_logger = Logger.new(AppConfig[:log_file])
+$app_logger.level = Logger::DEBUG
+
+# active record logging is purely internal
+# thus disabling it for production
+ActiveRecord::Base.logger = if AppConfig[:environment] == 'production'
+                              Logger.new(test('e', '/dev/null') ? '/dev/null' : 'NUL:')
+                            else
+                              $app_logger
+                            end
+
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
   :database => AppConfig[:database]

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

@@ -1,5 +1,5 @@
 class Redirect < ActiveRecord::Base
-  attr_accessible :pattern, :to
+  attr_accessible :pattern, :to, :position
 
   validates_presence_of :pattern, :to
   validates_uniqueness_of :position, :allow_blank => true

data/lib/rest-assured/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 +01:00
+date: 2011-09-18 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156510480 !ruby/object:Gem::Requirement
+  requirement: &2168546540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156510480
+  version_requirements: *2168546540
 - !ruby/object:Gem::Dependency
   name: rack-flash
-  requirement: &2156509960 !ruby/object:Gem::Requirement
+  requirement: &2168545960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156509960
+  version_requirements: *2168545960
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2156509480 !ruby/object:Gem::Requirement
+  requirement: &2168545440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156509480
+  version_requirements: *2168545440
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2156509060 !ruby/object:Gem::Requirement
+  requirement: &2168544980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156509060
+  version_requirements: *2168544980
 - !ruby/object:Gem::Dependency
   name: sinatra-static-assets
-  requirement: &2156508480 !ruby/object:Gem::Requirement
+  requirement: &2168544440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156508480
+  version_requirements: *2168544440
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2156508000 !ruby/object:Gem::Requirement
+  requirement: &2168536860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156508000
+  version_requirements: *2168536860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156507460 !ruby/object:Gem::Requirement
+  requirement: &2168536240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156507460
+  version_requirements: *2168536240
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
-  requirement: &2156495140 !ruby/object:Gem::Requirement
+  requirement: &2168535700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156495140
+  version_requirements: *2168535700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156494680 !ruby/object:Gem::Requirement
+  requirement: &2168535100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156494680
+  version_requirements: *2168535100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156494260 !ruby/object:Gem::Requirement
+  requirement: &2168534540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156494260
+  version_requirements: *2168534540
 - !ruby/object:Gem::Dependency
   name: meta_where
-  requirement: &2156493720 !ruby/object:Gem::Requirement
+  requirement: &2168534000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +132,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156493720
+  version_requirements: *2168534000
 description: 
 email:
 - artem.avetisyan@bbc.co.uk