RubyGems - bcms_blog - Versions diffs - 1.0.0 → 1.1.0 - Mend

bcms_blog 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

data/LICENSE.txt +165 -0
data/README.markdown +113 -2
data/app/controllers/application_controller.rb +10 -0
data/app/controllers/cms/blog_comments_controller.rb +1 -1
data/app/controllers/cms/blog_posts_controller.rb +34 -1
data/app/controllers/cms/blogs_controller.rb +10 -1
data/app/controllers/feeds_controller.rb +8 -0
data/app/helpers/application_helper.rb +3 -0
data/app/helpers/cms/blog_helper.rb +17 -0
data/app/helpers/feeds_helper.rb +2 -0
data/app/models/blog.rb +70 -14
data/app/models/blog_comment.rb +15 -9
data/app/models/blog_group_membership.rb +4 -0
data/app/models/blog_observer.rb +135 -0
data/app/models/blog_post.rb +76 -32
data/app/portlets/blog_post_portlet.rb +23 -9
data/app/portlets/blog_posts_portlet.rb +50 -0
data/app/views/cms/blog_posts/_form.html.erb +9 -4
data/app/views/cms/blog_posts/no_access.html.erb +9 -0
data/app/views/cms/blog_posts/render.html.erb +1 -5
data/app/views/cms/blogs/_form.html.erb +27 -1
data/app/views/cms/blogs/admin_only.html.erb +9 -0
data/app/views/cms/blogs/render.html.erb +2 -3
data/app/views/feeds/index.rss.builder +18 -0
data/app/views/partials/_blog_post.html.erb +102 -0
data/app/views/partials/_blog_post.html.haml +91 -0
data/app/views/portlets/blog_post/_form.html.erb +2 -1
data/app/views/portlets/blog_post/render.html.erb +33 -36
data/app/views/portlets/blog_posts/_form.html.erb +13 -0
data/app/views/portlets/blog_posts/render.html.haml +9 -0
data/db/migrate/20090415000000_create_blogs.rb +31 -18
data/db/migrate/20090415000001_create_blog_posts.rb +5 -30
data/db/migrate/20090415000002_create_blog_comments.rb +2 -1
data/db/migrate/20090415000003_add_attachment_to_blog_posts.rb +23 -0
data/db/migrate/20100521042244_add_moderate_comments_to_blog.rb +10 -0
data/doc/README_FOR_APP +2 -0
data/doc/migrate_to_20100427.rb +77 -0
data/doc/release_notes.txt +40 -0
data/lib/bcms_blog/routes.rb +3 -0
data/rails/init.rb +6 -1
data/test/factories.rb +47 -1
data/test/functional/blog_post_test.rb +19 -17
data/test/functional/blog_test.rb +47 -25
data/test/functional/cms/blog_posts_controller_test.rb +44 -0
data/test/functional/cms/blogs_controller_test.rb +25 -0
data/test/functional/feeds_controller_test.rb +8 -0
data/test/test_helper.rb +64 -120
data/test/unit/blog_comment_test.rb +34 -0
data/test/unit/blog_observer_test.rb +61 -0
data/test/unit/blog_post_test.rb +43 -0
data/test/unit/blog_test.rb +42 -0
data/test/unit/helpers/feeds_helper_test.rb +4 -0
metadata +64 -7
data/app/views/portlets/blog_post/_blog_post.html.erb +0 -29

data/test/test_helper.rb CHANGED Viewed

@@ -1,137 +1,81 @@
 ENV["RAILS_ENV"] = "test"
-ENV['BACKTRACE'] = "YES PLEASE"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
+require 'factory_girl'
+require 'mocha'
 class ActiveSupport::TestCase
   require File.dirname(__FILE__) + '/test_logging'
   include TestLogging
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #
-  # The only drawback to using transactional fixtures is when you actually
-  # need to test transactions.  Since your test is bracketed by a transaction,
-  # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
+  include Cms::DataLoader
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
+  self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
   fixtures :all
-  # Add more helper methods to be used by all tests here...
   def create_baseline_data
-      @section = Section.create!(:name => "My Site", :path => "/")
-      Group.create!(:name => "Guest", :code => "guest", :sections => [@section])
-      @page_template = PageTemplate.create!(:name => "test", :format => "html", :handler => "erb", :body => %q{<html>
-      <head>
-        <title>
-          <%= page_title %>
-        </title>
-        <%= yield :html_head %>
-      </head>
-      <body>
-        <%= cms_toolbar %>
-        <%= container :main %>
-      </body>
-    </html>})
-      @blog_page = Page.create!(:name => "My Blog Page", :section => @section, :path => "/", :template_file_name => "test.html.erb")
-      @blog_post_page = Page.create!(:name => "Blog Post Page", :section => @section, :path => "/blog/post", :template_file_name => "test.html.erb")
-      @blog_posts_with_tag_route = @blog_page.page_routes.create(
-        :name => "Blog Posts With Tag",
-        :pattern => "/articles/tag/:tag")
-      @blog_posts_in_category_route = @blog_page.page_routes.create(
-        :name => "Blog Posts In Category",
-        :pattern => "/articles/category/:category")
-      @blog_post_route = @blog_post_page.page_routes.build(
-        :name => "Blog Post",
-        :pattern => "/articles/:year/:month/:day/:slug",
-        :code => "@blog_post = BlogPost.published_on(params).with_slug(params[:slug]).first")
-      @blog_post_route.add_condition(:method, "get")
-      @blog_post_route.add_requirement(:year, '\d{4,}')
-      @blog_post_route.add_requirement(:month, '\d{2,}')
-      @blog_post_route.add_requirement(:day, '\d{2,}')
-      @blog_post_route.save!
-      @blog_page.publish!
-      @blog_post_page.publish!
-      @category_type = CategoryType.create!(:name => "Blog Post")
-      @stuff = Category.create!(:name => "Stuff", :category_type => @category_type)
-      @general = Category.create!(:name => "General", :category_type => @category_type)
-      @blog = Blog.create!(
-        :name => "My Blog",
-        :template => Blog.default_template,
-        :connect_to_page_id => @blog_page.id,
-        :connect_to_container => "main",
-        :publish_on_save => true)
-      @first_post = BlogPost.create!(
-        :name => "First Post",
-        :blog => @blog,
-        :category => @general,
-        :summary => "This is the first post",
-        :body => "Yadda Yadda Yadda",
-        :publish_on_save => true)
-      @foo_post_1 = BlogPost.create!(
-        :name => "Foo #1",
-        :blog => @blog,
-        :category => @stuff,
-        :tag_list => "foo stuff",
-        :summary => "This is the first foo post",
-        :body => "Foo 1 Foo 1 Foo 1",
-        :publish_on_save => true)
-      @foo_post_2 = BlogPost.create!(
-        :name => "Foo #2",
-        :blog => @blog,
-        :category => @general,
-        :tag_list => "foo",
-        :summary => "This is the second foo post",
-        :body => "Foo 2 Foo 2 Foo 2",
-        :publish_on_save => true)
-      @bar_post_1 = BlogPost.create!(
-        :name => "Bar #1",
-        :blog => @blog,
-        :category => @stuff,
-        :tag_list => "bar things",
-        :summary => "This is the first bar post",
-        :body => "Bar 1 Bar 1 Bar 1",
-        :publish_on_save => true)
+    load_bcms_seed_data
+    @blog = Blog.create!(:name => "MyBlog")
+    @blog.publish!
+    Page.all.each(&:publish)
+    @category_type = Factory(:category_type)
+    # For some reason this is necessary otherwise the relevant page routes aren't loaded when
+    # the tests are run via "rake" (as opposed to running them directly). I don't know exactly
+    # why this is the case.
+    # ActionController::Routing::Routes.load!
+    @stuff = Category.create!(:name => "Stuff", :category_type => @category_type)
+    @general = Category.create!(:name => "General", :category_type => @category_type)
+    @first_post = Factory(:blog_post, :blog => @blog, :category => @general,
+     :published_at => Time.utc(2008, 7, 5, 6), :publish_on_save => true)
+    @foo_post_1 = Factory(:blog_post, :blog => @blog, :category => @stuff,
+      :published_at => Time.utc(2008, 7, 5, 12), :tag_list => "foo stuff", :publish_on_save => true)
+    @foo_post_2 = Factory(:blog_post, :blog => @blog, :category => @general,
+      :published_at => Time.utc(2008, 7, 21), :publish_on_save => true)
+    @bar_post_1 = Factory(:blog_post, :blog => @blog, :category => @stuff,
+      :published_at => Time.utc(2008, 9, 2), :tag_list => "foo stuff", :publish_on_save => true)
+    @bar_post_2 = Factory(:blog_post, :blog => @blog, :category => @general,
+      :published_at => Time.utc(2009, 3, 18), :publish_on_save => true)
+  end
-      @bar_post_2 = BlogPost.create!(
-        :name => "Bar #2",
-        :blog => @blog,
-        :category => @general,
-        :tag_list => "bar",
-        :summary => "This is the second bar post",
-        :body => "Bar 2 Bar 2 Bar 2",
-        :publish_on_save => true)
+  def setup_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 login_as(user)
+    @request.session[:user_id] = user ? user.id : nil
+  end
+  private
+  # TODO Find a better way to load this data
+  def load_bcms_seed_data
+    require File.join(Rails.root, 'db', 'migrate', '20081114172307_load_seed_data.rb')
+    LoadSeedData.up
   end
+  #Cms::DataLoader defines methods create_group and create_user
+  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/unit/blog_comment_test.rb ADDED Viewed

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + "/../test_helper"
+class BlogCommentTest < ActiveSupport::TestCase
+  def setup
+    setup_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 ADDED Viewed

@@ -0,0 +1,61 @@
+require 'test_helper'
+class BlogObserverTest < ActiveSupport::TestCase
+  def setup
+    setup_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 ADDED Viewed

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + "/../test_helper"
+class BlogPostTest < ActiveSupport::TestCase
+  def setup
+    setup_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 ADDED Viewed

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + "/../test_helper"
+class BlogTest < ActiveSupport::TestCase
+  def setup
+    setup_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 ADDED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bcms_blog
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  hash: 19
+  prerelease: false
+  segments:
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors:
 - BrowserMedia
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-07-02 00:00:00 -04:00
+date: 2010-07-02 00:00:00 -05:00
 default_executable:
 dependencies: []
@@ -20,61 +26,112 @@ executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE.txt
 - README.markdown
 files:
+- app/controllers/application_controller.rb
 - 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
 - app/models/blog_comment.rb
+- app/models/blog_group_membership.rb
+- app/models/blog_observer.rb
 - app/models/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/portlets/blog_post/_blog_post.html.erb
+- app/views/feeds/index.rss.builder
+- app/views/partials/_blog_post.html.erb
+- app/views/partials/_blog_post.html.haml
 - 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
 - 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/routes.rb
 - rails/init.rb
+- LICENSE.txt
 - README.markdown
+- test/factories.rb
+- test/functional/blog_post_test.rb
+- test/functional/blog_test.rb
+- test/functional/cms/blog_posts_controller_test.rb
+- test/functional/cms/blogs_controller_test.rb
+- test/functional/feeds_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
+licenses: []
 post_install_message:
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      hash: 3
+      segments:
+      - 0
       version: "0"
-  version:
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      hash: 3
+      segments:
+      - 0
       version: "0"
-  version:
 requirements: []
 rubyforge_project: browsercms
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key:
-specification_version: 2
+specification_version: 3
 summary: The Blog Module for BrowserCMS
 test_files:
 - test/factories.rb
 - test/functional/blog_post_test.rb
 - test/functional/blog_test.rb
+- test/functional/cms/blog_posts_controller_test.rb
+- test/functional/cms/blogs_controller_test.rb
+- test/functional/feeds_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

data/app/views/portlets/blog_post/_blog_post.html.erb DELETED Viewed

@@ -1,29 +0,0 @@
-<div id="blog_post_<%= blog_post.id %>" class="blog_post">
-  <h2>
-    <% if blog_post.published_at %>
-        <%= link_to h(blog_post.name), blog_post_path(blog_post.route_params) %>
-    <% else %>
-        <%=h blog_post.name %>
-    <% end %>
-  </h2>
-  <% if blog_post.published_at %>
-    <p class="date"><%= blog_post.published_at.to_s(:long) %></p>
-  <% end %>
-  <p class="body">
-    <%= blog_post.body %>
-  </p>
-  <p class="meta">
-    <% unless blog_post.category_id.blank? %>
-      Posted in <%= link_to h(blog_post.category_name), blog_posts_in_category_path(:category => blog_post.category_name) %>
-      <strong>|</strong>
-    <% end %>
-    Tags
-    <span class="tags">
-      <%= blog_post.tags.map{|t| link_to(h(t.name), blog_posts_with_tag_path(:tag => t.name)) }.join(", ") %>
-    </span>
-    <strong>|</strong>
-    <% if blog_post.published_at %>
-      <%= link_to h(pluralize(blog_post.comments_count, "Comment")), "#{blog_post_path(blog_post.route_params)}#comments" %>
-    <% end %>
-  </p>
-</div>