ActionItem806: Squashed commit of the following:

block to list amount of posts by month offer BlogArchivesBlock only if profile has blog pagination save feed options after create blog the settings of feeds must be editable trhough it's parent blog not offer to create sub-folder to blog the title of the post and the comments count are links to the specific article display count of blog-post comments users cant create more then one blog

ActionItem806: Squashed commit of the following:
block to list amount of posts by month offer BlogArchivesBlock only if profile has blog pagination save feed options after create blog the settings of feeds must be editable trhough it's parent blog not offer to create sub-folder to blog the title of the post and the comments count are links to the specific article display count of blog-post comments users cant create more then one blog
Joenio Costa
1 parent 28dd8dad
Showing 30 changed files with 800 additions and 18 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/article_helper.rb
app/helpers/blog_helper.rb
app/helpers/cms_helper.rb
app/helpers/content_viewer_helper.rb
app/models/article.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/models/folder.rb
app/models/profile.rb
app/views/cms/_blog.rhtml
app/views/cms/edit.rhtml
app/views/cms/view.rhtml
app/views/content_viewer/view_page.rhtml
db/migrate/056_add_data_to_articles.rb
db/schema.rb
public/stylesheets/article.css
public/stylesheets/blocks/blog-archives-block.css
@@ -20,22 +20,34 @@ class CmsController &lt; MyProfileController
  
   def available_article_types
     articles = [
-      Folder,
       TinyMceArticle,
       TextileArticle,
-      RssFeed,
       UploadedFile,
       Event
     ]
+    parent_id = params ? params[:parent_id] : nil
+    if !parent_id or !Article.find(parent_id).blog?
+      articles += [
+        Folder,
+        RssFeed
+      ]
+    end
     if profile.enterprise?
       articles << EnterpriseHomepage
     end
     articles
   end
  
+  def special_article_types
+    [Blog]
+  end
+
   def view
     @article = profile.articles.find(params[:id])
     @subitems = @article.children.reject {|item| item.folder? }
+    if @article.blog?
+      @subitems.reject! {|item| item.class == RssFeed }
+    end
     @folders = @article.children.select {|item| item.folder? }
   end
  
@@ -80,7 +92,7 @@ class CmsController &lt; MyProfileController
       return
     end
  
-    raise "Invalid article type #{@type}" unless available_article_types.map {|item| item.name}.include?(@type)
+    raise "Invalid article type #{@type}" unless valid_article_type?(@type)
     klass = @type.constantize
     @article = klass.new(params[:article])
  
@@ -192,5 +204,9 @@ class CmsController &lt; MyProfileController
     [url, url.sub('https:', 'http:')]
   end
  
+  def valid_article_type?(type)
+    (available_article_types + special_article_types).map {|item| item.name}.include?(type)
+  end
+
 end
  
@@ -29,6 +29,11 @@ class ProfileDesignController &lt; BoxOrganizerController
       blocks << ProductsBlock
     end
  
+    # block exclusive to profile has blog
+    if profile.has_blog?
+      blocks << BlogArchivesBlock
+    end
+
     blocks
   end
  
@@ -14,6 +14,10 @@ class ContentViewerController &lt; ApplicationController
         return
       end
     else
+      path.gsub!(/\/(\d{4})\/(\d{2})\Z/, '')
+      year = $1
+      month = $2
+
       @page = profile.articles.find_by_path(path)
       unless @page
         page_from_old_path = profile.articles.find_by_old_path(path)
@@ -66,6 +70,10 @@ class ContentViewerController &lt; ApplicationController
       remove_comment
     end
  
+    if @page.blog?
+      @page.filter = {:year => year, :month => month}
+    end
+
     @comments = @page.comments(true)
   end
  
@@ -0,0 +1,14 @@
+module ArticleHelper
+
+  def custom_options_for_article(article)
+    @article = article
+    content_tag('h4', _('Options')) +
+    content_tag('div',
+      check_box(:article, :published) +
+      content_tag('label', _('Published'), :for => 'article_published') +
+      check_box(:article, :accept_comments) +
+      content_tag('label', _('Accept Comments'), :for => 'article_accept_comments')
+    )
+  end
+
+end
@@ -0,0 +1,9 @@
+module BlogHelper
+
+  def custom_options_for_article(article)
+    @article = article
+    hidden_field_tag('article[published]', 1) +
+    hidden_field_tag('article[accept_comments]', 0)
+  end
+
+end
@@ -11,4 +11,16 @@ module CmsHelper
  
   attr_reader :environment
  
+  def options_for_article(article)
+    article_helper = ActionView::Base.new
+    article_helper.extend ArticleHelper
+    begin
+      class_name = article.class.name + 'Helper'
+      klass = class_name.constantize
+      article_helper.extend klass
+    rescue
+    end
+    article_helper.custom_options_for_article(article)
+  end
+
 end
 module ContentViewerHelper
+
+  include GetText
+
+  def number_of_comments(article)
+    n = article.comments.size
+    if n == 0
+     _('No comments yet')
+    else
+     n_('One comment', '%{comments} comments', n) % { :comments => n }
+    end
+  end
+
+  def article_title(article, args = {})
+    title = content_tag('h1', article.title, :class => 'title')
+    if article.belongs_to_blog?
+      unless args[:no_link]
+        title = content_tag('h3', link_to(article.name, article.url), :class => 'title')
+      end
+      title << content_tag('span', _("%s, by %s" % [show_date(article.created_at), article.profile.name]), :class => 'created-at')
+    end
+    title
+  end
+
+  def list_posts(articles)
+    pagination = will_paginate(articles, {
+      :param_name => 'npage',
+      :page_links => false,
+      :prev_label => _('Newer posts &raquo;'),
+      :next_label => _('&laquo; Older posts')
+    })
+    articles.map{ |i| content_tag('div', display_post(i), :class => 'blog-post', :id => "post-#{i.id}") }.join("\n") +
+      (pagination or '')
+  end
+
+  def display_post(article)
+    article_title(article) + content_tag('p', article.to_html) +
+    content_tag('p', link_to( number_of_comments(article), article.url ), :class => 'metadata')
+  end
+
+  def article_to_html(article)
+    if article.blog?
+      children = if article.filter and article.filter[:year] and article.filter[:month]
+        filter_date = DateTime.parse("#{article.filter[:year]}-#{article.filter[:month]}-01")
+        article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page, :conditions => [ 'created_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
+      else
+        article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page
+      end
+      article.to_html + (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(children))
+    else
+      article.to_html
+    end
+  end
+
 end
@@ -147,6 +147,10 @@ class Article &lt; ActiveRecord::Base
     name
   end
  
+  def belongs_to_blog?
+    self.parent and self.parent.blog?
+  end
+
   def url
     self.profile.url.merge(:page => path.split('/'))
   end
@@ -159,6 +163,10 @@ class Article &lt; ActiveRecord::Base
     false
   end
  
+  def blog?
+    false
+  end
+
   def display_to?(user)
     if self.public_article
       self.profile.display_info_to?(user)
@@ -0,0 +1,54 @@
+class Blog < Folder
+
+  has_many :posts, :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'type != ?', 'RssFeed' ], :order => 'created_at DESC'
+
+  attr_accessor :feed_attrs
+  attr_accessor :filter
+
+  after_create do |blog|
+    blog.children << RssFeed.new(:name => 'feed', :profile => blog.profile, :include => 'parent_and_children')
+    blog.feed = blog.feed_attrs
+  end
+
+  settings_items :posts_per_page, :type => :integer, :default => 20
+  settings_items :title, :type => :string, :default => _('My blog')
+
+  before_save do |blog|
+    blog.name = 'blog'
+  end
+
+  def self.short_description
+    _('Blog')
+  end
+
+  def self.description
+    _('A blog, inside which you can put other articles.')
+  end
+
+  # FIXME isn't this too much including just to be able to generate some HTML?
+  include ActionView::Helpers::TagHelper
+  def to_html
+    content_tag('div', body) + tag('hr')
+  end
+
+  def folder?
+    true
+  end
+
+  def blog?
+    true
+  end
+
+  def feed
+    self.children.find(:first, :conditions => {:type => 'RssFeed'})
+  end
+
+  def feed=(attrs)
+    if self.feed
+      self.feed.update_attributes(attrs)
+    else
+      self.feed_attrs = attrs
+    end
+  end
+
+end
@@ -0,0 +1,31 @@
+class BlogArchivesBlock < Block
+
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionController::UrlWriter
+
+  def self.description
+    _('List posts of your blog')
+  end
+
+  def default_title
+    _('Blog posts')
+  end
+
+  def content
+    return nil unless owner.has_blog?
+    results = ''
+    posts = owner.blog.posts
+    posts.group_by{|i| i.created_at.year}.each do |year, results_by_year|
+      results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
+      results << "<ul class='#{year}-archive'>"
+      results_by_year.group_by{|i| [i.created_at.strftime("%m"), i.created_at.strftime("%B")]}.sort.each do |month, results_by_month|
+        results << content_tag('li', link_to("#{month[1]} (#{results_by_month.size})", owner.generate_url(:controller => 'content_viewer', :action => 'view_page', :page => [owner.blog.path, year, month[0]])))
+      end
+      results << "</ul>"
+    end
+    block_title(title) +
+    content_tag('ul', results, :class => 'blog-archives')
+  end
+
+end
 class Folder < Article
  
+  acts_as_having_settings :field => :setting
+
   def self.short_description
     _('Folder')
   end
@@ -469,4 +469,14 @@ class Profile &lt; ActiveRecord::Base
     LayoutTemplate.find(layout_template).number_of_boxes
   end
  
+  def blog
+    if self.has_blog?
+      self.articles.find(:first, :conditions => {:type => 'Blog'})
+    end
+  end
+
+  def has_blog?
+    !self.articles.count(:conditions => {:type => 'Blog'}).zero?
+  end
+
 end
@@ -0,0 +1,21 @@
+<h3><%= _('My Blog') %></h3>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<%= f.text_field('title', :size => '64') %>
+
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64)) %>
+
+<h4><%= _('Settings') %></h4>
+
+<%= f.text_field('posts_per_page') %>
+
+<h5><%= _('Feed options') %></h5>
+
+<% fields_for 'article[feed]', @article.feed do |feed| %>
+
+<%= labelled_form_field(_('Limit of articles'), feed.text_field(:limit)) %>
+
+<%= labelled_form_field(_('Use as item description:'), feed.select(:feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %>
+
+<% end %>
@@ -24,13 +24,7 @@
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
  
   <div id='edit-article-options'>
-    <h4><%= _('Options') %></h4>
-    <div>
-      <%= check_box :article, :published %>
-      <label for='article_published'><%= _('Published')%></label>
-      <%= check_box :article, :accept_comments %>
-      <label for='article_accept_comments'><%= _('Accept Comments')%></label>
-    </div>
+    <%= options_for_article(@article) %>
   </div>
  
   <% button_bar do %>
@@ -13,7 +13,15 @@
  
 <% button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
-  <%= button :add, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>
+  <% if profile.has_blog? %>
+    <%= button :edit, _('Edit blog'), :action => 'edit', :id => profile.blog.id %>
+  <% else %>
+    <%= button :add, _('Create blog'), :action => 'new', :type => 'Blog', :parent_id => parent_id %>
+  <% end %>
+
+  <% if !@article or !@article.blog? %>
+    <%= button :add, _('New folder'), :action => 'new', :type => 'Folder', :parent_id => parent_id %>
+  <% end %>
   <%= lightbox_button('new', _('New article'), :action => 'new', :parent_id => parent_id) %>
 <% end %>
  
@@ -23,7 +23,7 @@
  
 <div onmouseover="showArticleActions(true)"
      onmouseout="showArticleActions(false)">
-  <h1><%= @page.title %></h1>
+  <%= article_title(@page, :no_link => true) %>
   <script type="text/javascript">
     function showArticleActions( show ) {
       var act = $("article-actions");
@@ -65,7 +65,7 @@
 <% end %>
  
 <div class="article-body">
-  <%= @page.to_html %>
+  <%= article_to_html(@page) %>
   <br style="clear:both" />
 </div> <!-- end class="article-body" -->
  
@@ -82,9 +82,8 @@
     <i class="do-not-comment"><%= _('This article does not accept comments')%></i>
   <% else %>
   <h3 <%= 'class="no-comments-yet"' if @comments.size == 0 %>>
-  <%= @comments.size == 0 ? _('No comments yet') :
-          (n_('One comment', '%{comments} comments', @comments.size)) % { :comments => @comments.size}
-  %></h3>
+    <%= number_of_comments(@page) %>
+  </h3>
   <%= render :partial => 'comment', :collection => @comments %>
   <%= render :partial => 'comment_form' %>
   <% end %>
@@ -0,0 +1,11 @@
+class AddDataToArticles < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :setting, :text
+    add_column :article_versions, :setting, :text
+  end
+
+  def self.down
+    remove_column :articles, :setting
+    remove_column :article_versions, :setting
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 55) do
+ActiveRecord::Schema.define(:version => 56) do
  
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -39,6 +39,7 @@ ActiveRecord::Schema.define(:version =&gt; 55) do
     t.boolean  "public_article",       :default => true
     t.boolean  "accept_comments",      :default => true
     t.integer  "reference_article_id"
+    t.text     "setting"
   end
  
   create_table "articles", :force => true do |t|
@@ -69,6 +70,7 @@ ActiveRecord::Schema.define(:version =&gt; 55) do
     t.boolean  "public_article",       :default => true
     t.boolean  "accept_comments",      :default => true
     t.integer  "reference_article_id"
+    t.text     "setting"
   end
  
   create_table "articles_categories", :id => false, :force => true do |t|
@@ -165,3 +165,39 @@
   border: none;
 }
  
+/* * *  Blog  * * */
+
+.blog-post a {
+  text-decoration: none;
+}
+
+#content .title {
+  margin-bottom: 2px;
+}
+
+.blog-post .metadata {
+  display: block;
+  text-align: center;
+  font-size: small;
+}
+
+#content .created-at {
+  color: gray;
+  font-size: small;
+  display: block;
+  text-align: right;
+}
+
+#content .blog-post .created-at {
+  text-align: left;
+}
+
+#content .pagination .prev_page {
+  position: absolute;
+  right: 0;
+}
+
+#content .pagination .next_page {
+  position: absolute;
+  left: 0;
+}
@@ -0,0 +1,17 @@
+#content .blog-archives-block {
+  padding: 10px 0px 10px 10px;
+}
+
+.blog-archives-block ul {
+  margin: 0px;
+  padding: 0px 0px 0px 20px;
+}
+
+.blog-archives-block li {
+  margin: 0px;
+  padding: 0px;
+}
+
+.blog-archives-block a {
+  text-decoration: none;
+}
@@ -630,4 +630,99 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'div', :descendant => { :tag => 'h4', :content => 'Categorize your article' }
   end
  
+  should 'offer to create a blog' do
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=Blog"}
+  end
+
+  should 'not display input name on create blog' do
+    get :new, :profile => profile.identifier, :type => 'Blog'
+    assert_no_tag :tag => 'input', :attributes => { :name => 'article[name]', :type => 'text' }
+  end
+
+  should 'display posts per page input with default value on edit blog' do
+    get :new, :profile => profile.identifier, :type => 'Blog'
+    assert_tag :tag => 'input', :attributes => { :name => 'article[posts_per_page]', :type => 'text', :value => '20' }
+  end
+
+  should 'not offer to create special article types' do
+    get :new, :profile => profile.identifier
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=Blog"}
+  end
+
+  should 'not offer to create a blog if user already have' do
+    profile.articles << Blog.new(:name => 'blog test')
+
+    profile.articles.reload
+    assert profile.has_blog?
+
+    get :index, :profile => profile.identifier
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=Blog"}
+  end
+
+  should 'offer to edit a blog' do
+    profile.articles << Blog.new(:name => 'blog test')
+
+    profile.articles.reload
+    assert profile.has_blog?
+
+    b = profile.blog
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/edit/#{b.id}"}
+  end
+
+  should 'not offer to add folder to blog' do
+    profile.articles << Blog.new(:name => 'blog test')
+
+    profile.articles.reload
+    assert profile.has_blog?
+
+    get :view, :profile => profile.identifier, :id => profile.blog.id
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?parent_id=#{profile.blog.id}&amp;type=Folder"}
+  end
+
+  should 'not show feed subitem for blog' do
+    profile.articles << Blog.new(:name => 'Blog for test')
+
+    profile.articles.reload
+    assert profile.has_blog?
+
+    get :view, :profile => profile.identifier, :id => profile.blog.id
+
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/edit/#{profile.blog.feed.id}" }
+  end
+
+  should 'update feed options by edit blog form' do
+    profile.articles << Blog.new(:name => 'Blog for test')
+    post :edit, :profile => profile.identifier, :id => profile.blog.id, :article => { :feed => { :limit => 7 } }
+    assert_equal 7, profile.blog.feed.limit
+  end
+
+  should 'not offer folder to blog articles' do
+    @controller.stubs(:profile).returns(Enterprise.new)
+    blog = Blog.create!(:name => 'Blog for test', :profile => profile)
+    @controller.stubs(:params).returns({ :parent_id => blog.id })
+
+    assert_not_includes @controller.available_article_types, Folder
+  end
+
+  should 'not offer rssfeed to blog articles' do
+    @controller.stubs(:profile).returns(Enterprise.new)
+    blog = Blog.create!(:name => 'Blog for test', :profile => profile)
+    @controller.stubs(:params).returns({ :parent_id => blog.id })
+
+    assert_not_includes @controller.available_article_types, RssFeed
+  end
+
+  should 'update blog posts_per_page setting' do
+    profile.articles << Blog.new(:name => 'Blog for test')
+    post :edit, :profile => profile.identifier, :id => profile.blog.id, :article => { :posts_per_page => 5 }
+    assert_equal 5, profile.blog.posts_per_page
+  end
+
+  should 'display input title on create blog' do
+    get :new, :profile => profile.identifier, :type => 'Blog'
+    assert_tag :tag => 'input', :attributes => { :name => 'article[title]', :type => 'text' }
+  end
+
 end
@@ -528,4 +528,22 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_response :missing
   end
  
+  should 'display pagination links of blog' do
+    blog = Blog.create!(:name => 'A blog test', :profile => profile, :posts_per_page => 5)
+    for n in 1..10
+      blog.children << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
+    end
+    assert_equal 10, blog.posts.size
+
+    get :view_page, :profile => profile.identifier, :page => [blog.path]
+    assert_tag :tag => 'a', :attributes => { :href => "/#{profile.identifier}/#{blog.path}?npage=2", :rel => 'next' }
+  end
+
+  should 'extract year and month from path' do
+    blog = Blog.create!(:name => 'A blog test', :profile => profile)
+    year, month = blog.created_at.year, blog.created_at.month
+    get :view_page, :profile => profile.identifier, :page => [blog.path, year, month]
+    assert_equal({ :year => year.to_s, :month => month.to_s }, assigns(:page).filter)
+  end
+
 end
@@ -269,5 +269,15 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'a', :attributes => {:href => '/myprofile/test_profile'}
   end
  
-end
+  should 'offer to create blog archives block only if has blog' do
+    Blog.create!(:name => 'Blog test', :profile => holder)
+    get :add_block, :profile => 'designtestuser'
+    assert_tag :tag => 'input', :attributes => { :id => 'type_blogarchivesblock', :value => 'BlogArchivesBlock' }
+  end
  
+  should 'not offer to create blog archives block if user dont have blog' do
+    get :add_block, :profile => 'designtestuser'
+    assert_no_tag :tag => 'input', :attributes => { :id => 'type_blogarchivesblock', :value => 'BlogArchivesBlock' }
+  end
+
+end
@@ -263,6 +263,10 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert !Article.new.folder?, 'should identify itself as non-folder'
   end
  
+  should 'identify itself as a non-blog' do
+    assert !Article.new.blog?, 'should identify itself as non-blog'
+  end
+
   should 'always display if public content' do
     person = create_user('testuser').person
     assert_equal true, person.home_page.display_to?(nil)
@@ -544,4 +548,18 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_nil page
   end
  
+  should 'identify if belongs to blog' do
+    p = create_user('user_blog_test').person
+    blog = Blog.create!(:name => 'Blog test', :profile => p)
+    post = TextileArticle.create!(:name => 'First post', :profile => p, :parent => blog)
+    assert post.belongs_to_blog?
+  end
+
+  should 'not belongs to blog' do
+    p = create_user('user_blog_test').person
+    folder = Folder.create!(:name => 'Not Blog', :profile => p)
+    a = TextileArticle.create!(:name => 'Not blog post', :profile => p, :parent => folder)
+    assert !a.belongs_to_blog?
+  end
+
 end
@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BlogArchivesBlockTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = create_user('flatline').person
+    @profile.articles << Blog.new(:name => 'blog', :profile => @profile)
+  end
+  attr_reader :profile
+
+  should 'default describe' do
+    assert_not_equal Block.description, BlogArchivesBlock.description
+  end
+
+  should 'is editable' do
+    l = BlogArchivesBlock.new
+    assert l.editable?
+  end
+
+  should 'list amount posts by year' do
+    date = DateTime.parse('2008-01-01')
+    blog = profile.blog
+    for i in 1..10 do
+      post = TextileArticle.create!(:name => "post #{i} test", :profile => profile, :parent => blog)
+      post.update_attribute(:created_at, date)
+    end
+    block = BlogArchivesBlock.new
+    block.stubs(:owner).returns(profile)
+    assert_tag_in_string block.content, :tag => 'li', :content => '2008 (10)'
+  end
+
+  should 'list amount posts by month' do
+    date = DateTime.parse('2008-01-01')
+    blog = profile.blog
+    for i in 1..10 do
+      post = TextileArticle.create!(:name => "post #{i} test", :profile => profile, :parent => blog)
+      post.update_attribute(:created_at, date)
+    end
+    block = BlogArchivesBlock.new
+    block.stubs(:owner).returns(profile)
+    assert_tag_in_string block.content, :tag => 'a', :content => 'January (10)', :attributes => {:href => /2008\/01/}
+  end
+
+
+  should 'order list of amount posts' do
+    blog = profile.blog
+    for i in 1..10 do
+      post = TextileArticle.create!(:name => "post #{i} test", :profile => profile, :parent => blog)
+      post.update_attribute(:created_at, DateTime.parse("2008-#{i}-01"))
+    end
+    block = BlogArchivesBlock.new
+    block.stubs(:owner).returns(profile)
+    assert_tag_in_string block.content, :tag => 'li', :content => 'January (1)',
+      :sibling => {:tag => 'li', :content => 'February (1)',
+        :sibling => {:tag => 'li', :content => 'March (1)',
+          :sibling => {:tag => 'li', :content => 'April (1)',
+            :sibling => {:tag => 'li', :content => 'May (1)'}}}}
+  end
+
+  should 'not display any content if has no blog' do
+    profile.stubs(:has_blog?).returns(false)
+    assert !profile.has_blog?
+    block = BlogArchivesBlock.new
+    block.stubs(:owner).returns(profile)
+    assert_nil block.content
+  end
+
+end
@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BlogHelperTest < Test::Unit::TestCase
+
+  include BlogHelper
+
+  def setup
+    stubs(:show_date).returns('')
+    @profile = create_user('blog_helper_test').person
+  end
+  attr :profile
+
+  should 'add real tests' do
+    assert true
+  end
+
+end
@@ -0,0 +1,106 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BlogTest < ActiveSupport::TestCase
+
+  should 'be an article' do
+    assert_kind_of Article, Blog.new
+  end
+
+  should 'provide proper description' do
+    assert_kind_of String, Blog.description
+  end
+
+  should 'provide proper short description' do
+    assert_kind_of String, Blog.short_description
+  end
+
+  should 'provide own icon name' do
+    assert_not_equal Article.new.icon_name, Blog.new.icon_name
+  end
+
+  should 'identify as folder' do
+    assert Blog.new.folder?, 'blog must identity itself as folder'
+  end
+
+  should 'identify as blog' do
+    assert Blog.new.blog?, 'blog must identity itself as blog'
+  end
+
+  should 'create rss feed automatically' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test')
+    assert_kind_of RssFeed, b.feed
+  end
+
+  should 'get first blog from profile' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test')
+    assert_equal p.blog, b
+  end
+
+  should 'save feed options' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test')
+    p.blog.feed = { :limit => 7 }
+    assert_equal 7, p.blog.feed.limit
+  end
+
+  should 'includes only articles child of the same article on feed' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test')
+    assert_equal 'parent_and_children', b.feed.include
+  end
+
+  should 'save feed options after create blog' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test', :feed => { :limit => 7 })
+
+    p.blog.feed.reload
+    assert_equal 7, p.blog.feed.limit
+  end
+
+  should 'list 20 posts per page by default' do
+    blog = Blog.new
+    assert_equal 20, blog.posts_per_page
+  end
+
+  should 'update posts per page setting' do
+    p = create_user('testusermerda').person
+    blog = Blog.create!(:profile => p, :name => 'Blog test')
+    blog.reload
+    blog.posts_per_page = 5
+    assert blog.save!
+    assert_equal 5, blog.posts_per_page
+  end
+
+  should 'has posts' do
+    p = create_user('testusermerda').person
+    blog = Blog.create!(:profile => p, :name => 'Blog test')
+    post = TextileArticle.create!(:name => 'First post', :profile => p, :parent => blog)
+    blog.children << post
+    assert_includes blog.posts, post
+  end
+
+  should 'not includes rss feed in posts' do
+    p = create_user('testusermerda').person
+    blog = Blog.create!(:profile => p, :name => 'Blog test')
+    assert_includes blog.children, blog.feed
+    assert_not_includes blog.posts, blog.feed
+  end
+
+  should 'list posts ordered by created at' do
+    p = create_user('testusermerda').person
+    blog = Blog.create!(:profile => p, :name => 'Blog test', :profile => p)
+    newer = TextileArticle.create!(:name => 'Post 2', :parent => blog, :profile => p)
+    older = TextileArticle.create!(:name => 'Post 1', :parent => blog, :profile => p, :created_at => Time.now - 1.month)
+    assert_equal [newer, older], blog.posts
+  end
+
+  should 'has filter' do
+    p = create_user('testusermerda').person
+    blog = Blog.create!(:profile => p, :name => 'Blog test', :profile => p)
+    blog.filter = {:param => 'value'}
+    assert_equal 'value', blog.filter[:param]
+  end
+
+end
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CmsHelperTest < Test::Unit::TestCase
+
+  include CmsHelper
+  include BlogHelper
+
+  should 'show default options for article' do
+    result = options_for_article(RssFeed.new)
+    assert_match /id="article_published" name="article\[published\]" type="checkbox" value="1"/, result
+    assert_match /id="article_accept_comments" name="article\[accept_comments\]" type="checkbox" value="1"/, result
+  end
+
+  should 'show custom options for blog' do
+    result = options_for_article(Blog.new)
+    assert_match /id="article\[published\]" name="article\[published\]" type="hidden" value="1"/, result
+    assert_match /id="article\[accept_comments\]" name="article\[accept_comments\]" type="hidden" value="0"/, result
+  end
+
+end
+
+module RssFeedHelper
+end
@@ -0,0 +1,95 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContentViewerHelperTest < Test::Unit::TestCase
+
+  include ActionView::Helpers::TagHelper
+  include ContentViewerHelper
+
+  def setup
+    @profile = create_user('blog_helper_test').person
+  end
+  attr :profile
+
+  should 'display created-at for blog posts' do
+    blog = Blog.create!(:name => 'Blog test', :profile => profile)
+    post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => blog)
+    result = article_title(post)
+    assert_match /#{post.created_at}, by #{profile.identifier}/, result
+  end
+
+  should 'not display created-at for non-blog posts' do
+    article = TextileArticle.create!(:name => 'article for test', :profile => profile)
+    result = article_title(article)
+    assert_no_match /#{article.created_at}, by #{profile.identifier}/, result
+  end
+
+  should 'create link on title of blog posts' do
+    blog = Blog.create!(:name => 'Blog test', :profile => profile)
+    post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => blog)
+    assert post.belongs_to_blog?
+    result = article_title(post)
+    assert_match /a href='#{post.url}'>#{post.name}</, result
+  end
+
+  should 'not create link on title if pass no_link option' do
+    blog = Blog.create!(:name => 'Blog test', :profile => profile)
+    post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => blog)
+    result = article_title(post, :no_link => :true)
+    assert_no_match /a href='#{post.url}'>#{post.name}</, result
+  end
+
+  should 'not create link on title if non-blog post' do
+    article = TextileArticle.create!(:name => 'art test', :profile => profile)
+    result = article_title(article)
+    assert_no_match /a href='#{article.url}'>#{article.name}</, result
+  end
+
+  should 'count total of comments from post' do
+    article = TextileArticle.new(:name => 'first post for test', :body => 'first post for test', :profile => profile)
+    article.stubs(:url).returns('')
+    article.stubs(:comments).returns([Comment.new(:author => profile, :title => 'test', :body => 'test')])
+    result = display_post(article)
+    assert_match /One comment/, result
+  end
+
+  should 'not list feed article' do
+    profile.articles << Blog.new(:name => 'Blog test')
+    assert_includes profile.blog.children.map{|i| i.class}, RssFeed
+    result = list_posts(profile.blog.posts)
+    assert_no_match /feed/, result
+  end
+
+  should 'filter blog posts by date' do
+    blog = Blog.create!(:name => 'Blog test', :profile => profile)
+
+    nov = TextileArticle.create!(:name => 'November post', :parent => blog, :profile => profile)
+    nov.update_attributes!(:created_at => DateTime.parse('2008-11-15'))
+
+    sep = TextileArticle.create!(:name => 'September post', :parent => blog, :profile => profile)
+    sep.update_attribute(:created_at, DateTime.parse('2008-09-10'))
+
+    blog.reload
+    blog.filter = {:year => 2008, :month => 11}
+    assert blog.save!
+
+    self.stubs(:params).returns({:npage => nil})
+
+    result = article_to_html(blog)
+
+    assert_match /November post/, result
+    assert_no_match /September post/, result
+  end
+
+end
+
+def show_date(date)
+  date.to_s
+end
+def link_to(content, url)
+  "<a href='#{url}'>#{content}</a>"
+end
+def _(text)
+  text
+end
+def will_paginate(arg1, arg2)
+end
@@ -967,6 +967,28 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_not_equal p1.environment, p2.environment
   end
  
+  should 'has blog' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test')
+    assert p.has_blog?
+  end
+
+  should 'not has blog' do
+    p = create_user('testuser').person
+    assert !p.has_blog?
+  end
+
+  should 'get blog when has blog' do
+    p = create_user('testuser').person
+    b = Blog.create!(:profile => p, :name => 'blog_feed_test')
+    assert_equal b, p.blog
+  end
+
+  should 'get nil when no blog' do
+    p = create_user('testuser').person
+    assert_nil p.blog
+  end
+
   private
  
   def assert_invalid_identifier(id)
...	...	@@ -20,22 +20,34 @@ class CmsController < MyProfileController
20	20
21	21	def available_article_types
22	22	articles = [
23		- Folder,
24	23	TinyMceArticle,
25	24	TextileArticle,
26		- RssFeed,
27	25	UploadedFile,
28	26	Event
29	27	]
	28	+ parent_id = params ? params[:parent_id] : nil
	29	+ if !parent_id or !Article.find(parent_id).blog?
	30	+ articles += [
	31	+ Folder,
	32	+ RssFeed
	33	+ ]
	34	+ end
30	35	if profile.enterprise?
31	36	articles << EnterpriseHomepage
32	37	end
33	38	articles
34	39	end
35	40
	41	+ def special_article_types
	42	+ [Blog]
	43	+ end
	44	+
36	45	def view
37	46	@article = profile.articles.find(params[:id])
38	47	@subitems = @article.children.reject {\|item\| item.folder? }
	48	+ if @article.blog?
	49	+ @subitems.reject! {\|item\| item.class == RssFeed }
	50	+ end
39	51	@folders = @article.children.select {\|item\| item.folder? }
40	52	end
41	53
...	...	@@ -80,7 +92,7 @@ class CmsController < MyProfileController
80	92	return
81	93	end
82	94
83		- raise "Invalid article type #{@type}" unless available_article_types.map {\|item\| item.name}.include?(@type)
	95	+ raise "Invalid article type #{@type}" unless valid_article_type?(@type)
84	96	klass = @type.constantize
85	97	@article = klass.new(params[:article])
86	98
...	...	@@ -192,5 +204,9 @@ class CmsController < MyProfileController
192	204	[url, url.sub('https:', 'http:')]
193	205	end
194	206
	207	+ def valid_article_type?(type)
	208	+ (available_article_types + special_article_types).map {\|item\| item.name}.include?(type)
	209	+ end
	210	+
195	211	end
196	212
...	...
...	...	@@ -29,6 +29,11 @@ class ProfileDesignController < BoxOrganizerController
29	29	blocks << ProductsBlock
30	30	end
31	31
	32	+ # block exclusive to profile has blog
	33	+ if profile.has_blog?
	34	+ blocks << BlogArchivesBlock
	35	+ end
	36	+
32	37	blocks
33	38	end
34	39
...	...
...	...	@@ -14,6 +14,10 @@ class ContentViewerController < ApplicationController
14	14	return
15	15	end
16	16	else
	17	+ path.gsub!(/\/(\d{4})\/(\d{2})\Z/, '')
	18	+ year = $1
	19	+ month = $2
	20	+
17	21	@page = profile.articles.find_by_path(path)
18	22	unless @page
19	23	page_from_old_path = profile.articles.find_by_old_path(path)
...	...	@@ -66,6 +70,10 @@ class ContentViewerController < ApplicationController
66	70	remove_comment
67	71	end
68	72
	73	+ if @page.blog?
	74	+ @page.filter = {:year => year, :month => month}
	75	+ end
	76	+
69	77	@comments = @page.comments(true)
70	78	end
71	79
...	...
...	...	@@ -0,0 +1,14 @@
	1	+module ArticleHelper
	2	+
	3	+ def custom_options_for_article(article)
	4	+ @article = article
	5	+ content_tag('h4', _('Options')) +
	6	+ content_tag('div',
	7	+ check_box(:article, :published) +
	8	+ content_tag('label', _('Published'), :for => 'article_published') +
	9	+ check_box(:article, :accept_comments) +
	10	+ content_tag('label', _('Accept Comments'), :for => 'article_accept_comments')
	11	+ )
	12	+ end
	13	+
	14	+end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+module BlogHelper
	2	+
	3	+ def custom_options_for_article(article)
	4	+ @article = article
	5	+ hidden_field_tag('article[published]', 1) +
	6	+ hidden_field_tag('article[accept_comments]', 0)
	7	+ end
	8	+
	9	+end
...	...
...	...	@@ -11,4 +11,16 @@ module CmsHelper
11	11
12	12	attr_reader :environment
13	13
	14	+ def options_for_article(article)
	15	+ article_helper = ActionView::Base.new
	16	+ article_helper.extend ArticleHelper
	17	+ begin
	18	+ class_name = article.class.name + 'Helper'
	19	+ klass = class_name.constantize
	20	+ article_helper.extend klass
	21	+ rescue
	22	+ end
	23	+ article_helper.custom_options_for_article(article)
	24	+ end
	25	+
14	26	end
...	...
1	1	module ContentViewerHelper
	2	+
	3	+ include GetText
	4	+
	5	+ def number_of_comments(article)
	6	+ n = article.comments.size
	7	+ if n == 0
	8	+ _('No comments yet')
	9	+ else
	10	+ n_('One comment', '%{comments} comments', n) % { :comments => n }
	11	+ end
	12	+ end
	13	+
	14	+ def article_title(article, args = {})
	15	+ title = content_tag('h1', article.title, :class => 'title')
	16	+ if article.belongs_to_blog?
	17	+ unless args[:no_link]
	18	+ title = content_tag('h3', link_to(article.name, article.url), :class => 'title')
	19	+ end
	20	+ title << content_tag('span', _("%s, by %s" % [show_date(article.created_at), article.profile.name]), :class => 'created-at')
	21	+ end
	22	+ title
	23	+ end
	24	+
	25	+ def list_posts(articles)
	26	+ pagination = will_paginate(articles, {
	27	+ :param_name => 'npage',
	28	+ :page_links => false,
	29	+ :prev_label => _('Newer posts »'),
	30	+ :next_label => _('« Older posts')
	31	+ })
	32	+ articles.map{ \|i\| content_tag('div', display_post(i), :class => 'blog-post', :id => "post-#{i.id}") }.join("\n") +
	33	+ (pagination or '')
	34	+ end
	35	+
	36	+ def display_post(article)
	37	+ article_title(article) + content_tag('p', article.to_html) +
	38	+ content_tag('p', link_to( number_of_comments(article), article.url ), :class => 'metadata')
	39	+ end
	40	+
	41	+ def article_to_html(article)
	42	+ if article.blog?
	43	+ children = if article.filter and article.filter[:year] and article.filter[:month]
	44	+ filter_date = DateTime.parse("#{article.filter[:year]}-#{article.filter[:month]}-01")
	45	+ article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page, :conditions => [ 'created_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
	46	+ else
	47	+ article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page
	48	+ end
	49	+ article.to_html + (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(children))
	50	+ else
	51	+ article.to_html
	52	+ end
	53	+ end
	54	+
2	55	end
...	...
...	...	@@ -147,6 +147,10 @@ class Article < ActiveRecord::Base
147	147	name
148	148	end
149	149
	150	+ def belongs_to_blog?
	151	+ self.parent and self.parent.blog?
	152	+ end
	153	+
150	154	def url
151	155	self.profile.url.merge(:page => path.split('/'))
152	156	end
...	...	@@ -159,6 +163,10 @@ class Article < ActiveRecord::Base
159	163	false
160	164	end
161	165
	166	+ def blog?
	167	+ false
	168	+ end
	169	+
162	170	def display_to?(user)
163	171	if self.public_article
164	172	self.profile.display_info_to?(user)
...	...
...	...	@@ -0,0 +1,54 @@
	1	+class Blog < Folder
	2	+
	3	+ has_many :posts, :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'type != ?', 'RssFeed' ], :order => 'created_at DESC'
	4	+
	5	+ attr_accessor :feed_attrs
	6	+ attr_accessor :filter
	7	+
	8	+ after_create do \|blog\|
	9	+ blog.children << RssFeed.new(:name => 'feed', :profile => blog.profile, :include => 'parent_and_children')
	10	+ blog.feed = blog.feed_attrs
	11	+ end
	12	+
	13	+ settings_items :posts_per_page, :type => :integer, :default => 20
	14	+ settings_items :title, :type => :string, :default => _('My blog')
	15	+
	16	+ before_save do \|blog\|
	17	+ blog.name = 'blog'
	18	+ end
	19	+
	20	+ def self.short_description
	21	+ _('Blog')
	22	+ end
	23	+
	24	+ def self.description
	25	+ _('A blog, inside which you can put other articles.')
	26	+ end
	27	+
	28	+ # FIXME isn't this too much including just to be able to generate some HTML?
	29	+ include ActionView::Helpers::TagHelper
	30	+ def to_html
	31	+ content_tag('div', body) + tag('hr')
	32	+ end
	33	+
	34	+ def folder?
	35	+ true
	36	+ end
	37	+
	38	+ def blog?
	39	+ true
	40	+ end
	41	+
	42	+ def feed
	43	+ self.children.find(:first, :conditions => {:type => 'RssFeed'})
	44	+ end
	45	+
	46	+ def feed=(attrs)
	47	+ if self.feed
	48	+ self.feed.update_attributes(attrs)
	49	+ else
	50	+ self.feed_attrs = attrs
	51	+ end
	52	+ end
	53	+
	54	+end
...	...
...	...	@@ -0,0 +1,31 @@
	1	+class BlogArchivesBlock < Block
	2	+
	3	+ include ActionView::Helpers::TagHelper
	4	+ include ActionView::Helpers::UrlHelper
	5	+ include ActionController::UrlWriter
	6	+
	7	+ def self.description
	8	+ _('List posts of your blog')
	9	+ end
	10	+
	11	+ def default_title
	12	+ _('Blog posts')
	13	+ end
	14	+
	15	+ def content
	16	+ return nil unless owner.has_blog?
	17	+ results = ''
	18	+ posts = owner.blog.posts
	19	+ posts.group_by{\|i\| i.created_at.year}.each do \|year, results_by_year\|
	20	+ results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
	21	+ results << "<ul class='#{year}-archive'>"
	22	+ results_by_year.group_by{\|i\| [i.created_at.strftime("%m"), i.created_at.strftime("%B")]}.sort.each do \|month, results_by_month\|
	23	+ results << content_tag('li', link_to("#{month[1]} (#{results_by_month.size})", owner.generate_url(:controller => 'content_viewer', :action => 'view_page', :page => [owner.blog.path, year, month[0]])))
	24	+ end
	25	+ results << "</ul>"
	26	+ end
	27	+ block_title(title) +
	28	+ content_tag('ul', results, :class => 'blog-archives')
	29	+ end
	30	+
	31	+end
...	...