lib/wink/schema.rb
test/schema_test.rb
@@ -49,7 +49,7 @@ namespace :db do
desc 'Create all database tables'
task :init => [ :environment ] do
- Database.create!
+ Database.create! :welcome => true
end
desc 'Drop all database tables'
@@ -57,6 +57,8 @@ namespace :db do
Database.drop!
end
+ task :reset => [ :drop, :init ]
+
end
Rakefile
@@ -1,5 +1,6 @@
require 'sinatra'
require 'wink/core_extensions'
+require 'wink/schema'
# Tell Sinatra to not automatically start a server.
set :run, false
lib/wink.rb
@@ -3,7 +3,7 @@
require 'date'
require 'time'
-class DateTime
+class DateTime #:nodoc:
# ISO 8601 formatted time value. This is
alias_method :iso8601, :to_s
@@ -12,7 +12,7 @@ class DateTime
end
end
-class Date
+class Date #:nodoc:
def inspect
"#<Date: #{to_s}>"
end
@@ -61,7 +61,7 @@ end
gem 'datamapper', '=0.2.5'
require 'data_mapper'
-class DataMapper::Database
+class DataMapper::Database #:nodoc:
class Logger < ::Logger
def format_message(sev, date, message, progname)
@@ -77,27 +77,4 @@ class DataMapper::Database
logger
end
- # Acts exactly like Database#setup but runs exactly once. Multiple calls
- # to Database#setup result in multiple database connections being
- # established.
- def self.configure(options={})
- setup(options) unless reloading?
- end
-
- def self.create!(options={})
- require 'wink/models'
- [ Entry, Comment, Tag, Tagging ].each do |model|
- model.table.create! options[:force]
- end
- end
-
- def self.drop!
- require 'wink/models'
- [ Entry, Comment, Tag, Tagging ].each do |model|
- model.table.drop!
- end
- end
-
end
-
-Database = DataMapper::Database
lib/wink/core_extensions.rb
@@ -87,11 +87,10 @@ describe 'Rack::Request#remote_ip' do
end
-describe 'Database' do
+describe 'Database (DEPRECATED)' do
- it 'is defined as shortcut to DataMapper::Database' do
+ it 'is defined' do
Object.const_defined?(:Database).should.be.truthful
- Database.should.be DataMapper::Database
end
it 'responds to ::configure, ::create!, and ::drop!' do
test/core_extensions_test.rb
@@ -18,18 +18,17 @@ require 'sinatra/test/spec'
gem 'do_sqlite3', '=0.2.5'
require 'do_sqlite3'
+Database.configure \
+ :adapter => 'sqlite3',
+ :database => 'wink_test.sqlite3'
+
Wink.configure do
set :env, :test
set :url, 'http://test.local'
set :author, 'John Doe'
set :log_stream, File.open('test.log', 'wb')
-
- Database.configure \
- :adapter => 'sqlite3',
- :database => 'wink_test.sqlite3'
end
-
class Test::Unit::TestCase
def setup_database
test/help.rb
2ec031ba28f6a97c212cb66067c85e2caaa5ecc0
Ryan Tomayko
rtomayko@gmail.com
http://github.com/rtomayko/wink/commit/e527c7853fe866e853cb30fe453cea2fac32e11d
e527c7853fe866e853cb30fe453cea2fac32e11d
2008-05-29T14:35:57-07:00
2008-05-27T23:35:16-07:00
Add Wink::Schema for database creation, migration, etc.
A welcome entry is created with the initial database schema now.
The top-level Database object will be going away soon. Most methods
have moved to Wink::Schema.
114b2549b42a56c5985af9bb1dab4a4efd334b63
Ryan Tomayko
rtomayko@gmail.com