@@ -12,7 +12,7 @@ Saloon ## Running the tests - gem install test-spec mocha + gem install sr-couchy test-spec mocha rake database:redo test ## Status README.markdown @@ -1,14 +1,12 @@ -$: << File.dirname(__FILE__) + '/vendor/couchrest/lib' - require 'rubygems' require 'rake/testtask' require 'rcov/rcovtask' -require 'couch_rest' +require 'couchy' DatabaseName = 'saloonrb' CollectionId = 'my_collection' -$couch = CouchRest.new +$couch = Couchy.new $database = $couch.database(DatabaseName) desc 'Default: run all tests' @@ -29,8 +27,7 @@ namespace :test do report = Tempfile.new('saloon') validator.report(report) report.close - `open file://#{report.path}` - Process.kill('KILL', $pid) + `firefox --new-tab file://#{report.path}` Process.kill('KILL', app_pid) end @@ -48,7 +45,7 @@ namespace :test do task :app do unless app_pid - $pid = fork { `ruby lib/app.rb -p1234` } + fork { `ruby lib/app.rb -p1234` } sleep 2 end end @@ -56,7 +53,7 @@ namespace :test do def app_pid found = `ps ax`.grep(/ruby lib\/app\.rb/) return nil if found.empty? - found.first.lstrip[0..3].to_i + found.first.lstrip[/^(\d+)/] && $1.to_i end end @@ -129,7 +126,7 @@ namespace :database do desc 'Create views' task :views do - sh File.dirname(__FILE__) + "/vendor/couchrest/bin/couch-view-push -a #{DatabaseName}" + sh "couchy push views #{DatabaseName} --force" end end end Rakefile @@ -1,7 +1,5 @@ -$:.unshift File.dirname(__FILE__) + '/../vendor/couchrest/lib' - require 'rubygems' -require 'couch_rest' +require 'couchy' require 'atom/service' require 'atom/collection' require 'atom/entry' @@ -59,7 +57,7 @@ class Store document = database.save(entry.to_doc) # TODO: remove that hack - entry.edit_url = (collection['value']['base'] + '/').to_uri.join(document['id']).to_s + entry.edit_url = (collection['value']['base'] + '/').to_uri.join(document['id'].to_s).to_s database.save entry.to_doc.update( '_id' => document['id'], '_rev' => document['rev'], @@ -97,7 +95,7 @@ class Store private def database - @database ||= CouchRest.new.database(database_name) + @database ||= Couchy.new.database(database_name) end def get(view, key) lib/store.rb @@ -41,7 +41,7 @@ describe 'Store' do specify '#database returns a new CouchRest::Database object' do Store.class_eval { public :database } store = Store.new(TestDatabase) - store.database.should.be.an.instance_of(CouchRest::Database) + store.database.should.be.an.instance_of(Couchy::Database) store.database.name.should.equal TestDatabase end test/store_test.rb @@ -1,4 +1,3 @@ -$: << File.expand_path(File.dirname(__FILE__) + '/../vendor/sinatra/lib') require 'rubygems' require 'sinatra' require 'sinatra/test/spec' test/test_helper.rb 33604bc27ba299fdafb6f9277a9bb4607d756285 Simon Rozet simon@rozet.name http://github.com/sr/saloon/commit/3304a3f5a069f40b9e0cadd02479f8486ab18ab4 3304a3f5a069f40b9e0cadd02479f8486ab18ab4 2008-11-16T09:07:47-08:00 2008-11-16T09:07:47-08:00 switch to couchy 0311d630174510b57ec4d8a342fc5f36250d63b4 Simon Rozet simon@rozet.name