rest-assured 0.2.0.rc5 → 0.2.0.rc7

data/.gitignore

@@ -1,6 +1,5 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*
 bundle_bin
 *.db

data/Gemfile

@@ -17,4 +17,7 @@ gem 'launchy'
 gem 'rake'
 gem "spork", "> 0.9.0.rc"
 gem "guard-spork"
+gem 'rb-fsevent' if RUBY_PLATFORM =~ /darwin/
 gem 'sinatra-activerecord'
+gem 'mysql'
+gem 'sqlite3', '~> 1.3.4'

data/Gemfile.lock

@@ -0,0 +1,144 @@
+PATH
+  remote: .
+  specs:
+    rest-assured (0.2.0.rc6)
+      activerecord (~> 3.1.0)
+      activeresource (~> 3.1.0)
+      haml (>= 3.1.3)
+      rack-flash (>= 0.1.2)
+      sass (>= 3.1.8)
+      sinatra (>= 1.3.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    arel (2.2.1)
+    awesome_print (0.4.0)
+    builder (3.0.0)
+    capybara (1.1.1)
+      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 (0.0.10)
+      capybara (~> 1.0)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    columnize (0.3.4)
+    cucumber (1.1.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    database_cleaner (0.6.7)
+    diff-lcs (1.1.3)
+    ffi (1.0.9)
+    gherkin (2.5.4)
+      json (>= 1.4.6)
+    guard (0.8.8)
+      thor (~> 0.14.6)
+    guard-spork (0.3.1)
+      guard (>= 0.8.4)
+      spork (>= 0.8.4)
+    haml (3.1.3)
+    i18n (0.6.0)
+    interactive_editor (0.0.10)
+      spoon (>= 0.0.1)
+    json (1.6.1)
+    json_pure (1.6.1)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    mysql (2.8.1)
+    nokogiri (1.5.0)
+    rack (1.3.5)
+    rack-flash (0.1.2)
+      rack
+    rack-protection (1.1.4)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rb-fsevent (0.4.3.1)
+    rbx-require-relative (0.0.5)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.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)
+    rubyzip (0.9.4)
+    sass (3.1.10)
+    selenium-webdriver (2.9.1)
+      childprocess (>= 0.2.1)
+      ffi (= 1.0.9)
+      json_pure
+      rubyzip
+    shoulda-matchers (1.0.0.beta3)
+    sinatra (1.3.1)
+      rack (>= 1.3.4, ~> 1.3)
+      rack-protection (>= 1.1.2, ~> 1.1)
+      tilt (>= 1.3.3, ~> 1.3)
+    sinatra-activerecord (0.1.3)
+      sinatra (>= 0.9.4)
+    spoon (0.0.1)
+    spork (0.9.0.rc9)
+    sqlite3 (1.3.4)
+    term-ansicolor (1.0.7)
+    thor (0.14.6)
+    tilt (1.3.3)
+    tzinfo (0.3.30)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  capybara
+  capybara-firebug
+  cucumber
+  database_cleaner
+  guard-spork
+  interactive_editor
+  launchy
+  mysql
+  rack-test
+  rake
+  rb-fsevent
+  rest-assured!
+  rspec
+  ruby-debug
+  shoulda-matchers
+  sinatra-activerecord
+  spork (> 0.9.0.rc)
+  sqlite3 (~> 1.3.4)

data/bin/rest-assured

@@ -9,10 +9,22 @@ require 'rest-assured/config'
 OptionParser.new do |opts|
   opts.banner = "Usage: rest-assured [options]"
 
+  opts.on('-a', '--adapter mysql|sqlite') do |adapter|
+    AppConfig[:adapter] = adapter
+  end
+
   opts.on('-d', '--database FILENAME', "Path to database file. Defaults to ./rest-assured.db. There is a special value ':memory:' for in memory database.") do |fname|
     AppConfig[:database] = fname
   end
 
+  opts.on('--user', "Db username") do |uname|
+    AppConfig[:db_user] = uname
+  end
+
+  opts.on('--password', 'Db password') do |password|
+    AppConfig[:db_password] = password
+  end
+
   opts.on('-p', '--port PORT', Integer, "Server port. Defaults to 4578") do |port|
     AppConfig[:port] = port
   end

data/features/doubles_via_api.feature

@@ -3,7 +3,6 @@ Feature: use doubles via api
   As a developer
   I want to mock rest services my app is consuming from
 
-  @now
   Scenario Outline: create double
     When I create a double with "<fullpath>" as fullpath, "<content>" as response content, "<verb>" as request verb and status as "<status>"
     Then there should be 1 double with "<fullpath>" as fullpath, "<content>" as response content, "<result_verb>" as request verb and status as "<result_status>"

data/features/step_definitions/doubles_steps.rb

@@ -122,6 +122,7 @@ When /^I make (first|second) double active$/ do |ord|
 end
 
 Then /^(first|second) double should be served$/ do |ord|
+  sleep 0.1 # allow time for change to end up in the db
   f = instance_variable_get('@' + ord)
   get f.fullpath
   last_response.body.should == f.content

data/features/support/env.rb

@@ -38,6 +38,9 @@ end
 
 
 Spork.each_run do
+  require 'rest-assured/config'
+  AppConfig[:adapter] = 'mysql'
+
   require 'rest-assured'
   require 'rest-assured/client'
   require File.expand_path('../test-server', __FILE__)
@@ -71,6 +74,7 @@ Spork.each_run do
   end
 
   After do
+    sleep 0.1
     DatabaseCleaner.clean
   end
 end

data/features/support/test-server.rb

@@ -13,7 +13,7 @@ class TestServer
       if get_pid
         print "\nPrevious TestServer instance appears to be running. Will be using it."
       else
-        Process.exec("bundle exec rest-assured -p #{@server_port}")
+        Process.exec("bundle exec rest-assured -p #{@server_port} -a mysql")
       end
     end
 

data/lib/rest-assured.rb

@@ -4,6 +4,7 @@ require 'haml'
 require 'sass'
 require 'rack-flash'
 require 'sinatra/partials'
+require 'active_record'
 require 'rest-assured/init'
 require 'rest-assured/models/double'
 require 'rest-assured/models/redirect'
@@ -43,6 +44,11 @@ module RestAssured
     include DoubleRoutes
     include RedirectRoutes
 
+    #before do
+      #ActiveRecord::Base.clear_reloadable_connections!
+      #ActiveRecord::Base.clear_cache! 
+    #end
+
     get '/css/base.css' do
       scss :base
     end

data/lib/rest-assured/client.rb

@@ -1,3 +1,5 @@
+require 'rest-assured/client/resources'
+
 module RestAssured
   module Client
     class Config
@@ -13,5 +15,3 @@ module RestAssured
     end
   end
 end
-
-require 'rest-assured/client/resources'

data/lib/rest-assured/client/resources.rb

@@ -1,7 +1,8 @@
 require 'active_resource'
-require 'uri'
 
-module RestAssured::Client
-  class Double < ActiveResource::Base
+module RestAssured
+  module Client
+    class Double < ActiveResource::Base
+    end
   end
 end

data/lib/rest-assured/config.rb

@@ -1,14 +1,11 @@
+#default config values are set here
+
 AppConfig = {
   :port => 4578,
-  :environment => ENV['RACK_ENV'] || 'production'
+  :environment => ENV['RACK_ENV'] || 'production',
+  :adapter => 'sqlite'
 }
 
-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

data/lib/rest-assured/init.rb

@@ -1,25 +1,78 @@
 require 'active_record'
-require 'active_record/leak_connection_patch'
+#require 'active_record/leaky_connections_patch'
+#require 'active_record/sqlite_transaction_hell_patch'
 require 'rest-assured/config'
 require 'logger'
+require 'active_support/core_ext/kernel/reporting'
 
-$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],
-  :timeout => 10000
-)
-
-ActiveRecord::Migrator.migrate(
-  File.expand_path('../../../db/migrate', __FILE__)
-)
+module RestAssured
+  class Init
+    def self.init!
+      setup_logger
+      connect_db
+      migrate_db
+    end
+
+    private
+      def self.build_db_config
+        if AppConfig[:adapter] =~ /sqlite/i
+          AppConfig[:database] ||= if AppConfig[:environment] == 'production'
+                                     './rest-assured.db'
+                                   else
+                                     File.expand_path("../../../db/#{AppConfig[:environment]}.db", __FILE__)
+                                   end
+          {
+            :adapter => 'sqlite3',
+            :database => AppConfig[:database]
+          }
+        elsif AppConfig[:adapter] =~ /mysql/i
+          AppConfig[:database] ||= if AppConfig[:environment] != 'production'
+                                     "rest_assured_#{AppConfig[:environment]}"
+                                   else
+                                     'rest_assured'
+                                   end
+          AppConfig[:db_user] ||= 'root'
+
+          {
+            :adapter => 'mysql',
+            :reconnect => true,
+            :user => AppConfig[:db_user],
+            :password => AppConfig[:db_password],
+            :database => AppConfig[:database]
+          }
+        else
+          raise "Unsupported db adapter '#{AppConfig[:adapter]}'. Valid adapters are sqlite and mysql"
+        end
+      end
+
+      def self.connect_db
+        config = build_db_config
+        ActiveRecord::Base.establish_connection config
+      end
+
+      def self.migrate_db
+        migrate = lambda { ActiveRecord::Migrator.migrate(File.expand_path('../../../db/migrate', __FILE__)) }
+
+        if AppConfig[:environment] == 'production' && Kernel.respond_to?(:silence)
+          silence(:stdout, &migrate)
+        else
+          migrate.call
+        end
+      end
+
+      def self.setup_logger
+        $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
+      end
+  end
+
+  Init.init!
+end

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

@@ -15,7 +15,7 @@ class Double < ActiveRecord::Base
   before_validation :set_status
   after_destroy :set_active
 
-  has_many :requests
+  has_many :requests, :dependent => :destroy
 
   private
     def toggle_active

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

@@ -2,7 +2,6 @@ class Redirect < ActiveRecord::Base
   attr_accessible :pattern, :to, :position
 
   validates_presence_of :pattern, :to
-  validates_uniqueness_of :position, :allow_blank => true
 
   scope :ordered, order('position')
 
@@ -13,15 +12,14 @@ class Redirect < ActiveRecord::Base
 
     transaction do
       begin
-        update_all :position => nil
-
         ordered_redirect_ids.each_with_index do |r_id, idx|
           r = find(r_id)
           r.position = idx
           r.save!
         end
-      rescue
+      rescue => e
         # TODO log exception
+        puts e.inspect
         success = false
         raise ActiveRecord::Rollback
       end

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

@@ -66,6 +66,9 @@ module RestAssured
         end
       end
 
+      router.delete '/redirects/all' do
+        status Redirect.delete_all ? 200 : 500
+      end
     end
   end
 end

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '0.2.0.rc5'
+  VERSION = '0.2.0.rc7'
 end

data/rest-assured.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'haml', '>= 3.1.3'
   s.add_dependency 'sass', '>= 3.1.8'
   s.add_dependency 'activerecord', '~> 3.1.0'
-  s.add_dependency 'sqlite3', '>= 1.3.4'
-  s.add_dependency 'activeresource'
+  s.add_dependency 'activeresource', '~> 3.1.0'
 end
 

data/spec/client/resource_double_spec.rb

@@ -20,13 +20,16 @@ module RestAssured::Client
 
     it 'creates new double' do
       d = Double.create :fullpath => '/some/api', :content => 'content'
-      ::Double.where(:id => d.id).should exist
+      ::Double.where(:fullpath => d.fullpath, :content => d.content).should exist
     end
 
     it 'finds exising double' do
       d = ::Double.create :fullpath => '/some/api', :content => 'content'
 
-      Double.find(d.id).id.should be d.id
+      dd = Double.find(d.id)
+
+      dd.fullpath.should == d.fullpath
+      dd.content.should == d.content
     end
 
     it 'shows request history' do

data/spec/models/redirect_spec.rb

@@ -11,8 +11,6 @@ describe Redirect do
   it { should allow_mass_assignment_of(:pattern) }
   it { should allow_mass_assignment_of(:to) }
   it { should allow_mass_assignment_of(:position) }
-  # commented out since it doesn't work with :allow_blank => true
-  #it { should validate_uniqueness_of(:position) }
 
   it 'assigns incremental position on create' do
     r1 = Redirect.create :pattern => '.*', :to => 'someurl'

data/spec/spec_helper.rb

@@ -43,6 +43,9 @@ Spork.prefork do
 end
 
 Spork.each_run do
+  require 'rest-assured/config'
+  AppConfig[:adapter] = 'mysql'
+
   require 'rest-assured'
   require 'rest-assured/client'
   require 'shoulda-matchers'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rest-assured
 version: !ruby/object:Gem::Version 
-  hash: 15424063
+  hash: 15424059
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - rc
-  - 5
-  version: 0.2.0.rc5
+  - 7
+  version: 0.2.0.rc7
 platform: ruby
 authors: 
 - Artem Avetisyan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -99,36 +99,22 @@ dependencies:
         version: 3.1.0
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
-        version: 1.3.4
-  type: :runtime
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: activeresource
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 3
+        - 1
         - 0
-        version: "0"
+        version: 3.1.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 description: 
 email: 
 - artem.avetisyan@bbc.co.uk
@@ -141,6 +127,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.markdown
@@ -162,7 +149,6 @@ files:
 - features/call_history.feature
 - features/doubles_via_api.feature
 - features/doubles_via_ui.feature
-- features/persistence.feature
 - features/redirect_rules_via_api.feature
 - features/redirect_rules_via_ui.feature
 - features/step_definitions/call_history_steps.rb
@@ -173,10 +159,9 @@ files:
 - features/support/env.rb
 - features/support/selenium-fix.rb
 - features/support/test-server.rb
-- lib/active_record/leak_connection_patch.rb
+- lib/active_record/leaky_connections_patch.rb
 - lib/rest-assured.rb
 - lib/rest-assured/client.rb
-- lib/rest-assured/client/double.rb
 - lib/rest-assured/client/resources.rb
 - lib/rest-assured/config.rb
 - lib/rest-assured/init.rb
@@ -264,7 +249,6 @@ test_files:
 - features/call_history.feature
 - features/doubles_via_api.feature
 - features/doubles_via_ui.feature
-- features/persistence.feature
 - features/redirect_rules_via_api.feature
 - features/redirect_rules_via_ui.feature
 - features/step_definitions/call_history_steps.rb

data/features/persistence.feature

@@ -1,24 +0,0 @@
-Feature: Persistence
-  In order to persist fixtrures/redirects between service restarts
-  As a developer
-  I want to be able to specify persistent storage
-
-  Scenario: default storage
-    Given I start service without --database option
-    And I register "/api/something" as fullpath and "content" as response content
-    And I restart service without --database option
-    When I request "/api/something"
-    Then I should get 404 in response status
-
-  Scenario Outline: specify storage
-    Given I start service with --database "<db>" option
-    And I register "/api/something" as fullpath and "content" as response content
-    And I restart service with --database "<db2>" option
-    When I request "/api/something"
-    Then I should get <status> in response status
-
-    Examples:
-      | db               | db2              | status |
-      | database.db      | database.db      | 200    |
-      | /tmp/database.db | /tmp/database.db | 200    |
-      | database.db      | database2.db     | 404    |

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

@@ -1,9 +0,0 @@
-require 'active_resource'
-
-module RestAssured
-  module Client
-    class Double < ActiveResource::Base
-      self.site = RestAssured.config.server_address
-    end
-  end
-end