bcms_blog 1.1.1 → 1.2.0

data/README.markdown

@@ -19,23 +19,14 @@ The blog module installs like most other BrowserCMS modules (http://guides.brows
     
 ## Set up your application to use the module
 
-### 1. Edit config/environment.rb 
+### 1. Install the module 
     
-    config.gem "browsercms"
-    config.gem "bcms_blog"
+    rails g cms:install bcms_blog
     
 ### 2. Run the following commands
   
-    script/generate browser_cms
     rake db:migrate
-  
-### 3. Edit config/routes.rb
-
-Make sure the routes.rb loads the blog routes.
-
-    map.routes_for_bcms_blog
-    map.routes_for_browser_cms
-
+  	
 ## Creating a Blog
 
 * To get started, go to the Content Library and choose the Blog module in the left hand menu.

data/app/helpers/cms/blog_helper.rb

@@ -13,5 +13,8 @@ module Cms::BlogHelper
     auto_discovery_link_tag(:rss, blog_feeds_url(:blog_id => blog), :title => "#{blog.name}")
   end
   
+  def new_comment_path(portlet)
+    url_for(:controller=>"cms/portlet", :action=>"execute_handler", :id=>portlet.id, :handler=>"create_comment")
+  end
 end
 

data/app/models/blog.rb

@@ -8,7 +8,7 @@ class Blog < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name
 
-  named_scope :editable_by, lambda { |user|
+  scope :editable_by, lambda { |user|
     if user.able_to?(:administrate)
       { }
     else
@@ -91,4 +91,5 @@ class Blog < ActiveRecord::Base
   def name_for_path
     name.to_slug.gsub('-', '_')
   end
+
 end

data/app/models/blog_comment.rb

@@ -4,7 +4,9 @@ class BlogComment < ActiveRecord::Base
 
   validates_presence_of :post_id, :author, :body
   
-  def before_create
+  before_create :publish_if_comments_are_enabled
+  
+  def publish_if_comments_are_enabled
     self.published = true unless post.blog.moderate_comments?
   end
 

data/app/models/blog_observer.rb

@@ -5,15 +5,21 @@ class BlogObserver < ActiveRecord::Observer
     create_section_pages_and_routes
   end
   
-  def before_update(blog)
-    update_section_pages_and_route(blog)
+  def after_save(blog)
+    if blog.persisted?
+      blog.publish
+    end
   end
   
-  def after_update(blog)
-    blog.publish
+  # Can't use before_update since CMS callback stack is altered from normal callbacks.
+  def before_save(blog)
+    if blog.persisted?
+      update_section_pages_and_route(blog)
+    end
   end
-  
+
   private
+  
   # A section, two pages, 6 routes and a portlet are created alongside every blog.
   # This structure provides sensible defaults so users can pretty much start adding
   # posts right after creating a blog without having to worry about where to put
@@ -37,9 +43,7 @@ class BlogObserver < ActiveRecord::Observer
         :path => "/#{@blog.name_for_path}",
         :parent_id => 1
       )
-      @section.groups << Group.find_by_code("cms-admin")
-      @section.groups << Group.find_by_code("guest")
-      @section.groups << Group.find_by_code("content-editor")
+      @section.allow_groups = :all
       @section.save!
       @section
     )
@@ -106,12 +110,12 @@ class BlogObserver < ActiveRecord::Observer
   end 
 
   def reload_routes
-     ActionController::Routing::Routes.load!
+     PageRoute.reload_routes
   end
 
   def create_route(page, name, pattern)
     route = page.page_routes.build(:name => name, :pattern => pattern, :code => "")
-    route.send(:create_without_callbacks)
+    route.save!
     route.add_condition(:method, "get").save
     route.add_requirement(:year,  '\d{4,}') if pattern.include?(":year")
     route.add_requirement(:month, '\d{2,}') if pattern.include?(":month")

data/app/models/blog_post.rb

@@ -26,13 +26,13 @@ class BlogPost < ActiveRecord::Base
   before_validation :set_slug
   validates_presence_of :name, :slug, :blog_id, :author_id
 
-  named_scope :published_between, lambda { |start, finish|
+  scope :published_between, lambda { |start, finish|
     { :conditions => [
          "blog_posts.published_at >= ? AND blog_posts.published_at < ?",
          start, finish ] }
   }
 
-  named_scope :not_tagged_with, lambda { |tag| {
+  scope :not_tagged_with, lambda { |tag| {
     :conditions => [
       "blog_posts.id not in (
         SELECT taggings.taggable_id FROM taggings

data/app/portlets/blog_post_portlet.rb

@@ -1,6 +1,6 @@
 class BlogPostPortlet < Portlet
-  #render_inline false
-  #enable_template_editor false
+  
+  enable_template_editor false
 
   def render
     scope = Blog.find(self.blog_id).posts
@@ -16,6 +16,8 @@ class BlogPostPortlet < Portlet
       raise BlogPost::INCORRECT_PARAMETERS
     end
 
+    make_page_title_use_blog_post_name(@blog_post)
+   
     pmap = flash[instance_name] || params
     pmap[:blog_comment] ||= {}
 
@@ -24,6 +26,8 @@ class BlogPostPortlet < Portlet
   end
 
   def create_comment
+    work_around_cms_3_3_bug_where_current_user_is_not_correctly_set
+
     params[:blog_comment].merge! :ip => request.remote_ip
     blog_comment = BlogComment.new(params[:blog_comment])
     if blog_comment.valid? && blog_comment.save
@@ -34,5 +38,21 @@ class BlogPostPortlet < Portlet
       url_for_failure
     end
   end
+  
+  private
+  
+  def work_around_cms_3_3_bug_where_current_user_is_not_correctly_set
+    User.current = current_user
+  end
+  
+  # This is a work around for a bug in bcms 3.3 where the Cms::PageHeler#page_title doesnt
+  #   share state between the portlet view and the page view.
+  #   When the portlet view (app/views/portlets/blog_post/render) calls 'page_title @post.name' 
+  #   that instance variable isn't shared back to the page template. 
+  # Instead, we just temporarily set the name of the page itself.
+  def make_page_title_use_blog_post_name(post)
+    page = @controller.current_page
+    page.name = post.name
+  end
 
 end

data/app/portlets/blog_posts_portlet.rb

@@ -1,5 +1,8 @@
 class BlogPostsPortlet < Portlet
-  def after_initialize
+  
+  after_initialize :build_permalink_code
+  
+  def build_permalink_code
     self.render_blog_post_code ||= 'truncate(blog_post.name, 30)'
   end
 

data/app/views/cms/blog_comments/render.html.erb

@@ -1,2 +1,2 @@
 <%= link_to h(@content_block.post.name), cms_blog_post_path(@content_block.post) %>
-<p><%=h @content_block.body %></p>
+<p><%=h @content_block.body.html_safe %></p>

data/app/views/partials/_blog_post.html.erb

@@ -20,7 +20,7 @@
   
   <div class="body">
     <% if showing_individual_post or blog_post.summary.blank? %>
-      <%= blog_post.body %>
+      <%= blog_post.body.html_safe %>
     <% else %>
       <%= blog_post.summary %>
       <p class="read_more">
@@ -38,7 +38,7 @@
     <% if blog_post.tags.any? %>
       Tags:
       <span class="tags">
-        <%= blog_post.tags.map{|t| link_to(h(t.name), _blog_path(blog_post.blog, 'posts_with_tag', :tag => t.name)) }.join(", ") %>
+        <%= blog_post.tags.map{|t| link_to(h(t.name), _blog_path(blog_post.blog, 'posts_with_tag', :tag => t.name)) }.join(", ").html_safe %>
       </span>
       <strong>|</strong>
     <% end %>

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

@@ -1,10 +1,15 @@
+<% 
+	logger.warn "Page title is: #{page_title}"
+	page_title "SOMETHING ELSE"
+	logger.warn "Now it's #{page_title}"
+%>
 <% page_title @blog_post.name %>
 <%= render :partial => "partials/blog_post", :object => @blog_post %>
 
 <div class="blog_comment_form">
-  <% form_for @blog_comment, :url => cms_handler_path(@portlet, "create_comment") do |f| %>
+  <%= form_for @blog_comment, :url => new_comment_path(@portlet) do |f| %>
     <%= f.hidden_field :post_id %>
-    <%= f.error_messages %>
+    <%= f.cms_error_messages %>
     <div class="fields text_fields">
       <%= f.label :author, 'Name *' %>
       <%= f.text_field :author %>

data/doc/release_notes.txt

@@ -1,3 +1,6 @@
+v1.2.0
+- Upgrade to be compatible with BrowserCMS 3.3 (aka Rails 3)
+
 v1.1.1
 
 - Blog partials and templates no longer include any css style declarations
@@ -5,7 +8,6 @@ v1.1.1
 - Fixed bug on page route conditions and requirements when creating a blog
 - Tests refactoring. Tests now depend on bcms_support gem
 
-
 v1.1.0
 
 This version introduces significant changes and improvements over version 1.0.0
@@ -42,4 +44,5 @@ https://browsermedia.lighthouseapp.com/projects/28481/tickets/163-review-and-int
 Contributors:
 =============
 Tyler Rick
-Jon Leighton
+Jon Leighton
+Juan Alvarez

data/lib/bcms_blog/engine.rb

@@ -0,0 +1,10 @@
+require 'browsercms'
+
+module BcmsBlog
+  class Engine < Rails::Engine
+    include Cms::Module
+    
+    config.active_record.observers = :blog_observer
+    
+  end
+end

data/lib/bcms_blog/routes.rb

@@ -1,12 +1,10 @@
 module Cms::Routes
   def routes_for_bcms_blog
-    
-    blog_feeds '/blog/feeds', :controller => "feeds", :format => "rss"
-    
-    namespace(:cms) do |cms|      
-      cms.content_blocks :blogs
-      cms.content_blocks :blog_posts
-      cms.content_blocks :blog_comments
+    match '/blog/feeds', :to=>"feeds#index", :defaults=>{:format => "rss"}, :as=>'blog_feeds'
+    namespace(:cms) do     
+      content_blocks :blogs
+      content_blocks :blog_posts
+      content_blocks :blog_comments
     end
   end
 end

data/lib/bcms_blog.rb

@@ -1 +1,2 @@
+require 'bcms_blog/engine'
 require 'bcms_blog/routes'

data/lib/generators/bcms_blog/install/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Installs the bcms_blog module.
+
+Example:
+    rails generate bcms_blog:install
+
+    This will:
+		1. Copy any migrations from the gem into the project.
+		2. Add the routes to the config/routes.rb
+

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

@@ -0,0 +1,18 @@
+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 add_helpers
+      append_to_file 'app/helpers/application_helper.rb', :after=>"module ApplicationHelper\n" do
+        "  include Cms::BlogHelper\n"
+      end
+    end
+end

metadata

@@ -1,53 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bcms_blog
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - BrowserMedia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-11 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bcms_support
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2010-07-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: browsercms
+  requirement: &70330799771200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70330799771200
 description: The Blog Module for BrowserCMS
 email: github@browsermedia.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
-files: 
-- app/controllers/application_controller.rb
+files:
 - app/controllers/cms/blog_comments_controller.rb
 - app/controllers/cms/blog_posts_controller.rb
 - app/controllers/cms/blogs_controller.rb
 - app/controllers/feeds_controller.rb
-- app/helpers/application_helper.rb
 - app/helpers/cms/blog_helper.rb
 - app/helpers/feeds_helper.rb
 - app/models/blog.rb
@@ -72,79 +58,46 @@ files:
 - app/views/portlets/blog_post/render.html.erb
 - app/views/portlets/blog_posts/_form.html.erb
 - app/views/portlets/blog_posts/render.html.haml
+- LICENSE.txt
+- README.markdown
+- doc/migrate_to_20100427.rb
+- doc/README_FOR_APP
+- doc/release_notes.txt
 - db/migrate/20090415000000_create_blogs.rb
 - db/migrate/20090415000001_create_blog_posts.rb
 - db/migrate/20090415000002_create_blog_comments.rb
 - db/migrate/20090415000003_add_attachment_to_blog_posts.rb
 - db/migrate/20100521042244_add_moderate_comments_to_blog.rb
-- doc/README_FOR_APP
-- doc/migrate_to_20100427.rb
-- doc/release_notes.txt
-- lib/bcms_blog.rb
+- lib/bcms_blog/engine.rb
 - lib/bcms_blog/routes.rb
-- rails/init.rb
-- LICENSE.txt
-- README.markdown
-- test/blog_test_helper.rb
-- test/factories.rb
-- test/functional/blog_controller_test.rb
-- test/functional/blog_post_controller_test.rb
-- test/functional/cms/blog_posts_controller_test.rb
-- test/functional/cms/blogs_controller_test.rb
-- test/performance/browsing_test.rb
-- test/test_helper.rb
-- test/test_logging.rb
-- test/unit/blog_comment_test.rb
-- test/unit/blog_observer_test.rb
-- test/unit/blog_post_test.rb
-- test/unit/blog_test.rb
-- test/unit/helpers/feeds_helper_test.rb
-has_rdoc: true
-homepage: http://browsercms.org
+- lib/bcms_blog.rb
+- lib/generators/bcms_blog/install/install_generator.rb
+- lib/generators/bcms_blog/install/USAGE
+homepage: http://www.github.com/browsermedia/bcms_blog
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3905715097688536829
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: browsercms
-rubygems_version: 1.3.7
+rubyforge_project: bcms_blog
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The Blog Module for BrowserCMS
-test_files: 
-- test/blog_test_helper.rb
-- test/factories.rb
-- test/functional/blog_controller_test.rb
-- test/functional/blog_post_controller_test.rb
-- test/functional/cms/blog_posts_controller_test.rb
-- test/functional/cms/blogs_controller_test.rb
-- test/performance/browsing_test.rb
-- test/test_helper.rb
-- test/test_logging.rb
-- test/unit/blog_comment_test.rb
-- test/unit/blog_observer_test.rb
-- test/unit/blog_post_test.rb
-- test/unit/blog_test.rb
-- test/unit/helpers/feeds_helper_test.rb
+test_files: []

data/app/controllers/application_controller.rb

@@ -1,10 +0,0 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
-
-  # Scrub sensitive parameters from your log
-  # filter_parameter_logging :password
-end

data/app/helpers/application_helper.rb

@@ -1,3 +0,0 @@
-# Methods added to this helper will be available to all templates in the application.
-module ApplicationHelper
-end

data/rails/init.rb

@@ -1,8 +0,0 @@
-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 }
-
-config.after_initialize do
-  ActiveRecord::Base.observers << BlogObserver
-end

data/test/blog_test_helper.rb

@@ -1,52 +0,0 @@
-module BlogTestHelper
-
-  # Seeds all data created by this module's migrations
-  def seed_blog_data
-    @content_type_group = ContentTypeGroup.create!(:name => "Blog")
-    CategoryType.create!(:name => "Blog Post") 
-    ContentType.create!(:name  => "Blog", :content_type_group => @content_type_group)
-    ContentType.create!(:name  => "BlogPost", :content_type_group => @content_type_group)
-    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 = 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 = Factory(:blog_post, opts.merge(:category => @general, :published_at => Time.utc(2008, 7, 5, 6), :name => "The first Post"))
-    @foo_post_1 = Factory(:blog_post, opts.merge(:category => @stuff,   :published_at => Time.utc(2008, 7, 5, 12), :tag_list => "foo stuff"))
-    @foo_post_2 = Factory(:blog_post, opts.merge(:category => @general, :published_at => Time.utc(2008, 7, 21)))
-    @bar_post_1 = Factory(:blog_post, opts.merge(:category => @stuff,   :published_at => Time.utc(2008, 9, 2),     :tag_list => "foo stuff"))
-    @bar_post_2 = Factory(:blog_post, opts.merge(:category => @general, :published_at => Time.utc(2009, 3, 18)))
-
-    publish_all_pages
-  end
-
-  def setup_blog_stubs
-    Blog.any_instance.stubs(:reload_routes)
-    @section = Section.new
-    Section.stubs(:create! => @section)
-    @section.stubs(:groups => [], :save! => true)
-    Page.stubs(:create! => Page.new)
-    Page.any_instance.stubs(:create_connector)
-  end
-
-  def create_group
-    @group = Factory(:group, :name => "Test", :group_type => Factory(:group_type, :name => "CMS User", :cms_access => true))
-    @group.permissions << Factory(:permission, :name => "edit_content")
-    @group.permissions << Factory(:permission, :name => "publish_content")
-  end
-
-  def create_user(opts = {})
-    create_group
-    @group.permissions << Factory(:permission, :name => "administrate") if opts[:admin]
-    @user = Factory(:user, :groups => [@group])
-  end
-end

data/test/factories.rb

@@ -1,18 +0,0 @@
-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

data/test/functional/blog_controller_test.rb

@@ -1,63 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class BlogControllerTest < ActionController::TestCase
-  tests Cms::ContentController
-
-  def setup
-    seed_bcms_data
-    seed_blog_data
-    create_test_data
-  end
-
-  test "displays the list of blog posts" do
-    get :show, :path => ['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 :show, :path => ['myblog'], :category => 'General'
-    assert_response :success
-    assert_select ".blog_post", 3
-  end
-
-  test "list of blog posts by tag" do
-    get :show, :path => ['myblog'], :tag => 'foo'
-    assert_response :success
-    assert_select ".blog_post", 2
-  end
-
-  test "list_of_blog_posts_in_day" do
-    get :show, :path => ["myblog"], :year => 2008, :month => 7, :day => 5
-    assert_response :success
-    assert_select ".blog_post", 2
-  end
-
-  test "list_of_blog_posts_in_month" do
-    get :show, :path => ["myblog"], :year => 2008, :month => 7
-    assert_response :success
-    assert_select ".blog_post", 3
-  end
-
-  test "list_of_blog_posts_in_year" do
-    get :show, :path => ["myblog"], :year => 2008
-    assert_response :success
-    assert_select ".blog_post", 4
-  end
-end

data/test/functional/blog_post_controller_test.rb

@@ -1,31 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class BlogPostControllerTest < ActionController::TestCase
-  tests Cms::ContentController
-
-  def setup
-    seed_bcms_data
-    seed_blog_data
-    create_test_data
-  end
-
-  test "show_post" do
-    get :show, :path => ['myblog', 'post'], :year => 2008, :month => 07, :day => 05, :slug => 'the-first-post'
-    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 "div.body", @first_post.body
-      assert_select "div.meta a", "General"
-      assert_select "div.meta a", "0 Comments"
-    end
-  end
-
-  test "non_existent_post_should_return_404" do
-    get :show, :path => ["myblog"], :year => 2005, :month => 6, :day => 14, :slug => "not-here"
-    assert_response :not_found
-  end
-end

data/test/functional/cms/blog_posts_controller_test.rb

@@ -1,45 +0,0 @@
-require File.dirname(__FILE__) + '/../../test_helper'
-
-class Cms::BlogPostsControllerTest < ActionController::TestCase
-  
-  def setup
-    setup_blog_stubs
-    ContentType.create!(:name => 'BlogPost', :group_name => 'Blog')
-    login_as(create_user)
-  end
-
-  def test_access_denied_on_create_if_blog_not_user_editable
-    @editable = Factory(:blog, :groups => [@group])
-    @non_editable = Factory(: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 = Factory.create(:blog, :groups => [@group])
-    @non_editable = Factory.create(:blog)
-    @blog_post = Factory.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 = Factory.create(:blog)
-     get :index
-     assert_template "no_access"
-   end
-   
-   def test_index_shouldnt_show_non_editable_posts
-     @editable = Factory.create(:blog, :groups => [@group])
-     @non_editable = Factory.create(:blog)
-     @blog_post = Factory.create(:blog_post, :name => "Non-editable", :blog => @non_editable)
-     get :index
-     assert !@response.body.include?("Non-editable")
-   end
-   
-   def test_create_sets_author
-     @blog = Factory.create(:blog, :groups => [@group])
-     post :create, :blog_post => { :blog_id => @blog.id }
-     assert_equal @user, assigns(:block).author
-   end
-end

data/test/functional/cms/blogs_controller_test.rb

@@ -1,25 +0,0 @@
-require File.dirname(__FILE__) + '/../../test_helper'
-
-class Cms::BlogsControllerTest < ActionController::TestCase
-  
-  def setup
-    setup_blog_stubs
-    ContentType.create!(:name => 'Blog', :group_name => 'Blog')
-    Factory(: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_template("admin_only.html.erb")    
-  end
-end

data/test/performance/browsing_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end

data/test/test_helper.rb

@@ -1,18 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-require 'mocha'
-require 'factory_girl'
-require 'bcms_support'
-require 'bcms_support/factories'
-require 'blog_test_helper'
-require 'test_logging'
-
-class ActiveSupport::TestCase
-  include BcmsSupport::Test
-  include BlogTestHelper
-  include TestLogging
-
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
-end

data/test/test_logging.rb

@@ -1,64 +0,0 @@
-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

data/test/unit/blog_comment_test.rb

@@ -1,34 +0,0 @@
-require File.dirname(__FILE__) + "/../test_helper"
-
-class BlogCommentTest < ActiveSupport::TestCase
-  
-  def setup
-    setup_blog_stubs
-  end
-  
-  test "crates a valid instance" do
-    assert Factory.build(:blog_comment).valid?
-  end
-  
-  test "requires post" do
-    assert Factory.build(:blog_comment, :post => nil).invalid?
-  end
-  
-  test "requires author" do
-    assert Factory.build(:blog_comment, :author => nil).invalid?
-  end
-  
-  test "requires body" do
-    assert Factory.build(:blog_comment, :body => nil).invalid?
-  end
-  
-  test "should not be published if Blog#moderate_comments is true" do
-    assert !Factory(:blog_comment).published?
-  end
-  
-  test "should be published if  Blog#moderate_comments is false" do
-    blog = Factory(:blog, :moderate_comments => false)
-    post = Factory(:blog_post, :blog => blog)
-    assert Factory(:blog_comment, :post => post).published?
-  end
-end

data/test/unit/blog_observer_test.rb

@@ -1,61 +0,0 @@
-require 'test_helper'
-
-class BlogObserverTest < ActiveSupport::TestCase
-
-  def setup
-    setup_blog_stubs
-    [Section, PageRoute, Page].each {|klass| klass.stubs(:find_by_name)}
-    BlogPostPortlet.stubs(:create!)
-    @blog = Factory(:blog, :name => 'TestBlog')
-  end
-  
-  test "does not update section, pageroute and pages if name did not change when updated" do
-    [Section, PageRoute, Page].each {|klass| klass.expects(:find_by_name).never}
-    @blog.toggle!(:moderate_comments)
-  end
-  
-  test "updates section, pageroute and pages if name changed" do
-    route = mock('page_route', :update_attribute => true)
-    page = mock('page')
-    Section.expects(:find_by_name).returns(Section.new)
-    PageRoute.expects(:find_by_name).returns(route)
-    Page.expects(:find_by_name).twice.returns(page)
-    page.expects(:update_attribute).twice.returns(true)
-    page.expects(:publish).twice.returns(true)
-    
-    @blog.update_attribute(:name, "OtherName")
-  end
-  
-  test "should create a section with the same name and route" do
-     Section.expects(:create!).with(:name => 'Test', :path => '/test', :parent_id => 1).returns(@section)
-     Factory(:blog, :name => 'Test')
-   end
-   
-   test "should create a hidden page with the same name in the section with the blog's name" do
-     Page.expects(:create!).with(:name => 'Test', 
-                                 :path => '/test', 
-                                 :section => @section, 
-                                 :template_file_name => 'default.html.erb',
-                                 :hidden => true).returns(Page.new)
-     Factory(:blog, :name => 'Test')       
-   end
-   
-   test "should create a page to hold the BlogPostPortlet" do
-     Page.expects(:create!).with(:name => 'Test: Post', 
-                                 :path => '/test/post', 
-                                 :section => @section, 
-                                 :template_file_name => 'default.html.erb',
-                                 :hidden => true).returns(Page.new)
-     Factory(:blog, :name => 'Test')  
-   end
-   
-   test "should create an instance of BlogPostPortlet" do
-     BlogPostPortlet.expects(:create!).with(:name => 'Test: Post Portlet',
-                                            :blog_id => 2,
-                                            :template => BlogPostPortlet.default_template,
-                                            :connect_to_page_id => nil,
-                                            :connect_to_container => 'main',
-                                            :publish_on_save => true).returns(BlogPostPortlet.new)
-     Factory(:blog, :name => 'Test')
-   end
-end

data/test/unit/blog_post_test.rb

@@ -1,43 +0,0 @@
-require File.dirname(__FILE__) + "/../test_helper"
-
-class BlogPostTest < ActiveSupport::TestCase
-  
-  def setup
-    setup_blog_stubs
-    @post = Factory(:blog_post, :name => "This is the first Post")
-  end
-  
-  test "cretates a valid instance" do
-    assert @post.valid?
-  end
-  
-  test "requires name" do
-    assert Factory.build(:blog_post, :name => nil).invalid?
-  end
-  
-  test "requires blog_id" do
-    assert Factory.build(:blog_post, :blog =>  nil).invalid?
-  end
-  
-  test "requires author_id" do
-    assert Factory.build(:blog_post, :author => nil).invalid?
-  end
-  
-  test "should set slug" do
-    assert_equal('this-is-the-first-post', @post.slug)
-  end
-  
-  test "should set published_at when published" do
-    assert_nil @post.published_at
-    @post.publish!
-    assert_not_nil @post.published_at
-  end
-  
-  test "BlogPost should find posts published between 2 given dates" do
-    @post.publish!
-    Factory(:blog_post, :published_at => 5.days.ago)
-    Factory(:blog_post, :published_at => 10.days.ago)
-    assert_equal(1, BlogPost.published_between(6.days.ago, 4.days.ago).count)
-  end
-  
-end

data/test/unit/blog_test.rb

@@ -1,42 +0,0 @@
-require File.dirname(__FILE__) + "/../test_helper"
-
-class BlogTest < ActiveSupport::TestCase
-  
-  def setup
-    setup_blog_stubs
-    @blog = Factory(:blog, :name => 'TestBlog')
-  end
-
-  test "creates a valid instance" do
-    assert @blog.valid?
-  end
-  
-  test "requires name" do
-    assert Factory.build(:blog, :name => nil).invalid?
-  end
-  
-  test "should be editable by user" do
-    group = Factory(:group, :group_type  => Factory(:group_type,:cms_access => true))
-    user = Factory(:user, :groups => [group])
-    blog = Factory.build(:blog, :groups => [group])
-    assert blog.editable_by?(user)
-    assert !@blog.editable_by?(user)
-  end
-  
-  test "should be editable by administrators" do
-    admin = Factory(:user)
-    admin.expects(:able_to?).with(:administrate).returns(true)
-    assert @blog.editable_by?(admin)
-  end
-
-  test "should create an instance of BlogPostPortlet" do
-    BlogPostPortlet.expects(:create!).with(:name => 'Test: Post Portlet',
-                                           :blog_id => 2,
-                                           :template => BlogPostPortlet.default_template,
-                                           :connect_to_page_id => nil,
-                                           :connect_to_container => 'main',
-                                           :publish_on_save => true).returns(BlogPostPortlet.new)
-    Factory(:blog, :name => 'Test')
-  end
-  
-end

data/test/unit/helpers/feeds_helper_test.rb

@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class FeedsHelperTest < ActionView::TestCase
-end