typo 3.99.4 → 4.0.0

data/app/controllers/admin/content_controller.rb

@@ -78,9 +78,9 @@ class Admin::ContentController < Admin::BaseController
   def new_or_edit
     get_or_build_article
     params[:article] ||= {}
-    params[:article].reverse_merge!('allow_comments' => this_blog.default_allow_comments,
-                                    'allow_pings'    => this_blog.default_allow_pings,
-                                    'published'      => true)
+#    params[:article].reverse_merge!('allow_comments' => this_blog.default_allow_comments,
+#                                    'allow_pings'    => this_blog.default_allow_pings,
+#                                    'published'      => true)
     @article.attributes = (params[:article])
     setup_categories
     @selected = @article.categories.collect { |c| c.id }
@@ -129,7 +129,11 @@ class Admin::ContentController < Admin::BaseController
   def get_or_build_article
     @article = case params[:action]
                when 'new'
-                 this_blog.articles.build
+                 art = this_blog.articles.build
+                 art.allow_comments = this_blog.default_allow_comments
+                 art.allow_pings    = this_blog.default_allow_pings
+                 art.published      = true
+                 art
                when 'edit'
                  this_blog.articles.find(params[:id])
                else

data/app/models/content.rb

@@ -1,6 +1,5 @@
 require 'observer'
 require 'set'
-require 'Akismet'
 
 class Content < ActiveRecord::Base
   include Observable
@@ -9,6 +8,9 @@ class Content < ActiveRecord::Base
   belongs_to :blog
   validates_presence_of :blog_id
 
+  composed_of :state, :class_name => 'ContentState::Factory',
+    :mapping => %w{ state memento }
+
   has_and_belongs_to_many :notify_users, :class_name => 'User',
     :join_table => 'notifications', :foreign_key => 'notify_content_id',
     :association_foreign_key => 'notify_user_id', :uniq => true
@@ -25,10 +27,12 @@ class Content < ActiveRecord::Base
 
   def initialize(*args)
     super(*args)
+    set_default_blog
+  end
 
-    #
+  def set_default_blog
     if self.blog_id == nil or self.blog_id == 0
-      self.blog_id = Blog.default
+      self.blog = Blog.default
     end
   end
 
@@ -107,14 +111,6 @@ class Content < ActiveRecord::Base
     end
   end
 
-  def state
-    @state ||= ContentState::Factory.derived_from(self)
-  end
-
-  def state=(new_state)
-    @state = new_state
-  end
-
   def state_before_save
     self.state.before_save(self)
   end

data/app/models/content_state/base.rb

@@ -10,6 +10,10 @@ module ContentState
       protected :new
     end
 
+    def memento
+      self.class.to_s
+    end
+
     def before_save(content)
       serialize_on(content)
       true

data/app/models/content_state/factory.rb

@@ -1,16 +1,13 @@
 module ContentState
   class Factory
-    def self.derived_from(content)
-      state = [New, Draft, PublicationPending,
-               JustPublished, Published].detect(self) do |k|
-        k.derivable_from(content)
-      end.instance
-
-      unless state
-        raise "No derivable state for #{content.inspect}"
-      else
-        return state
+    def self.new(state_name)
+      return ContentState::New.instance unless state_name
+      state_name = state_name.to_s.underscore
+      unless state_name.rindex('/')
+        state_name = 'content_state/' + state_name
       end
+      require state_name
+      state_name.camelize.constantize.instance
     end
   end
 end

data/db/migrate/047_add_content_state_field.rb

@@ -0,0 +1,24 @@
+class AddContentStateField < ActiveRecord::Migration
+  class Content < ActiveRecord::Base
+    include BareMigration
+  end
+
+  def self.up
+    modify_tables_and_update(:add_column, Content,
+                             :state, :text) do |content|
+      unless $schema_generator
+        if content.published?
+          content.state = 'Published'
+        elsif content.published_at
+          content.state = 'PublicationPending'
+        else
+          content.state = 'Draft'
+        end
+      end
+    end
+  end
+
+  def self.down
+    remove_column :contents, :state
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 46) do
+ActiveRecord::Schema.define(:version => 47) do
 
   create_table "articles_categories", :id => false, :force => true do |t|
     t.column "article_id", :integer
@@ -65,6 +65,7 @@ ActiveRecord::Schema.define(:version => 46) do
     t.column "allow_comments", :boolean
     t.column "blog_id", :integer
     t.column "published_at", :datetime
+    t.column "state", :text
   end
 
   add_index "contents", ["article_id"], :name => "contents_article_id_index"

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "3.99.4"
+PKG_VERSION = "4.0.0"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '3.99.4'
+TYPO_VERSION = '4.0.0'

data/svk-commitP6cVv.tmp

@@ -0,0 +1 @@
+Tagging 3.99.4

data/test/fixtures/contents.yml

@@ -19,6 +19,7 @@ article1:
   guid: a87c4220-18d4-11da-aadd-0002a5d5c51b
   type: Article
   published: true
+  state: ContentState::Published
   
 article2:
   type: Article
@@ -39,6 +40,7 @@ article2:
   author: Bob
   guid: bbbbb
   published: true
+  state: ContentState::Published
 
 
 article3:
@@ -60,6 +62,7 @@ article3:
   author: Tobi
   guid: ccccc
   published: true
+  state: ContentState::Published
 
 article4:
   type: Article
@@ -69,6 +72,7 @@ article4:
   body: I'm not "public":http://www.example.com/public!
   body_html: I'm not <a href="http://www.example.com/public">public</a>!
   published: false
+  state: ContentState::Draft
   created_at: 2004-06-01 20:00:01
   updated_at: 2004-06-01 20:00:01
   published_at: 2004-06-01 20:00:01
@@ -92,6 +96,7 @@ spam_comment:
   updated_at: 2005-01-01 02:00:00
   published_at: 2005-01-01 02:00:00
   guid: 12313123123123123
+  state: ContentState::Published
 
 comment2:
   type: Comment
@@ -108,12 +113,14 @@ comment2:
   updated_at: 2005-01-01 02:00:01
   published_at: 2005-01-01 02:00:01
   guid: 453456456456456
+  state: ContentState::Published
 
 comment3:
   type: Comment
   blog_id: 1
   id: 12
   published: false
+  state: ContentState::Draft
   article_id: 1
   author: Foo Bar
   body: Zzzzzz
@@ -128,6 +135,7 @@ trackback1:
   id: 7
   article_id: 2
   published: false
+  state: ContentState::Draft
   blog_name: Trackback Blog
   title: Trackback Entry
   url: http://www.example.com
@@ -142,6 +150,7 @@ trackback2:
   blog_id: 1
   id: 8
   article_id: 1
+  state: ContentState::Published
   published: true
   blog_name: Trackback Blog
   title: Trackback Entry
@@ -158,6 +167,7 @@ trackback3:
   id: 13
   article_id: 1
   published: true
+  state: ContentState::Published
   blog_name: Trackback Blog 2
   title: Trackback Entry 2
   url: http://www.example.com
@@ -179,6 +189,7 @@ first_page:
   updated_at: 2005-05-05 01:00:00
   user_id: 1
   published: true
+  state: ContentState::Published
 
 another_page:
   type: Page
@@ -192,6 +203,7 @@ another_page:
   published_at: 2005-05-05 01:00:00
   user_id: 1
   published: true
+  state: ContentState::Published
 
 markdown_page:
   type: Page
@@ -206,6 +218,7 @@ markdown_page:
   published_at: 2005-05-05 01:00:00
   user_id: 1
   published: true
+  state: ContentState::Published
 
 inactive_article:
   type: Article
@@ -226,6 +239,7 @@ inactive_article:
   author: Tobi
   guid: i1n2a3c4t5i6v7e
   published: true
+  state: ContentState::Published
 
 old_comment:
   type: Comment
@@ -241,6 +255,7 @@ old_comment:
   updated_at: 2004-05-02 20:00:02
   published_at: 2004-05-02 20:00:02
   published: true
+  state: ContentState::Published
 
 second_blog_article:
   type: Article
@@ -261,6 +276,7 @@ second_blog_article:
   author: Tobi
   guid: 2b1l0o6g4ar7
   published: true
+  state: ContentState::Published
 
 search_target:
   type: Article
@@ -281,6 +297,7 @@ search_target:
   author: Tobi
   guid: 2b1l0o6g4ar7
   published: true
+  state: ContentState::Published
 
 xmltest:
   type: Article
@@ -300,3 +317,4 @@ xmltest:
   author: Tobi
   guid: urn:uuid:0d676c66-4135-4a8b-9d65-b6a3248d3032
   published: true
+  state: ContentState::Published

data/test/unit/content_state/factory_test.rb

@@ -2,32 +2,27 @@ require File.dirname(__FILE__) + '/../../test_helper'
 require 'content_state/factory'
 
 class ContentState::FactoryTest < Test::Unit::TestCase
-  def test_correctly_derives_new_state
-    assert_instance_of(ContentState::New,
-                       ContentState::Factory.derived_from(MockContent.new(true)))
+  def test_correctly_builds_new_state
+    [:new, 'new', 'content_state/new', 'New',
+     'ContentState::New', nil].each do |memento|
+      assert_instance_of(ContentState::New,
+                         ContentState::Factory.new(memento))
+    end
   end
 
-  def test_correctly_derives_draft_state
+  def test_correctly_builds_draft_state
     assert_instance_of(ContentState::Draft,
-                       ContentState::Factory.derived_from(MockContent.new(false, nil, nil)))
+                       ContentState::Factory.new('draft'))
   end
 
-  def test_correctly_derives_publication_pending_state
-    assert_instance_of(ContentState::PublicationPending,
-                       ContentState::Factory.derived_from(MockContent.new(false, nil, 1.day.from_now)))
-    assert_instance_of(ContentState::PublicationPending,
-                       ContentState::Factory.derived_from(MockContent.new(true, true,
-                                                                          1.hour.from_now)))
-
+  def test_correctly_builds_publication_pending_state
     assert_instance_of(ContentState::PublicationPending,
-                       ContentState::Factory.derived_from(MockContent.new(true, false,
-                                                                          1.hour.from_now)))
+                       ContentState::Factory.new('publication_pending'))
   end
 
-  def test_correct_derives_published_state
+  def test_correct_builds_published_state
     assert_instance_of(ContentState::Published,
-                       ContentState::Factory.derived_from(MockContent.new(false, true,
-                                                                          1.hour.ago)))
+                       ContentState::Factory.new('published'))
   end
 
   def test_cant_make_state_directly

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 3.99.4
-date: 2006-07-21 00:00:00 -07:00
+  version: 4.0.0
+date: 2006-07-22 00:00:00 -07:00
 summary: Modern weblog engine.
 require_paths: 
 - .
@@ -28,7 +28,6 @@ cert_chain:
 authors: 
 - Tobias Luetke
 files: 
-- .DS_Store
 - app
 - bin
 - cache
@@ -45,6 +44,7 @@ files:
 - Rakefile
 - README
 - script
+- svk-commitP6cVv.tmp
 - test
 - themes
 - tmp
@@ -490,6 +490,7 @@ files:
 - db/migrate/044_add_published_at_to_content.rb
 - db/migrate/045_fix_contents_published_default.rb
 - db/migrate/046_fixup_forthcoming_publications.rb
+- db/migrate/047_add_content_state_field.rb
 - db/scripts/fix_permalinks.rb
 - db/updates/update.168.to.200.mysql.sql
 - db/updates/update.168.to.200.psql.sql
@@ -785,7 +786,7 @@ files:
 - vendor/sparklines
 - vendor/syntax
 - vendor/uuidtools
-- vendor/akismet/Akismet.rb
+- vendor/akismet/akismet.rb
 - vendor/bluecloth/bin
 - vendor/bluecloth/CHANGES
 - vendor/bluecloth/install.rb