refinerycms-blog 2.1.0 → 3.0.1

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

@@ -2,28 +2,7 @@ module Refinery
   module Blog
     module ControllerHelper
 
-      protected
-
-        def find_blog_post
-          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
-              error_404
-            end
-          end
-        end
-
-        def find_all_blog_posts
-          @posts = Refinery::Blog::Post.live.includes(:comments, :categories).with_globalize.page(params[:page])
-        end
-
-        def find_tags
-          @tags = Refinery::Blog::Post.live.tag_counts_on(:tags)
-        end
-        def find_all_blog_categories
-          @categories = Refinery::Blog::Category.translated
-        end
+      
     end
   end
 end

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

@@ -6,7 +6,6 @@ module Refinery
       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,10 +1,10 @@
 module Refinery
   module Blog
     class Category < ActiveRecord::Base
+      extend FriendlyId
 
       translates :title, :slug
 
-      extend FriendlyId
       friendly_id :title, :use => [:slugged, :globalize]
 
       has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_category_id
@@ -12,11 +12,8 @@ module Refinery
 
       validates :title, :presence => true, :uniqueness => true
 
-      attr_accessible :title
-      attr_accessor :locale
-
-      class Translation
-        attr_accessible :locale
+      def self.by_title(title)
+        joins(:translations).find_by(title: title)
       end
 
       def self.translated

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

@@ -1,31 +1,29 @@
+require 'filters_spam'
+
 module Refinery
   module Blog
     class Comment < ActiveRecord::Base
 
-      attr_accessible :name, :email, :message
-
-      filters_spam :author_field => :name,
-                   :email_field => :email,
-                   :message_field => :body
+      filters_spam author_field: :name, email_field: :email, message_field: :body
 
-      belongs_to :post, :foreign_key => 'blog_post_id'
+      belongs_to :post, foreign_key: 'blog_post_id'
 
       alias_attribute :message, :body
 
-      validates :name, :message, :presence => true
-      validates :email, :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
+      validates :name, :message, presence: true
+      validates :email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i }
 
       class << self
         def unmoderated
-          where(:state => nil)
+          where(state: nil)
         end
 
         def approved
-          where(:state => 'approved')
+          where(state: 'approved')
         end
 
         def rejected
-          where(:state => 'rejected')
+          where(state: 'rejected')
         end
       end
 
@@ -55,7 +53,7 @@ module Refinery
         currently = Refinery::Setting.find_or_set(:comments_allowed, true, {
           :scoping => 'blog'
         })
-        Refinery::Setting.set(:comments_allowed, {:value => !currently, :scoping => 'blog'})
+        Refinery::Setting.set(:comments_allowed, {value: !currently, scoping: 'blog'})
       end
 
       before_create do |comment|
@@ -68,16 +66,16 @@ module Refinery
         class << self
           def enabled?
             Refinery::Setting.find_or_set(:comment_moderation, true, {
-              :scoping => 'blog',
-              :restricted => false
+              scoping: 'blog',
+              restricted: false
             })
           end
 
           def toggle!
             new_value = {
-              :value => !Blog::Comment::Moderation.enabled?,
-              :scoping => 'blog',
-              :restricted => false
+              value: !Blog::Comment::Moderation.enabled?,
+              scoping: 'blog',
+              restricted: false
             }
             Refinery::Setting.set(:comment_moderation, new_value)
           end

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

@@ -4,51 +4,50 @@ require 'seo_meta'
 module Refinery
   module Blog
     class Post < ActiveRecord::Base
+      extend FriendlyId
 
       translates :title, :body, :custom_url, :custom_teaser, :slug, :include => :seo_meta
 
-      extend FriendlyId
       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::Blog.user_class.to_s, :foreign_key => :user_id, :readonly => true
+      is_seo_meta
 
-      has_many :comments, :dependent => :destroy, :foreign_key => :blog_post_id
       acts_as_taggable
 
+      belongs_to :author, proc { readonly(true) }, :class_name => Refinery::Blog.user_class.to_s, :foreign_key => :user_id
+      has_many :comments, :dependent => :destroy, :foreign_key => :blog_post_id
       has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_post_id
       has_many :categories, :through => :categorizations, :source => :blog_category
 
       validates :title, :presence => true, :uniqueness => true
       validates :body,  :presence => true
-      validates :published_at, :author, :presence => true
-
+      validates :published_at, :presence => true
+      validates :author, :presence => true, if: :author_required?
       validates :source_url, :url => { :if => 'Refinery::Blog.validate_source_url',
                                       :update => true,
                                       :allow_nil => true,
                                       :allow_blank => true,
                                       :verify => [:resolve_redirects]}
 
-      attr_accessible :title, :body, :custom_teaser, :tag_list, :draft, :published_at, :custom_url, :author
-      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
+      end
+      
+      # Override this to disable required authors
+      def author_required?
+        true
+      end
 
-    class Translation
-      is_seo_meta
-      attr_accessible :browser_title, :meta_description, :locale
-    end
+      # If custom_url or title changes tell friendly_id to regenerate slug when
+      # saving record
+      def should_generate_new_friendly_id?
+        custom_url_changed? || title_changed?
+      end
 
-      # Delegate SEO Attributes to globalize3 translation
+      # Delegate SEO Attributes to globalize 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
 
       def next
@@ -60,7 +59,7 @@ module Refinery
       end
 
       def live?
-        !draft and published_at <= Time.now
+        !draft && published_at <= Time.now
       end
 
       def friendly_id_source
@@ -79,56 +78,58 @@ module Refinery
             end
           end
           # A join implies readonly which we don't really want.
-          joins(:translations).where(globalized_conditions).where(conditions).readonly(false)
+          where(conditions).joins(:translations).where(globalized_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
+        def by_month(date)
+          newest_first.where(:published_at => date.beginning_of_month..date.end_of_month)
         end
 
-        def by_month(date)
-          where(:published_at => date.beginning_of_month..date.end_of_month)
+        def by_year(date)
+          newest_first.where(:published_at => date.beginning_of_year..date.end_of_year).with_globalize
         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)
+        def by_title(title)
+          joins(:translations).find_by(:title => title)
         end
 
-        def by_year(date)
-          where(:published_at => date.beginning_of_year..date.end_of_year).with_globalize
+        def newest_first
+          order("published_at DESC")
         end
 
         def published_dates_older_than(date)
-          published_before(date).select(:published_at).map(&:published_at)
+          newest_first.published_before(date).select(:published_at).map(&:published_at)
         end
 
         def recent(count)
-          live.limit(count)
+          newest_first.live.limit(count)
         end
 
         def popular(count)
-          unscoped.order("access_count DESC").limit(count).with_globalize
+          order("access_count DESC").limit(count).with_globalize
         end
 
         def previous(item)
-          published_before(item.published_at).first
+          newest_first.published_before(item.published_at).first
         end
 
         def uncategorized
-          live.includes(:categories).where(Refinery::Blog::Categorization.table_name => { :blog_category_id => nil })
+          newest_first.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]).reorder('published_at ASC').with_globalize.first
+          where(arel_table[:published_at].gt(current_record.published_at))
+            .where(:draft => false)
+            .order('published_at ASC').with_globalize.first
         end
 
         def published_before(date=Time.now)
-          where("published_at < ? and draft = ?", date, false).with_globalize
+          where(arel_table[:published_at].lt(date))
+            .where(:draft => false)
+            .with_globalize
         end
         alias_method :live, :published_before
 

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

@@ -1,8 +1,6 @@
 <nav id='actions' class='multilist'>
   <ul class='search_list'>
-    <li class='not_a_link'>
-      <%= render "/refinery/admin/search", :url => request.path %>
-    </li>
+    <li class='not_a_link'><%= render "/refinery/admin/search", :url => request.path -%></li>
   </ul>
 
   <ul class='collapsible_menu'>

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

@@ -2,12 +2,21 @@
   <span class='title'>
     <%= 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' %>
+      <% if Refinery::I18n.frontend_locales.many? %>
+        <span class='locales'>
+          <% category.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
+            <% if translation.title.present? %>
+              <%= link_to refinery.edit_blog_admin_category_path(category,
+                  :switch_locale => translation.locale),
+                  :class => 'locale',
+                  :title => translation.locale.upcase do %>
+                <div class="<%=translation.locale %> locale_marker">
+                  <%= locale_text_icon(translation.locale.upcase) %>
+                </div>
+              <% end %>
+            <% end %>
           <% end %>
+        </span>
       <% end %>
     </span>
   </span>

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

@@ -40,14 +40,14 @@
     </div>
   </div>
 
-  <%= render '/refinery/admin/form_advanced_options_menu', :f => f %>
-
   <div class='field'>
     <%= f.label :tag_list, t('refinery.blog.shared.tags.title') -%>
-    <%= f.text_field :tag_list, :class => 'larger' -%>
+    <%= f.text_field :tag_list, value: @post.tag_list.to_s, :class => 'larger' -%>
   </div>
 
-  <div id='more_options' style="display:none;">
+  <%= render '/refinery/admin/form_advanced_options_menu', :f => f %>
+
+  <div id='more_options'>
     <div class="hemisquare">
       <h3><%= t('title', :scope => 'refinery.blog.admin.submenu.categories') %></h3>
       <ul class='blog_categories'>
@@ -106,11 +106,18 @@
   <%= render "/refinery/admin/form_actions",
              :f => f,
              :continue_editing => true,
-             :delete_title => t('delete', :scope => 'refinery.blog.admin.posts.post') %>
+             :delete_title => t('delete', :scope => 'refinery.blog.admin.posts.post'),
+             :before_delete_button => (link_to(t('delete_translation', :scope => 'refinery.blog.admin.posts.post'),
+                                               refinery.delete_translation_blog_admin_post_path(@post, :locale_to_delete => Globalize.locale),
+                                               :method => :post,
+                                               :data => {
+                                                 :confirm => t('delete_translation_confirmation', :scope => 'refinery.blog.admin.posts.post')
+                                               },
+                                               :class => "button confirm-delete") if Refinery::I18n.frontend_locales.many? && @post.translations.size > 1) %>
 <% end -%>
 
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/backend') %>
 <% content_for :javascripts, javascript_include_tag('refinery/blog/backend') %>
 <%= render 'refinery/shared/admin/autocomplete',
-           :dom_id => '#blog_post_tag_list',
+           :dom_id => '#post_tag_list',
            :url => refinery.tags_blog_admin_posts_url %>

data/app/views/refinery/blog/admin/posts/_form_part.html.erb

@@ -1,3 +1,3 @@
 <div class='page_part' id='page_part_body'>
-  <%= f.text_area :body, :rows => 20, :class => 'wymeditor widest' -%>
+  <%= f.text_area :body, :rows => 20, :class => 'visual_editor widest' -%>
 </div>

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

@@ -2,12 +2,19 @@
   <span class='title'>
     <%= post.title.presence || post.translations.detect {|t| t.title.present?}.title %>
     <span class="preview">
-      <% post.translations.each do |translation| %>
-        <% if translation.title.present? %>
-          <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
-              refinery.edit_blog_admin_post_path(post, :switch_locale => translation.locale),
-              :class => 'locale' %>
+      <% if Refinery::I18n.frontend_locales.many? %>
+        <span class='locales'>
+          <% post.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
+            <% if translation.title.present? %>
+              <%= link_to refinery.edit_blog_admin_post_path(post, :switch_locale => translation.locale), :class => 'locale', title: translation.locale.upcase do %>
+
+                <div class="<%=translation.locale %> locale_marker">
+                  <%= locale_text_icon(translation.locale.upcase) %>
+                </div>
+              <% end %>
+            <% end %>
           <% end %>
+        </span>
       <% end %>
 
       <%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %>

data/app/views/refinery/blog/admin/posts/_teaser_part.html.erb

@@ -1,5 +1,5 @@
 <div class='page_part' id='page_part_teaser'>
-  <%= f.text_area :custom_teaser, :rows => 20, :class => 'wymeditor widest' -%>
+  <%= f.text_area :custom_teaser, :rows => 20, :class => 'visual_editor widest' -%>
   <p>
     <span class='clearfix label_inline_with_link'>
       <%= link_to t('copy_body', :scope => 'refinery.blog.admin.posts.form'), "#",

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

@@ -1,5 +1,5 @@
 <% content_for :body do %>
-  <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
+  <%= raw @page.content_for(Refinery::Pages.default_parts.first[:slug].to_sym) if Refinery::Pages.default_parts.any? %>
 
   <% if @posts.any? %>
     <section id="blog_posts">
@@ -12,7 +12,7 @@
 <% end %>
 
 <% content_for :side_body_prepend do -%>
-  <%= raw @page.content_for(Refinery::Pages.default_parts.second.to_sym) %>
+  <%= raw @page.content_for(Refinery::Pages.default_parts.second[:slug].to_sym) %>
 <% end if Refinery::Pages.default_parts.many? -%>
 <%= render '/refinery/blog/shared/body_content_right' %>
 

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

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

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

@@ -1 +1,46 @@
 <% content_for :stylesheets, stylesheet_link_tag("refinery/blog/ui-lightness/jquery-ui-1.8.13.custom") %>
+<% content_for :javascripts do %>
+<script>
+  function split(val) {
+    return val.split(/,\s*/);
+  }
+  function extractLast(term) {
+    return split(term).pop();
+  }
+  $(document).ready(function(){
+    $('<%= dom_id %>').bind("keydown", function(event) {
+      if (event.keyCode === $.ui.keyCode.TAB && $(this).data("autocomplete").menu.active) {
+        event.preventDefault()
+      }
+    }).autocomplete({
+      source: function(request, response) {
+        $.getJSON("<%= url %>", {
+          term: extractLast(request.term)
+        }, response);
+      },
+      search: function() {
+        // custom minLength
+        var term = extractLast(this.value);
+        if (term.length < 2) {
+          return false;
+        }
+      },
+      focus: function() {
+        // prevent value inserted on focus
+        return false;
+      },
+      select: function(event, ui) {
+        var terms = split(this.value);
+        // remove the current input
+        terms.pop();
+        // add the selected item
+        terms.push(ui.item.value);
+        // add placeholder to get the comma-and-space at the end
+        terms.push("");
+        this.value = terms.join(", ");
+        return false;
+      }
+    });
+  })
+</script>
+<% end %>