wa_bcms_blog 1.1.0

data/app/views/portlets/blog_post/_form.html.erb

@@ -0,0 +1,3 @@
+<%= f.cms_text_field :name %>
+<%= f.cms_drop_down :blog_id, Blog.all.map{|b| [b.name, b.id.to_s]} %>
+<%# f.cms_text_area :template, :default_value => @block.class.default_template %>

data/app/views/portlets/blog_post/render.html.erb

@@ -0,0 +1,33 @@
+<% page_title @blog_post.name %>
+<%= render :partial => "partials/blog_post", :object => @blog_post %>
+
+<style>
+  @import url('/stylesheets/cms/form_layout.css');
+</style>
+
+<div class="blog_comment_form">
+  <% form_for @blog_comment, :url => cms_handler_path(@portlet, "create_comment") do |f| %>
+    <%= f.hidden_field :post_id %>
+    <%= f.error_messages %>
+    <div class="fields text_fields">
+      <%= f.label :author, 'Name *' %>
+      <%= f.text_field :author %>
+    </div>
+    <div class="fields text_fields clear">
+      <%= f.label :email, 'E-mail address' %>
+      <%= f.text_field :email %>
+    </div>
+    <div class="fields text_fields clear">
+      <%= f.label :url, 'Web site' %>
+      <%= f.text_field :url %>
+    </div>
+    <div class="fields text_editor_fields clear">
+      <%= f.label :body, 'Body *' %>
+      <br/>
+      <%= f.text_area :body, :size => "50x5", :style => 'height: auto'  %>
+    </div>
+    <div class="buttons clear">
+      <%= submit_tag "Submit comment" %>
+    </div>
+  <% end %>
+</div>

data/app/views/portlets/blog_posts/_form.html.erb

@@ -0,0 +1,13 @@
+<%= f.cms_text_field :name, :label => 'Portlet Name', :instructions => 'Since we may have many Articles portlets, each with different parameters, give each portlet a descriptive name.' %>
+
+<%= f.cms_drop_down :blog_id, Blog.all.map{|b| [b.name, b.id.to_s]}, :include_blank => true, :label => "Show posts from", :instructions => 'Leave blank to include posts from all blogs' %>
+<%# f.cms_drop_down :show_posts_as, [['First post as full post, the rest as Summary + Read More link', 'first_full_post_others_summary'], ['Summary + Read More link', 'summary'], ['Full post', 'full_post'], ['Title (links to post)', 'link']] %>
+<%= f.cms_drop_down :show_posts_as, [['Title (links to post)', 'link'], ['Post', 'post']] %>
+<%= f.cms_check_box :show_full_posts %>
+<%= f.cms_drop_down :category_id, categories_for('Blog Post').map{|c| [c.path, c.id]}, :include_blank => true, :label => "Only posts in category" %>
+<%= f.cms_tag_list :label => "Only posts with tags", :instructions => 'Separate tags with spaces' %>
+<%= f.cms_text_field :exclude_tags, :label => 'Exclude posts with tags' %>
+<%= f.cms_text_field :limit, :label => 'Limit' %>
+<%= f.cms_text_area :render_blog_post_code, :label => 'Code to turn blog_post into link text' %>
+
+<%= f.cms_template_editor :template %>

data/app/views/portlets/blog_posts/render.html.haml

@@ -0,0 +1,9 @@
+- if @portlet.show_posts_as == 'post'
+  = render :partial => '/partials/blog_post', :collection => @blog_posts, :locals => {:show_full_posts => @options[:show_full_posts]}
+- elsif @portlet.show_posts_as == 'link'
+  %ul.blog_posts
+    - for blog_post in @blog_posts
+      - text = @portlet.render_blog_post_code.present? ? eval(@portlet.render_blog_post_code) : text = truncate(blog_post.name, 30)
+      %li= link_to text, _blog_post_path(blog_post)
+- else
+  Unrecognized option '#{@portlet.show_posts_as}' for @portlet.show_posts_as

data/db/migrate/20090415000000_create_blogs.rb

@@ -0,0 +1,45 @@
+require 'pp'
+
+Page # trigger auto-loading
+# At the time of this writing, these associations are missing :dependent => :destroy
+class Page
+  has_many :page_routes, :dependent => :destroy
+end
+class PageRoute
+  has_many :requirements, :class_name => "PageRouteRequirement", :dependent => :destroy
+  has_many :conditions,   :class_name => "PageRouteCondition",   :dependent => :destroy
+end
+
+class CreateBlogs < ActiveRecord::Migration
+  def self.up
+    create_versioned_table :blogs do |t|
+      t.string :name
+      t.string :format
+      t.text :template
+    end
+    
+    create_table :blog_group_memberships do |t|
+      t.integer :blog_id
+      t.integer :group_id
+    end
+    
+    ContentType.create!(:name => "Blog", :group_name => "Blog")
+  end
+
+  def self.down
+    puts "Destroying portlets, pages, page_routes..."
+    pp (portlets = BlogPostPortlet.all).map(&:connected_pages).flatten.each(&:destroy)
+    pp portlets.each(&:destroy)
+
+    #Blog.all.map(&:connected_pages).flatten.map(&:page_routes).flatten.each(&:destroy)
+    pp Blog.all.map(&:connected_pages).flatten.each(&:destroy)
+
+    ContentType.destroy_all(:name => "Blog")
+    Connector.destroy_all(:connectable_type => "Blog")
+
+    drop_table :blog_versions
+    drop_table :blogs
+
+    drop_table :blog_group_memberships
+  end
+end

data/db/migrate/20090415000001_create_blog_posts.rb

@@ -0,0 +1,25 @@
+class CreateBlogPosts < ActiveRecord::Migration
+  def self.up
+    create_versioned_table :blog_posts do |t|
+      t.integer :blog_id
+      t.integer :author_id
+      t.integer :category_id
+      t.string :name
+      t.string :slug
+      t.text :summary
+      t.text :body, :size => (64.kilobytes + 1)
+      t.integer :comments_count
+      t.datetime :published_at
+    end
+    CategoryType.create!(:name => "Blog Post")
+    ContentType.create!(:name => "BlogPost", :group_name => "Blog")
+  end
+
+  def self.down
+    ContentType.destroy_all(:name => 'BlogPost')
+    CategoryType.destroy_all(:name => "Blog Post")
+
+    drop_table :blog_post_versions
+    drop_table :blog_posts
+  end
+end

data/db/migrate/20090415000002_create_blog_comments.rb

@@ -0,0 +1,19 @@
+class CreateBlogComments < ActiveRecord::Migration
+  def self.up
+    create_versioned_table :blog_comments do |t|
+      t.integer :post_id
+      t.string :author
+      t.string :email
+      t.string :url
+      t.string :ip
+      t.text :body
+    end
+    ContentType.create!(:name => "BlogComment", :group_name => "Blog")    
+  end
+
+  def self.down
+    ContentType.destroy_all(:name => 'BlogComment')
+    drop_table :blog_comment_versions
+    drop_table :blog_comments
+  end
+end

data/db/migrate/20090415000003_add_attachment_to_blog_posts.rb

@@ -0,0 +1,23 @@
+class AddAttachmentToBlogPosts < ActiveRecord::Migration
+  def self.up
+    change_table :blog_posts do |t|
+      t.belongs_to :attachment
+      t.integer :attachment_version
+    end
+    change_table :blog_post_versions do |t|
+      t.belongs_to :attachment
+      t.integer :attachment_version
+    end
+  end
+
+  def self.down
+    change_table :blog_posts do |t|
+      t.remove :attachment
+      t.remove :attachment_version
+    end
+    change_table :blog_post_versions do |t|
+      t.remove :attachment
+      t.remove :attachment_version
+    end
+  end
+end

data/db/migrate/20100521042244_add_moderate_comments_to_blog.rb

@@ -0,0 +1,10 @@
+class AddModerateCommentsToBlog < ActiveRecord::Migration
+  def self.up
+    add_content_column :blogs, :moderate_comments, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :blogs, :moderate_comments
+    remove_column :blog_versions, :moderate_comments
+  end
+end

data/doc/README_FOR_APP

@@ -0,0 +1,2 @@
+Use this README file to introduce your application and point to useful places in the API for learning more.
+Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.

data/doc/migrate_to_20100427.rb

@@ -0,0 +1,77 @@
+# Ideally, we would create a new migration whenever we wanted to make changes to an existing
+# migration that is already in circulation, instead of simply editing the existing migrations
+# and publishing the new version, because doing rake db:migrate:redo VERSION=20090415000000,
+# etc. on each updated migration is not only a pain but will probably result in more data being
+# lost than is strictly necessary -- assuming the migrations work correctly at all.
+#
+# On the other hand, there's something pretty compelling about "fixing" the migration so that
+# it doesn't have any useless steps that are just going to get reverted by the next migration.
+#
+# There is also the problem of model dependencies: you can't safely remove a model in the same
+# commit that you use that model in a migration (f.e., Model.destroy_all). Even if you remove it
+# in the following commit, it's only safe if people check out every intermediate version and run
+# db:migrate at each version, instead of simply checking out the tip version and then running
+# db:migrate. And people don't do that.
+#
+# Anyway, I guess we assume that there are only a few brave souls out there who are already
+# using bcms_blog and hope for the best. Here is the "missing migration"; hopefully it will be
+# helpful to you.
+#
+# Run this script instead of re-running the changed migrations with rake db:migrate:redo so that
+# your blog data is not destroyed.
+#
+# Usage: ./script/runner 'require "/path/to/bcms_blog/doc/migrate_to_20100427.rb"'
+
+require 'pp'
+
+Page # trigger auto-loading
+# At the time of this writing, these associations are missing :dependent => :destroy
+class Page
+  has_many :page_routes, :dependent => :destroy
+end
+class PageRoute
+  has_many :requirements, :class_name => "PageRouteRequirement", :dependent => :destroy
+  has_many :conditions,   :class_name => "PageRouteCondition",   :dependent => :destroy
+end
+
+# Added these here because these classes will be removed by the next commit, so if anyone tried to run this script in future versions it would have a missing constant error unless we keep these class definitions around
+class BlogPostsInCategoryPortlet < Portlet; end
+class BlogPostsWithTagPortlet    < Portlet; end
+class BlogPostPortlet            < Portlet; end
+class BlogPostsInDayPortlet      < Portlet; end
+class BlogPostsInMonthPortlet    < Portlet; end
+class BlogPostsInYearPortlet     < Portlet; end
+
+class MigrateTo20100427 < ActiveRecord::Migration
+  def self.up
+    drop_table :blog_group_membership_versions
+
+    PageRouteOption.all.each {|a| a.destroy unless a.page_route }
+
+    puts "Destroying portlets, pages, page_routes left over from old version of bcms_blog..."
+    puts "(*Not* destroying any existing Blogs, pages on which Blogs are connected, or BlogPosts)"
+    portlets = [BlogPostPortlet, BlogPostsInCategoryPortlet, BlogPostsWithTagPortlet, BlogPostsInDayPortlet, BlogPostsInMonthPortlet, BlogPostsInYearPortlet]
+    #pp portlets.map(&:all).flatten.map(&:connected_pages).flatten.map(&:page_routes).flatten.each(&:destroy)
+    pp portlets.map(&:all).flatten.map(&:connected_pages).flatten.each(&:destroy)
+    pp portlets.map(&:all).flatten.each(&:destroy)
+
+    # Something like this might not work if they have moved their Blog page to a different section or to no section, so we better let users resolve this manually...
+    #Blog.all.map(&:connected_pages).flatten.each do |page|
+    #  page.hidden = true
+    #  page.save!
+    #  page.section.hidden = false
+    #  page.section.save!
+    #end
+
+    puts "Calling after_create on each Blog in the system..."
+    Blog.all.each do |blog|
+      puts "#{blog}..."
+      blog.send :after_create
+    end
+  end
+
+  def self.down
+  end
+end
+
+MigrateTo20100427.up

data/doc/release_notes.txt

@@ -0,0 +1,40 @@
+v1.1.0
+
+This version introduces significant changes and improvements over version 1.0.0
+and lays the groundwork for a more sophisticated blogging platform for BrowserCMS.
+
+Notable Features:
+=================
+
+1. A Blog and supporting structure (sections, pages, page routes, etc.) and data are no longer 
+   created as part of the modules's installation process. When running the module's migrations,
+   only the following items are created:
+   
+   * blogs, blog_posts and blog_comment tables (and corresponding tables to hold versioning data)
+   * blog_group_memberships table
+   * Blog, BlogPost and BlogComment content types
+   * Blog Post category type
+   
+2. It is only until a Blog is created when a corresponding section, pages, page routes and portlets are created.
+   Each blog has its own section, pages and page routes, which allows for multiple blogs to be created.
+
+3. It is now possible to add attachments to blog posts.
+
+4. Comments are moderated by default using BrowserCMS' default behaviors. However, when creating a Blog,
+   users can specify whether comments should be published automatically.
+   
+5. The module now uses BrowserCMS' permissions framework to specify if a particular user is able to
+   create or edit Blogs and BlogPosts.
+
+6. Portlets have been improved to match common standard blog publishing templates.
+
+For a complete rundown and rationale behind the changes introduced, please refer to:
+https://browsermedia.lighthouseapp.com/projects/28481/tickets/163-review-and-integrate-changes-to-the-blog-module
+
+Contributors:
+=============
+Tyler Rick
+Jon Leighton
+
+
+v1.0.0

data/lib/bcms_blog.rb

@@ -0,0 +1 @@
+require 'bcms_blog/routes'

data/lib/bcms_blog/routes.rb

@@ -0,0 +1,9 @@
+module Cms::Routes
+  def routes_for_bcms_blog
+    namespace(:cms) do |cms|      
+      cms.content_blocks :blogs
+      cms.content_blocks :blog_posts
+      cms.content_blocks :blog_comments
+    end
+  end
+end

data/rails/init.rb

@@ -0,0 +1,4 @@
+gem_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+Cms.add_to_rails_paths gem_root
+Cms.add_generator_paths gem_root, "db/migrate/[0-9]*_*.rb"
+ApplicationHelper.module_eval { include Cms::BlogHelper }

data/test/factories.rb

@@ -0,0 +1,48 @@
+if ActiveRecord::Base.connection.table_exists?("blogs")
+
+  Factory.define :group do |m|
+    m.sequence(:name) {|n| "TestGroup#{n}" }
+    m.association :group_type
+  end
+
+  Factory.define :group_type do |m|
+    m.sequence(:name) {|n| "TestGroupType#{n}" }
+  end
+  
+  Factory.define :permission do |m|
+    m.name "edit_content"
+  end
+
+  Factory.define :user do |m|
+    m.first_name "Test"
+    m.last_name "User"
+    m.sequence(:login) {|n| "test_#{n}" }
+    m.email {|a| "#{a.login}@example.com" }
+    m.password "password"
+    m.password_confirmation {|a| a.password }
+  end
+  
+  Factory.define :section do |m|
+    m.name "A Section"
+    m.path "/a-section"
+  end
+
+  Factory.define :blog do |m|
+    m.sequence(:name) {|n| "TestBlog#{n}"}
+    m.moderate_comments true
+  end
+
+  Factory.define :blog_post do |m|
+    m.sequence(:name) { |n| "BlogPost#{n}" }
+    m.blog {|b| b.association(:blog) }
+    m.sequence(:body) { |n| "Lorem ipsum #{n}" }
+    m.association :author, :factory => :user
+  end
+
+  Factory.define :blog_comment do |m|
+    m.name "Just a comment"
+    m.body "Nice blog"
+    m.association :post, :factory => :blog_post
+    m.association :author, :factory => :user
+  end
+end

data/test/functional/blog_post_test.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BlogPostTest < ActionController::TestCase
+  tests Cms::ContentController
+  
+  def setup
+    setup_stubs
+    create_baseline_data
+  end
+  
+  # def teardown
+  #   destroy_baseline_data
+  # end
+  
+  def test_show_post
+    get :show, :path => ["blog", "post"],
+      :year => @first_post.year,
+      :month => @first_post.month,
+      :day => @first_post.day,
+      :slug => @first_post.slug
+    #log @response.body
+    assert_response :success
+    assert_select "title", @first_post.name
+    assert_select ".blog_post", 1
+  
+    assert_select "#blog_post_#{@first_post.id}" do
+      assert_select "h2 a", @first_post.name
+      assert_select "p.body", @first_post.body
+      assert_select "p.meta a", "General"
+      assert_select "p.meta a", "0 Comments"
+    end
+    
+  end
+  
+  # def test_non_existent_slug_should_return_404
+  #   get :show, :path => ["blog", "post"],
+  #     :year => 2005, :month => 6, :day => 14,
+  #     :slug => "not-here"
+  #   assert_response :not_found
+  # end
+  
+end

data/test/functional/blog_test.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BlogTest < ActionController::TestCase
+  tests Cms::ContentController
+  
+  def setup
+    # create_baseline_data
+    # `rake db:test:purge`
+    # `rake db:migrate`
+    create_baseline_data
+  end
+  # 
+  # def teardown
+  #   destroy_baseline_data
+  # end
+  # 
+  def test_list_of_blog_posts
+    
+    
+     get :show
+     log @response.body
+     assert_response :success
+     assert_select ".blog_post", 5
+     
+     assert_select "#blog_post_#{@first_post.id}" do
+       assert_select "h2 a", @first_post.name
+       assert_select "p.body", @first_post.body
+       assert_select "p.meta a", "General"
+       assert_select "p.meta a", "0 Comments"
+     end
+     
+     assert_select "#blog_post_#{@foo_post_1.id}" do
+       assert_select "h2 a", @foo_post_1.name
+       assert_select "p.body", @foo_post_1.body
+       assert_select "p.meta .tags a", "foo"
+       assert_select "p.meta .tags a", "stuff"
+     end
+   end
+  
+  # def test_list_of_tagged_blog_posts
+  #   get :show, :category => "General"
+  #   puts @response.body
+  #   assert_response :success
+  #   assert_select ".blog_post", 3
+  # end
+  # 
+  # def test_list_of_categorized_blog_posts
+  #   get :show, :tag => "foo"
+  #   #log @response.body
+  #   assert_response :success
+  #   assert_select ".blog_post", 2
+  # end
+  # 
+  # def test_list_of_blog_posts_in_day
+  #   get :show, :path => ["blog", "posts_in_day"],
+  #       :year => 2008, :month => 7, :day => 5
+  #   assert_response :success
+  #   assert_select ".blog_post", 2
+  # end
+  # 
+  # def test_list_of_blog_posts_in_month
+  #   get :show, :path => ["blog", "posts_in_month"],
+  #       :year => 2008, :month => 7
+  #   assert_response :success
+  #   assert_select ".blog_post", 3
+  # end
+  # 
+  # def test_list_of_blog_posts_in_year
+  #   get :show, :path => ["blog", "posts_in_year"],
+  #       :year => 2008
+  #   assert_response :success
+  #   assert_select ".blog_post", 4
+  # end
+end