typo 4.0.3 → 4.1

data/test/unit/content_state/factory_test.rb

@@ -76,5 +76,13 @@ class ContentState::FactoryTest < Test::Unit::TestCase
   class MockContent < Struct.new(:new_record, :published, :published_at)
     alias_method :new_record?, :new_record
     alias_method :published?, :published
+
+    def changed
+      @changed = true
+    end
+
+    def changed?
+      @changed
+    end
   end
 end

data/test/unit/content_state/feedback_states_test.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class FeedbackStatesTest < Test::Unit::TestCase
+  fixtures :blogs, :contents, :articles_tags, :tags, :resources,
+    :categories, :categorizations, :users, :notifications, :text_filters
+
+  def setup
+    @comment = Article.find(:first).comments.build(:author => 'Piers',
+                                                   :body => 'Body')
+  end
+
+  def test_ham_all_the_way
+    assert_state ContentState::Unclassified
+    assert   @comment.published?
+    assert   @comment.just_published?
+    assert   @comment.just_changed_published_status?
+    assert   @comment.save
+    assert   @comment.just_changed_published_status?
+    assert   @comment.just_published?
+    @comment.reload
+    assert ! @comment.just_changed_published_status?
+    assert ! @comment.just_published?
+    @comment.confirm_classification
+    assert   @comment.published?
+    assert ! @comment.just_published?
+    assert ! @comment.just_changed_published_status?
+  end
+
+  def test_spam_all_the_way
+    class << @comment
+      def classify
+        :spam
+      end
+    end
+    assert_state ContentState::Unclassified
+    assert ! @comment.published?
+    assert ! @comment.just_published?
+    assert ! @comment.just_changed_published_status?
+    assert   @comment.save
+    assert ! @comment.published?
+    assert ! @comment.just_published?
+    assert ! @comment.just_changed_published_status?
+    @comment.reload
+    assert ! @comment.just_changed_published_status?
+    assert ! @comment.just_published?
+    @comment.confirm_classification
+    assert ! @comment.published?
+    assert ! @comment.just_published?
+    assert ! @comment.just_changed_published_status?
+  end
+
+  def test_presumed_spam_marked_as_ham
+    @comment.state = ContentState::PresumedSpam.instance
+    @comment.mark_as_ham
+    assert @comment.published?
+    assert @comment.just_published?
+    assert @comment.just_changed_published_status?
+  end
+
+  def test_presumed_ham_marked_as_spam
+    @comment.state = ContentState::PresumedHam.instance
+    @comment.mark_as_spam
+    assert ! @comment.published?
+    assert ! @comment.just_published?
+    assert   @comment.just_changed_published_status?
+  end
+
+  def assert_state(state)
+    assert_instance_of state, @comment.state
+  end
+end

data/test/unit/magnolia_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class MagnoliaTest < Test::Unit::TestCase
 
   def setup
-    @mag = MagnoliaAggregation.new("",false)
+    @mag = ::MagnoliaAggregation.new("",false)
     @mag.send(:parse, fixture)
   end
 

data/test/unit/notification_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class NotificationTest < Test::Unit::TestCase
+  fixtures :notifications
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/page_test.rb

@@ -6,6 +6,21 @@ class PageTest < Test::Unit::TestCase
   def setup
     @page = Page.find(9)
   end
+  
+  def test_permalink_url
+    p = contents(:first_page)
+    assert_equal 'http://myblog.net/pages/page_one', p.permalink_url
+  end
+  
+  def test_edit_url
+    p = contents(:first_page)
+    assert_equal 'http://myblog.net/admin/pages/edit/9', p.edit_url
+  end
+  
+  def test_delete_url
+    p = contents(:first_page)
+    assert_equal 'http://myblog.net/admin/pages/destroy/9', p.delete_url
+  end
 
   def test_validate
     a = Page.new
@@ -22,4 +37,9 @@ class PageTest < Test::Unit::TestCase
 
     assert !b.save
   end
+  
+  def test_default_filter
+    a = Page.find(:first)
+    assert_equal 'textile', a.default_text_filter.name
+  end
 end

data/test/unit/ping_test.rb

@@ -42,7 +42,7 @@ class PingTest < Test::Unit::TestCase
       :published => true
     assert art.save
     sent_ping = XMLRPC::Client.pings.last
-    assert !art.just_published?
+    assert art.just_published?
     art.reload
     assert !art.just_published?
   end

data/test/unit/sidebar_test.rb

@@ -3,12 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class SidebarTest < Test::Unit::TestCase
   fixtures :sidebars
 
-  def setup
-    @sidebar = Sidebar.find(1)
-  end
-
-  # Replace this with your real tests.
-  def test_truth
-    assert_kind_of Sidebar,  @sidebar
+  def test_available_sidebars
+    assert Sidebar.available_sidebars.size >= 19
   end
 end

data/test/unit/static_sidebar_test.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class StaticSidebarTest < Test::Unit::TestCase
+  def test_creation
+    assert_kind_of Sidebar, StaticSidebar.new
+  end
+
+  def test_default_title
+    assert_equal 'Links', StaticSidebar.new.title
+  end
+
+  def test_default_body
+    assert_equal StaticSidebar::DEFAULT_TEXT, StaticSidebar.new.body
+  end
+
+  def test_description
+    assert_equal "Static content, like links to other sites, advertisements, or blog meta-information", StaticSidebar.description
+  end
+end

data/test/unit/tag_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class TagTest < Test::Unit::TestCase
-  fixtures :tags, :contents, :articles_tags
+  fixtures :tags, :contents, :articles_tags, :blogs
 
   def setup
     @tag = Tag.find(1)
@@ -63,4 +63,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal "bar", tags.last.name
     assert_equal 2, tags.first.article_counter
   end
+  
+  def test_permalink
+    tag = Tag.get('foo')
+    assert_equal 'http://myblog.net/articles/tag/foo', tag.permalink_url
+  end
 end

data/test/unit/text_filter_test.rb

@@ -33,12 +33,12 @@ class TextFilterTest < Test::Unit::TestCase
   def test_available
     filters = TextFilter.available_filters
 
-    assert filters.include?(Plugins::Textfilters::MarkdownController)
-    assert filters.include?(Plugins::Textfilters::SmartypantsController)
-    assert filters.include?(Plugins::Textfilters::HtmlfilterController)
-    assert filters.include?(Plugins::Textfilters::TextileController)
-    assert filters.include?(Plugins::Textfilters::AmazonController)
-    assert filters.include?(Plugins::Textfilters::FlickrController)
+    assert filters.include?(Typo::Textfilter::Markdown)
+    assert filters.include?(Typo::Textfilter::Smartypants)
+    assert filters.include?(Typo::Textfilter::Htmlfilter)
+    assert filters.include?(Typo::Textfilter::Textile)
+    assert filters.include?(Typo::Textfilter::Amazon)
+    assert filters.include?(Typo::Textfilter::Flickr)
 
     assert !filters.include?(TextFilterPlugin::Markup)
     assert !filters.include?(TextFilterPlugin::Macro)
@@ -65,19 +65,19 @@ class TextFilterTest < Test::Unit::TestCase
     assert types['postprocess']
     assert types['other']
 
-    assert types['markup'].include?(Plugins::Textfilters::MarkdownController)
-    assert types['markup'].include?(Plugins::Textfilters::TextileController)
+    assert types['markup'].include?(Typo::Textfilter::Markdown)
+    assert types['markup'].include?(Typo::Textfilter::Textile)
 
-    assert types['macropost'].include?(Plugins::Textfilters::FlickrController)
+    assert types['macropost'].include?(Typo::Textfilter::Flickr)
 
-    assert types['macropre'].include?(Plugins::Textfilters::CodeController)
+    assert types['macropre'].include?(Typo::Textfilter::Code)
 
-    assert types['postprocess'].include?(Plugins::Textfilters::SmartypantsController)
-    assert types['postprocess'].include?(Plugins::Textfilters::AmazonController)
+    assert types['postprocess'].include?(Typo::Textfilter::Smartypants)
+    assert types['postprocess'].include?(Typo::Textfilter::Amazon)
 
-    assert types['other'].include?(Plugins::Textfilters::HtmlfilterController)
-    assert types['other'].include?(Plugins::Textfilters::MacroPreController)
-    assert types['other'].include?(Plugins::Textfilters::MacroPostController)
+    assert types['other'].include?(Typo::Textfilter::Htmlfilter)
+    assert types['other'].include?(Typo::Textfilter::MacroPre)
+    assert types['other'].include?(Typo::Textfilter::MacroPost)
 
     # There shouldn't be any 'other' plugins coming from users; they
     # should all be part of the core
@@ -87,17 +87,17 @@ class TextFilterTest < Test::Unit::TestCase
   def test_map
     map = TextFilter.filters_map
 
-    assert_equal Plugins::Textfilters::MarkdownController,
+    assert_equal Typo::Textfilter::Markdown,
           map['markdown']
-    assert_equal Plugins::Textfilters::SmartypantsController,
+    assert_equal Typo::Textfilter::Smartypants,
           map['smartypants']
-    assert_equal Plugins::Textfilters::HtmlfilterController,
+    assert_equal Typo::Textfilter::Htmlfilter,
           map['htmlfilter']
-    assert_equal Plugins::Textfilters::TextileController,
+    assert_equal Typo::Textfilter::Textile,
           map['textile']
-    assert_equal Plugins::Textfilters::AmazonController,
+    assert_equal Typo::Textfilter::Amazon,
           map['amazon']
-    assert_equal Plugins::Textfilters::FlickrController,
+    assert_equal Typo::Textfilter::Flickr,
           map['flickr']
   end
 

data/test/unit/theme_test.rb

@@ -25,7 +25,7 @@ class ThemeTest < Test::Unit::TestCase
   end
 
   def test_theme_from_path
-    assert_equal "azure", Theme.theme_from_path(this_blog.current_theme_path).name
+    assert_equal "azure", Theme.theme_from_path(this_blog.current_theme.path).name
   end
 
   def test_search_theme_directory

data/test/unit/trackback_test.rb

@@ -3,7 +3,22 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'dns_mock'
 
 class TrackbackTest < Test::Unit::TestCase
-  fixtures :contents, :blacklist_patterns, :blogs
+  fixtures :contents, :feedback, :blacklist_patterns, :blogs
+
+  def test_permalink_url
+    t = feedback(:trackback4)
+    assert_equal "http://myblog.net/articles/2004/04/01/second-blog-article#trackback-#{t.id}", t.permalink_url
+  end
+
+  def test_edit_url
+    t = feedback(:trackback4)
+    assert_equal "http://myblog.net/admin/trackbacks/edit/#{t.id}", t.edit_url
+  end
+
+  def test_delete_url
+    t = feedback(:trackback4)
+    assert_equal "http://myblog.net/admin/trackbacks/destroy/#{t.id}", t.delete_url
+  end
 
   def test_incomplete
     tb = Trackback.new

data/themes/azure/layouts/default.rhtml

@@ -12,7 +12,7 @@
   <div id="container" class="clearfix">
       <div id="header">
         <div id="logo">
-          <h1 id="sitename"><%= link_to this_blog.blog_name, { :controller => '/' } %></h1>
+          <h1 id="sitename"><%= link_to this_blog.blog_name, this_blog.base_url %></h1>
           <h2 id="subtitle"><%= this_blog.blog_subtitle %></h2>
         </div>
       </div>
@@ -41,7 +41,7 @@
       <div id="footer">
         <ul>
           <li><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0</a></li>
-          <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=<%= server_url_for :controller => '/' %>">Valid CSS</a></li>
+          <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=<%= this_blog.base_url %>">Valid CSS</a></li>
         </ul>
       </div>
   </div>

data/themes/scribbish/layouts/default.rhtml

@@ -9,7 +9,7 @@
 <body>
 <div id="container">
   <div id="header">
-    <h1><span><%= link_to this_blog.blog_name, { :controller => '/' } %></span></h1>
+    <h1><span><%= link_to this_blog.blog_name, this_blog.base_url %></span></h1>
     <h2><%= this_blog.blog_subtitle %></h2>
   </div>
 
@@ -31,7 +31,7 @@
 
   <div id="footer">
     <hr />
-    <p><%= link_to this_blog.blog_name, { :controller => '/' } %></p>
+    <p><%= link_to this_blog.blog_name, this_blog.base_url %></p>
     <ul>
       <li>powered by <%= link_to 'typo', 'http://typosphere.org' %> /
           styled with <%= link_to 'scribbish', 'http://quotedprintable.com/pages/scribbish' %></li>

data/themes/scribbish/stylesheets/content.css

@@ -136,7 +136,7 @@
 	background: transparent;
 }
 
-#content .atomentry .title .comment_count { display: none; }
+#content .atomentry .title .comment_count { color: #eee; }
 
 #content .atomentry .author {
 	color: #bbb;
@@ -333,23 +333,21 @@
 /* Flickr sidebar-node */
 #sidebar #flickr {
 	margin: 0 0 2em;
-	float: right;
+	clear: both;
 }
 
 #sidebar #flickr div {
-	margin: 0 0 5px;
-	border: 1px solid #ddd;
-	float: right;
-	clear: both;
 }
 
 #sidebar #flickr img { 
-	border: 4px solid #fff;
+	margin: 0 0 5px;
+	padding: 5px;
+	border: 1px solid #ddd;
 	display: block;
 }
         
 #sidebar #flickr img:hover {
-	border: 4px solid #ffc;
+	background: #ffc;
 }
         
 #sidebar #flickr a { 

data/themes/scribbish/views/articles/_article.rhtml

@@ -1,7 +1,7 @@
 <div class="atomentry" id="article-<%= article.id %>">
   <h2 class="title">
-    <%= (controller.action_name.include? 'permalink') ? article.title : article_link(article.title, article) %> 
-    <%= content_tag(:span, article.comments.size, :class => 'comment_count') if article.comments.size > 0 %>
+    <%= (controller.action_name.include? 'permalink') ? article.title : link_to_permalink(article,article.title) %>
+    <%= content_tag(:span, article.published_comments.size, :class => 'comment_count') if article.published_comments.size > 0 %>
   </h2>
 
   <p class="author">
@@ -10,28 +10,28 @@
   </p>
 
   <div class="content">
-    <%= article_html(article, :body) %>
+    <%= article.html(:body) %>
 
     <% if article.extended? -%>
       <div class="extended">
         <% if controller.action_name == 'index' -%>
-          <p><%= article_link "Continue reading...", article %></p>
+          <p><%= link_to_permalink article,"Continue reading..." %></p>
         <% else -%>
-          <%= article_html(article, :extended) %>
+          <%= article.html(:extended) %>
         <% end -%>
       </div>
-    <% end -%>  
+    <% end -%>
   </div>
 
   <ul class="meta">
     <%= content_tag(:li, category_links(article), :class => 'categories') unless article.categories.empty? %>
     <%= content_tag(:li, tag_links(article), :class => 'tags') unless article.tags.empty? %>
-    <li>Meta 
+    <li>Meta
       <%= trackbacks_link(article) << ',' if article.allow_pings? %>
       <%= comments_link(article) << ',' if article.allow_comments? %>
-      <a href="<%= article_url article %>" rel="bookmark">permalink</a>,
-      <a href="<%= xml_url :action=>'feed', :type=>'article', :format => 'rss',  :id => article %>">rss</a>,    
-      <a href="<%= xml_url :action=>'feed', :type=>'article', :format => 'atom', :id => article %>">atom</a>   
+      <a href="<%= article.permalink_url %>" rel="bookmark">permalink</a>,
+      <a href="<%= url_for :controller => 'xml', :action=>'feed', :type=>'article', :format => 'rss',  :id => article %>">rss</a>,
+      <a href="<%= url_for :controller => 'xml', :action=>'feed', :type=>'article', :format => 'atom', :id => article %>">atom</a>
     </li>
   </ul>
 </div>

data/themes/scribbish/views/articles/_comment.rhtml

@@ -1,14 +1,18 @@
 <ol id="comments" class="comments">
-  <% for comment in @article.comments -%>
-	<li class="comment" id="comment-<%= comment.id %>">
-	  <div class="author">
-	    <%= content_tag(:div, gravatar_tag(comment.email)) if config_value(:use_gravatar) and comment.email %>
-	    <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
-		<abbr title="<%= comment.created_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now comment.created_at %></abbr>
-	  </div>
-	  <div class="content">
-	    <%= comment_html(comment) %>
-	  </div>
-	</li>
-	<% end -%>
+  <% if @article.published_comments.any? -%>
+    <% for comment in @article.published_comments -%>
+    <li class="comment" id="comment-<%= comment.id %>">
+      <div class="author">
+        <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %>
+        <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
+        <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:</abbr>
+      </div>
+      <div class="content">
+        <%= comment.html %>
+      </div>
+    </li>
+    <% end -%>
+  <% else -%>
+    <li class="dummy_comment" style="display:none">No comments</li>
+  <% end -%>
 </ol>