refinerycms-blog 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 386dd9e1c928e0babc7a3de9a9f0fd2f2bb94811
-  data.tar.gz: 21540284666101eee6ce91f779f903cf178b4ac4
+SHA256:
+  metadata.gz: 597f06b7bd6f17d95315443d3b2d11ff80f426dbfd173b1c3e0b89a133dde153
+  data.tar.gz: 44cbe39a432bef4d113972c3602bf167d844b246da4c2ac420529f54c0a492c4
 SHA512:
-  metadata.gz: d12d10fb99f4e74bfc1620be1135cd0a7139a58859a6f080befd8647a173b4fb87cd98aa172c691547aa7abc67e4f40db20972fa41ea5dc600aa48db27678ce8
-  data.tar.gz: 44976cb43eb0b726022ac1289030b94843ff43e94752d0e551fda384fff21457cc5052b6d9af39a27e39a7359f82f29c1a72b19407213f83f9c6e7dafd71018d
+  metadata.gz: d1106d3a7977b42bd9e89261516af147cc6c7f14f06c47c69a60591b3b23ba72146cc1d8ad54252f4c4949a7490dff2b57edadc97ba233642a58a6a5046d8f60
+  data.tar.gz: 87170e08784d993834f348ddd7af0ee7095de88f3eec9539e4fc1468c8649e76fdf0c4609a60eb0aa28cdb0c4012b5b06135ccacddad1e1ea5fc0c9434e31662

data/.gitignore

@@ -46,6 +46,8 @@ capybara-*html
 
 # rvm
 .rvmrc
+.ruby-version
+.ruby-gemset
 
 #rbenv
 .rbenv-version

data/.travis.yml

@@ -11,6 +11,4 @@ notifications:
 rvm:
   - 2.3.1
   - 2.2
-  - 2.1
-  - 2.0.0
-sudo: false
+sudo: false

data/Gemfile

@@ -1,22 +1,22 @@
 source "https://rubygems.org"
 
-gem "refinerycms-authentication-devise", '~> 1.0.4'
-
 gemspec
 
-gem 'refinerycms', '~> 3.0.5'
+git "https://github.com/refinery/refinerycms", branch: "4-0-stable" do
+  gem 'refinerycms'
 
-group :development, :test do
-  gem 'refinerycms-testing', '~> 3.0.5'
+  group :test do
+    gem 'refinerycms-testing'
+  end
 end
 
 # Add the default visual editor, for now.
-gem 'refinerycms-wymeditor', ['~> 1.0', '>= 1.0.6']
+gem 'refinerycms-wymeditor', ['~> 2.0', '>= 2.0.0']
 
 group :test do
-  gem 'pry'
   gem 'launchy'
   gem 'poltergeist'
+  gem 'listen'
 end
 
 # Database Configuration
@@ -33,7 +33,7 @@ end
 
 if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
   gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-  gem 'pg', :platform => :ruby
+  gem 'pg', '~> 0.18', :platform => :ruby
 end
 
 # Refinery/rails should pull in the proper versions of these

data/app/controllers/refinery/blog/admin/categories_controller.rb

@@ -4,8 +4,8 @@ module Refinery
       class CategoriesController < ::Refinery::AdminController
 
         crudify :'refinery/blog/category',
-                :include => [:translations],
-                :order => 'title ASC'
+                include: [:translations],
+                order: 'refinery_blog_category_translations.title ASC'
 
         private
 

data/app/controllers/refinery/blog/admin/posts_controller.rb

@@ -4,13 +4,16 @@ module Refinery
       class PostsController < ::Refinery::AdminController
 
         crudify :'refinery/blog/post',
-                :order => 'published_at DESC',
-                :include => [:translations, :author]
+                order: 'published_at DESC',
+                include: [:translations, :author]
 
-        before_filter :find_all_categories,
-                      :only => [:new, :edit, :create, :update]
+        before_action :find_all_categories,
+                      only: [:new, :edit, :create, :update]
 
-        before_filter :check_category_ids, :only => :update
+        before_action :find_all_authors,
+                      only: [:new, :edit, :create, :update]
+
+        before_action :check_category_ids, only: :update
 
         def uncategorized
           @posts = Refinery::Blog::Post.uncategorized.page(params[:page])
@@ -31,10 +34,6 @@ module Refinery
           render :json => @tags.flatten
         end
 
-        def new
-          @post = ::Refinery::Blog::Post.new(:author => current_refinery_user)
-        end
-
         def create
           # if the position field exists, set this object as last object, given the conditions of this class.
           if Refinery::Blog::Post.column_names.include?("position")
@@ -87,11 +86,11 @@ module Refinery
         def post_params
           params.require(:post).permit(permitted_post_params)
         end
-        
+
         def permitted_post_params
           [
             :title, :body, :custom_teaser, :tag_list,
-            :draft, :published_at, :custom_url, :user_id, :browser_title,
+            :draft, :published_at, :custom_url, :user_id, :username, :browser_title,
             :meta_description, :source_url, :source_url_title, :category_ids => []
           ]
         end
@@ -99,13 +98,17 @@ module Refinery
       protected
 
         def find_post
-          @post = Refinery::Blog::Post.friendly.find(params[:id])
+          @post = Refinery::Blog::Post.friendly.joins(:translations).find(params[:id])
         end
 
         def find_all_categories
           @categories = Refinery::Blog::Category.all
         end
 
+        def find_all_authors
+          @authors = Refinery::Blog.user_class.all if (!Refinery::Blog.user_class.nil? && Refinery::Blog.user_class.column_names.include?('username'))
+        end
+
         def check_category_ids
           params[:post][:category_ids] ||= []
         end

data/app/controllers/refinery/blog/blog_controller.rb

@@ -28,7 +28,7 @@ module Refinery
       end
 
       def find_page
-        @page = Refinery::Page.find_by(:link_url => Refinery::Blog.page_url)
+        @page = Refinery::Page.find_by(link_url: Refinery::Blog.page_url)
       end
 
       def find_tags

data/app/controllers/refinery/blog/posts_controller.rb

@@ -1,10 +1,12 @@
+require 'responders'
+
 module Refinery
   module Blog
     class PostsController < BlogController
 
-      before_filter :find_all_blog_posts, :except => [:archive]
-      before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
-      before_filter :find_tags
+      before_action :find_all_blog_posts, except: [:archive]
+      before_action :find_blog_post, only: [:show, :comment, :update_nav]
+      before_action :find_tags
 
       respond_to :html, :js, :rss
 
@@ -19,20 +21,20 @@ module Refinery
         end
         respond_with (@posts) do |format|
           format.html
-          format.rss { render :layout => false }
+          format.rss { render layout: false }
         end
       end
 
       def show
         @comment = Comment.new
 
-        @canonical = refinery.url_for(:locale => Refinery::I18n.current_frontend_locale) if canonical?
+        @canonical = refinery.url_for(locale: Refinery::I18n.current_frontend_locale) if canonical?
 
-        @post.increment!(:access_count, 1)
+        Post.increment_counter(:access_count, @post.id)
 
         respond_with (@post) do |format|
           format.html { present(@post) }
-          format.js { render :partial => 'post', :layout => false }
+          format.js { render partial: 'post', layout: false }
         end
       end
 
@@ -48,12 +50,12 @@ module Refinery
           end
 
           if Comment::Moderation.enabled?
-            flash[:notice] = t('thank_you_moderated', :scope => 'refinery.blog.posts.comments')
+            flash[:notice] = t('thank_you_moderated', scope: 'refinery.blog.posts.comments')
             redirect_to refinery.blog_post_url(params[:id])
           else
-            flash[:notice] = t('thank_you', :scope => 'refinery.blog.posts.comments')
+            flash[:notice] = t('thank_you', scope: 'refinery.blog.posts.comments')
             redirect_to refinery.blog_post_url(params[:id],
-                                      :anchor => "comment-#{@comment.to_param}")
+                                      anchor: "comment-#{@comment.to_param}")
           end
         else
           render :show
@@ -64,12 +66,12 @@ module Refinery
         if params[:month].present?
           date = "#{params[:month]}/#{params[:year]}"
           archive_date = Time.parse(date)
-          @date_title = ::I18n.l(archive_date, :format => '%B %Y')
+          @date_title = ::I18n.l(archive_date, format: '%B %Y')
           @posts = Post.live.by_month(archive_date).page(params[:page])
         else
           date = "01/#{params[:year]}"
           archive_date = Time.parse(date)
-          @date_title = ::I18n.l(archive_date, :format => '%Y')
+          @date_title = ::I18n.l(archive_date, format: '%Y')
           @posts = Post.live.by_year(archive_date).page(params[:page])
         end
         respond_with (@posts)
@@ -78,7 +80,7 @@ module Refinery
       def tagged
         @tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
         @tag_name = @tag.name
-        @posts = Post.live.newest_first.uniq.tagged_with(@tag_name).page(params[:page])
+        @posts = Post.live.newest_first.distinct.tagged_with(@tag_name).page(params[:page])
       end
 
     private

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

@@ -11,11 +11,11 @@ module Refinery
 
       def blog_post_teaser(post)
         if post.respond_to?(:custom_teaser) && post.custom_teaser.present?
-         post.custom_teaser.html_safe
+          post.custom_teaser.html_safe
         else
-         truncate(post.body, {
-           :length => Refinery::Blog.post_teaser_length,
-           :preserve_html_tags => true
+          truncate(post.body, {
+            :length => Refinery::Blog.post_teaser_length,
+            :preserve_html_tags => true
           }).html_safe
         end
       end

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

@@ -4,6 +4,9 @@ module Refinery
       extend FriendlyId
 
       translates :title, :slug
+      attribute :title
+      attribute :slug
+      after_save {translations.collect(&:save)}
 
       friendly_id :title, :use => [:slugged, :globalize]
 

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

@@ -1,12 +1,30 @@
 require 'acts-as-taggable-on'
-require 'seo_meta'
 
 module Refinery
   module Blog
     class Post < ActiveRecord::Base
       extend FriendlyId
 
-      translates :title, :body, :custom_url, :custom_teaser, :slug, :include => :seo_meta
+      translates :title, :body, :custom_url, :custom_teaser, :slug, include: :seo_meta
+
+      attribute :title
+      attribute :body
+      attribute :custom_url
+      attribute :custom_teaser
+      attribute :slug
+      after_save {translations.collect(&:save)}
+
+      class Translation
+        is_seo_meta
+
+        def self.seo_fields
+          ::SeoMeta.attributes.keys.map {|a| [a, :"#{a}="]}.flatten
+        end
+      end
+
+      def validating_source_urls?
+        Refinery::Blog.validate_source_url
+      end
 
       friendly_id :friendly_id_source, :use => [:slugged, :globalize]
 
@@ -14,38 +32,42 @@ module Refinery
 
       acts_as_taggable
 
-      belongs_to :author, proc { readonly(true) }, :class_name => Refinery::Blog.user_class.to_s, :foreign_key => :user_id
+      belongs_to :author, proc { readonly(true) }, class_name: Refinery::Blog.user_class.to_s, foreign_key: :user_id, optional: true
+
       has_many :comments, :dependent => :destroy, :foreign_key => :blog_post_id
-      has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_post_id
+      has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_post_id, inverse_of: :blog_post
       has_many :categories, :through => :categorizations, :source => :blog_category
 
       validates :title, :presence => true, :uniqueness => true
-      validates :body,  :presence => true
+      validates :body, :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]}
+      validates :username, :presence => true, unless: :author_required?
+      validates :source_url, url: {
+        if: :validating_source_urls?,
+        update: true,
+        allow_nil: true,
+        allow_blank: true,
+        verify: [:resolve_redirects]
+      }
 
       class Translation
         is_seo_meta
       end
-      
+
       # Override this to disable required authors
       def author_required?
-        true
+        !Refinery::Blog.user_class.nil?
       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?
+        saved_change_to_attribute?(:custom_url) || saved_change_to_attribute?(:title)
       end
 
       # Delegate SEO Attributes to globalize translation
-      seo_fields = ::SeoMeta.attributes.keys.map{|a| [a, :"#{a}="]}.flatten
+      seo_fields = ::SeoMeta.attributes.keys.map {|a| [a, :"#{a}="]}.flatten
       delegate(*(seo_fields << {:to => :translation}))
 
       self.per_page = Refinery::Blog.posts_per_page
@@ -66,6 +88,10 @@ module Refinery
         custom_url.presence || title
       end
 
+      def author_username
+        author.try(:username) || username
+      end
+
       class << self
 
         # Wrap up the logic of finding the pages based on the translations table.
@@ -79,7 +105,7 @@ module Refinery
           end
           # A join implies readonly which we don't really want.
           where(conditions).joins(:translations).where(globalized_conditions)
-                           .readonly(false)
+            .readonly(false)
         end
 
         def by_month(date)
@@ -116,7 +142,7 @@ module Refinery
 
         def uncategorized
           newest_first.live.includes(:categories).where(
-            Refinery::Blog::Categorization.table_name => { :blog_category_id => nil }
+            Refinery::Blog::Categorization.table_name => {:blog_category_id => nil}
           )
         end
 
@@ -131,6 +157,7 @@ module Refinery
             .where(:draft => false)
             .with_globalize
         end
+
         alias_method :live, :published_before
 
         def comments_allowed?

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

@@ -21,15 +21,9 @@
     </span>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_edit.png"),
-                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",
-                :title => t('.delete'),
-                :method => :delete,
-                :data => {
-                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => category.title)
-                } %>
+    <%= action_icon(:edit, refinery.edit_blog_admin_category_path(category), t('.edit') ) %>
+    <%= action_icon(:delete,  refinery.blog_admin_category_path(category), t('.delete'),
+      { class: "cancel confirm-delete",
+      data: {confirm: t('message',  scope: 'refinery.admin.delete', title: category.title)}}  ) %>
   </span>
 </li>

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

@@ -4,19 +4,9 @@
     <span class="preview"> - <%= truncate(comment.message, :length => 75) %></span>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_go.png"),
-                refinery.blog_post_path(comment.post, :anchor => "comment-#{comment.to_param}"),
-                :title => t('.view_live_html'),
-                :target => "_blank" unless comment.unmoderated? %>
-    <%= link_to refinery_icon_tag('zoom.png'), refinery.blog_admin_comment_path(comment),
-                :title => t('.read') %>
-    <%= link_to refinery_icon_tag("cross.png"),
-                refinery.reject_blog_admin_comment_path(comment),
-                :method => :post,
-                :title => t('.reject') unless comment.rejected? %>
-    <%= link_to refinery_icon_tag("tick.png"),
-                refinery.approve_blog_admin_comment_path(comment),
-                :method => :post,
-                :title => t('.approve') unless comment.approved? %>
+    <%= action_icon(:preview, refinery.blog_post_path(comment.post, :anchor => "comment-#{comment.to_param}"), t('.view_live_html')) unless comment.unmoderated? %>
+    <%= action_icon(:search, refinery.blog_admin_comment_path(comment), t('.read')) %>
+    <%= action_icon(:failure, refinery.reject_blog_admin_comment_path(comment), t('.reject'), method: 'post') unless comment.rejected? %>
+    <%= action_icon(:success, refinery.approve_blog_admin_comment_path(comment), t('.approve'), method: 'post') unless comment.approved? %>
   </span>
 </li>

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

@@ -94,7 +94,11 @@
           <%= f.label :user_id, t('.author') %>
           <%= refinery_help_tag t('.author_help') %>
           <br/>
-          <%= f.collection_select :user_id, Refinery::Blog.user_class.all, :id, :username %>
+          <% if @authors.present? %>
+            <%= f.collection_select :user_id, @authors, :id, :username %>
+          <% else %>
+            <%= f.text_field :username, id: :post_user_id, :class => "widest" %>
+          <% end %>
         </span>
       </div>