typo 4.0.0 → 4.0.1

data/lib/typo_version.rb

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

data/public/stylesheets/administration.css

@@ -81,9 +81,8 @@
 
  #tabs-container {
    height: 20px;
-   width: 100%;
+   width: auto;
    padding: 14px 0 0 100px;
-   height: 16px;
    margin-top: -40px;
    border-bottom: 1px solid #637987;
    background: #F8F7EF;
@@ -628,3 +627,24 @@ div.user {
 .feedbackbody td {
   border-bottom: 1px dotted #ccc;
 }
+
+.presumed_ham td {
+  border-bottom: 1px dotted #ccc;
+}
+
+.presumed_spam td {
+  border-bottom: 1px dotted #ccc;
+}
+
+.ham td {
+  border-bottom: 1px dotted #ccc;
+}
+
+.spam td {
+  border-bottom: 1px dotted #ccc;
+}
+
+.spam .state {
+    font-weight: bold
+}
+

data/test/fixtures/blogs.yml

@@ -6,6 +6,7 @@ default:
     show_extended_on_rss: true
     itunes_owner: ""
     blog_name: test blog
+    title_prefix: true
     limit_article_display: 10
     sp_url_limit: 3
     use_gravatar: false
@@ -43,6 +44,7 @@ second:
     show_extended_on_rss: true
     itunes_owner: ""
     blog_name: second test blog
+    title_prefix: false
     limit_article_display: 10
     sp_url_limit: 0
     use_gravatar: false

data/test/fixtures/contents.yml

@@ -96,7 +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
+  state: ContentState::Ham
 
 comment2:
   type: Comment
@@ -113,14 +113,14 @@ comment2:
   updated_at: 2005-01-01 02:00:01
   published_at: 2005-01-01 02:00:01
   guid: 453456456456456
-  state: ContentState::Published
+  state: ContentState::Ham
 
 comment3:
   type: Comment
   blog_id: 1
   id: 12
   published: false
-  state: ContentState::Draft
+  state: ContentState::PresumedSpam
   article_id: 1
   author: Foo Bar
   body: Zzzzzz
@@ -135,7 +135,7 @@ trackback1:
   id: 7
   article_id: 2
   published: false
-  state: ContentState::Draft
+  state: ContentState::PresumedSpam
   blog_name: Trackback Blog
   title: Trackback Entry
   url: http://www.example.com
@@ -150,7 +150,7 @@ trackback2:
   blog_id: 1
   id: 8
   article_id: 1
-  state: ContentState::Published
+  state: ContentState::PresumedHam
   published: true
   blog_name: Trackback Blog
   title: Trackback Entry
@@ -167,7 +167,7 @@ trackback3:
   id: 13
   article_id: 1
   published: true
-  state: ContentState::Published
+  state: ContentState::PresumedHam
   blog_name: Trackback Blog 2
   title: Trackback Entry 2
   url: http://www.example.com
@@ -255,7 +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
+  state: ContentState::Ham
 
 second_blog_article:
   type: Article

data/test/functional/admin/users_controller_test.rb

@@ -42,6 +42,9 @@ class Admin::UsersControllerTest < Test::Unit::TestCase
     get :show, :id => 1
     assert_rendered_file 'show'
     assert_valid_record 'user'
+
+    assert_template_has 'user'
+    assert_template_has 'articles'
   end
 
   def test_edit

data/test/functional/articles_controller_test.rb

@@ -107,6 +107,19 @@ class ArticlesControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_rendered_file "archives"
   end
+  
+  def test_blog_title
+    blogs(:default).title_prefix = true
+    get :permalink, :year => 2004, :month => 06, :day => 01, :title => "article-3"
+    assert_response :success
+    assert_tag :tag => 'title', :content => /^test blog : Article 3!$/
+    
+    blogs(:default).title_prefix = false
+    get :permalink, :year => 2004, :month => 06, :day => 01, :title => "article-3"
+    assert_response :success
+    assert_tag :tag => 'title', :content => /^Article 3!$/
+
+  end
 
   # Permalinks
   def test_permalink
@@ -116,7 +129,7 @@ class ArticlesControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:article)
     assert_equal contents(:article3), assigns(:article)
   end
-
+  
   # Posts for given day
   def test_find_by_date
     get :find_by_date, :year => 2004, :month => 06, :day => 01
@@ -354,6 +367,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
     get :read, :id => contents(:article1).id
     assert_response :success
     assert_template "read"
+    
+    assert_equal contents(:article1).comments.to_a.select{|c| c.published?}, contents(:article1).published_comments
 
     assert_tag :tag => "ol",
       :attributes => { :id => "commentList"},

data/test/mocks/test/xmlrpc_mock.rb

@@ -2,26 +2,27 @@ module XMLRPC
   class XMLRPC::Client
     attr_reader :method_name, :args
     attr_accessor :uri
+    $xmlrpc_pings = []
 
     def initialize
     end
 
     def self.new2(uri)
-      @@pings ||= []
+      $xmlrpc_pings ||= []
       client = new
       client.uri = uri
       client
     end
 
     def self.pings
-      @@pings
+      $xmlrpc_pings
     end
 
     def call(name, *args)
       @method_name = name
       @args = *args
-      @@pings ||= []
-      @@pings << self
+      $xmlrpc_pings ||= []
+      $xmlrpc_pings << self
     end
   end
 end

data/test/unit/article_test.rb

@@ -15,10 +15,10 @@ class ArticleTest < Test::Unit::TestCase
       assert @articles.include?(i.is_a?(Symbol) ? contents(i) : i)
     end
   end
-  
+
   def test_blog
     a = Article.new
-    
+
     assert_equal(1, a.blog_id)
     assert_kind_of(Blog, a.blog)
   end
@@ -119,10 +119,10 @@ class ArticleTest < Test::Unit::TestCase
 
     assert_kind_of Article,b
     assert_equal 0, b.tags.size
-    
+
     c = Article.new(:title => 'Foo', :keywords => 'test "tag test" web2.0')
     c.keywords_to_tags
-    
+
     assert_equal 3, c.tags.size
     assert_equal ['test', 'tagtest', 'web2.0'].sort, c.tags.collect(&:name).sort
   end
@@ -248,4 +248,16 @@ class ArticleTest < Test::Unit::TestCase
     assert_equal(2, Article.find_all_by_date(2004,03).size)
     assert_equal(1, Article.find_all_by_date(2004,03,01).size)
   end
+
+  def test_withdrawal
+    art = Article.find(contents(:article1).id)
+    assert   art.published?
+    assert ! art.withdrawn?
+    art.withdraw!
+    assert ! art.published?
+    assert   art.withdrawn?
+    art.reload
+    assert ! art.published?
+    assert   art.withdrawn?
+  end
 end

data/test/unit/comment_test.rb

@@ -27,49 +27,51 @@ class CommentTest < Test::Unit::TestCase
   end
 
   def test_reject_spam_rbl
-    c = Comment.new
-    c.author = "Spammer"
-    c.body = %{This is just some random text. &lt;a href="http://chinaaircatering.com"&gt;without any senses.&lt;/a&gt;. Please disregard.}
-    c.url = "http://buy-computer.us"
-    c.ip = "212.42.230.206"
-
-    assert_equal true, c.is_spam?
+    cmt = Comment.new do |c|
+      c.author = "Spammer"
+      c.body = %{This is just some random text. &lt;a href="http://chinaaircatering.com"&gt;without any senses.&lt;/a&gt;. Please disregard.}
+      c.url = "http://buy-computer.us"
+      c.ip = "212.42.230.206"
+    end
+    assert cmt.spam?
   end
 
   def test_not_spam_but_rbl_lookup_succeeds
-    c        = Comment.new
-    c.author = "Not a Spammer"
-    c.body   = "Useful commentary!"
-    c.url    = "http://www.bofh.org.uk"
-    c.ip     = "10.10.10.10"
-
-    assert_equal false, c.is_spam?
+    cmt      = Comment.new do |c|
+      c.author = "Not a Spammer"
+      c.body   = "Useful commentary!"
+      c.url    = "http://www.bofh.org.uk"
+      c.ip     = "10.10.10.10"
+    end
+    assert !cmt.spam?
   end
 
   def test_reject_spam_pattern
-    c = Comment.new
-    c.author = "Another Spammer"
-    c.body = "Texas hold-em poker crap"
-    c.url = "http://texas.hold-em.us"
-
-    assert_equal true, c.is_spam?
+    cmt = Comment.new do |c|
+      c.author = "Another Spammer"
+      c.body = "Texas hold-em poker crap"
+      c.url = "http://texas.hold-em.us"
+    end
+    assert cmt.spam?
   end
 
   def test_reject_spam_uri_limit
-    c = Comment.new
-    c.author = "Yet Another Spammer"
-    c.body = %{ <a href="http://www.one.com/">one</a> <a href="http://www.two.com/">two</a> <a href="http://www.three.com/">three</a> <a href="http://www.four.com/">four</a> }
-    c.url = "http://www.uri-limit.com"
-    c.ip = "123.123.123.123"
+    c = Comment.new do |c|
+      c.author = "Yet Another Spammer"
+      c.body = %{ <a href="http://www.one.com/">one</a> <a href="http://www.two.com/">two</a> <a href="http://www.three.com/">three</a> <a href="http://www.four.com/">four</a> }
+      c.url = "http://www.uri-limit.com"
+      c.ip = "123.123.123.123"
+    end
 
-    assert_equal true, c.is_spam?
+    assert c.spam?
   end
 
   def test_reject_article_age
-    c = Comment.new
-    c.author = "Old Spammer"
-    c.body = "Old trackback body"
-    c.article = contents(:inactive_article)
+    c = Comment.new do |c|
+      c.author = "Old Spammer"
+      c.body = "Old trackback body"
+      c.article = contents(:inactive_article)
+    end
 
     assert ! c.save
     assert c.errors.invalid?('article_id')
@@ -93,10 +95,11 @@ class CommentTest < Test::Unit::TestCase
   end
 
   def test_xss_rejection
-    c = Comment.new
-    c.body = "Test foo <script>do_evil();</script>"
-    c.author = 'Bob'
-    c.article_id = 1
+    c = Comment.new do |c|
+      c.body = "Test foo <script>do_evil();</script>"
+      c.author = 'Bob'
+      c.article_id = 1
+    end
 
     # Test each filter to make sure that we don't allow scripts through.
     # Yes, this is ugly.
@@ -114,7 +117,26 @@ class CommentTest < Test::Unit::TestCase
     c = Comment.find(contents(:comment2).id)
     assert c.withdraw!
     assert ! c.published?
-    assert c.reload
+    assert c.spam?
+    c.reload
     assert ! c.published?
+    assert c.spam?
+  end
+
+  def test_published
+    a = Article.new(:title => 'foo', :blog_id => 1)
+    assert a.save
+
+    assert_equal 0, a.published_comments.size
+    c = a.comments.build(:body => 'foo', :author => 'bob', :published => true, :published_at => Time.now)
+    assert c.save
+    assert c.published?
+    a.reload
+
+    assert_equal 1, a.published_comments.size
+    c.withdraw!
+
+    a = Article.new(:title => 'foo', :blog_id => 1)
+    assert_equal 0, a.published_comments.size
   end
 end

data/test/unit/content_state/factory_test.rb

@@ -34,7 +34,7 @@ class ContentState::FactoryTest < Test::Unit::TestCase
   def test_write_new_state
     content = MockContent.new(true)
 
-    assert ContentState::New.instance.serialize_on(content)
+    ContentState::New.instance.enter_hook(content)
 
     assert_equal false, content.published?
     assert_nil content.published_at
@@ -42,34 +42,35 @@ class ContentState::FactoryTest < Test::Unit::TestCase
 
   def test_write_publication_pending_state
     content = MockContent.new(true, true, 1.hour.from_now)
-    assert ContentState::PublicationPending.instance.serialize_on(content)
+    ContentState::PublicationPending.instance.enter_hook(content)
     assert_equal false, content.published?
     assert content.published_at > Time.now
   end
 
   def test_write_draft_state
     content = MockContent.new(true, nil, nil)
-    assert ContentState::Draft.instance.serialize_on(content)
+    ContentState::Draft.instance.enter_hook(content)
     assert_equal false, content.published
     assert_nil content.published_at
   end
 
   def test_write_just_published_state
     content = MockContent.new(true, nil, nil)
-    assert ContentState::JustPublished.instance.serialize_on(content)
+    ContentState::JustPublished.instance.enter_hook(content)
     assert_equal true, content.published
     assert content.published_at <= Time.now
 
     published_at = 10.minutes.ago
     content = MockContent.new(true, nil, published_at)
-    assert ContentState::JustPublished.instance.serialize_on(content)
+    ContentState::JustPublished.instance.enter_hook(content)
     assert_equal true, content.published
     assert_equal published_at, content.published_at
   end
 
   def test_write_published_state
     content = MockContent.new
-    assert ContentState::Published.instance.serialize_on(content)
+    assert ContentState::Published.instance.enter_hook(content)
+    assert_equal true, content.published
   end
 
   class MockContent < Struct.new(:new_record, :published, :published_at)

data/test/unit/ping_test.rb

@@ -33,6 +33,20 @@ class PingTest < Test::Unit::TestCase
     assert_pingback_sent
   end
 
+  def test_ping_sent_on_save
+    Net::HTTP.next_response = self
+
+    art = Blog.default.articles.build \
+      :body => %{<link rel="pingback" href="http://anotherblog.org/xml-rpc" />},
+      :title => 'Test the pinging',
+      :published => true
+    assert art.save
+    sent_ping = XMLRPC::Client.pings.last
+    assert !art.just_published?
+    art.reload
+    assert !art.just_published?
+  end
+
   def assert_pingback_sent
     Net::HTTP.next_response = self
     ping = contents(:article1).pings.build("url" =>

data/test/unit/trackback_test.rb

@@ -18,26 +18,27 @@ class TrackbackTest < Test::Unit::TestCase
     assert tb.save
     assert tb.errors.empty?
     assert tb.guid.size > 15
-    assert_equal false, tb.is_spam?
+    assert !tb.spam?
   end
 
   def test_reject_spam_rbl
-    tb = Trackback.new
-    tb.blog_name = "Spammer"
-    tb.title = "Spammy trackback"
-    tb.excerpt = %{This is just some random text. <a href="http://chinaaircatering.com">without any senses.</a>. Please disregard.}
-    tb.url = "http://buy-computer.us"
-    tb.ip = "212.42.230.206"
-
-    assert_equal true, tb.is_spam?
+    tb = Trackback.new do |tb|
+      tb.blog_name = "Spammer"
+      tb.title = "Spammy trackback"
+      tb.excerpt = %{This is just some random text. <a href="http://chinaaircatering.com">without any senses.</a>. Please disregard.}
+      tb.url = "http://buy-computer.us"
+      tb.ip = "212.42.230.206"
+    end
+
+    assert tb.spam?
   end
 
   def test_reject_spam_pattern
-    tb = Trackback.new
-    tb.blog_name = "Another Spammer"
-    tb.title = "Spammy trackback"
-    tb.excerpt = "Texas hold-em poker crap"
-
-    assert_equal true, tb.is_spam?
+    tb = Trackback.new do |tb|
+      tb.blog_name = "Another Spammer"
+      tb.title = "Spammy trackback"
+      tb.excerpt = "Texas hold-em poker crap"
+    end
+    assert tb.spam?
   end
 end