bcms_blog 1.2.0 → 1.3.0

data/app/views/{cms → bcms_blog}/blogs/_form.html.erb

@@ -5,7 +5,7 @@
   <label>Permissions</label>
   <%= hidden_field_tag "blog[group_ids][]", "", :id => nil %>
   <div class="checkboxes">
-    <% for group in Group.cms_access.all(:order => "groups.name") %>
+    <% for group in Cms::Group.cms_access.all(:order => "groups.name") %>
     <div class="checkbox_fields">
         <%= check_box_tag "blog[group_ids][]", group.id,
             @block.groups.include?(group), :class => "cms_group_ids", :id => "cms_group_ids_#{group.id}", :tabindex => next_tabindex %>
@@ -21,7 +21,7 @@
 </div>
 <br clear="all" />
 
-<%= f.cms_text_area :template, :default_value => Blog.default_template %>
+<%= f.cms_text_area :template, :default_value => BcmsBlog::Blog.default_template %>
 
 <div class="instructions" style="float:none">
   Saving your blog might take a couple of seconds while everything is set up.

data/app/views/{feeds → bcms_blog/feeds}/index.rss.builder

@@ -2,7 +2,7 @@ xml.instruct! :xml, :version=>"1.0"
 xml.rss(:version=>"2.0") do
   xml.channel do
     xml.title("#{@blog.name} Posts Feed")
-    xml.link(blog_feeds_url(:id => @blog.id, :format => "rss"))
+    xml.link(main_app.blog_feeds_url(:id => @blog.id, :format => "rss"))
     xml.description("")
     xml.language('en-us')
       for post in @blog_posts
@@ -10,8 +10,8 @@ xml.rss(:version=>"2.0") do
           xml.title(post.name)
           xml.description(post.summary) unless post.summary.blank?             
           xml.pubDate(post.published_at.strftime("%a, %d %b %Y %H:%M:%S %z")) unless post.published_at.blank?
-          xml.link(send("#{@blog.name_for_path}_post_url", post.route_params))
-          xml.guid(send("#{@blog.name_for_path}_post_url", post.route_params))
+          xml.link(main_app.send("#{@blog.name_for_path}_post_url", post.route_params))
+          xml.guid(main_app.send("#{@blog.name_for_path}_post_url", post.route_params))
         end
       end
   end

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

@@ -1,3 +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_drop_down :blog_id, BcmsBlog::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

@@ -7,7 +7,9 @@
 <%= render :partial => "partials/blog_post", :object => @blog_post %>
 
 <div class="blog_comment_form">
-  <%= form_for @blog_comment, :url => new_comment_path(@portlet) do |f| %>
+  <%#= form_for @blog_comment, :url => new_comment_path(@portlet) do |f| %>
+  <%= form_for @blog_comment, new_comment_params(@portlet) do |f| %>
+
     <%= f.hidden_field :post_id %>
     <%= f.cms_error_messages %>
     <div class="fields text_fields">

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

@@ -1,6 +1,6 @@
 <%= 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 :blog_id, Bcms::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 %>

data/config/routes.rb

@@ -0,0 +1,5 @@
+BcmsBlog::Engine.routes.draw do
+  content_blocks :blogs
+  content_blocks :blog_posts
+  content_blocks :blog_comments
+end

data/db/bcms_blog.seeds.rb

@@ -0,0 +1,4 @@
+Cms::ContentType.create!(:name => "BcmsBlog::Blog", :group_name => "Blog")
+Cms::CategoryType.create!(:name => "Blog Post")
+Cms::ContentType.create!(:name => "BcmsBlog::BlogPost", :group_name => "Blog")
+Cms::ContentType.create!(:name => "BcmsBlog::BlogComment", :group_name => "Blog")    

data/db/migrate/20090415000000_create_blogs.rb

@@ -1,11 +1,11 @@
 require 'pp'
 
-Page # trigger auto-loading
+Cms::Page # trigger auto-loading
 # At the time of this writing, these associations are missing :dependent => :destroy
-class Page
+class Cms::Page
   has_many :page_routes, :dependent => :destroy
 end
-class PageRoute
+class Cms::PageRoute
   has_many :requirements, :class_name => "PageRouteRequirement", :dependent => :destroy
   has_many :conditions,   :class_name => "PageRouteCondition",   :dependent => :destroy
 end
@@ -23,7 +23,6 @@ class CreateBlogs < ActiveRecord::Migration
       t.integer :group_id
     end
     
-    ContentType.create!(:name => "Blog", :group_name => "Blog")
   end
 
   def self.down
@@ -34,8 +33,8 @@ class CreateBlogs < ActiveRecord::Migration
     #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")
+    Cms::ContentType.destroy_all(:name => "Blog")
+    Cms::Connector.destroy_all(:connectable_type => "Blog")
 
     drop_table :blog_versions
     drop_table :blogs

data/db/migrate/20090415000001_create_blog_posts.rb

@@ -11,14 +11,10 @@ class CreateBlogPosts < ActiveRecord::Migration
       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

data/db/migrate/20090415000002_create_blog_comments.rb

@@ -8,11 +8,9 @@ class CreateBlogComments < ActiveRecord::Migration
       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

data/db/migrate/20120529184028_v130.rb

@@ -0,0 +1,12 @@
+require 'cms/upgrades/v3_5_0'
+
+# Upgrade this module to v1.3.0 of BcmsBlog (Rails 3.2/CMS 3.5.x compatible)
+class V130 < ActiveRecord::Migration
+  def change
+    ["Blog", "BlogPost", "BlogComment"].each do |model|
+      v3_5_0_apply_namespace_to_block("BcmsBlog", model)
+    end
+    
+    rename_table "blog_group_memberships", "bcms_blog_blog_group_memberships"
+  end
+end

data/lib/bcms_blog/engine.rb

@@ -3,8 +3,22 @@ require 'browsercms'
 module BcmsBlog
   class Engine < Rails::Engine
     include Cms::Module
+    isolate_namespace BcmsBlog
     
-    config.active_record.observers = :blog_observer
+    config.active_record.observers = 'bcms_blog/blog_observer'
     
+    config.to_prepare do
+      Cms::ViewContext.send(:include, BcmsBlog::BlogHelper)
+      ApplicationHelper.send(:include, BcmsBlog::BlogHelper)
+    end
+    
+    initializer 'bcms_blog.route_extensions', :after => 'action_dispatch.prepare_dispatcher' do |app|
+       ActionDispatch::Routing::Mapper.send :include, BcmsBlog::RouteExtensions
+    end
+    
+    config.before_configuration do |app|
+      # Used by blog_feed_url to determine the host
+      Rails.application.routes.default_url_options[:host]= config.cms.site_domain
+    end
   end
 end

data/lib/bcms_blog/route_extensions.rb

@@ -0,0 +1,8 @@
+module BcmsBlog::RouteExtensions
+  def mount_bcms_blog
+    mount BcmsBlog::Engine => "/bcms_blog"
+    match '/blog/feeds', :to=>"bcms_blog/feeds#index", :defaults=>{:format => "rss"}, :as=>'blog_feeds'
+  end
+  
+  alias :routes_for_bcms_blog :mount_bcms_blog
+end

data/lib/bcms_blog/version.rb

@@ -0,0 +1,3 @@
+module BcmsBlog
+  VERSION = "1.3.0"
+end

data/lib/bcms_blog.rb

@@ -1,2 +1,5 @@
-require 'bcms_blog/engine'
-require 'bcms_blog/routes'
+require "bcms_blog/engine"
+require 'bcms_blog/route_extensions'
+
+module BcmsBlog
+end

data/lib/generators/bcms_blog/install/install_generator.rb

@@ -2,17 +2,17 @@ require 'cms/module_installation'
 
 class BcmsBlog::InstallGenerator < Cms::ModuleInstallation
   add_migrations_directory_to_source_root __FILE__
-
-  # Add migrations to be copied, by uncommenting the following file and editing as needed.
   
-  ['20090415000001_create_blog_posts.rb', '20090415000000_create_blogs.rb', '20090415000002_create_blog_comments.rb', 
-    '20090415000003_add_attachment_to_blog_posts.rb', '20100521042244_add_moderate_comments_to_blog.rb'].each do |mg|
-      copy_migration_file mg
-    end
+  def copy_migrations
+    rake 'bcms_blog:install:migrations'
+  end
+    
+  def add_seed_data_to_project
+    copy_file "../bcms_blog.seeds.rb", "db/bcms_blog.seeds.rb"
+    append_to_file "db/seeds.rb", "\nload File.expand_path('../bcms_blog.seeds.rb', __FILE__)\n"
+  end
 
-    def add_helpers
-      append_to_file 'app/helpers/application_helper.rb', :after=>"module ApplicationHelper\n" do
-        "  include Cms::BlogHelper\n"
-      end
-    end
+  def add_routes
+    route 'mount_bcms_blog'
+  end
 end

data/lib/tasks/bcms_blog_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :bcms_blog do
+#   # Task goes here
+# end

data/test/bcms_blog_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class BcmsBlogTest < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, BcmsBlog
+  end
+end

data/test/functional/cms/blog_posts_controller_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+module BcmsBlog
+  class BlogPostsControllerTest < ActionController::TestCase
+  
+    def setup
+      setup_blog_stubs
+      Cms::ContentType.create!(:name => 'BcmsBlog::BlogPost', :group_name => 'Blog')
+      login_as(create_user)
+    end
+
+    def test_access_denied_on_create_if_blog_not_user_editable
+      @editable = create(:blog, :groups => [@group])
+      @non_editable = create(:blog)
+      post :create, :blog_post => { :blog_id => @non_editable.id }
+      assert @response.body.include?("Access Denied")
+    end
+  
+    def test_access_denied_on_update_if_blog_not_user_editable
+      @editable = create(:blog, :groups => [@group])
+      @non_editable = create(:blog)
+      @blog_post = create(:blog_post, :blog => @non_editable)
+      put :update, :id => @blog_post, :blog_post => { :name => "Foo" }
+      assert @response.body.include?("Access Denied")
+     end
+   
+     def test_no_access_if_no_editable_blogs
+       @blog = create(:blog)
+       get :index
+       assert_template "no_access"
+     end
+   
+     def test_index_shouldnt_show_non_editable_posts
+       @editable = create(:blog, :groups => [@group])
+       @non_editable = create(:blog)
+       @blog_post = create(:blog_post, :name => "Non-editable", :blog => @non_editable)
+       get :index
+       assert !@response.body.include?("Non-editable")
+     end
+   
+     def test_create_sets_author
+       @blog = create(:blog, :groups => [@group])
+       post :create, :blog_post => { :blog_id => @blog.id }
+       assert_equal @user, assigns(:block).author
+     end
+  end
+end

data/test/functional/cms/blogs_controller_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+module BcmsBlog
+  class BlogsControllerTest < ActionController::TestCase
+  
+    def setup
+      setup_blog_stubs
+      Cms::ContentType.create!(:name => 'BcmsBlog::Blog', :group_name => 'Blog')
+      create(:blog)
+    end
+  
+    test "should allow access to admin users" do
+      login_as(create_user(:admin => true))
+      get :index
+      assert_response :success
+      assert assigns(:blocks)
+      assert_template("index")
+    end
+  
+    test "should not allow access to non-admin users" do
+      login_as(create_user)
+      get :index
+      assert_response :success
+      assert_select "p", "Sorry, this section is restricted to administrators."
+    end
+  end
+end

data/test/integration/blog_controller_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+
+class BlogControllerTest < ActionController::IntegrationTest
+  def setup
+    seed_bcms_data
+    seed_blog_data
+    create_test_data
+  end
+
+  test "displays the list of blog posts" do
+    get "/myblog"
+
+    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 "div.body", @first_post.body
+      assert_select "div.meta" do
+        assert_select "a", 2
+      end
+    end
+    assert_select "#blog_post_#{@foo_post_1.id}" do
+      assert_select "h2 a", @foo_post_1.name
+      assert_select "div.body", @foo_post_1.body
+      assert_select "div.meta .tags a", "foo"
+      assert_select "div.meta .tags a", "stuff"
+    end
+  end
+
+  test "list of blog posts by category" do
+    get "/myblog/category/General"
+    assert_response :success
+    assert_select ".blog_post", 3
+  end
+
+  test "list of blog posts by tag" do
+    get "/myblog/tag/foo"
+    assert_response :success
+    assert_select ".blog_post", 2
+  end
+
+  test "list_of_blog_posts_in_day" do
+    get "/myblog/2008/07/05"
+    assert_response :success
+    assert_select ".blog_post", 2
+  end
+
+  test "list_of_blog_posts_in_month" do
+    get '/myblog/2008/07'
+    assert_response :success
+    assert_select ".blog_post", 3
+  end
+
+  test "list_of_blog_posts_in_year" do
+    get "/myblog/2008"
+    assert_response :success
+    assert_select ".blog_post", 4
+  end
+  
+  private
+  
+end

data/test/integration/blog_post_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class BlogPostIntegrationTest < ActionController::IntegrationTest
+  
+  def setup
+    seed_bcms_data
+    seed_blog_data
+    create_test_data
+  end
+  
+  def test_show_post
+    get "/myblog/#{@first_post.year}/#{@first_post.month}/#{@first_post.day}/#{@first_post.slug}"
+    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 ".body", @first_post.body
+      assert_select ".meta a", "General"
+      assert_select ".meta a", "0 Comments"
+    end
+    
+  end
+  
+  test "non_existent_post_should_return_404" do
+    get "/myblog/2005/6/14/non-existent"
+    assert_response :not_found
+  end
+  
+end

data/test/support/blog_test_helper.rb

@@ -0,0 +1,71 @@
+module Cms
+module BlogTestHelper
+
+  def seed_bcms_data
+    silence_stream(STDOUT) do
+      load File.expand_path('../../dummy/db/browsercms.seeds.rb', __FILE__) 
+    end
+  end
+  
+  def login_as(user)
+    @request.session[:user_id] = user ? user.id : nil
+  end
+      
+      
+  # Seeds all data created by this module's migrations
+  def seed_blog_data
+    @content_type_group = ContentTypeGroup.create!(:name => "Blog")
+    Cms::CategoryType.create!(:name => "Blog Post") 
+    Cms::ContentType.create!(:name  => "Blog", :content_type_group => @content_type_group)
+    Cms::ContentType.create!(:name  => "BlogPost", :content_type_group => @content_type_group)
+    Cms::ContentType.create!(:name  => "BlogComment", :content_type_group => @content_type_group)   
+  end
+
+  # Creates data specifically used on tests
+  def create_test_data
+    template = %q[<% page_title @page_title || @blog.name %><%= render :partial => "partials/blog_post", :collection => @blog_posts %>"]
+    @blog = BcmsBlog::Blog.create!(:name => "MyBlog", :template => template)
+
+    @category_type = CategoryType.find_by_name("Blog Post")
+
+    @stuff = Category.create!(:name => "Stuff", :category_type => @category_type)
+    @general = Category.create!(:name => "General", :category_type => @category_type)
+
+    opts = {:blog => @blog, :publish_on_save => true}
+    @first_post = FactoryGirl.create(:blog_post, opts.merge(:category => @general, :published_at => Time.utc(2008, 7, 5, 6), :name => "The first Post"))
+    @foo_post_1 = FactoryGirl.create(:blog_post, opts.merge(:category => @stuff,   :published_at => Time.utc(2008, 7, 5, 12), :tag_list => "foo stuff"))
+    @foo_post_2 = FactoryGirl.create(:blog_post, opts.merge(:category => @general, :published_at => Time.utc(2008, 7, 21)))
+    @bar_post_1 = FactoryGirl.create(:blog_post, opts.merge(:category => @stuff,   :published_at => Time.utc(2008, 9, 2),     :tag_list => "foo stuff"))
+    @bar_post_2 = FactoryGirl.create(:blog_post, opts.merge(:category => @general, :published_at => Time.utc(2009, 3, 18)))
+
+    publish_all_pages
+  end
+  
+  def publish_all_pages
+    Cms::Page.all.each(&:publish)
+  end
+
+  def setup_blog_stubs()
+    Cms::PageRoute.stubs(:reload_routes)
+    @section = Section.new
+    Cms::Section.stubs(:create! => @section)
+    @section.stubs(:groups => [], :save! => true)
+    Cms::Page.stubs(:create! => Page.new)
+    Cms::Page.any_instance.stubs(:create_connector)
+    Cms::PageRoute.any_instance.stubs(:save!)
+  end
+
+  def create_group
+    @group = FactoryGirl.create(:group, :name => "Test", :group_type => FactoryGirl.create(:group_type, :name => "CMS User", :cms_access => true))
+    @group.permissions << FactoryGirl.create(:permission, :name => "edit_content")
+    @group.permissions << FactoryGirl.create(:permission, :name => "publish_content")
+  end
+
+  def create_user(opts = {})
+    create_group
+    @group.permissions << FactoryGirl.create(:permission, :name => "administrate") if opts[:admin]
+    @user = FactoryGirl.create(:user, :groups => [@group])
+  end
+end
+end
+ActiveSupport::TestCase.send(:include, Cms::BlogTestHelper)

data/test/support/factories.rb

@@ -0,0 +1,54 @@
+require 'factory_girl'
+# These factories are copied from bcms_support to avoid needing to update dependency
+
+FactoryGirl.define do
+  factory :user, :class => Cms::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 :group_type, :class => Cms::GroupType do |m|
+    m.sequence(:name) {|n| "TestGroupType#{n}" }
+  end
+
+  factory :group, :class => Cms::Group do |m|
+    m.sequence(:name) {|n| "TestGroup#{n}" }
+  end
+  
+  factory :permission, :class => Cms::Permission do |m|
+    m.sequence(:name) {|n| "TestPermission#{n}" }
+  end
+end
+
+
+# Blog specific factories
+FactoryGirl.define do
+  factory :blog, :class=>BcmsBlog::Blog do |m|
+    m.sequence(:name) {|n| "TestBlog#{n}"}
+    m.moderate_comments true
+  end
+
+  factory :blog_post, :class=>BcmsBlog::BlogPost 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 :blog_comment, :class=>BcmsBlog::BlogComment do |m|
+    m.name "Just a comment"
+    m.body "Nice blog"
+    m.association :post, :factory => :blog_post
+    m.association :author, :factory => :user
+  end
+
+  factory :root_section, :class=>Cms::Section do |m|
+    m.name "My Site"
+    m.root true
+    m.path "/"
+  end
+end

data/test/support/factory_girl_support.rb

@@ -0,0 +1,2 @@
+require 'factory_girl'
+ActiveSupport::TestCase.send(:include, FactoryGirl::Syntax::Methods)

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.method_defined?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end

data/test/test_logging.rb

@@ -0,0 +1,64 @@
+module TestLogging
+  def log(msg)
+    Rails.logger.info(msg)
+  end
+  
+  def log_array(obj, *columns)
+    lengths = columns.map{|m| m.to_s.length }
+
+    obj.each do |r|
+      columns.each_with_index do |m, i|
+        v = r.send(m)
+        if v.to_s.length > lengths[i]
+          lengths[i] = v.to_s.length
+        end
+      end
+    end
+
+    str = "  "
+    columns.each_with_index do |m, i|
+      str << "%#{lengths[i]}s" % m
+      str << "  "
+    end
+    str << "\n  "
+
+    columns.each_with_index do |m, i|
+      str << ("-"*lengths[i])
+      str << "  "
+    end
+    str << "\n  "
+
+    obj.each do |r|
+      columns.each_with_index do |m, i|
+        str << "%#{lengths[i]}s" % r.send(m)
+        str << "  "
+      end
+      str << "\n  "      
+    end
+
+    log str    
+  end  
+  
+  def log_table(cls, options={})
+    if options[:include_columns]
+      columns = options[:include_columns]
+    elsif options[:exclude_columns]
+      columns = cls.column_names - options[:exclude_columns].map(&:to_s)
+    else
+      columns = cls.column_names      
+    end
+    log_array (cls.uses_soft_delete? ? cls.find_with_deleted(:all) : cls.all), *columns
+  end
+  
+  def log_table_with(cls, *columns)
+    log_table(cls, :include_columns => columns)
+  end
+  
+  def log_table_without(cls, *columns)
+    log_table(cls, :exclude_columns => columns)
+  end
+
+  def log_table_without_stamps(cls, *columns)
+    log_table(cls, :exclude_columns => %w[created_at updated_at created_by_id updated_by_id] + columns)
+  end    
+end