refinerycms-blog 1.0.rc11 → 1.0.rc13

data/Gemfile

@@ -1 +1 @@
-gem 'filters_spam', '~> 0.2'
+gem 'filters_spam', '~> 0.3'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   specs:
-    filters_spam (0.2)
+    filters_spam (0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  filters_spam (~> 0.2)
+  filters_spam (~> 0.3)

data/app/controllers/admin/blog/comments_controller.rb

@@ -2,7 +2,7 @@ class Admin::Blog::CommentsController < Admin::BaseController
 
   crudify :blog_comment,
           :title_attribute => :name,
-          :order => 'created_at DESC'
+          :order => 'published_at DESC'
 
   def index
     @blog_comments = BlogComment.unmoderated

data/app/controllers/admin/blog/posts_controller.rb

@@ -2,7 +2,7 @@ class Admin::Blog::PostsController < Admin::BaseController
 
   crudify :blog_post,
           :title_attribute => :title,
-          :order => 'created_at DESC'
+          :order => 'published_at DESC'
 
   before_filter :find_all_categories,
                 :only => [:new, :edit, :create, :update]

data/app/models/blog_post.rb

@@ -10,7 +10,7 @@ class BlogPost < ActiveRecord::Base
 
   has_friendly_id :title, :use_slug => true
 
-  default_scope :order => "created_at DESC"
+  default_scope :order => "published_at DESC"
 
   if Rails.version < '3.0.0'
     named_scope :live, lambda { {:conditions => ["published_at < ? and draft = ?", Time.now, false]} }

data/app/views/blog/categories/show.html.erb

@@ -2,9 +2,9 @@
 
 <% content_for :body_content_left do %>
   <% if @category.posts.any? %>
-  <ul id="blog_posts">
+  <article id="blog_posts">
     <%= render :partial => "/blog/shared/post", :collection => @category.posts %>
-  </ul>
+  </article>
   <% else %>
     <p>
       <%= t('.no_posts') %>

data/app/views/blog/posts/_comment.html.erb

@@ -1,9 +1,11 @@
-<div class='blog_comment_message' id='<%= "comment-#{comment.to_param}" %>'>
+<article class='blog_comment_message' id='<%= "comment-#{comment.to_param}" %>'>
   <p>
-    <%= comment.message.to_s.gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>") %>
+    <%= simple_format auto_link(comment.message.to_s) %>
   </p>
-</div>
-<p class='blog_comment_author'>
-  <%= t('blog.posts.comments.by', :who => comment.name) %>,
-  <%= t('blog.posts.comments.time_ago', :time => time_ago_in_words(comment.created_at)) %>
-</p>
+  <footer class='blog_comment_author'>
+    <p>
+      <%= t('blog.posts.comments.by', :who => comment.name) %>,
+      <%= t('blog.posts.comments.time_ago', :time => time_ago_in_words(comment.created_at)) %>
+    </p>
+  </footer>
+</article>

data/app/views/blog/posts/index.html.erb

@@ -1,9 +1,9 @@
 <% content_for :body_content_left do %>
   <%= @page[Page.default_parts.first.to_sym] %>
 
-  <ul id="blog_posts">
+  <section id="blog_posts">
     <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
-  </ul>
+  </section>
 <% end %>
 
 <% content_for :body_content_right do %>

data/app/views/blog/posts/index.rss.builder

@@ -9,7 +9,7 @@ xml.rss :version => "2.0" do
       xml.item do
         xml.title post.title
         xml.description post.body
-        xml.pubDate post.created_at.to_s(:rfc822)
+        xml.pubDate post.published_at.to_s(:rfc822)
         xml.link blog_post_url(post)
       end
     end

data/app/views/blog/posts/show.html.erb

@@ -1,7 +1,7 @@
 <% content_for :head do %>
   <% if BlogPost::ShareThis.enabled? %>
-    <script type="text/javascript" src="http://w.sharethis.com/button/buttons.js"></script>
-    <script type="text/javascript">
+    <script src="http://w.sharethis.com/button/buttons.js"></script>
+    <script>
       stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});
     </script>
   <% end %>
@@ -10,68 +10,73 @@
 <% content_for :body_content_title, @blog_post.title %>
 
 <% content_for :body_content_left do %>
-  <p class='posted_at'>
-    <%= t('blog.shared.posts.created_at', :when => @blog_post.created_at.strftime('%d %B %Y')) %>.
+  <article id="show_blog_post">
+    <header>
+      <p class='posted_at'>
+        <%= t('blog.shared.posts.created_at', :when => @blog_post.published_at.strftime('%d %B %Y')) %>.
     
-    <% if (categories = @blog_post.categories).any? %>
-      <span class='filed_in'>
-        <%= t('.filed_in') %>
-        <% categories.each_with_index do |category, index| %>
-            <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
+        <% if (categories = @blog_post.categories).any? %>
+          <span class='filed_in'>
+            <%= t('.filed_in') %>
+            <% categories.each_with_index do |category, index| %>
+                <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
+            <% end %>
+          </span>
         <% end %>
-      </span>
-    <% end %>
-  </p>
-  <%= @blog_post.body %>
-  
-  <% if BlogPost::ShareThis.enabled? %>
-    <span class="st_sharethis" displayText="ShareThis"></span>
-  <% end %>
-    
-  <% if BlogPost.comments_allowed? %>
-    <h2><%= t('.comments.title') %></h2>
-  
-    <% if (comments = @blog_post.comments.approved).any? %>
-      <%= render :partial => "comment", :collection => comments %>
-    <% else %>
-      <p>
-        <%= t('blog.shared.comments.none') %>.
       </p>
-    <% end %>
+    </header>
+    <%=raw @blog_post.body %>
   
-    <% flash.each do |key, value| %>
-      <div id='flash' class="flash flash_<%= key %>">
-        <%= value %>
-      </div>
+    <% if BlogPost::ShareThis.enabled? %>
+      <span class="st_sharethis" displayText="ShareThis"></span>
     <% end %>
-  
-    <h2><%= t('.comments.add') %></h2>
-    <% form_for [:blog_post, @blog_comment] do |f| %>
-      <% if Rails.version < '3.0.0'%>
-        <%= f.error_messages %>
+  </article>  
+  <% if BlogPost.comments_allowed? %>
+    <aside id="comments">
+      <h2><%= t('.comments.title') %></h2>
+
+      <% if (comments = @blog_post.comments.approved).any? %>
+        <%= render :partial => "comment", :collection => comments %>
       <% else %>
-        <%= render :partial => "/shared/admin/error_messages",
-                   :locals => {
-                     :object => f.object,
-                     :include_object_name => true
-                   } %>
+        <p>
+          <%= t('blog.shared.comments.none') %>.
+        </p>
       <% end %>
-      <div class='field'>
-        <%= f.label :name %>
-        <%= f.text_field :name %>
-      </div>
-      <div class='field'>
-        <%= f.label :email %>
-        <%= f.text_field :email %>
-      </div>
-      <div class='field message_field'>
-        <%= f.label :message %>
-        <%= f.text_area :message, :rows => 6 %>
-      </div>
-      <div class='field form-actions'>
-        <%= f.submit t('.submit') %>
-      </div>
-    <% end %>
+
+      <% flash.each do |key, value| %>
+        <div id='flash' class="flash flash_<%= key %>">
+          <%= value %>
+        </div>
+      <% end %>
+
+      <h2><%= t('.comments.add') %></h2>
+      <% form_for [:blog_post, @blog_comment] do |f| %>
+        <% if Rails.version < '3.0.0'%>
+          <%= f.error_messages %>
+        <% else %>
+          <%= render :partial => "/shared/admin/error_messages",
+                     :locals => {
+                       :object => f.object,
+                       :include_object_name => true
+                     } %>
+        <% end %>
+        <div class='field'>
+          <%= f.label :name %>
+          <%= f.text_field :name %>
+        </div>
+        <div class='field'>
+          <%= f.label :email %>
+          <%= f.email_field :email %>
+        </div>
+        <div class='field message_field'>
+          <%= f.label :message %>
+          <%= f.text_area :message, :rows => 6 %>
+        </div>
+        <div class='field form-actions'>
+          <%= f.submit t('.submit') %>
+        </div>
+      <% end %>
+    </aside>
   <% end %>
 <% end %>
 

data/app/views/blog/shared/_post.html.erb

@@ -1,24 +1,28 @@
 <% if post.live? %>
-  <li>
-    <h2><%= link_to post.title, blog_post_url(post) %></h2>
-    <p class='posted_at'>
-      <%= t('blog.shared.posts.created_at', :when => post.published_at.strftime('%d %B %Y')) %>
-    </p>
-    <div clas='clearfix'>
+  <article class="blog_post" id="<%= dom_id(post) %>">
+    <header>
+      <h1><%= link_to post.title, blog_post_url(post) %></h1>
+      <p class='posted_at'>
+        <%= t('blog.shared.posts.created_at', :when => post.published_at.strftime('%d %B %Y')) %>
+      </p>
+    </header>
+    <section class='clearfix'>
       <%= truncate(post.body, 
                    :length => RefinerySetting.find_or_set(:blog_post_teaser_length, 250), 
                    :preserve_html_tags => true) %>
-    </div>
-    <p>
-      <%= link_to t('blog.shared.posts.read_more'), blog_post_url(post) %>
+    </section>
+    <footer>
+      <p> 
+        <%= link_to t('blog.shared.posts.read_more'), blog_post_url(post) %>
     
-      <span class='comment_count'>
-        <% if post.comments.any? %>
-           (<%= pluralize(post.comments.count, t('blog.shared.comments.singular')) %>)
-        <% else %>
-          (<%= t('blog.shared.comments.none') %>)
-        <% end %>
-      </span>
-    </p>
-  </li>
+        <span class='comment_count'>
+          <% if post.comments.any? %>
+             (<%= pluralize(post.comments.count, t('blog.shared.comments.singular')) %>)
+          <% else %>
+            (<%= t('blog.shared.comments.none') %>)
+          <% end %>
+        </span>
+      </p>
+    </footer>
+  </article>
 <% end %>

data/config/routes.rb

@@ -32,8 +32,8 @@ if Rails.version < '3.0.0'
 else
   Refinery::Application.routes.draw do
     scope(:path => 'blog', :module => 'blog') do
-      root :to => 'posts#index'
-      match 'feed.rss', :to => 'posts#index.rss', :as => 'rss_feed'
+      root :to => 'posts#index', :as => 'blog_root'
+      match 'feed.rss', :to => 'posts#index.rss', :as => 'blog_rss_feed'
       match ':id', :to => 'posts#show', :as => 'blog_post'
       match 'categories/:id', :to => 'categories#show', :as => 'blog_category'
       match ':id/comments', :to => 'posts#comment', :as => 'blog_post_blog_comments'

data/generators/refinery_blog/refinery_blog_generator.rb

@@ -37,7 +37,7 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
             :attributes => [
               Rails::Generator::GeneratedAttribute.new('title', 'string'),
               Rails::Generator::GeneratedAttribute.new('body', 'text'),
-              Rails::Generator::GeneratedAttribute.new('draft', 'boolean')
+              Rails::Generator::GeneratedAttribute.new('draft', 'boolean'),
               Rails::Generator::GeneratedAttribute.new('published_at', 'datetime')
             ], :id => true
           },{

data/lib/generators/refinery_blog_generator.rb

@@ -16,7 +16,8 @@ class RefineryBlogGenerator < Rails::Generators::NamedBase
        :attributes => [
          Rails::Generators::GeneratedAttribute.new('title', 'string'),
          Rails::Generators::GeneratedAttribute.new('body', 'text'),
-         Rails::Generators::GeneratedAttribute.new('draft', 'boolean')
+         Rails::Generators::GeneratedAttribute.new('draft', 'boolean'),
+         Rails::Generators::GeneratedAttribute.new('published_at', 'datetime')
        ], :id => true
      },{
        :table_name => 'blog_comments',

data/lib/refinerycms-blog.rb

@@ -42,7 +42,7 @@ module Refinery
 
     class << self
       def version
-        %q{1.0.rc11}
+        %q{1.0.rc13}
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-blog
 version: !ruby/object:Gem::Version 
-  hash: -398340060
+  hash: -398340062
   prerelease: true
   segments: 
   - 1
   - 0
-  - rc11
-  version: 1.0.rc11
+  - rc13
+  version: 1.0.rc13
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +12:00
+date: 2010-10-05 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency