diff --git a/app/models/post.rb b/app/models/post.rb index 4325aba..4de00fd 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -16,8 +16,9 @@ class Post < DataMapper::Base # Alias up some more sensible revisions alias :revisions :post_revisions; alias :revisions= :post_revisions= - def initialize(*args); super + def initialize(*args) revisions << self.class.revision.new + super end def content=(content); revisions.last.content=(content); end diff --git a/app/models/post_revision.rb b/app/models/post_revision.rb index 6dac695..91a0471 100644 --- a/app/models/post_revision.rb +++ b/app/models/post_revision.rb @@ -4,6 +4,7 @@ class PostRevision < DataMapper::Base belongs_to :post validates_presence_of :post + validates_presence_of :content def content=(content) if new_record? @@ -11,6 +12,7 @@ def content=(content) else r = self.class.new(:content => content) post.revisions << r + content # return end end diff --git a/config/init.rb b/config/init.rb index 5bd5812..8c1dc6c 100644 --- a/config/init.rb +++ b/config/init.rb @@ -41,6 +41,8 @@ # use_test :test_unit use_test :rspec +Merb.logger.auto_flush = true + ### Add your other dependencies here # These are some examples of how you might specify dependencies. @@ -52,6 +54,8 @@ # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0" dependencies 'datamapper' +dependency 'merb-action-args' +dependency 'merb_helpers' Merb::BootLoader.after_app_loads do ### Add dependencies here that must load after the application loads: