0
@@ -1,5 +1,11 @@
0
 * SVN *
0
 
0
+* [CHANGED] Changed {{ article.body }} and added {{ article.content }}
0
+
0
+  * {{ article.body }} is now always the article's body, regardless of what template is currently being rendered.
0
+  * {{ article.content }} tries to be a little smart.  On sections with multiple articles, it shows the excerpt, or the body if the excerpt is missing.
0
+  Single article templates show the body.
0
+
0
 * [NEW] Added {{ article.excerpt }} liquid tag for accessing an articles excerpt.
0
 
0
 * Change - Article#body_for_mode only returns the body, not excerpt + body.  This means you'll have to do this in your templates

0
@@ -91,7 +91,7 @@ class Article < Content
0
   end
0
 
0
   def full_permalink
0
-    ['', published_at.year, published_at.month, published_at.day, permalink] * '/'
0
+    published? && ['', published_at.year, published_at.month, published_at.day, permalink] * '/'
0
   end
0
 
0
   def has_section?(section)
0
@@ -165,10 +165,6 @@ class Article < Content
0
       @new_sections = nil
0
     end
0
     
0
-    def body_for_mode(mode = :list)
0
-      (mode == :single ? [body_html, excerpt_html] : [excerpt_html, body_html]).detect { |attr| !attr.blank? }.to_s.strip
0
-    end
0
-    
0
     def pass_filter_to_comments
0
       return unless @old_filter
0
       self.record_timestamps  = false

0
@@ -1,6 +1,5 @@
0
 class Content < ActiveRecord::Base
0
   filtered_column :body, :excerpt
0
-  validates_presence_of :body
0
   belongs_to :user, :with_deleted => true
0
   belongs_to :site
0
 end
0
\ No newline at end of file

0
@@ -6,16 +6,17 @@ module Mephisto
0
       def article() @source end
0
 
0
       def initialize(source, options = {})
0
+        @options        = options
0
         @source         = source
0
         @article_liquid = { 
0
           'id'               => @source.id,
0
           'title'            => @source.title,
0
           'permalink'        => @source.permalink,
0
           'url'              => @source.full_permalink,
0
-          'body'             => @source.send(:body_for_mode, options[:mode] || :list),
0
+          'body'             => @source.body_html,
0
           'excerpt'          => @source.excerpt_html,
0
-          'published_at'     => @source.site.timezone.utc_to_local(@source.published_at),
0
-          'updated_at'       => @source.site.timezone.utc_to_local(@source.updated_at),
0
+          'published_at'     => (@source.site.timezone.utc_to_local(@source.published_at) rescue nil),
0
+          'updated_at'       => (@source.site.timezone.utc_to_local(@source.updated_at)   rescue nil),
0
           'comments_count'   => @source.comments_count,
0
           'author'           => @source.user.to_liquid,
0
           'accept_comments'  => @source.accept_comments?,
0
@@ -42,6 +43,17 @@ module Mephisto
0
       def page_sections
0
         sections.select { |s| s.section.paged? }
0
       end
0
+      
0
+      def content
0
+        @content ||= body_for_mode(@options[:mode] || :list)
0
+      end
0
+      
0
+      protected
0
+        def body_for_mode(mode)
0
+          contents = [before_method(:excerpt), before_method(:body)]
0
+          contents.reverse! if mode == :single
0
+          contents.detect { |content| !content.blank? }.to_s.strip
0
+        end
0
     end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -4,5 +4,5 @@
0
   <h2>{{ article.title }}</h2>
0
   <p><span>{{ article.published_at | format_date: 'standard' }}</span></p>
0
   <p>{{ article | link_to_article }}</p>
0
-  <p>{{ article.body }}</p>
0
+  <p>{{ article.content }}</p>
0
 {% endfor %}
0
\ No newline at end of file

0
@@ -27,4 +27,32 @@ class ArticleDropTest < Test::Unit::TestCase
0
   def test_should_list_only_paged_sections
0
     assert_equal [sections(:about)], @article.page_sections.collect(&:section)
0
   end
0
+
0
+  def test_empty_body
0
+    assert contents(:welcome).update_attributes(:body => nil, :excerpt => nil), contents(:welcome).errors.full_messages.to_sentence
0
+    a = contents(:welcome).to_liquid
0
+    assert_equal '', a.send(:body_for_mode, :single)
0
+    assert_equal '', a.send(:body_for_mode, :list)
0
+  end
0
+  
0
+  def test_body_with_excerpt
0
+    assert contents(:welcome).update_attributes(:body => 'body', :excerpt => 'excerpt'), contents(:welcome).errors.full_messages.to_sentence
0
+    a = contents(:welcome).to_liquid
0
+    assert_equal "<p>body</p>", a.send(:body_for_mode, :single)
0
+    assert_equal '<p>excerpt</p>', a.send(:body_for_mode, :list)
0
+  end
0
+  
0
+  def test_only_body
0
+    assert contents(:welcome).update_attributes(:body => 'body', :excerpt => nil), contents(:welcome).errors.full_messages.to_sentence
0
+    a = contents(:welcome).to_liquid
0
+    assert_equal "<p>body</p>", a.send(:body_for_mode, :single)
0
+    assert_equal '<p>body</p>', a.send(:body_for_mode, :list)
0
+  end
0
+  
0
+  def test_only_body_with_empty_excerpt
0
+    assert contents(:welcome).update_attributes(:body => 'body', :excerpt => ''), contents(:welcome).errors.full_messages.to_sentence
0
+    a = contents(:welcome).to_liquid
0
+    assert_equal "<p>body</p>", a.send(:body_for_mode, :single)
0
+    assert_equal '<p>body</p>', a.send(:body_for_mode, :list)
0
+  end
0
 end

0
@@ -103,30 +103,6 @@ class ArticleTest < Test::Unit::TestCase
0
     assert  a.accept_comments?
0
   end
0
 
0
-  def test_empty_body
0
-    a = create_article
0
-    assert_equal '', a.send(:body_for_mode, :single)
0
-    assert_equal '', a.send(:body_for_mode, :list)
0
-  end
0
-  
0
-  def test_body_with_excerpt
0
-    a = create_article :excerpt => 'excerpt', :body => 'body'
0
-    assert_equal "<p>body</p>", a.send(:body_for_mode, :single)
0
-    assert_equal '<p>excerpt</p>', a.send(:body_for_mode, :list)
0
-  end
0
-  
0
-  def test_only_body
0
-    a = create_article :body => 'body'
0
-    assert_equal "<p>body</p>", a.send(:body_for_mode, :single)
0
-    assert_equal '<p>body</p>', a.send(:body_for_mode, :list)
0
-  end
0
-  
0
-  def test_only_body_with_empty_excerpt
0
-    a = create_article :body => 'body', :excerpt => ''
0
-    assert_equal "<p>body</p>", a.send(:body_for_mode, :single)
0
-    assert_equal '<p>body</p>', a.send(:body_for_mode, :list)
0
-  end
0
-
0
   def test_should_set_published_to_utc
0
     a = create_article :body => 'body', :published_at => Time.now
0
     assert a.published_at.utc?

0
@@ -1 +1,2 @@
0
-error
0
\ No newline at end of file
0
+<h2>You broke it!</h2>
0
+<p>Just kidding!  It seems the page you requested doesn't exist.</p>
0
\ No newline at end of file