refinerycms-blog 2.0.5 → 2.1.0

data/app/helpers/refinery/blog/controller_helper.rb

@@ -1,11 +1,11 @@
 module Refinery
   module Blog
     module ControllerHelper
-    
+
       protected
-    
+
         def find_blog_post
-          unless (@post = Refinery::Blog::Post.find(params[:id])).try(:live?)
+          unless (@post = Refinery::Blog::Post.with_globalize.find(params[:id])).try(:live?)
             if refinery_user? and current_refinery_user.authorized_plugins.include?("refinerycms_blog")
               @post = Refinery::Blog::Post.find(params[:id])
             else
@@ -13,16 +13,16 @@ module Refinery
             end
           end
         end
-    
+
         def find_all_blog_posts
-          @posts = Refinery::Blog::Post.live.includes(:comments, :categories).page(params[:page])
+          @posts = Refinery::Blog::Post.live.includes(:comments, :categories).with_globalize.page(params[:page])
         end
 
         def find_tags
-          @tags = Refinery::Blog::Post.tag_counts_on(:tags)
+          @tags = Refinery::Blog::Post.live.tag_counts_on(:tags)
         end
         def find_all_blog_categories
-          @categories = Refinery::Blog::Category.all
+          @categories = Refinery::Blog::Category.translated
         end
     end
   end

data/app/helpers/refinery/blog/posts_helper.rb

@@ -28,6 +28,11 @@ module Refinery
         Refinery::Blog::Post.published_dates_older_than(cutoff)
       end
 
+      def avatar_url(email, options = {:size => 60})
+        require 'digest/md5'
+        "http://gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s.strip.downcase)}?s=#{options[:size]}.jpg"
+      end
+
       class ArchiveWidget
         delegate :t, :link_to, :refinery, :render, :to => :view_context
         attr_reader :view_context

data/app/models/refinery/blog/categorization.rb

@@ -0,0 +1,12 @@
+module Refinery
+  module Blog
+    class Categorization < ActiveRecord::Base
+
+      self.table_name = 'refinery_blog_categories_blog_posts'
+      belongs_to :blog_post, :class_name => 'Refinery::Blog::Post', :foreign_key => :blog_post_id
+      belongs_to :blog_category, :class_name => 'Refinery::Blog::Category', :foreign_key => :blog_category_id
+
+      attr_accessible :blog_category_id, :blog_post_id
+    end
+  end
+end

data/app/models/refinery/blog/category.rb

@@ -1,20 +1,30 @@
 module Refinery
   module Blog
     class Category < ActiveRecord::Base
+
+      translates :title, :slug
+
       extend FriendlyId
-      friendly_id :title, :use => [:slugged]
+      friendly_id :title, :use => [:slugged, :globalize]
 
       has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_category_id
       has_many :posts, :through => :categorizations, :source => :blog_post
 
-      acts_as_indexed :fields => [:title]
-
       validates :title, :presence => true, :uniqueness => true
 
       attr_accessible :title
+      attr_accessor :locale
+
+      class Translation
+        attr_accessible :locale
+      end
+
+      def self.translated
+        with_translations(::Globalize.locale)
+      end
 
       def post_count
-        posts.select(&:live?).count
+        posts.live.with_globalize.count
       end
 
       # how many items to show per page

data/app/models/refinery/blog/comment.rb

@@ -10,8 +10,6 @@ module Refinery
 
       belongs_to :post, :foreign_key => 'blog_post_id'
 
-      acts_as_indexed :fields => [:name, :email, :message]
-
       alias_attribute :message, :body
 
       validates :name, :message, :presence => true
@@ -33,13 +31,6 @@ module Refinery
 
       self.per_page = Refinery::Blog.comments_per_page
 
-      def avatar_url(options = {})
-        options = {:size => 60}
-        require 'digest/md5'
-        size = ("?s=#{options[:size]}" if options[:size])
-        "http://gravatar.com/avatar/#{Digest::MD5.hexdigest(self.email.to_s.strip.downcase)}#{size}.jpg"
-      end
-
       def approve!
         self.update_column(:state, 'approved')
       end

data/app/models/refinery/blog/post.rb

@@ -4,14 +4,17 @@ require 'seo_meta'
 module Refinery
   module Blog
     class Post < ActiveRecord::Base
+
+      translates :title, :body, :custom_url, :custom_teaser, :slug, :include => :seo_meta
+
       extend FriendlyId
-      friendly_id :friendly_id_source, :use => [:slugged]
+      friendly_id :friendly_id_source, :use => [:slugged, :globalize]
 
       is_seo_meta if self.table_exists?
 
       default_scope :order => 'published_at DESC'
 
-      belongs_to :author, :class_name => 'Refinery::User', :foreign_key => :user_id, :readonly => true
+      belongs_to :author, :class_name => Refinery::Blog.user_class.to_s, :foreign_key => :user_id, :readonly => true
 
       has_many :comments, :dependent => :destroy, :foreign_key => :blog_post_id
       acts_as_taggable
@@ -19,10 +22,9 @@ module Refinery
       has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_post_id
       has_many :categories, :through => :categorizations, :source => :blog_category
 
-      acts_as_indexed :fields => [:title, :body]
-
       validates :title, :presence => true, :uniqueness => true
       validates :body,  :presence => true
+      validates :published_at, :author, :presence => true
 
       validates :source_url, :url => { :if => 'Refinery::Blog.validate_source_url',
                                       :update => true,
@@ -31,8 +33,21 @@ module Refinery
                                       :verify => [:resolve_redirects]}
 
       attr_accessible :title, :body, :custom_teaser, :tag_list, :draft, :published_at, :custom_url, :author
-      attr_accessible :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids
+      attr_accessible :browser_title, :meta_description, :user_id, :category_ids
       attr_accessible :source_url, :source_url_title
+      attr_accessor :locale
+
+
+    class Translation
+      is_seo_meta
+      attr_accessible :browser_title, :meta_description, :locale
+    end
+
+      # Delegate SEO Attributes to globalize3 translation
+      seo_fields = ::SeoMeta.attributes.keys.map{|a| [a, :"#{a}="]}.flatten
+      delegate(*(seo_fields << {:to => :translation}))
+
+      before_save { |m| m.translation.save }
 
       self.per_page = Refinery::Blog.posts_per_page
 
@@ -49,20 +64,47 @@ module Refinery
       end
 
       def friendly_id_source
-        custom_url.present? ? custom_url : title
+        custom_url.presence || title
       end
 
       class << self
-        def by_archive(date)
+
+        # Wrap up the logic of finding the pages based on the translations table.
+        def with_globalize(conditions = {})
+          conditions = {:locale => ::Globalize.locale}.merge(conditions)
+          globalized_conditions = {}
+          conditions.keys.each do |key|
+            if (translated_attribute_names.map(&:to_s) | %w(locale)).include?(key.to_s)
+              globalized_conditions["#{self.translation_class.table_name}.#{key}"] = conditions.delete(key)
+            end
+          end
+          # A join implies readonly which we don't really want.
+          joins(:translations).where(globalized_conditions).where(conditions).readonly(false)
+        end
+
+        def find_by_slug_or_id(slug_or_id)
+          if slug_or_id.friendly_id?
+            find_by_slug(slug_or_id)
+          else
+            find(slug_or_id)
+          end
+        end
+
+        def by_month(date)
           where(:published_at => date.beginning_of_month..date.end_of_month)
         end
 
+        def by_archive(date)
+          Refinery.deprecate("Refinery::Blog::Post.by_archive(date)", {:replacement => "Refinery::Blog::Post.by_month(date)", :when => 2.2 })
+          by_month(date)
+        end
+
         def by_year(date)
-          where(:published_at => date.beginning_of_year..date.end_of_year)
+          where(:published_at => date.beginning_of_year..date.end_of_year).with_globalize
         end
 
         def published_dates_older_than(date)
-          published_before(date).pluck(:published_at)
+          published_before(date).select(:published_at).map(&:published_at)
         end
 
         def recent(count)
@@ -70,7 +112,7 @@ module Refinery
         end
 
         def popular(count)
-          unscoped.order("access_count DESC").limit(count)
+          unscoped.order("access_count DESC").limit(count).with_globalize
         end
 
         def previous(item)
@@ -78,15 +120,15 @@ module Refinery
         end
 
         def uncategorized
-          live.includes(:categories).where(Refinery::Categorization.table_name => { :blog_category_id => nil })
+          live.includes(:categories).where(Refinery::Blog::Categorization.table_name => { :blog_category_id => nil })
         end
 
         def next(current_record)
-          where(["published_at > ? and draft = ?", current_record.published_at, false]).first
+          where(["published_at > ? and draft = ?", current_record.published_at, false]).reorder('published_at ASC').with_globalize.first
         end
 
         def published_before(date=Time.now)
-          where("published_at < ? and draft = ?", date, false)
+          where("published_at < ? and draft = ?", date, false).with_globalize
         end
         alias_method :live, :published_before
 

data/app/views/refinery/blog/admin/_submenu.html.erb

@@ -1,10 +1,7 @@
 <nav id='actions' class='multilist'>
   <ul class='search_list'>
     <li class='not_a_link'>
-      <%= render :partial => "/refinery/admin/search",
-                 :locals => {
-                   :url => refinery.blog_admin_posts_path
-                 } %>
+      <%= render "/refinery/admin/search", :url => request.path %>
     </li>
   </ul>
 

data/app/views/refinery/blog/admin/categories/_category.html.erb

@@ -1,11 +1,19 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(category) -%>">
   <span class='title'>
-    <%= category.title %>
-    <span class="preview">&nbsp;</span>
+    <%= category.title.presence || category.translations.detect {|t| t.title.present?}.title %>
+    <span class="preview">
+      <% category.translations.each do |translation| %>
+        <% if translation.title.present? %>
+          <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
+              refinery.edit_blog_admin_category_path(category, :switch_locale => translation.locale),
+              :class => 'locale' %>
+          <% end %>
+      <% end %>
+    </span>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_edit.png"),
-                refinery.edit_blog_admin_category_path(category, :dialog => true, :height => 325),
+                refinery.edit_blog_admin_category_path(category),
                 :title => t('.edit') %>
     <%= link_to refinery_icon_tag("delete.png"), refinery.blog_admin_category_path(category),
                 :class => "cancel confirm-delete",

data/app/views/refinery/blog/admin/categories/_form.html.erb

@@ -1,19 +1,18 @@
 <%= form_for [refinery, :blog_admin, @category] do |f| -%>
-  <%= render :partial => "/refinery/admin/error_messages",
-             :locals => {
-               :object => f.object,
-               :include_object_name => true
-             } %>
+  <%= render "/refinery/admin/error_messages",
+             :object => f.object,
+             :include_object_name => true %>
+
+  <%= render '/refinery/admin/locale_picker',
+              :current_locale => Globalize.locale %>
 
   <div class='field'>
     <%= f.label :title -%>
     <%= f.text_field :title, :class => 'larger widest' -%>
   </div>
 
-  <%= render :partial => "/refinery/admin/form_actions",
-              :locals => {
-                :f => f,
-                :continue_editing => false,
-                :delete_title => t('delete', :scope => 'refinery.blog.admin.categories.category')
-              } %>
+  <%= render "/refinery/admin/form_actions",
+             :f => f,
+             :continue_editing => false,
+             :delete_title => t('delete', :scope => 'refinery.blog.admin.categories.category') %>
 <% end %>

data/app/views/refinery/blog/admin/categories/_sortable_list.html.erb

@@ -1,7 +1,5 @@
 <ul id='sortable_list'>
   <%= render :partial => 'category', :collection => @categories %>
 </ul>
-<%= render :partial => "/refinery/admin/sortable_list",
-           :locals => {
-             :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
-           } %>
+<%= render "/refinery/admin/sortable_list",
+           :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true) %>

data/app/views/refinery/blog/admin/categories/edit.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render "form" %>

data/app/views/refinery/blog/admin/categories/index.html.erb

@@ -1,21 +1,15 @@
-<%= render :partial => '/refinery/blog/admin/submenu' %>
+<%= render '/refinery/blog/admin/submenu' %>
+<%= render 'refinery/admin/search_header', :url => request.path %>
 <div id='records'>
-  <% if searching? %>
-    <h2><%= t('results_for', :scope => 'refinery.admin.search',
-                             :query => params[:search]) %></h2>
-    <% if @categories.any? %>
-      <%= render :partial => "blog_categories",
-                 :collection => @categories %>
-    <% else %>
-      <p><%= t('no_results', :scope => 'refinery.admin.search') %></p>
-    <% end %>
-  <% else %>
-    <% if @categories.any? %>
-      <%= will_paginate @categories %>
+  <% if @categories.any? %>
+    <%= will_paginate @categories %>
 
-      <%= render :partial => "sortable_list" %>
+    <%= render "sortable_list" %>
 
-      <%= will_paginate @categories %>
+    <%= will_paginate @categories %>
+  <% else %>
+    <% if searching? %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
       <p>
         <strong>

data/app/views/refinery/blog/admin/categories/new.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render "form" %>

data/app/views/refinery/blog/admin/comments/_comment.html.erb

@@ -11,10 +11,12 @@
     <%= link_to refinery_icon_tag('zoom.png'), refinery.blog_admin_comment_path(comment),
                 :title => t('.read') %>
     <%= link_to refinery_icon_tag("cross.png"),
-                refinery.rejected_blog_admin_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                refinery.reject_blog_admin_comment_path(comment),
+                :method => :post,
                 :title => t('.reject') unless comment.rejected? %>
     <%= link_to refinery_icon_tag("tick.png"),
-                refinery.approved_blog_admin_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                refinery.approve_blog_admin_comment_path(comment),
+                :method => :post,
                 :title => t('.approve') unless comment.approved? %>
   </span>
 </li>

data/app/views/refinery/blog/admin/comments/_sortable_list.html.erb

@@ -1,7 +1,5 @@
 <ul id='sortable_list'>
   <%= render :partial => 'comment', :collection => @comments %>
 </ul>
-<%= render :partial => "/refinery/admin/sortable_list",
-           :locals => {
-             :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
-           } %>
+<%= render "/refinery/admin/sortable_list",
+           :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true) %>

data/app/views/refinery/blog/admin/comments/index.html.erb

@@ -1,30 +1,21 @@
-<%= render :partial => '/refinery/blog/admin/submenu' %>
+<%= render 'refinery/blog/admin/submenu' %>
+<%= render 'refinery/admin/search_header', :url => request.path %>
 <div id='records'>
-  <% if searching? %>
-    <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
-    <% if @comments.any? %>
-      <%= will_paginate @comments %>
+  <% if @comments.any? %>
+    <%= will_paginate @comments %>
 
-      <ul>
-        <%= render :partial => "blog_comments",
-                   :collection => @comments %>
-      </ul>
+    <%= render "sortable_list" %>
 
-      <%= will_paginate @comments %>
-    <% else %>
-      <p><%= t('search_no_results', :scope => 'admin') %></p>
-    <% end %>
+    <%= will_paginate @comments %>
   <% else %>
-    <% if @comments.any? %>
-      <%= will_paginate @comments %>
-
-      <%= render :partial => "sortable_list" %>
-
-      <%= will_paginate @comments %>
+    <% if searching? %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
-      <h3>
-        <%= t('.no_items_yet', :type => action_name.gsub('index', 'new').downcase) %>
-      </h3>
-    <% end %>
+      <p>
+        <strong>
+          <%= t('.no_items_yet', :type => action_name.gsub('index', 'new').downcase) %>
+        </strong>
+      </p>
   <% end %>
+<% end %>
 </div>

data/app/views/refinery/blog/admin/comments/show.html.erb

@@ -9,12 +9,14 @@
       <%= link_to t('.back'), refinery.blog_admin_comments_path, :class => "back_icon" %>
     </li>
     <li>
-      <%= link_to t('.reject'), refinery.rejected_blog_admin_comment_path(@comment, :return_to => 'rejected'),
-          :class => 'comment_cross_icon' unless @comment.rejected? %>
+    <%= link_to t('.reject'), refinery.reject_blog_admin_comment_path(@comment),
+                              :method => :post,
+                              :class => 'comment_cross_icon' unless @comment.rejected? %>
     </li>
     <li>
-      <%= link_to t('.approve'), refinery.approved_blog_admin_comment_path(@comment, :return_to => 'approved'),
-          :class => 'comment_tick_icon' unless @comment.approved? %>
+      <%= link_to t('.approve'), refinery.approve_blog_admin_comment_path(@comment),
+                                 :method => :post,
+                                 :class => 'comment_tick_icon' unless @comment.approved? %>
     </li>
   </ul>
 </div>