bcms_blog 1.2.0 → 1.3.0

data/test/unit/blog_comment_test.rb

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

data/test/unit/blog_observer_test.rb

@@ -0,0 +1,84 @@
+require 'test_helper'
+
+module BcmsBlog
+  class BlogPersistenceTest < ActiveSupport::TestCase
+  
+    def setup
+      @root = create(:root_section)
+      @blog = create(:blog, :name => 'TestBlog')
+    end
+  
+    test "Update pages/routes when a section changes" do
+      BlogObserver.any_instance.expects(:update_section_pages_and_route).with(@blog)
+      @blog.name = "Change the Name"
+      @blog.save!        
+    end
+  
+    test "Published afters saving" do
+      BlogObserver.any_instance.expects(:update_section_pages_and_route).with(@blog)
+      @blog.name = "Change the Name"
+      @blog.save!
+      assert @blog.published?
+    end
+  end
+
+  class BlogObserverTest < ActiveSupport::TestCase
+
+    def setup
+      setup_blog_stubs
+      [Cms::Section, Cms::PageRoute, Cms::Page].each {|klass| klass.stubs(:find_by_name)}
+      BlogPostPortlet.stubs(:create!)
+      @blog = create(:blog, :name => 'TestBlog')
+    end
+
+    test "does not update section, pageroute and pages if name did not change when updated" do
+      [Cms::Section, Cms::PageRoute, Cms::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')
+      Cms::Section.expects(:find_by_name).returns(Cms::Section.new)
+      Cms::PageRoute.expects(:find_by_name).returns(route)
+      Cms::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
+       Cms::Section.expects(:create!).with(:name => 'Test', :path => '/test', :parent => Cms::Section.root.first).returns(@section)
+       create(:blog, :name => 'Test')
+     end
+   
+     test "should create a hidden page with the same name in the section with the blog's name" do
+       Cms::Page.expects(:create!).with(:name => 'Test', 
+                                   :path => '/test', 
+                                   :section => @section, 
+                                   :template_file_name => 'default.html.erb',
+                                   :hidden => true).returns(Cms::Page.new)
+       create(:blog, :name => 'Test')       
+     end
+   
+     test "should create a page to hold the BlogPostPortlet" do
+       Cms::Page.expects(:create!).with(:name => 'Test: Post', 
+                                   :path => '/test/post', 
+                                   :section => @section, 
+                                   :template_file_name => 'default.html.erb',
+                                   :hidden => true).returns(Cms::Page.new)
+       create(: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)
+       create(:blog, :name => 'Test')
+     end
+  end
+end

data/test/unit/blog_post_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+module BcmsBlog
+  class BlogPostTest < ActiveSupport::TestCase
+  
+    def setup
+      setup_blog_stubs
+      @post = create(:blog_post, :name => "This is the first Post")
+    end
+  
+    test "cretates a valid instance" do
+      assert @post.valid?
+    end
+  
+    test "requires name" do
+      assert build(:blog_post, :name => nil).invalid?
+    end
+  
+    test "requires blog_id" do
+      assert build(:blog_post, :blog =>  nil).invalid?
+    end
+  
+    test "requires author_id" do
+      assert 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!
+      create(:blog_post, :published_at => 5.days.ago)
+      create(:blog_post, :published_at => 10.days.ago)
+      assert_equal(1, BlogPost.published_between(6.days.ago, 4.days.ago).count)
+    end
+  
+  end
+end

data/test/unit/blog_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class BlogTest < ActiveSupport::TestCase
+  
+  def setup
+    setup_blog_stubs
+    @blog = create(:blog, :name => 'TestBlog')
+  end
+
+  test "creates a valid instance" do
+    assert @blog.valid?
+  end
+  
+  test "requires name" do
+    assert build(:blog, :name => nil).invalid?
+  end
+  
+  test "should be editable by user" do
+    group = create(:group, :group_type  => create(:group_type,:cms_access => true))
+    user = create(:user, :groups => [group])
+    blog = build(:blog, :groups => [group])
+    assert blog.editable_by?(user)
+    assert !@blog.editable_by?(user)
+  end
+  
+  test "should be editable by administrators" do
+    admin = create(: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)
+    create(:blog, :name => 'Test')
+  end
+  
+end

data/test/unit/helpers/feeds_helper_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcms_blog
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-07-11 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browsercms
-  requirement: &70330799771200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.5.0.rc4
   type: :runtime
   prerelease: false
-  version_requirements: *70330799771200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.5.0.rc4
 description: The Blog Module for BrowserCMS
 email: github@browsermedia.com
 executables: []
@@ -30,49 +41,68 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
 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/cms/blog_helper.rb
+- app/assets/javascripts/bcms_blog/application.js
+- app/assets/stylesheets/bcms_blog/application.css
+- app/controllers/bcms_blog/blog_comments_controller.rb
+- app/controllers/bcms_blog/blog_posts_controller.rb
+- app/controllers/bcms_blog/blogs_controller.rb
+- app/controllers/bcms_blog/feeds_controller.rb
+- app/helpers/bcms_blog/blog_helper.rb
 - app/helpers/feeds_helper.rb
-- app/models/blog.rb
-- app/models/blog_comment.rb
-- app/models/blog_group_membership.rb
-- app/models/blog_observer.rb
-- app/models/blog_post.rb
+- app/models/bcms_blog/blog.rb
+- app/models/bcms_blog/blog_comment.rb
+- app/models/bcms_blog/blog_group_membership.rb
+- app/models/bcms_blog/blog_observer.rb
+- app/models/bcms_blog/blog_post.rb
 - app/portlets/blog_post_portlet.rb
 - app/portlets/blog_posts_portlet.rb
-- app/views/cms/blog_comments/_form.html.erb
-- app/views/cms/blog_comments/render.html.erb
-- app/views/cms/blog_posts/_form.html.erb
-- app/views/cms/blog_posts/no_access.html.erb
-- app/views/cms/blog_posts/render.html.erb
-- app/views/cms/blogs/_form.html.erb
-- app/views/cms/blogs/admin_only.html.erb
-- app/views/cms/blogs/render.html.erb
-- app/views/feeds/index.rss.builder
-- app/views/layouts/templates/default.html.erb
+- app/views/bcms_blog/blog_comments/_form.html.erb
+- app/views/bcms_blog/blog_comments/render.html.erb
+- app/views/bcms_blog/blog_posts/_form.html.erb
+- app/views/bcms_blog/blog_posts/no_access.html.erb
+- app/views/bcms_blog/blog_posts/render.html.erb
+- app/views/bcms_blog/blogs/_form.html.erb
+- app/views/bcms_blog/blogs/admin_only.html.erb
+- app/views/bcms_blog/blogs/render.html.erb
+- app/views/bcms_blog/feeds/index.rss.builder
 - app/views/partials/_blog_post.html.erb
 - app/views/portlets/blog_post/_form.html.erb
 - 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
+- config/routes.rb
+- db/bcms_blog.seeds.rb
 - 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
+- db/migrate/20120529184028_v130.rb
 - lib/bcms_blog/engine.rb
-- lib/bcms_blog/routes.rb
+- lib/bcms_blog/route_extensions.rb
+- lib/bcms_blog/version.rb
 - lib/bcms_blog.rb
 - lib/generators/bcms_blog/install/install_generator.rb
 - lib/generators/bcms_blog/install/USAGE
+- lib/tasks/bcms_blog_tasks.rake
+- LICENSE.txt
+- README.markdown
+- Gemfile
+- test/bcms_blog_test.rb
+- test/functional/cms/blog_posts_controller_test.rb
+- test/functional/cms/blogs_controller_test.rb
+- test/integration/blog_controller_test.rb
+- test/integration/blog_post_test.rb
+- test/support/blog_test_helper.rb
+- test/support/factories.rb
+- test/support/factory_girl_support.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
 homepage: http://www.github.com/browsermedia/bcms_blog
 licenses: []
 post_install_message: 
@@ -87,17 +117,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3905715097688536829
+      hash: -3961525454364369353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3961525454364369353
 requirements: []
 rubyforge_project: bcms_blog
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The Blog Module for BrowserCMS
-test_files: []
+test_files:
+- test/bcms_blog_test.rb
+- test/functional/cms/blog_posts_controller_test.rb
+- test/functional/cms/blogs_controller_test.rb
+- test/integration/blog_controller_test.rb
+- test/integration/blog_post_test.rb
+- test/support/blog_test_helper.rb
+- test/support/factories.rb
+- test/support/factory_girl_support.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

data/app/controllers/cms/blog_comments_controller.rb

@@ -1,3 +0,0 @@
-class Cms::BlogCommentsController < Cms::ContentBlockController
-
-end

data/app/controllers/cms/blog_posts_controller.rb

@@ -1,35 +0,0 @@
-class Cms::BlogPostsController < Cms::ContentBlockController
-  before_filter :show_no_access_if_none_editable
-  
-  def build_block
-    super
-    ensure_blog_editable
-    @block.author = current_user
-  end
-  
-  def load_block
-    super
-    ensure_blog_editable
-  end
-  
-  def load_blocks
-    super
-    @blocks.delete_if { |b| !b.editable_by?(current_user) }
-  end
-  
-  private
-    
-    # If the current user is not able to edit any blog, just show them a page saying so
-    def show_no_access_if_none_editable
-      if Blog.editable_by(current_user).empty?
-        render :action => "no_access"
-      end
-    end
-    
-    # Ensure the current user can actually edit the blog this blog post is associated with
-    def ensure_blog_editable
-      if @block.blog
-        raise Cms::Errors::AccessDenied unless @block.blog.editable_by?(current_user)
-      end
-    end
-end

data/app/controllers/cms/blogs_controller.rb

@@ -1,11 +0,0 @@
-class Cms::BlogsController < Cms::ContentBlockController
-  check_permissions :administrate, :except => :index
-  
-  def index
-    if current_user.able_to?(:administrate)
-      super
-    else
-      render :action => "admin_only"
-    end
-  end
-end

data/app/controllers/feeds_controller.rb

@@ -1,8 +0,0 @@
-class FeedsController < ApplicationController
-  
-  def index
-    @blog = Blog.find(params[:blog_id])
-    @blog_posts = @blog.posts.published.all(:limit => 10, :order => "published_at DESC")
-  end
-  
-end

data/app/helpers/cms/blog_helper.rb

@@ -1,20 +0,0 @@
-module Cms::BlogHelper
-  # We can't call it 'blog_path' because that would conflict with the actual named route method if there's a blog named "Blog".
-  def _blog_path(blog, route_name, route_params)
-    send("#{blog.name_for_path}_#{route_name}_path", route_params)
-  end
-
-  def _blog_post_path(blog_post)
-    send("#{blog_post.route_name}_path", blog_post.route_params)
-  end
-  
-  def feeds_link_tag_for(name)
-    blog = Blog.find_by_name(name)
-    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

@@ -1,95 +0,0 @@
-class Blog < ActiveRecord::Base
-  acts_as_content_block
-  
-  has_many :posts, :class_name => "BlogPost", :conditions => { :published => true }, :order => "published_at desc"
-  has_many :blog_group_memberships
-  has_many :groups, :through => :blog_group_memberships
-
-  validates_presence_of :name
-  validates_uniqueness_of :name
-
-  scope :editable_by, lambda { |user|
-    if user.able_to?(:administrate)
-      { }
-    else
-      { :include => :groups, :conditions => ["groups.id IN (?)", user.group_ids.join(",")] }
-    end
-  }
-
-  def self.default_template
-    template_file = ActionController::Base.view_paths.map do |vp|
-      path = vp.to_s.first == "/" ? vp.to_s : File.join(Rails.root, vp.to_s)
-      File.join(path, "cms/blogs/render.html.erb")
-    end.detect{|f| File.exists? f }
-    template_file ? open(template_file){|f| f.read } : ""
-  end
-
-  def self.posts_finder(finder, options)
-    if options[:tag]
-      finder = finder.tagged_with(options[:tag])
-    end
-    if options[:exclude_tags]
-      finder = finder.not_tagged_with(options[:exclude_tags])
-    end
-    if options[:category] || options[:category_id]
-      category_type = CategoryType.named("Blog Post").first
-      category = category_type.categories.named(options[:category]).first if options[:category]
-      category = category_type.categories. find(options[:category_id])    if options[:category_id]
-      finder = finder.in_category(category)
-    end
-    finder
-  end
-
-  def render
-    @blog = self
-    finder = @blog.posts.published
-    finder = Blog.posts_finder(finder, params)
-
-    if params[:year] && params[:month] && params[:day]
-      @date = Date.new(params[:year].to_i, params[:month].to_i, params[:day].to_i)
-      finder = posts.published_between(@date, @date + 1.day)
-    elsif params[:year] && params[:month]
-      @date = Date.new(params[:year].to_i, params[:month].to_i)
-      finder = posts.published_between(@date, @date + 1.month)
-    elsif params[:year]
-      @date = Date.new(params[:year].to_i)
-      finder = posts.published_between(@date, @date + 1.year)
-    end
-
-    @blog_posts = finder.all(:limit => 25, :order => "published_at desc")
-    raise ActiveRecord::RecordNotFound.new("No posts found") if @blog_posts.empty?
-
-    if params[:category]
-      @page_title = "#{params[:category]}"
-    elsif params[:tag]
-      @page_title = "Posts tagged with #{params[:tag]}"
-    elsif params[:year] && params[:month] && params[:day]
-      @page_title = "Posts from #{@date.to_s(:long)}"
-    elsif params[:year] && params[:month]
-      @page_title = "Posts from #{Date::MONTHNAMES[@date.month]} #{@date.year}"
-    elsif params[:year]
-      @page_title = "Posts from #{@date.year}"
-    end
-  end
-
-  def inline_options
-    {:inline => self.template}
-  end
-
-  def self.default_order
-    "name"
-  end
-
-  def editable_by?(user)
-    user.able_to?(:administrate) || !(group_ids & user.group_ids).empty?
-  end
-
-  def potential_authors
-    groups.map(&:users).flatten.uniq
-  end
-
-  def name_for_path
-    name.to_slug.gsub('-', '_')
-  end
-
-end

data/app/models/blog_comment.rb

@@ -1,34 +0,0 @@
-class BlogComment < ActiveRecord::Base
-  acts_as_content_block :is_searachable => "body"
-  belongs_to :post, :class_name => "BlogPost", :counter_cache => "comments_count"
-
-  validates_presence_of :post_id, :author, :body
-  
-  before_create :publish_if_comments_are_enabled
-  
-  def publish_if_comments_are_enabled
-    self.published = true unless post.blog.moderate_comments?
-  end
-
-  def self.default_order
-    "blog_comments.created_at desc"
-  end
-
-  def self.default_order_for_search
-    default_order
-  end
-
-  def self.columns_for_index
-    [ {:label => "Comment",    :method => :name,                 :order => "blog_comments.body" },
-      {:label => "Created At", :method => :formatted_created_at, :order => "blog_comments.created_at"} ]
-  end
-
-  def name
-    body ? body[0..50] : ""
-  end
-
-  def formatted_created_at
-    created_at.to_s(:date)
-  end
-
-end

data/app/models/blog_group_membership.rb

@@ -1,4 +0,0 @@
-class BlogGroupMembership < ActiveRecord::Base
-  belongs_to :blog
-  belongs_to :group
-end