@@ -1,5 +1,11 @@ # Various extensions to core and library classes. +# TODO move gem declarations elsewhere +gem 'dm-core', '= 0.9.5' +gem 'dm-validations', '= 0.9.5' +gem 'dm-ar-finders', '= 0.9.5' +require 'dm-core' + require 'date' require 'time' @@ -10,6 +16,16 @@ class DateTime #:nodoc: def inspect "#<DateTime: #{to_s}>" end + def to_date + Date.civil(year, mon, mday) + end + def to_time + if self.offset == 0 + ::Time.utc(year, month, day, hour, min, sec) + else + new_offset(0).to_time + end + end end class Date #:nodoc: @@ -18,6 +34,16 @@ class Date #:nodoc: end end +class Time + def to_datetime + jd = DateTime.civil_to_jd(year, mon, mday, DateTime::ITALY) + fr = DateTime.time_to_day_fraction(hour, min, [sec, 59].min) + + usec.to_r/86400000000 + of = utc_offset.to_r/86400 + DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY) + end +end + require 'rack' module Rack @@ -47,10 +73,3 @@ end def reloading? Sinatra.application.reloading? end - -# datamapper-0.2.5 is incompatible with do_mysql-0.9.2 -gem 'do_mysql', '=0.2.4' -require 'do_mysql' - -gem 'datamapper', '=0.2.5' -require 'data_mapper' lib/wink/core_extensions.rb @@ -1,32 +1,42 @@ +require 'dm-core' +require 'dm-validations' +require 'dm-ar-finders' require 'wink' +class InvalidRecord < Exception +end + class Entry - include DataMapper::Persistence - - property :id, :integer, :serial => true - property :slug, :string, :size => 255, :nullable => false, :index => :unique - property :type, :class, :nullable => false, :index => true - property :published, :boolean, :default => false - property :title, :string, :size => 255, :nullable => false - property :summary, :text, :lazy => false - property :filter, :string, :size => 20, :default => 'markdown' - property :url, :string, :size => 255 - property :created_at, :datetime, :nullable => false, :index => true - property :updated_at, :datetime, :nullable => false - property :body, :text - - validates_presence_of :title, :slug, :filter - - has_many :comments, + include DataMapper::Resource + + property :id, Integer, :serial => true + + property :slug, String, :size => 255, :nullable => false, :index => :unique + property :type, Discriminator, :index => true + property :published, Boolean, :default => false + property :title, String, :size => 255, :nullable => false + property :summary, Text, :lazy => false + property :filter, String, :size => 20, :default => 'markdown' + property :url, String, :size => 255 + property :created_at, DateTime, :nullable => false, :index => true + property :updated_at, DateTime, :nullable => false + property :body, Text + + validates_present :title, :slug, :filter + + has n, :comments, :spam.not => true, - :order => 'created_at ASC' + :order => [:created_at.asc] + + has n, :taggings + has n, :tags, :through => :taggings - has_and_belongs_to_many :tags, - :join_table => 'taggings' + before(:save) { self.updated_at = DateTime.now } def initialize(attributes={}) - @created_at = DateTime.now - @filter = 'markdown' + self.created_at = DateTime.now + self.updated_at = self.created_at + self.filter = 'markdown' super yield self if block_given? end @@ -47,12 +57,12 @@ class Entry def created_at=(value) value = value.to_datetime if value.respond_to?(:to_datetime) - @created_at = value + attribute_set :created_at, value end def updated_at=(value) value = value.to_datetime if value.respond_to?(:to_datetime) - @updated_at = value + attribute_set :updated_at, value end def published? @@ -62,7 +72,7 @@ class Entry def published=(value) value = ! ['false', 'no', '0', ''].include?(value.to_s) self.created_at = self.updated_at = DateTime.now if value && draft? && !new_record? - @published = value + attribute_set :published, value end def publish! @@ -79,31 +89,39 @@ class Entry end def tag_names=(value) - tags.clear + taggings.clear tag_names = if value.respond_to?(:to_ary) value.to_ary + elsif value.nil? + [] elsif value.respond_to?(:to_str) value.split(/[\s,]+/) end - tag_names.uniq.each do |tag_name| - tag = Tag.find_or_create(:name => tag_name) - tags << tag - end + tag_names.uniq.each { |tag_name| tag! tag_name } end def tag_names - tags.collect { |t| t.name } + taggings.collect { |t| t.tag.name } + end + + def tag!(tag_name) + if tag = Tag.find_or_create(:name => tag_name) + tagging = Tagging.new(:tag => tag) + taggings << tagging + # tags.reload! + tagging + end end def self.published(options={}) - options = { :order => 'created_at DESC', :published => true }. + options = { :order => [:created_at.desc], :published => true }. merge(options) all(options) end def self.drafts(options={}) - options = { :order => 'created_at DESC', :published => false }. + options = { :order => [:created_at.desc], :published => false }. merge(options) all(options) end @@ -112,7 +130,7 @@ class Entry options = { :created_at.gte => Date.new(year, 1, 1), :created_at.lt => Date.new(year + 1, 1, 1), - :order => 'created_at ASC' + :order => [:created_at.asc] }.merge(options) published(options) end @@ -128,28 +146,10 @@ class Entry # The most recently published Entry (or specific subclass when called on # Article, Bookmark, or other Entry subclass). def self.latest(options={}) - first({ :order => 'created_at DESC', :published => true }.merge(options)) - end - - # XXX The following two methods shouldn't be necessary but DM isn't adding - # the type condition. - - def self.first(options={}) #:nodoc: - return super if self == Entry - options = { :type => ([self] + self::subclasses.to_a) }. - merge(options) - super(options) - end - - def self.all(options={}) #:nodoc: - return super if self == Entry - options = { :type => ([self] + self::subclasses.to_a) }. - merge(options) - super(options) + first({ :order => [:created_at.desc], :published => true }.merge(options)) end - # XXX neither ::create or ::create! pass the block parameter to ::new so - # we need to override to fix that. + # XXX neither ::create or ::create! pass the block parameter to ::new def self::create(attributes={}, &block) #:nodoc: instance = new(attributes, &block) @@ -159,7 +159,7 @@ class Entry def self::create!(attributes={}, &block) #:nodoc: instance = create(attributes, &block) - raise DataMapper::InvalidRecord, instance if instance.errors.any? + raise InvalidRecord, instance.errors.inspect if instance.errors.any? instance end @@ -236,20 +236,21 @@ end class Tag - include DataMapper::Persistence + include DataMapper::Resource - property :id, :integer, :serial => true - property :name, :string, :nullable => false, :index => :unique - property :created_at, :datetime, :nullable => false - property :updated_at, :datetime, :nullable => false + property :id, Integer, :serial => true + property :name, String, :nullable => false, :index => :unique + property :created_at, DateTime, :nullable => false + property :updated_at, DateTime, :nullable => false - validates_uniqueness_of :name + validates_is_unique :name alias_method :to_s, :name - has_and_belongs_to_many :entries, + has n, :taggings + has n, :entries, + :through => :taggings, :conditions => { :published => true }, - :order => "(entries.type = 'Bookmark') ASC, entries.created_at DESC", - :join_table => 'taggings' + :order => [:created_at.desc] # When key is a String or Symbol, find a Tag by name; when key is an # Integer, find a Tag by id. @@ -260,49 +261,60 @@ class Tag else raise TypeError, "String, Symbol, or Integer key expected" end end + + def initialize(*args) + self.updated_at = DateTime.now + self.created_at ||= self.updated_at + super + end + end -class Tagging #:nodoc: - include DataMapper::Persistence +class Tagging + include DataMapper::Resource + + property :id, Integer, :serial => true belongs_to :entry belongs_to :tag - index [:entry_id] - index [:tag_id] end class Comment - include DataMapper::Persistence - - property :id, :integer, :serial => true - property :author, :string, :size => 80 - property :ip, :string, :size => 50 - property :url, :string, :size => 255 - property :body, :text, :nullable => false, :lazy => false - property :created_at, :datetime, :nullable => false, :index => true - property :referrer, :string, :size => 255 - property :user_agent, :string, :size => 255 - property :checked, :boolean, :default => false - property :spam, :boolean, :default => false, :index => true - + include DataMapper::Resource + + property :id, Integer, :serial => true + property :author, String, :size => 80 + property :ip, String, :size => 50 + property :url, String, :size => 255 + property :body, Text, :nullable => false, :lazy => false + property :created_at, DateTime, :nullable => false, :index => true + property :referrer, String, :size => 255 + property :user_agent, String, :size => 255 + property :checked, Boolean, :default => false + property :spam, Boolean, :default => false, :index => true + + property :entry_id, Integer, :index => true belongs_to :entry - index [ :entry_id ] - validates_presence_of :body, :entry_id + validates_present :body, :entry_id - before_create do |comment| - comment.check - true + before :create do + check + end + + def initialize(*args, &b) + self.created_at = DateTime.now + super end def self.ham(options={}) - all({:spam.not => true, :order => 'created_at DESC'}.merge(options)) + all({:spam.not => true, :order => [:created_at.desc]}.merge(options)) end def self.spam(options={}) - all({:spam => true, :order => 'created_at DESC'}.merge(options)) + all({:spam => true, :order => [:created_at.desc]}.merge(options)) end def excerpt(length=65) @@ -312,15 +324,17 @@ class Comment def body=(text) # the first sub autolinks URLs when on line by itself; the second sub # disables escapes markdown's headings when followed by a number. - @body = text.to_s - @body.gsub!(/^https?:\/\/\S+$/, '<\&>') - @body.gsub!(/^(\s*)(#\d+)/) { [$1, "\\", $2].join } - @body.gsub!(/\r/, '') + text = text.to_s + text.gsub!(/^https?:\/\/\S+$/, '<\&>') + text.gsub!(/^(\s*)(#\d+)/) { [$1, "\\", $2].join } + text.gsub!(/\r/, '') + attribute_set :body, text end def url # TODO move this kind of logic into the setter - @url.strip unless @url.to_s.strip.blank? + return nil if attribute_get(:url).to_s.strip.blank? + attribute_get(:url).to_s.strip end def author_link @@ -337,22 +351,22 @@ class Comment end def author - if @author.blank? + if (author = attribute_get(:author)).blank? 'Anonymous Coward' else - @author + author end end # Check the comment with Akismet. The spam attribute is updated to reflect # whether the spam was detected or not. def check - return true if @checked - @checked = true - @spam = blacklisted? || akismet(:check) || false + return true if checked + self.checked = true + self.spam = blacklisted? || akismet(:check) || false rescue => boom logger.error "An error occured while connecting to Akismet: #{boom.to_s}" - @checked = false + self.checked = false end # Check the comment with Akismet and immediately save the comment. @@ -374,7 +388,7 @@ class Comment # Mark this comment as Spam and immediately save the comment. If Akismet is # enabled, the comment is submitted as spam. def spam! - @checked = @spam = true + self.checked = self.spam = true akismet :spam! save end @@ -388,7 +402,7 @@ class Comment # Mark this comment as Ham and immediately save the comment. If Akismet is # enabled, the comment is submitted as Ham. def ham! - @checked, @spam = true, false + self.checked, self.spam = true, false akismet :ham! save end lib/wink/models.rb @@ -9,8 +9,8 @@ module Wink # Configure the default DataMapper database. This method delegates to # DataMapper::Database::setup but guards against Sinatra reloading. - def configure(options) - DataMapper::Database.setup(options) unless reloading? + def configure(*options) + DataMapper.setup(*options) unless reloading? end # Create the database schema using the current default DataMapper @@ -19,14 +19,15 @@ module Wink # tables already exist. def create!(options={}) force = !! options[:force] - model_classes.each { |model| model.table.create!(force) } + model_classes.each { |model| model.auto_migrate! } create_welcome_entry! if options[:welcome] true end # Drop all Wink tables from the current default DataMapper database. def drop! - model_classes.each { |model| model.table.drop! } + model_classes.each do |model| + end true end @@ -35,20 +36,20 @@ module Wink def create_welcome_entry! remove_welcome_entry! Article.create! :slug => 'welcome' do |a| - a.slug = 'welcome' - a.title = 'Hiya!' + a.slug = 'welcome' + a.title = 'Hiya!' a.summary = 'A brief introduction to Wink.' a.published = true - a.body = (<<-end).gsub(/^\s{10}/, '') + a.body = (<<-TEXT).gsub(/^\s{10}/, '') Foo bar baz ... - end + TEXT end end # Remove the welcome entry. def remove_welcome_entry! if article = Article.first(:slug => 'welcome') - article.destroy! + article.destroy true end end lib/wink/schema.rb @@ -262,15 +262,12 @@ end get Wink.tag_url + ':tag' do @title = "Regarding: '#{h(params[:tag].to_s.upcase)}'" - @entries = Entry.tagged(params[:tag]) - @entries.reject! { |e| e.draft? } + @entries = Entry.tagged(params[:tag]).reject { |e| e.draft? } @entries.sort! do |b,a| - if a.is_a?(Bookmark) && !b.is_a?(Bookmark) - -1 - elsif b.is_a?(Bookmark) && !a.is_a?(Bookmark) - 1 - else - a.created_at <=> b.created_at + case + when a.is_a?(Bookmark) && !b.is_a?(Bookmark) ; -1 + when b.is_a?(Bookmark) && !a.is_a?(Bookmark) ; 1 + else a.created_at <=> b.created_at end end haml :home @@ -312,7 +309,7 @@ post Wink.drafts_url do if params[:id].blank? Article.new else - Entry[params[:id].to_i] + Entry.get!(params[:id].to_i) end @entry.tag_names = params[:tag_names] @entry.attributes = params.to_hash @@ -379,25 +376,25 @@ end delete '/comments/:id' do require_administrative_privileges - comment = Comment[params[:id].to_i] + comment = Comment.get!(params[:id].to_i) raise Sinatra::NotFound if comment.nil? - comment.destroy! + comment.destroy '' end put '/comments/:id' do require_administrative_privileges bad_request! if request.media_type != 'text/plain' - comment = Comment[params[:id].to_i] + comment = Comment.get!(params[:id].to_i) raise Sinatra::NotFound if comment.nil? comment.body = request.body.read - comment.save + comment.save! status 204 '' end get '/comments/:id' do - comment = Comment[params[:id].to_i] + comment = Comment.get!(params[:id].to_i) raise Sinatra::NotFound if comment.nil? comment_body(comment) end lib/wink/web.rb @@ -41,7 +41,8 @@ describe 'Comment' do comment.author.should.be == 'Anonymous Coward' comment.url.should.be nil comment.author_link?.should.not.be.truthful - comment.save.should.be.truthful + comment.save #.should.be.truthful + assert_validated comment comment = Comment.first comment.body.should.be == 'Test Comment' test/comment_test.rb @@ -164,9 +164,9 @@ describe 'Entry' do created_at, updated_at = original.created_at, original.updated_at sleep 1.0 entry = Entry.first(:slug => 'test') - entry.draft?.should.be true - entry.created_at.should == created_at - entry.updated_at.should == updated_at + entry.should.be.draft + entry.created_at.to_s.should.be == created_at.to_s + entry.updated_at.to_s.should.be == updated_at.to_s entry.published = true # entry.save.should.be.truthful entry.created_at.should.be > created_at @@ -241,53 +241,6 @@ describe "Entry#tags association" do before(:each) { setup_database } after(:each) { teardown_database } - it 'can be used to tag new entries' do - entry = Entry.new(:slug => 'test', :title => 'Test Tagging Entry') - entry.should.be.new_record - entry.tags << Tag.new(:name => 'foo') - entry.tags << Tag.new(:name => 'bar') - entry.tags << Tag.new(:name => 'baz') - entry.tags.length.should.be 3 - entry.should.be.new_record - entry.tags.each { |t| t.should.be.new_record } - entry.save - entry.should.not.be.new_record - entry.tags.each { |t| t.should.not.be.new_record } - end - - it 'can be used to tag saved entries' do - entry = Entry.create(:slug => 'test', :title => 'Test Tagging Entry') - entry.should.not.be.new_record - entry.errors.should.be.empty - entry.tags << Tag.new(:name => 'foo') - entry.tags << Tag.new(:name => 'bar') - entry.tags << Tag.new(:name => 'baz') - entry.tags.length.should.be 3 - entry.tags.each { |t| t.should.be.new_record } - entry.save - entry.tags.each { |t| t.should.not.be.new_record } - end - - it 'can be cleared' do - entry = Entry.create(:slug => 'test', :title => 'Test Tagging Entry') - entry.should.not.be.new_record - entry.errors.should.be.empty - %w[foo bar baz].each { |t| entry.tags << Tag.new(:name => t) } - entry.save.should.be.truthful - entry.tags.length.should.be 3 - entry.tags.should.respond_to :clear - entry.tags.clear - entry.tags.length.should.be 0 - # it doesn't persist the clear until saved ... watch when we reload: - entry = Entry.first(:slug => 'test') - entry.tags.length.should.be 3 - # clear it again and save - entry.tags.clear - entry.save - entry = Entry.first(:slug => 'test') - entry.tags.should.be.empty - end - end describe 'Entry#tag_names attribute' do @@ -300,7 +253,7 @@ describe 'Entry#tag_names attribute' do entry.tag_names = ['foo','bar','baz'] entry.save entry.errors.should.be.empty - entry.tags.length.should.be 3 + entry.tag_names.length.should.be == 3 entry.tag_names.sort.should.be == ['bar','baz','foo'] end @@ -309,7 +262,7 @@ describe 'Entry#tag_names attribute' do entry.tag_names = 'foo bar baz' entry.save entry.errors.should.be.empty - entry.tags.length.should.be 3 + entry.tag_names.length.should.be 3 entry.tag_names.sort.should.be == ['bar','baz','foo'] end @@ -318,7 +271,7 @@ describe 'Entry#tag_names attribute' do entry.tag_names = 'foo, bar, baz' entry.save entry.errors.should.be.empty - entry.tags.length.should.be 3 + entry.tag_names.length.should.be == 3 entry.tag_names.sort.should.be == ['bar','baz','foo'] end @@ -327,8 +280,26 @@ describe 'Entry#tag_names attribute' do entry.tag_names = %w[foo bar baz bar foo] entry.save entry.errors.should.be.empty - entry.tags.length.should.be 3 + entry.tag_names.length.should.be == 3 entry.tag_names.sort.should.be == ['bar','baz','foo'] end + it 'takes nil or an empty Array to clear tags' do + entry = Entry.create(:slug => 'test', :title => 'Test Tagging Entry') + assert_validated entry + entry.tag_names = 'foo bar baz' + entry.save.should.be.truthful + entry.tag_names.length.should.be == 3 + entry.tag_names = nil + entry.tag_names.length.should.be == 0 + # it doesn't persist the clear until saved ... watch when we reload: + entry = Entry.first(:slug => 'test') + entry.tag_names.length.should.be == 3 + # clear it again and save + entry.tag_names = [] + entry.save + entry = Entry.first(:slug => 'test') + entry.tag_names.should.be.empty + end + end test/entry_test.rb @@ -14,13 +14,7 @@ require 'wink' require 'sinatra/test/unit' require 'sinatra/test/spec' -# Use SQLite3 for now -gem 'do_sqlite3', '=0.2.5' -require 'do_sqlite3' - -Database.configure \ - :adapter => 'sqlite3', - :database => 'wink_test.sqlite3' +Database.configure :default, 'sqlite3::memory:' Wink.configure do set :env, :test @@ -49,6 +43,10 @@ class Test::Unit::TestCase end end + def assert_validated(model) + assert_equal [], model.errors.full_messages + end + end test/help.rb @@ -32,8 +32,9 @@ describe 'Tag' do it "does not allow duplicate tag names to be saved" do original = Tag.new(:name => 'test') - original.save.should.be.truthful + assert_validated original original.errors.should.be.empty + original.save.should.not.be == false duplicate = Tag.create(:name => 'test') duplicate.save.should.not.be.truthful duplicate.errors.should.not.be.empty @@ -42,8 +43,8 @@ describe 'Tag' do it "implements ::[] finder shortcut with Integer id" do tag = Tag.create!(:name => "test") Tag.should.respond_to :[] - Tag[tag.id].should.be.kind_of Tag - Tag[tag.id].id.should.be == tag.id + Tag.get!(tag.id).should.be.kind_of Tag + Tag.get!(tag.id).id.should.be == tag.id end it "implements ::[] finder shortcut with String name" do test/tag_test.rb @@ -1,6 +1,5 @@ require File.dirname(__FILE__) + "/help" require 'wink' -require 'data_mapper' describe 'Wink' do @@ -18,7 +17,7 @@ describe 'Wink' do it "defines #{class_name} model at the top level" do Object.should.const_defined class_name Object.const_get(class_name).should.not.be.nil - Object.const_get(class_name).should < DataMapper::Persistence + Object.const_get(class_name).should < DataMapper::Resource end end test/wink_test.rb @@ -43,8 +43,8 @@ if development? # We also remove DataMapper's schema cache and subclass tracking since it keeps # references to the class objects we've removed above. This ensures that old # class objects can be GC'd. - DataMapper::Database[:default].adapter.instance_variable_set(:@schema, nil) - DataMapper::Persistence.subclasses.clear + # DataMapper::Database[:default].adapter.instance_variable_set(:@schema, nil) + # DataMapper::Persistence.subclasses.clear # reload all wink sources. load 'wink.rb' wink 82189d691566a5d80183f793b8f8483d0f38254d Ryan Tomayko rtomayko@gmail.com http://github.com/rtomayko/wink/commit/3d250e7f124fd45d1bd108dff8bc48d1bf60760d 3d250e7f124fd45d1bd108dff8bc48d1bf60760d 2008-09-12T08:00:07-07:00 2008-09-12T07:17:27-07:00 upgrade datamapper to 0.9.5 Requires dm-core, dm-validations, and dm-ar-finders. The dm-timestamps was causing problems with validations so timestamps are currently implemented manually. ee6ea42a9cbba73d02fcc3de9f0aa139ff4a98f6 Ryan Tomayko rtomayko@gmail.com