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

bcms_blog 1.1.0 → 1.1.1

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 (22) hide show

data/app/models/blog.rb +2 -2
data/app/models/blog_observer.rb +3 -2
data/app/views/layouts/templates/default.html.erb +17 -0
data/app/views/partials/_blog_post.html.erb +3 -44
data/app/views/portlets/blog_post/render.html.erb +3 -7
data/doc/release_notes.txt +9 -4
data/test/blog_test_helper.rb +52 -0
data/test/factories.rb +0 -31
data/test/functional/blog_controller_test.rb +63 -0
data/test/functional/blog_post_controller_test.rb +31 -0
data/test/functional/cms/blog_posts_controller_test.rb +3 -2
data/test/functional/cms/blogs_controller_test.rb +3 -3
data/test/test_helper.rb +8 -71
data/test/unit/blog_comment_test.rb +1 -1
data/test/unit/blog_observer_test.rb +1 -1
data/test/unit/blog_post_test.rb +1 -1
data/test/unit/blog_test.rb +1 -1
metadata +26 -13
data/app/views/partials/_blog_post.html.haml +0 -91
data/test/functional/blog_post_test.rb +0 -37
data/test/functional/blog_test.rb +0 -67
data/test/functional/feeds_controller_test.rb +0 -8

data/app/models/blog.rb CHANGED Viewed

@@ -25,8 +25,8 @@ class Blog < ActiveRecord::Base
   end
   def self.posts_finder(finder, options)
-    if options[:tags]
-      finder = finder.tagged_with(options[:tags])
+    if options[:tag]
+      finder = finder.tagged_with(options[:tag])
     end
     if options[:exclude_tags]
       finder = finder.not_tagged_with(options[:exclude_tags])

data/app/models/blog_observer.rb CHANGED Viewed

@@ -111,11 +111,12 @@ class BlogObserver < ActiveRecord::Observer
   def create_route(page, name, pattern)
     route = page.page_routes.build(:name => name, :pattern => pattern, :code => "")
-    route.add_condition(:method, "get")
+    route.send(:create_without_callbacks)
+    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")
     route.add_requirement(:day,   '\d{2,}') if pattern.include?(":day")
-    route.send(:create_without_callbacks)
+    route.requirements.each(&:save)
   end
   def create_portlet(page, name, portlet_class)

data/app/views/layouts/templates/default.html.erb ADDED Viewed

@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <title><%= page_title %></title>
+    <%= yield :html_head %>
+  </head>
+  <body style="margin: 0; padding: 0; text-align: center;">
+    <%= cms_toolbar %>
+    <div id="wrapper" style="width: 700px; margin: 0 auto; text-align: left; padding: 30px">
+      Breadcrumbs: <%= render_breadcrumbs %>
+      Main Menu: <%= render_menu %>
+      <h1><%= page_title %></h1>
+      <%= container :main %>
+    </div>
+  </body>
+</html>

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

@@ -1,44 +1,3 @@
-<style>
-  .blog_post {
-    border-bottom: 1px solid #ccc;
-    margin-bottom: 20px;
-  }
-  .blog_post h2 {
-    margin-bottom: 0
-  }
-  .blog_post h2,
-  .blog_post h2 a {
-    font: normal 30px/28px 'arial black', arial, sans-serif !important;
-    text-decoration: none !important;
-  }
-  .blog_post h2 a:hover {
-    text-decoration: underline !important;
-  }
-  .blog_post .image {
-    float: left;
-    border: 1px solid #ccc;
-    margin: 10px;
-    margin-top: 0;
-  }
-  .blog_post .date {
-    color: #666;
-  }
-  .blog_post .read_more {
-    font-weight: bold;
-  }
-  .blog_post .comment + .comment {
-    border-top: 1px dashed #ccc;
-  }
-  .clear {
-    clear: both;
-  }
-</style>
 <%
   # _counter is defined only if we pass :collection to the partial
   if defined?(blog_post_counter)
@@ -48,8 +7,7 @@
     blog_post_counter = 0
   end
 %>
-<div id="blog_post_<%= blog_post.id %>" class="blog_post clear">
+<div id="blog_post_<%= blog_post.id %>" class="blog_post">
   <% if blog_post.attachment %>
     <div class="image">
       <%= image_tag blog_post.attachment.file_path %>
@@ -87,7 +45,8 @@
     <%= link_to h(pluralize(blog_post.comments.published.count, "Comment")), "#{_blog_post_path(blog_post)}#comments" %>
   </div>
-  <br class="clear" />
+  <br />
   <% comments = blog_post.comments.published.reject(&:new_record?) %>
   <% if showing_individual_post and comments.any? -%>

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

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

data/doc/release_notes.txt CHANGED Viewed

@@ -1,3 +1,11 @@
+v1.1.1
+- Blog partials and templates no longer include any css style declarations
+- Fixed browsing by tags, categories and dates
+- 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
@@ -34,7 +42,4 @@ https://browsermedia.lighthouseapp.com/projects/28481/tickets/163-review-and-int
 Contributors:
 =============
 Tyler Rick
-Jon Leighton
-v1.0.0
+Jon Leighton

data/test/blog_test_helper.rb ADDED Viewed

@@ -0,0 +1,52 @@
+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 CHANGED Viewed

@@ -1,34 +1,3 @@
-Factory.define :category_type do |m|
-  m.name "Blog Post"
-end
-Factory.define :group do |m|
-  m.sequence(:name) {|n| "TestGroup#{n}" }
-  m.association :group_type
-end
-Factory.define :group_type do |m|
-  m.sequence(:name) {|n| "TestGroupType#{n}" }
-end
-Factory.define :permission do |m|
-  m.name "edit_content"
-end
-Factory.define :user do |m|
-  m.first_name "Test"
-  m.last_name "User"
-  m.sequence(:login) {|n| "test_#{n}" }
-  m.email {|a| "#{a.login}@example.com" }
-  m.password "password"
-  m.password_confirmation {|a| a.password }
-end
-Factory.define :section do |m|
-  m.name "A Section"
-  m.path "/a-section"
-end
 Factory.define :blog do |m|
   m.sequence(:name) {|n| "TestBlog#{n}"}
   m.moderate_comments true

data/test/functional/blog_controller_test.rb ADDED Viewed

@@ -0,0 +1,63 @@
+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 ADDED Viewed

@@ -0,0 +1,31 @@
+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 CHANGED Viewed

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 class Cms::BlogPostsControllerTest < ActionController::TestCase
   def setup
-    setup_stubs
+    setup_blog_stubs
     ContentType.create!(:name => 'BlogPost', :group_name => 'Blog')
-    login_as(_create_user)
+    login_as(create_user)
   end
   def test_access_denied_on_create_if_blog_not_user_editable

data/test/functional/cms/blogs_controller_test.rb CHANGED Viewed

@@ -3,13 +3,13 @@ require File.dirname(__FILE__) + '/../../test_helper'
 class Cms::BlogsControllerTest < ActionController::TestCase
   def setup
-    setup_stubs
+    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))
+    login_as(create_user(:admin => true))
     get :index
     assert_response :success
     assert assigns(:blocks)
@@ -17,7 +17,7 @@ class Cms::BlogsControllerTest < ActionController::TestCase
   end
   test "should not allow access to non-admin users" do
-    login_as(_create_user)
+    login_as(create_user)
     get :index
     assert_response :success
     assert_template("admin_only.html.erb")

data/test/test_helper.rb CHANGED Viewed

@@ -1,81 +1,18 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
-require 'factory_girl'
 require 'mocha'
+require 'factory_girl'
+require 'bcms_support'
+require 'bcms_support/factories'
+require 'blog_test_helper'
+require 'test_logging'
 class ActiveSupport::TestCase
-  require File.dirname(__FILE__) + '/test_logging'
-  include TestLogging
-  include Cms::DataLoader
+  include BcmsSupport::Test
+  include BlogTestHelper
+  include TestLogging
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
-  fixtures :all
-  def create_baseline_data
-    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
-  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 CHANGED Viewed

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../test_helper"
 class BlogCommentTest < ActiveSupport::TestCase
   def setup
-    setup_stubs
+    setup_blog_stubs
   end
   test "crates a valid instance" do

data/test/unit/blog_observer_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require 'test_helper'
 class BlogObserverTest < ActiveSupport::TestCase
   def setup
-    setup_stubs
+    setup_blog_stubs
     [Section, PageRoute, Page].each {|klass| klass.stubs(:find_by_name)}
     BlogPostPortlet.stubs(:create!)
     @blog = Factory(:blog, :name => 'TestBlog')

data/test/unit/blog_post_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../test_helper"
 class BlogPostTest < ActiveSupport::TestCase
   def setup
-    setup_stubs
+    setup_blog_stubs
     @post = Factory(:blog_post, :name => "This is the first Post")
   end

data/test/unit/blog_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../test_helper"
 class BlogTest < ActiveSupport::TestCase
   def setup
-    setup_stubs
+    setup_blog_stubs
     @blog = Factory(:blog, :name => 'TestBlog')
   end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bcms_blog
 version: !ruby/object:Gem::Version
-  hash: 19
+  hash: 17
   prerelease: false
   segments:
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors:
 - BrowserMedia
@@ -15,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-07-02 00:00:00 -05:00
+date: 2010-07-11 00:00:00 -05:00
 default_executable:
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcms_support
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: The Blog Module for BrowserCMS
 email: github@browsermedia.com
 executables: []
@@ -53,8 +66,8 @@ files:
 - 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/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
@@ -72,12 +85,12 @@ files:
 - rails/init.rb
 - LICENSE.txt
 - README.markdown
+- test/blog_test_helper.rb
 - test/factories.rb
-- test/functional/blog_post_test.rb
-- test/functional/blog_test.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/functional/feeds_controller_test.rb
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/test_logging.rb
@@ -121,12 +134,12 @@ signing_key:
 specification_version: 3
 summary: The Blog Module for BrowserCMS
 test_files:
+- test/blog_test_helper.rb
 - test/factories.rb
-- test/functional/blog_post_test.rb
-- test/functional/blog_test.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/functional/feeds_controller_test.rb
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/test_logging.rb

data/app/views/partials/_blog_post.html.haml DELETED Viewed

@@ -1,91 +0,0 @@
-%style
-  :sass
-    .blog_post.first
-      h2, h2 a
-        font: normal 30px/28px 'arial black', arial, sans-serif !important
-      border-bottom: 1px solid #ccc
-    .blog_post
-      border: 0px solid gray
-      margin-bottom: 20px
-      h2
-        margin-bottom: 0
-      h2, h2 a
-        font: normal 20px/23px 'arial black', arial, sans-serif !important
-        text-decoration: none !important
-      h2 a:hover
-        text-decoration: underline !important
-      .image
-        float: left
-        border: 1px solid #ccc
-        margin: 10px
-        margin-top: 0
-      .date
-        color: #666
-      .read_more
-        font-weight: bold
-      .comment + .comment
-        border-top: 1px dashed #ccc
-    .clear
-      clear: both
-:ruby
-  # _counter is defined only if we pass :collection to the partial
-  if defined?(blog_post_counter)
-    showing_individual_post = false
-  else
-    showing_individual_post = true
-    blog_post_counter = 0
-  end
-  if blog_post_counter == 0
-    max_width = 250
-    css_class = 'first'
-  else
-    max_width = 75
-    css_class = ''
-  end
-.blog_post.clear{:id => "blog_post_#{blog_post.id}", :class => css_class}
-  - if blog_post.attachment
-    -# .image= image_tag_with_max_size blog_post.attachment.file_path, blog_post.attachment.full_file_location, :width => max_width
-    .image= image_tag blog_post.attachment.file_path
-  %h2= link_to h(blog_post.name), href = _blog_post_path(blog_post)
-  .date= blog_post.published_at.to_s(:long)
-  .body
-    - if showing_individual_post or blog_post.summary.blank?
-      = blog_post.body
-    - else
-      = blog_post.summary
-      %p.read_more= link_to 'Read More »', href
-  - if showing_individual_post || blog_post_counter == 0
-    .meta
-      - unless blog_post.category_id.blank?
-        Posted in #{link_to h(blog_post.category_name), _blog_path(blog_post.blog, 'posts_in_category', :category => blog_post.category_name)}
-        %strong |
-      - if blog_post.tags.any?
-        Tags:
-        %span.tags
-          = blog_post.tags.map{|t| link_to(h(t.name), _blog_path(blog_post.blog, 'posts_with_tag', :tag => t.name)) }.join(", ")
-        %strong |
-        = link_to h(pluralize(blog_post.comments_count, "Comment")), "#{_blog_post_path(blog_post)}#comments"
-  %br.clear/
-  - comments = blog_post.comments.reject(&:new_record?)
-  - if showing_individual_post and comments.any?
-    %h2 Comments
-    - comments.each_with_index do |comment, i|
-      %div{:class => "comment #{'first' if i == 0}"}
-        = h comment.body
-        %p
-          \&mdash;#{comment.url.present? ? link_to(h(comment.author), comment.url) : h(comment.author)}

data/test/functional/blog_post_test.rb DELETED Viewed

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

data/test/functional/blog_test.rb DELETED Viewed

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

data/test/functional/feeds_controller_test.rb DELETED Viewed

@@ -1,8 +0,0 @@
-require 'test_helper'
-class FeedsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end