refinerycms-blog 1.8.0 → 2.0.0

data/app/views/{blog → refinery/blog}/comment_mailer/notification.html.erb

@@ -12,6 +12,6 @@
 <%=raw t('.comment_ends') %>
 
 <%=raw t('.closing_line') %>,
-<%=raw RefinerySetting[:site_name] %>
+<%=raw Refinery::Core.site_name %>
 
 <%=raw t('.ps') %>

data/app/views/{blog → refinery/blog}/posts/_comment.html.erb

@@ -3,8 +3,8 @@
   <%= simple_format auto_link(comment.message.to_s) %>
   <footer class='blog_comment_author'>
     <p>
-      <%= t('by', :scope => 'blog.posts.comments', :who => comment.name) %>,
-      <%= t('time_ago', :scope => 'blog.posts.comments', :time => time_ago_in_words(comment.created_at)) %>
+      <%= t('by', :scope => 'refinery.blog.posts.comments', :who => comment.name) %>,
+      <%= t('time_ago', :scope => 'refinery.blog.posts.comments', :time => time_ago_in_words(comment.created_at)) %>
     </p>
   </footer>
 </article>

data/app/views/refinery/blog/posts/_comments.html.erb

@@ -0,0 +1,40 @@
+<aside id="comments">
+  <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
+  <% if (comments = @post.comments.approved).any? %>
+    <%= render :partial => "comment", :collection => comments %>
+  <% else %>
+    <p>
+      <%= t('none', :scope => 'refinery.blog.shared.comments') %>.
+    </p>
+  <% end %>
+
+  <% flash.each do |key, value| %>
+    <div id='flash' class="flash flash_<%= key %>">
+      <%= value %>
+    </div>
+  <% end %>
+
+  <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
+  <%= form_for [refinery, :blog, @comment] do |f| %>
+    <%= render :partial => "/refinery/admin/error_messages",
+               :locals => {
+                 :object => f.object,
+                 :include_object_name => true
+               } %>
+    <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', :scope => 'refinery.blog.posts.show') %>
+    </div>
+  <% end %>
+</aside>

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

@@ -0,0 +1,17 @@
+<nav id="next_prev_article">
+  <% if @post.next.present? -%>
+    <%= link_to (truncate(@post.next.title) + " &#187;").html_safe, 
+                refinery.blog_post_path(@post.next), 
+                :class => 'next' %>
+  <% end -%>
+
+  <%= link_to t('blog_home', :scope => 'refinery.blog.posts.show'), 
+              refinery.blog_root_path, 
+              :class => 'home' %>
+
+  <% if @post.prev.present? -%>
+    <%= link_to ("&#171; " + truncate(@post.prev.title)).html_safe, 
+                refinery.blog_post_path(@post.prev), 
+                :class => 'prev' %>
+  <% end -%>
+</nav><!-- /next_prev_article -->

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

@@ -0,0 +1,37 @@
+<% flash.each do |key, value| %>
+ <div id='flash' class="flash flash_<%= key %>">
+   <%= value %>
+ </div>
+<% end %>
+<article id="blog_post">
+  <header>
+    <h1><%= @post.title %></h1>
+    <section class='details'>
+      <time datetime="<%=l @post.published_at.to_date, :format => :default %>" class='posted_at'>
+        <%= t('created_at', :scope => 'refinery.blog.shared.posts', :when => l(@post.published_at.to_date, :format => :short)) %>
+      </time>
+      <%= content_tag(:div, "#{t('by', :scope => 'refinery.blog.posts.show')} #{@post.author.username}", :class => "blog_author") if @post.author.present? %>
+      <% if @post.source_url.present? %>
+        <div class='blog_source'>
+          <%= "#{t('source', :scope => 'refinery.blog.posts.show')}: " %>
+          <%= link_to (@post.source_url_title.blank? ? @post.source_url : @post.source_url_title), @post.source_url %>
+        </div>
+      <% end %>
+      <% if (categories = @post.categories).any? %>
+        <aside class='filed_in'>
+          <%= t('filed_in', :scope => 'refinery.blog.posts.show') %>
+          <% categories.each_with_index do |category, index| %>
+            <%= link_to category.title, refinery.blog_category_path(category) -%><%= ',' if index < ((categories.length) - 1) %>
+          <% end %>
+        </aside>
+      <% end %>
+    </section>
+  </header>
+  <%= @post.body.html_safe %>
+
+  <% if Refinery::Blog::Post::ShareThis.enabled? %>
+    <span class="st_sharethis" displayText="ShareThis"></span>
+  <% end %>
+</article>
+<%= render :partial => '/refinery/draft_page_message' unless @post.nil? or @post.live? -%>
+<%= render 'nav' if next_or_previous?(@post) %>

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

@@ -0,0 +1,17 @@
+<% content_for :title, "#{t('.blog_archive_for', :date => @archive_date.strftime('%B %Y'))}" %>
+
+<% content_for :body_content_left do %>
+  <h1><%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %></h1>
+  <% if @posts.any? %>
+    <section id="blog_posts">
+      <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
+    </section>
+  <% else %>
+    <p><%= t('.no_blog_articles_posted', :date => @archive_date.strftime('%B %Y')) %></p>
+  <% end %>
+<% end %>
+
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
+
+<%= render :partial => "/refinery/content_page" %>
+<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>

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

@@ -0,0 +1,20 @@
+<% content_for :body_content_left do %>
+  <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
+
+  <% if @posts.any? %>
+    <section id="blog_posts">
+      <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
+      <%= will_paginate @posts %>
+    </section>
+  <% else %>
+    <p><%= t('.no_blog_articles_yet') %></p>
+  <% end %>
+<% end %>
+
+<% content_for :body_content_right_prepend do -%>
+  <%= raw @page.content_for(Refinery::Pages.default_parts.second.to_sym) %>
+<% end if Refinery::Pages.default_parts.many? -%>
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
+
+<%= render :partial => "/refinery/content_page" %>
+<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>

data/app/views/refinery/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 Refinery::Core.site_name
+    xml.description Refinery::Core.site_name + " Blog Posts"
+    xml.link refinery.blog_root_url
+
+    @posts.each do |post|
+      xml.item do
+        xml.title post.title
+        xml.description post.body
+        xml.pubDate post.published_at.to_s(:rfc822)
+        xml.link refinery.blog_post_url(post)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+<% content_for :body_content_left do %>
+  <div id="show_blog_post">
+    <%= render 'post' %>
+  </div>
+
+  <% if Refinery::Blog::Post.comments_allowed? %>
+    <%= render 'comments'%>
+  <% end %>
+<% end %>
+
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
+
+<%= render :partial => "/refinery/content_page", :locals => { :remove_automatic_sections => true }  %>
+
+<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>
+<% content_for :javascripts do %>
+  <%# enable AJAX'd post nav at your own risk until html5 history API implemented. %>
+  <%#= javascript_include_tag('refinery/blog/frontend') %>
+  <script src="http://w.sharethis.com/button/buttons.js"></script>
+  <script>stLight.options({publisher:'<%= Blog::Post::ShareThis.key %>'});</script>
+<% end if Refinery::Blog::Post::ShareThis.enabled? %>

data/app/views/refinery/blog/posts/tagged.html.erb

@@ -0,0 +1,19 @@
+<% content_for :title, "#{t('.posts_tagged')} '#{@tag_name.titleize}'"  %>
+
+<% content_for :body_content_title, "#{t('.posts_tagged')} &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
+
+<% content_for :body_content_left do %>
+  <% if @posts.any? %>
+    <section id="blog_posts">
+      <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
+      <%= will_paginate @posts %>
+    </section>
+  <% else %>
+    <p><%= t('.no_blog_articles_yet') %></p>
+  <% end %>
+<% end %>
+
+<%= render :partial => '/refinery/blog/shared/body_content_right' %>
+
+<%= render :partial => "/refinery/content_page" %>
+<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>

data/app/views/refinery/blog/shared/_body_content_right.html.erb

@@ -0,0 +1,9 @@
+<% content_for :body_content_right do %>
+  <%= yield(:body_content_right_prepend) %>
+  <%= render :partial => "/refinery/blog/shared/rss_feed" %>
+  <%= render :partial => "/refinery/blog/shared/categories" %>
+  <%= render :partial => "/refinery/blog/shared/tags" %>
+  <%= render :partial => "/refinery/blog/shared/posts" %>
+  <%= blog_archive_widget %>
+  <%= yield(:body_content_right_append) %>
+<% end %>

data/app/views/{blog → refinery/blog}/shared/_categories.html.erb

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

data/app/views/{blog → refinery/blog}/shared/_post.html.erb

@@ -1,22 +1,22 @@
 <% if post.live? %>
   <article class="blog_post" id="<%= dom_id(post) %>">
     <header>
-      <h1><%= link_to post.title, blog_post_url(post) %></h1>
+      <h1><%= link_to post.title, refinery.blog_post_path(post) %></h1>
       <section class='details'>
         <time datetime="<%=l post.published_at.to_date, :format => :default %>" class='posted_at'>
-          <%= t('created_at', :scope => 'blog.shared.posts', :when => l(post.published_at.to_date, :format => :short)) %>
+          <%= t('created_at', :scope => 'refinery.blog.shared.posts', :when => l(post.published_at.to_date, :format => :short)) %>
         </time>
-        <%= "#{t('by', :scope => 'blog.posts.show')} #{post.author.username}" if post.author.present? %>.
+        <%= "#{t('by', :scope => 'refinery.blog.posts.show')} #{post.author.username}" if post.author.present? %>.
         <% if (categories = post.categories).any? %>
           <aside class='filed_in'>
-            <%= t('filed_in', :scope => 'blog.posts.show') %>
-            <%=raw categories.collect { |category| link_to category.title, blog_category_url(category) }.to_sentence %>
+            <%= t('filed_in', :scope => 'refinery.blog.posts.show') %>
+            <%=raw categories.collect { |category| link_to category.title, refinery.blog_category_path(category) }.to_sentence %>
           </aside>
         <% end %>
         <% if (tags = post.tags).any? %>
           <aside class='tagged'>
-            <%= t('tagged', :scope => 'blog.posts.show') %>
-            <%=raw tags.collect { |tag| link_to tag, tagged_posts_path(tag.id, tag.name.parameterize) }.to_sentence %>
+            <%= t('tagged', :scope => 'refinery.blog.posts.show') %>
+            <%=raw tags.collect { |tag| link_to tag, refinery.blog_tagged_posts_path(tag.id, tag.name.parameterize) }.to_sentence %>
           </aside>
         <% end %>
       </section>
@@ -30,14 +30,14 @@
     </section>
     <footer>
       <p>
-        <%= link_to t('read_more', :scope => 'blog.shared.posts'), blog_post_url(post) if blog_post_teaser_enabled? %>
+        <%= link_to t('read_more', :scope => 'refinery.blog.shared.posts'), refinery.blog_post_path(post) if blog_post_teaser_enabled? %>
       </p>
       <aside class='comment_count'>
-        <% if BlogPost.comments_allowed? %>
+        <% if Refinery::Blog::Post.comments_allowed? %>
           <% if post.comments.any? %>
-             (<%= pluralize(post.comments.approved.count, t('singular', :scope => 'blog.shared.comments')) %>)
+             (<%= pluralize(post.comments.approved.count, t('singular', :scope => 'refinery.blog.shared.comments')) %>)
           <% else %>
-                (<%= t('none', :scope => 'blog.shared.comments') %>)
+                (<%= t('none', :scope => 'refinery.blog.shared.comments') %>)
           <% end %>
         <% end %>
       </aside>

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

@@ -0,0 +1,10 @@
+<% if @posts.many? %>
+  <h2><%= t('.other') %></h2>
+  <ul id="blog_posts">
+    <% @posts.each do |blog_post| %>
+      <li class='clearfix'>
+        <%= link_to blog_post.title, refinery.blog_post_path(blog_post) %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

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

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

data/app/views/{blog → refinery/blog}/shared/_tags.html.erb

@@ -2,7 +2,7 @@
   <h2><%= t('.title') %></h2>
   <nav id='tags'>
     <% tag_cloud(@tags, %w(tag1 tag2 tag3 tag4)) do |tag, css_class| %>
-      <%= link_to tag.name, tagged_posts_path(tag.id, tag.name.parameterize), :class => css_class %>
+      <%= link_to tag.name, refinery.blog_tagged_posts_path(tag.id, tag.name.parameterize), :class => css_class %>
     <% end %>
   </nav>
 <% end %>

data/app/views/refinery/blog/widgets/_blog_archive.html.erb

@@ -0,0 +1,10 @@
+<section id="blog_archive_widget">
+  <h2><%= t('archives', :scope => 'refinery.blog.shared') %></h2>
+  <nav>
+    <ul>
+      <% links.each do |link| %>
+        <li><%= link %></li>
+      <% end %>
+    </ul>
+  </nav>
+</section>

data/app/views/refinery/shared/admin/_autocomplete.html.erb

@@ -0,0 +1,5 @@
+<% content_for :stylesheets, stylesheet_link_tag("refinery/blog/ui-lightness/jquery-ui-1.8.13.custom") %>
+
+<% content_for :javascripts do %>
+  <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js" %>
+<% end %>

data/changelog.md

@@ -1,29 +1,16 @@
-## 1.8.0 [UNRELEASED]
-* extraneous shared/_post partial was moved directly into posts/show [nicinabox](https://github.com/nicinabox)
-* blog archive list helper logic refactored (HTML exists in view template) [nicinabox](https://github.com/nicinabox)
-* pretty "Draft" label added to admin list of blog posts [nicinabox](https://github.com/nicinabox)
-* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.7.0...1.8.0)
-
-## 1.7.0 [05 December 2011]
+## 1.6.3 [UNRELEASED]
 * Bulgarian translations [mirosr](https://github.com/mirosr)
 * posts/tagged... params[:tag_name] is optional [joemsak](https://github.com/joemsak)
-* Bug Fix on Categorization relationship: destroying a post produced error because no primary key existed on join table [joemsak](https://github.com/joemsak)
-* Bug fix on archive listing, don't include draft posts [jgrevich](https://github.com/jgrevich)
-* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.2...1.7.0)
 
 ## 1.6.2 [29 June 2011]
 * Custom teaser field to overwrite the automatic truncation of the body [wikyd](https://github.com/wikyd)
 * Tagging URL strategy updated again [joemsak](https://github.com/joemsak)
 * Tagging bug fixed [ruprict](https://github.com/ruprict)
 * Refactored specs [parndt](https://github.com/parndt)
-* * [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.1...1.6.2)
-
 
 ## 1.6.1 [21 June 2011]
 * Tagging URL strategy updated for reliability /blog/posts/tagged/ID-name-parameterized [joemsak](https://github.com/joemsak)
 * Heroku/PostgreSQL support for autocomplete tags [joemsak](https://github.com/joemsak)
-* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6...1.6.1)
-
 
 ## 1.6 [20 June 2011]
 * Category bug fixes and cleanup [wikyd](https://github.com/wikyd)
@@ -33,14 +20,11 @@
 * More testing [wakeless](https://github.com/wakeless)
 * Tag list autocomplete baked in [joemsak](https://github.com/joemsak)
 * Customize the URL of your blog post [wikyd](https://github.com/wikyd)
-* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.5...1.6)
-
 
 ## 1.5 [28 May 2011]
 
 * Added Gravatar support. [parndt](https://github.com/parndt)
 * Added support for Refinery CMS 1.0.0 and above. [parndt](https://github.com/parndt)
-* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.4...1.5)
 
 ## 1.4 [26 May 2011]
 
@@ -82,4 +66,4 @@
 * Rails 3 Support
 * Archives
 * Categories
-* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.0...1.1)
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.0...1.1)

data/config/initializers/url_validator.rb

@@ -0,0 +1,84 @@
+require 'net/http'
+
+class UrlValidator < ActiveModel::EachValidator
+
+  def validate_each(record, attribute, value)
+    url = value
+    
+    # Regex code by 'Arsenic' from http://snippets.dzone.com/posts/show/3654
+    if url =~ /^
+( (https?):\/\/ )?
+( [a-z\d]+([\-\.][a-z\d]+)*\.[a-z]{2,6} )
+(
+(:
+( \d{1,5} )
+)?
+( \/.* )?
+)?
+$/ix
+      url = "http#{'s' if $7 == '81'}://#{url}" unless $1
+    else
+      record.errors[attribute] << 'Not a valid URL'
+    end
+
+    if options[:verify]
+      begin
+        url_response = RedirectFollower.new(url).resolve
+        url = url_response.url if options[:verify] == [:resolve_redirects]
+      rescue RedirectFollower::TooManyRedirects
+        record.errors[attribute] << 'URL is redirecting too many times'
+      rescue
+        record.errors[attribute] << 'could not be resolved'
+      end
+    end
+
+    if options[:update]
+      value.replace url
+    end
+  end
+end
+
+# Code below written by John Nunemaker
+# See blog post at http://railstips.org/blog/archives/2009/03/04/following-redirects-with-nethttp/
+class RedirectFollower
+  class TooManyRedirects < StandardError; end
+
+  attr_accessor :url, :body, :redirect_limit, :response
+
+  def initialize(url, limit=5)
+    @url, @redirect_limit = url, limit
+  end
+
+  def logger
+    @logger ||= Rails.logger
+  end
+
+  def resolve
+    raise TooManyRedirects if redirect_limit < 0
+
+    self.response = Net::HTTP.get_response(URI.parse(url))
+
+    logger.info "redirect limit: #{redirect_limit}"
+    logger.info "response code: #{response.code}"
+    logger.debug "response body: #{response.body}"
+
+    if response.kind_of?(Net::HTTPRedirection)
+      self.url = redirect_url
+      self.redirect_limit -= 1
+
+      logger.info "redirect found, headed to #{url}"
+      resolve
+    end
+
+    self.body = response.body
+    self
+  end
+
+  def redirect_url
+    if response['location'].nil?
+      response.body.match(/<a href=\"([^>]+)\">/i)[1]
+    else
+      response['location']
+    end
+  end
+end