refinerycms-blog 0.9.8.0.rc2 → 1.0.rc10

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

@@ -0,0 +1,9 @@
+<div 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/>") %>
+  </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>

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

@@ -0,0 +1,17 @@
+<% content_for :body_content_left do %>
+  <%= @page[Page.default_parts.first.to_sym] %>
+
+  <ul id="blog_posts">
+    <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
+  </ul>
+<% end %>
+
+<% content_for :body_content_right do %>
+  <%= @page[Page.default_parts.second.to_sym] %>
+
+  <%= render :partial => "/blog/shared/categories" %>
+  <%= render :partial => "/blog/shared/rss_feed" %>
+<% end %>
+
+<%= render :partial => "/shared/content_page" %>
+<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>

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

@@ -0,0 +1,17 @@
+xml.instruct! :xml, :version => "1.0"
+xml.rss :version => "2.0" do
+  xml.channel do
+    xml.title RefinerySetting.find_or_set(:site_name, "Company Name")
+    xml.description RefinerySetting.find_or_set(:site_name, "Company Name") + " Blog Posts"
+    xml.link blog_root_url
+
+    @blog_posts.each do |post|
+      xml.item do
+        xml.title post.title
+        xml.description post.body
+        xml.pubDate post.created_at.to_s(:rfc822)
+        xml.link blog_post_url(post)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+<% 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">
+      stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});
+    </script>
+  <% end %>
+<% end %>
+
+<% 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')) %>.
+    
+    <% 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 %>
+  </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 %>
+  
+    <% 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.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 %>
+  <% end %>
+<% end %>
+
+<% content_for :body_content_right do %>
+  <%= render :partial => "/blog/shared/categories" %>
+  <%= render :partial => "/blog/shared/posts" %>
+  <%= render :partial => "/blog/shared/rss_feed" %>
+<% end %>
+
+<%= render :partial => "/shared/content_page" %>
+<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>

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

@@ -0,0 +1,8 @@
+<h2><%= t('.title') %></h2>
+<ul id='categories'>
+  <% @blog_categories.each do |category| %>
+    <li<%= " class='selected'" if @category.present? and @category.id == category.id %>>
+      <%= link_to "#{category.title} (#{category.posts.count})", blog_category_url(category) %>
+    </li>
+  <% end %>
+</ul>

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

@@ -0,0 +1,22 @@
+<li>
+  <h2><%= link_to post.title, blog_post_url(post) %></h2>
+  <p class='posted_at'>
+    <%= t('blog.shared.posts.created_at', :when => post.created_at.strftime('%d %B %Y')) %>
+  </p>
+  <div clas='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) %>
+    
+    <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>

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

@@ -0,0 +1,8 @@
+<h2><%= t('.other') %></h2>
+<ul id="blog_posts">
+  <% @blog_posts.each do |blog_post| %>
+    <li>
+      <%= link_to blog_post.title, blog_post_url(blog_post) %>
+    </li>
+  <% end %>
+</ul>

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

@@ -0,0 +1,2 @@
+<h2><%= t('.title') %></h2>
+<%= link_to "Subscribe", blog_rss_feed_url, :id => "rss_feed_subscribe"%>

data/config/locales/en.yml

@@ -9,17 +9,36 @@ en:
           edit: Edit this category
           delete: Delete this category forever
         index:
-          no_items_yet: There are no categories yet. Click "{{create}}" to add your first category.
+          no_items_yet: 'There are no categories yet. Click "{{create}}" to add your first category.'
       comments:
+        approved: 'The comment from "{{author}}" has been approved.'
+        comment:
+          view_live: View this comment live <br/><em>(opens in a new window)</em>
+          read: Read this comment
+          reject: Reject this comment
+          approve: Approve this comment
+        rejected: 'The comment from "{{author}}" has been rejected.'
         index:
-          no_items_yet: There are no {{type}} comments yet.
+          no_items_yet: 'There are no {{type}} comments.'
+        show:
+          comment: Comment
+          blog_post: Blog Post
+          from: Posted by
+          date: Posted at
+          message: Comment
+          details: Details
+          age: Age
+          actions: Actions
+          back: Back to all comments
+          reject: Reject this comment
+          approve: Approve this comment
       posts:
         form:
           advanced_options: Advanced Options
           toggle_advanced_options: Click to access meta tag settings and menu options
           save_as_draft: Save as Draft
         index:
-          no_items_yet: There are no Blog Posts yet. Click "{{create}}" to add your first blog post.
+          no_items_yet: 'There are no Blog Posts yet. Click "{{create}}" to add your first blog post.'
         post:
           view_live: View this blog post live <br/><em>(opens in a new window)</em>
           edit: Edit this blog post
@@ -27,9 +46,10 @@ en:
       settings:
         notification_recipients:
           value: Send notifications to
-          explanation: Every time someone comments on a blog post, Refinery sends out an email to say there is a new comment.
-          hint: When a new comment is added, Refinery will send an email notification to you.
+          explanation: 'Every time someone comments on a blog post, Refinery sends out an email to say there is a new comment.'
+          hint: 'When a new comment is added, Refinery will send an email notification to you.'
           example: "Enter your email address(es) like: jack@work.com, jill@office.com"
+          updated: 'Notification recipients have been set to "{{recipients}}"'
       submenu:
         categories:
           title: Categories
@@ -37,6 +57,7 @@ en:
           new: Create new category
         comments:
           title: Comments
+          title_with_count: 'Comments ({{new_count}} new)'
           new: New
           unmoderated: New
           approved: Approved
@@ -49,18 +70,33 @@ en:
           title: Settings
           moderation: Moderation
           update_notified: Update who gets notified
-  blog_posts:
-    side_bar:
-      categories: Categories
-    index:
-      read_more: Read more
-    show:
+  blog:
+    shared:
+      categories:
+        title: Categories
+      rss_feed:
+        title: RSS Feed
+      posts:
+        other: Other Posts
+        created_at: 'Posted on {{when}}'
+        read_more: Read more
+      comments:
+        singular: comment
+        none: no comments
+    categories:
+      show:
+        no_posts: There are no posts here yet.
+    posts:
+      comment: comment
       comments:
-        title: Comments
-        by: Posted by {{who}}
+        by: 'Posted by {{who}}'
         time_ago: '{{time}} ago'
-      other: Other Blog Posts
-      filed_in: Filed in
-      created_at_title: Publishing Date
-      created_at: Posted on {{when}}
-      submit: Send comment
+        thank_you: 'Thank you for commenting.'
+        thank_you_moderated: 'Thank you for commenting. Your message has been placed in the moderation queue and will appear shortly.'
+      show:
+        comments:
+          title: Comments
+          add: Make a Comment
+        other: Other Blog Posts
+        filed_in: Filed in
+        submit: Send comment

data/config/routes.rb

@@ -1,18 +1,27 @@
 if Rails.version < '3.0.0'
   ActionController::Routing::Routes.draw do |map|
-    map.blog_post '/blog', :controller => :blog_posts, :action => :index
-    map.blog_post '/blog/:id', :controller => :blog_posts, :action => :show
-    map.blog_category '/blog/categories/:category_id', :controller => :blog_posts, :action => :index
-    map.blog_post_blog_comments '/blog/:id/comments', :controller => :blog_posts, :action => :comment
+    map.namespace(:blog) do |blog|
+      blog.rss_feed 'feed.rss', :controller => 'posts', :action => 'index', :format => 'rss'
+      blog.root :controller => "posts", :action => 'index'
+      blog.post ':id', :controller => "posts", :action => 'show'
+      blog.category 'categories/:id', :controller => "categories", :action => 'show'
+      blog.post_blog_comments ':id/comments', :controller => 'posts', :action => 'comment'
+    end
 
     map.namespace(:admin, :path_prefix => 'refinery') do |admin|
       admin.namespace :blog do |blog|
         blog.resources :posts
+
         blog.resources :categories
+
         blog.resources :comments, :collection => {
           :approved => :get,
           :rejected => :get
+        }, :member => {
+          :approved => :get,
+          :rejected => :get
         }
+
         blog.resources :settings, :collection => {
           :notification_recipients => [:get, :post],
           :moderation => :get
@@ -21,5 +30,42 @@ if Rails.version < '3.0.0'
     end
   end
 else
-  # route for rails3 here.
+  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'
+      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'
+    end
+
+    scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
+      scope(:path => 'blog', :name_prefix => 'admin', :as => 'blog', :module => 'blog') do
+        root :to => 'posts#index'
+        resources :posts
+
+        resources :categories
+
+        resources :comments do
+          collection do
+            get :approved
+            get :rejected
+          end
+          member do
+            get :approved
+            get :rejected
+          end
+        end
+
+        resources :settings do
+          collection do
+            get :notification_recipients
+            post :notification_recipients
+
+            get :moderation
+          end
+        end
+      end
+    end
+  end
 end

data/generators/refinery_blog/refinery_blog_generator.rb

@@ -12,24 +12,23 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      if Rails.version < '3.0.0'
-        matches = Dir[
-          File.expand_path('../../../public/images/**/*', __FILE__),
-          File.expand_path('../../../public/stylesheets/**/*', __FILE__),
-          File.expand_path('../../../public/javascripts/**/*', __FILE__),
-        ]
-        matches.reject{|d| !File.directory?(d)}.each do |dir|
-          m.directory((%w(public) | dir.split('public/').last.split('/')).join('/'))
-        end
-        matches.reject{|f| File.directory?(f)}.each do |image|
-          path = (%w(public) | image.split('public/').last.split('/'))[0...-1].join('/')
-          m.template "../../../#{path}/#{image.split('/').last}", "#{path}/#{image.split('/').last}"
-        end
+      matches = Dir[
+        File.expand_path('../../../public/images/**/*', __FILE__),
+        File.expand_path('../../../public/stylesheets/**/*', __FILE__),
+        File.expand_path('../../../public/javascripts/**/*', __FILE__),
+      ]
+      matches.reject{|d| !File.directory?(d)}.each do |dir|
+        m.directory((%w(public) | dir.split('public/').last.split('/')).join('/'))
       end
+      matches.reject{|f| File.directory?(f)}.each do |image|
+        path = (%w(public) | image.split('public/').last.split('/'))[0...-1].join('/')
+        m.template "../../../#{path}/#{image.split('/').last}", "#{path}/#{image.split('/').last}"
+      end
+      
+      m.directory('db/seeds')
+      m.template('db/seeds/seed.rb', 'db/seeds/refinerycms_blog.rb')
 
-      m.template('seed.rb', 'db/seeds/refinerycms_blog.rb')
-
-      m.migration_template('migration.rb', 'db/migrate',
+      m.migration_template('db/migrate/migration.rb', 'db/migrate',
         :migration_file_name => 'create_blog_structure',
         :assigns => {
           :migration_name => 'CreateBlogStructure',

data/lib/gemspec.rb

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage          = %q{http://refinerycms.com}
   s.authors           = %w(Resolve\\ Digital Neoteric\\ Design)
   s.require_paths     = %w(lib)
-  s.add_dependency    'refinerycms',  '~> 0.9.7.13'
+  s.add_dependency    'refinerycms',  '>= 0.9.7.13'
   s.add_dependency    'filters_spam', '~> 0.2'
 
   s.files             = %w(

data/lib/generators/refinery_blog/templates/db/migrate/migration_number_create_singular_name.rb

@@ -0,0 +1,26 @@
+class Create<%= singular_name.camelize %> < ActiveRecord::Migration
+
+  def self.up<% @refinerycms_blog_tables.each do |table| %>
+    create_table :<%= table[:table_name] %>, :id => <%= table[:id].to_s %> do |t|
+<% table[:attributes].each do |attribute| -%>
+      t.<%= attribute.type %> :<%= attribute.name %>
+<% end -%>
+      <%= 't.timestamps' if table[:id] %>
+    end
+
+    <%= "add_index :#{table[:table_name]}, :id" if table[:id] %>
+<% end -%>
+    load(Rails.root.join('db', 'seeds', 'refinerycms_blog.rb').to_s)
+  end
+
+  def self.down
+    UserPlugin.destroy_all({:name => "refinerycms_blog"})
+
+    Page.delete_all({:link_url => "/blog"})
+
+<% @refinerycms_blog_tables.each do |table| -%>
+    drop_table :<%= table[:table_name] %>
+<% end -%>
+  end
+
+end

data/lib/generators/refinery_blog/templates/db/seeds/seed.rb

@@ -0,0 +1,16 @@
+User.find(:all).each do |user|
+  user.plugins.create(:name => "<%= singular_name %>",
+                      :position => (user.plugins.maximum(:position) || -1) +1)
+end
+
+page = Page.create(
+  :title => "Blog",
+  :link_url => "/blog",
+  :deletable => false,
+  :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
+  :menu_match => "^/blogs?(\/|\/.+?|)$"
+)
+
+Page.default_parts.each do |default_page_part|
+  page.parts.create(:title => default_page_part, :body => nil)
+end