refinerycms-blog 1.0.rc16 → 1.0.1

data/app/views/admin/blog/posts/_form.js.erb

@@ -0,0 +1,13 @@
+<script>
+  $(document).ready(function(){
+    $('#toggle_advanced_options').click(function(e){
+      e.preventDefault();
+
+      $('#more_options').animate({opacity: 'toggle', height: 'toggle'}, 250);
+
+      $('html,body').animate({
+        scrollTop: $('#toggle_advanced_options').parent().offset().top
+      }, 250);
+    });
+  });
+</script>

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

@@ -27,4 +27,4 @@
       </p>
     <% end %>
   <% end %>
-</div>
+</div>

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

@@ -17,4 +17,4 @@
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
-<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>

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

@@ -0,0 +1,13 @@
+<% if next_or_previous?(@blog_post) -%>
+  <nav id="next_prev_article">
+    <% if @blog_post.next.present? -%>
+      <%= link_to raw(truncate(@blog_post.next.title) + "&nbsp;&#187;"), @blog_post.next, :class => 'next' %>
+    <% end -%>
+
+    <%= link_to 'Blog Home', blog_root_path, :class => 'home' %>
+
+    <% if @blog_post.prev.present? -%>
+      <%= link_to "&#171;&nbsp;".html_safe + truncate(@blog_post.prev.title), @blog_post.prev, :class => 'prev' %>
+    <% end -%>
+  </nav><!-- /next_prev_article -->
+<% end -%>

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

@@ -0,0 +1,34 @@
+<% flash.each do |key, value| %>
+ <div id='flash' class="flash flash_<%= key %>">
+   <%= value %>
+ </div>
+<% end %>
+<article id="blog_post">
+  <header>
+    <h1><%= @blog_post.title %></h1>
+    <details>
+      <time datetime="<%= @blog_post.published_at.strftime('%Y-%m-%d') %>" class='posted_at'>
+        <%= t('blog.shared.posts.created_at', :when => @blog_post.published_at.strftime('%d %B %Y')) %>.
+      </time>
+      <% if (categories = @blog_post.categories).any? %>
+        <aside 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 %>
+        </aside>
+      <% end %>
+    </details>
+  </header>
+  <%= @blog_post.body.html_safe %>
+
+  <% if BlogPost::ShareThis.enabled? %>
+    <span class="st_sharethis" displayText="ShareThis"></span>
+  <% end %>
+</article>
+<%= render :partial => '/shared/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%>
+<% if next_or_previous?(@blog_post) -%>
+  <nav id="next_prev_article">
+    <%= render 'nav' %>
+  </nav><!-- /next_prev_article -->
+<% end -%>

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

@@ -0,0 +1,19 @@
+<% content_for :body_content_left do %>
+  <%= @page[Page.default_parts.first.to_sym] %>
+  <h1>Blog Archive for <%= @archive_date.strftime('%B %Y') %></h1>
+  <section id="blog_posts">
+    <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
+  </section>
+  <%= "There are no blog articles posted for #{@archive_date.strftime('%B %Y')}. Stay tuned." unless @blog_posts.any? %>
+  <%# TODO: Add locale logic here - hubble is a n00b at that %>
+<% 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" %>
+  <%= blog_archive_list %>
+<% end %>
+
+<%= render :partial => "/shared/content_page" %>
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>

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

@@ -4,6 +4,8 @@
   <section id="blog_posts">
     <%= render :partial => "/blog/shared/post", :collection => @blog_posts %>
   </section>
+  <%= "<p>There are no blog articles posted yet. Stay tuned.</p>".html_safe unless @blog_posts.any? %>
+  <%# TODO: Add locale logic here - hubble is a n00b at that %>
 <% end %>
 
 <% content_for :body_content_right do %>
@@ -11,7 +13,8 @@
 
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
+  <%= blog_archive_list %>
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
-<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>

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

@@ -1,36 +1,8 @@
-<% content_for :head do %>
-  <% if BlogPost::ShareThis.enabled? %>
-    <script src="http://w.sharethis.com/button/buttons.js"></script>
-    <script>
-      stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});
-    </script>
-  <% end %>
-<% end %>
-
-<% content_for :body_content_title, @blog_post.title %>
-
 <% content_for :body_content_left do %>
-  <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) %>
-            <% end %>
-          </span>
-        <% end %>
-      </p>
-    </header>
-    <%= @blog_post.body.html_safe %>
+  <div id="show_blog_post">
+    <%= render 'post' %>
+  </div>
 
-    <% if BlogPost::ShareThis.enabled? %>
-      <span class="st_sharethis" displayText="ShareThis"></span>
-    <% end %>
-  </article>
   <% if BlogPost.comments_allowed? %>
     <aside id="comments">
       <h2><%= t('.comments.title') %></h2>
@@ -51,26 +23,15 @@
 
       <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 %>
+        <%= f.error_messages %>
+
         <div class='field'>
           <%= f.label :name %>
           <%= f.text_field :name %>
         </div>
         <div class='field'>
           <%= f.label :email %>
-          <% if Rails.version > '3.0.0' %>
-            <%= f.email_field :email %>
-          <% else %>
-            <%= f.text_field :email %>
-          <% end %>
+          <%= f.text_field :email %>
         </div>
         <div class='field message_field'>
           <%= f.label :message %>
@@ -88,7 +49,27 @@
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/posts" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
+  <%= blog_archive_list %>
 <% end %>
 
-<%= render :partial => "/shared/content_page" %>
-<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>
+<%= render :partial => "/shared/content_page", :locals => { :remove_automatic_sections => true }  %>
+
+<% if Refinery.version < '0.9.9' %>
+  <% content_for :head_libraries, jquery_include_tags(:jquery_ui => false) %>
+  <% content_for :head do %>
+    <%= stylesheet_link_tag 'refinerycms-blog' %>
+    <%= javascript_include_tag('refinerycms-blog') %>
+    <% if BlogPost::ShareThis.enabled? %>
+      <script src="http://w.sharethis.com/button/buttons.js"></script>
+      <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script>
+    <% end %>
+  <% end %>
+<% else %>
+  <% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
+  <% content_for :before_javascript_libraries, jquery_include_tags(:jquery_ui => false) %>
+  <% content_for :javascripts do %>
+    <%= javascript_include_tag 'refinerycms-blog' %>
+    <script src="http://w.sharethis.com/button/buttons.js"></script>
+    <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script>
+  <% end if BlogPost::ShareThis.enabled? %>
+<% end %>

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

@@ -5,4 +5,4 @@
       <%= link_to "#{category.title} (#{category.post_count})", blog_category_url(category) %>
     </li>
   <% end %>
-</ul>
+</ul>

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

@@ -2,9 +2,19 @@
   <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>
+      <details>
+        <time datetime="<%= post.published_at.strftime('%Y-%m-%d') %>" class='posted_at'>
+          <%= t('blog.shared.posts.created_at', :when => post.published_at.strftime('%d %B %Y')) %>.
+        </time>
+        <% if (categories = post.categories).any? %>
+          <aside class='filed_in'>
+            <%= t('filed_in', :scope => 'blog.posts.show') %>
+            <% categories.each_with_index do |category, index| %>
+              <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
+            <% end %>
+          </aside>
+        <% end %>
+      </details>
     </header>
     <section class='clearfix'>
       <%= truncate(post.body,
@@ -15,14 +25,14 @@
       <p>
         <%= link_to t('blog.shared.posts.read_more'), blog_post_url(post) %>
 
-        <span class='comment_count'>
+        <aside class='comment_count'>
           <% if post.comments.any? %>
              (<%= pluralize(post.comments.approved.count, t('blog.shared.comments.singular')) %>)
           <% else %>
             (<%= t('blog.shared.comments.none') %>)
           <% end %>
-        </span>
+        </aside>
       </p>
     </footer>
   </article>
-<% end %>
+<% end %>

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

@@ -5,4 +5,4 @@
       <%= link_to blog_post.title, blog_post_url(blog_post) %>
     </li>
   <% end %>
-</ul>
+</ul>

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

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

data/config/routes.rb

@@ -1,71 +1,33 @@
-if Rails.version < '3.0.0'
-  ActionController::Routing::Routes.draw do |map|
-    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
-        }
-      end
-    end
+ActionController::Routing::Routes.draw do |map|
+  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'
+
+    ## TODO: what is the rails2 syntax for this? sorry ;__;
+    # get 'archive/:year/:month', :to => 'posts#archive', :as => 'archive_blog_posts'
   end
-else
-  Refinery::Application.routes.draw do
-    scope(:path => 'blog', :module => 'blog') do
-      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'
-    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
+  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
+    admin.namespace :blog do |blog|
+      blog.resources :posts
 
-        resources :comments do
-          collection do
-            get :approved
-            get :rejected
-          end
-          member do
-            get :approved
-            get :rejected
-          end
-        end
+      blog.resources :categories
 
-        resources :settings do
-          collection do
-            get :notification_recipients
-            post :notification_recipients
+      blog.resources :comments, :collection => {
+        :approved => :get,
+        :rejected => :get
+      }, :member => {
+        :approved => :get,
+        :rejected => :get
+      }
 
-            get :moderation
-          end
-        end
-      end
+      blog.resources :settings, :collection => {
+        :notification_recipients => [:get, :post],
+        :moderation => :get
+      }
     end
   end
-end
+end

data/{spec → features/support}/factories/blog_categories.rb

@@ -1,4 +1,4 @@
 Factory.define(:blog_category) do |f|
   f.title "Shopping"
-  f.posts {|p| [p.association :post]}
-end
+  f.posts {|p| [p.association(:post)]}
+end

data/{spec → features/support}/factories/blog_comments.rb

@@ -7,4 +7,4 @@ Factory.define(:blog_comment) do |f|
   f.email { Factory.next(:email) }
   f.body "Which one is the best for picking up new shoes?"
   f.association :post
-end
+end

data/{spec → features/support}/factories/blog_posts.rb

@@ -1,4 +1,4 @@
 Factory.define(:post, :class => BlogPost) do |f|
   f.title "Top Ten Shopping Centers in Chicago"
   f.body "These are the top ten shopping centers in Chicago. You're going to read a long blog post about them. Come to peace with it."
-end
+end

data/features/support/paths.rb

@@ -0,0 +1,24 @@
+module NavigationHelpers
+  module Refinery
+    module Blog
+      def path_to(page_name)
+        case page_name
+        when /the list of blog posts/
+          admin_blog_posts_path
+        when /the new blog posts? form/
+          new_admin_blog_post_path
+        else
+          begin
+            if page_name =~ /the blog post titled "?([^\"]*)"?/ and (page = BlogPost.find_by_title($1)).present?
+              self.url_for(page.url)
+            else
+              nil
+            end
+          rescue
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/generators/{refinery_blog/refinery_blog_generator.rb → refinerycms_blog/refinerycms_blog_generator.rb}

@@ -1,4 +1,4 @@
-class RefineryBlogGenerator < Rails::Generator::NamedBase
+class RefinerycmsBlogGenerator < Rails::Generator::NamedBase
 
   def initialize(*runtime_args)
     # set argument for the user.
@@ -7,7 +7,7 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
   end
 
   def banner
-    'Usage: script/generate refinery_blog'
+    'Usage: script/generate refinerycms_blog'
   end
 
   def manifest
@@ -24,7 +24,7 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
         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')
 
@@ -66,4 +66,4 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
     end
   end
 
-end if defined?(Rails::Generator::NamedBase)
+end if defined?(Rails::Generator::NamedBase)