tb_blog 1.3.3 → 1.3.4

data/app/helpers/admin/posts_helper.rb

@@ -1,25 +1,25 @@
 module Admin::PostsHelper
 
-	def options_for_parent_category(parent_id = 0)
-		if @categories[parent_id]
-			return @categories[parent_id].collect{ |c| 
-				opts = [c.name, c.id] 
-				opts += options_for_parent_category(c.id)
-			}
-		else
-			return []
-		end
-	end
+  def options_for_parent_category(parent_id = 0)
+    if @categories[parent_id]
+      return @categories[parent_id].collect do |c|
+        opts = [c.name, c.id]
+        opts += options_for_parent_category(c.id)
+      end
+    else
+      return []
+    end
+  end
 
-	def link_to_disqus_comment_count(post)
-		# TODO: It would be great to link directly to the thread
-		# 	ie: https://myblog.disqus.com/admin/moderate/#/all/search/thread:4584301535
-		#
-		# However, we do not know the thread ID at this time. We may be able to fetch it
-		# via the Disqus JavaScript API.
-		#
-		return link_to 'Comments', "https://#{Spud::Blog.disqus_shortname}.disqus.com/admin/moderate/#/all", :target => :blank, :class => 'disqus-comment-count',
-			:data => {:disqus_identifier => post.identifier}
-	end
+  def link_to_disqus_comment_count(post)
+    # TODO: It would be great to link directly to the thread
+    # 	ie: https://myblog.disqus.com/admin/moderate/#/all/search/thread:4584301535
+    #
+    # However, we do not know the thread ID at this time. We may be able to fetch it
+    # via the Disqus JavaScript API.
+    #
+    return link_to 'Comments', "https://#{Spud::Blog.disqus_shortname}.disqus.com/admin/moderate/#/all", target: :blank, class: 'disqus-comment-count',
+                                                                                                         data: { disqus_identifier: post.identifier }
+  end
 
 end

data/app/helpers/blog_helper.rb

@@ -1,30 +1,30 @@
 module BlogHelper
 
-	def options_for_post_category_select
-		return options_from_collection_for_select(SpudPostCategory.ordered, :url_name, :name, params[:category_url_name])
-	end
+  def options_for_post_category_select
+    return options_from_collection_for_select(SpudPostCategory.ordered, :url_name, :name, params[:category_url_name])
+  end
 
-	def options_for_post_archive_select
-		return options_for_select(SpudPost.months_with_public_posts.collect{ |d| 
-			[d.strftime('%B %Y'), d.strftime('%Y-%b').downcase]
-		}, params[:archive_date])
-	end
+  def options_for_post_archive_select
+    return options_for_select(SpudPost.months_with_public_posts.collect do |d|
+      [d.strftime('%B %Y'), d.strftime('%Y-%b').downcase]
+    end, params[:archive_date])
+  end
 
-	def spud_post_category_select
-		return select_tag('category_url_name', options_for_post_category_select(), {:prompt => 'All Categories', :class => 'form-control'})
-	end
+  def spud_post_category_select
+    return select_tag('category_url_name', options_for_post_category_select(), prompt: 'All Categories', class: 'form-control')
+  end
 
-	def spud_post_archive_select
-		return select_tag 'archive_date', options_for_post_archive_select(), :prompt => 'All Dates', :rel => 'archive', :class => 'form-control'
-	end
+  def spud_post_archive_select
+    return select_tag 'archive_date', options_for_post_archive_select(), prompt: 'All Dates', rel: 'archive', class: 'form-control'
+  end
 
-	def spud_blog_rss_link
-		return tag :link, :rel => 'alternate', :type => 'application/rss+xml', :title => "#{Spud::Core.site_name} Blog RSS", :href => posts_path(:format => :rss)
-	end
+  def spud_blog_rss_link
+    return tag :link, rel: 'alternate', type: 'application/rss+xml', title: "#{Spud::Core.site_name} Blog RSS", href: posts_path(format: :rss)
+  end
 
-	def disqus_comment_count_for_post(post)
-		return content_tag :span, 'Comments', :class => 'disqus-comment-count',
-			:data => {:disqus_identifier => post.identifier}
-	end
+  def disqus_comment_count_for_post(post)
+    return content_tag :span, 'Comments', class: 'disqus-comment-count',
+                                          data: { disqus_identifier: post.identifier }
+  end
 
 end

data/app/models/spud/spud_post_model.rb

@@ -5,22 +5,22 @@ class Spud::SpudPostModel < ActiveRecord::Base
 
   spud_searchable
 
-  has_many :spud_post_categories_posts, :foreign_key => 'spud_post_id'
+  has_many :spud_post_categories_posts, foreign_key: 'spud_post_id'
   has_many :categories,
-    :class_name => 'SpudPostCategory',
-    :through => :spud_post_categories_posts,
-    :source => :spud_post_category
+    class_name: 'SpudPostCategory',
+    through: :spud_post_categories_posts,
+    source: :spud_post_category
 
-  belongs_to :author, :class_name => 'SpudUser', :foreign_key => 'spud_user_id'
+  belongs_to :author, class_name: 'SpudUser', foreign_key: 'spud_user_id'
 
-  scope :blog_posts, ->{ for_blog('blog') }
-  scope :news_posts, ->{ for_blog('news') }
-  scope :for_blog, ->(key){ where(:blog_key => key) }
-  scope :visible, ->{ where('visible = true AND published_at <= ?', Time.now.utc) }
-  scope :ordered, ->{ order('published_at desc') }
+  scope :blog_posts, -> { for_blog('blog') }
+  scope :news_posts, -> { for_blog('news') }
+  scope :for_blog, ->(key) { where(blog_key: key) }
+  scope :visible, -> { where('visible = true AND published_at <= ?', Time.now.utc) }
+  scope :ordered, -> { order('published_at desc') }
 
-  scope :search, ->(term){ where('title LIKE ?', "%#{term}%") }
-  scope :for_user, ->(user){
+  scope :search, ->(term) { where('title LIKE ?', "%#{term}%") }
+  scope :for_user, ->(user) {
     if Spud::Blog.query_for_user.present?
       where(Spud::Blog.query_for_user.call(user))
     else
@@ -28,74 +28,70 @@ class Spud::SpudPostModel < ActiveRecord::Base
     end
   }
 
-  validates_presence_of :title, :content, :published_at, :spud_user_id
-  validates :url_name, :presence => true, :uniqueness => true, :format => {:with => /\A[\w\-]+\z/, :message => 'must contain only letters, numbers, and dashes'}
-  validates_uniqueness_of :url_name
+  validates :title, :content, :published_at, :spud_user_id, presence: true
+  validates :url_name, presence: true, uniqueness: true, format: { with: /\A[\w\-]+\z/, message: 'must contain only letters, numbers, and dashes' }
+  validates :url_name, uniqueness: true
   before_validation :set_url_name
   before_validation :set_identifier
 
   acts_as_tb_liquid_content
 
-  def self.for_spud_site(spud_site_id)
+  def self.for_spud_site(_spud_site_id)
     ActiveSupport::Deprecation.warn 'SpudBlog.for_spud_site is deprecated and will be removed in the future'
     return all()
   end
 
-  def self.recent_posts(limit=5)
+  def self.recent_posts(limit = 5)
     return where('visible = ? AND published_at <= ?', true, Time.now.utc).order('published_at desc').limit(limit)
   end
 
-  def self.recent_blog_posts(limit=5)
-    return self.blog_posts.recent_posts(limit)
+  def self.recent_blog_posts(limit = 5)
+    return blog_posts.recent_posts(limit)
   end
 
-  def self.recent_news_posts(limit=5)
-    return self.news_posts.recent_posts(limit)
+  def self.recent_news_posts(limit = 5)
+    return news_posts.recent_posts(limit)
   end
 
   def self.from_archive(date_string)
-    begin
-      date = Date.strptime(date_string, "%Y-%b")
-      return where(:published_at => date..date.end_of_month)
-    rescue
-      logger.debug 'fallback'
-      return where('')
-    end
+    date = Date.strptime(date_string, '%Y-%b')
+    return where(published_at: date..date.end_of_month)
+  rescue
+    logger.debug 'fallback'
+    return where('')
   end
 
   def is_news
-    ActiveSupport::Deprecation.warn ":is_news is deprecated. Please rely on the :blog_key column stead.", caller
-    return self.read_attribute(:is_news)
+    ActiveSupport::Deprecation.warn ':is_news is deprecated. Please rely on the :blog_key column stead.', caller
+    return self[:is_news]
   end
 
   def self.months_with_public_posts
     records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ?', true, DateTime.now).group('published_month, published_year').order('published_year desc, published_month desc')
     begin
-      return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
+      return records.collect { |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
     rescue Exception => e
-      logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
+      logger.fatal "Exception occurred while fetching post archive dates:\n #{e}"
       return []
     end
   end
 
   def postprocess_content
-    template = Liquid::Template.parse(self.content)
+    template = Liquid::Template.parse(content)
     self.content_processed = template.render()
   end
 
   def content_processed
-    if read_attribute(:content_processed).blank?
-      postprocess_content
-    end
-    read_attribute(:content_processed)
+    postprocess_content if self[:content_processed].blank?
+    self[:content_processed]
   end
 
   def content_processed=(content)
-    write_attribute(:content_processed,content)
+    self[:content_processed] = content
   end
 
   def display_date
-    return published_at.strftime("%b %d, %Y")
+    return published_at.strftime('%b %d, %Y')
   end
 
   def is_public?
@@ -107,29 +103,25 @@ class Spud::SpudPostModel < ActiveRecord::Base
   end
 
   def category_names
-    return self.categories.collect{ |c| c.name }.join(', ')
+    return categories.collect(&:name).join(', ')
   end
 
   def author_name
-    if self.custom_author.present?
-      self.custom_author
-    else    
-      self.author.full_name
+    if custom_author.present?
+      custom_author
+    else
+      author.full_name
     end
   end
 
-private
+  private
 
   def set_url_name
-    if url_name.blank?
-      self.url_name = title.parameterize
-    end
+    self.url_name = title.parameterize if url_name.blank?
   end
 
   def set_identifier
-    if identifier.blank?
-      self.identifier = SecureRandom.uuid
-    end
+    self.identifier = SecureRandom.uuid if identifier.blank?
     return true
   end
 

data/app/models/spud_blog_config.rb

@@ -5,7 +5,7 @@ class SpudBlogConfig
   end
 
   def self.find(key)
-    return Spud::Blog.config.blogs.find{ |it| it.key == key }
+    return Spud::Blog.config.blogs.find { |it| it.key == key }
   end
 
   def self.each
@@ -16,7 +16,7 @@ class SpudBlogConfig
 
   attr_accessor :name, :key, :path, :layout
 
-  def initialize(name:, key:, path:, layout:nil)
+  def initialize(name:, key:, path:, layout: nil)
     @name = name
     @key = key
     @path = path

data/app/models/spud_post.rb

@@ -1,3 +1,3 @@
 class SpudPost < Spud::SpudPostModel
-	# Copy this file to your app to extend the base SpudPost model
+  # Copy this file to your app to extend the base SpudPost model
 end

data/app/models/spud_post_categories_post.rb

@@ -1,4 +1,4 @@
 class SpudPostCategoriesPost < ActiveRecord::Base
-  belongs_to :spud_post, :touch => true
+  belongs_to :spud_post, touch: true
   belongs_to :spud_post_category
 end

data/app/models/spud_post_category.rb

@@ -1,30 +1,28 @@
 class SpudPostCategory < ActiveRecord::Base
-	spud_searchable
+  spud_searchable
 
-	has_and_belongs_to_many :posts,
-		:class_name => 'SpudPost',
-		:join_table => 'spud_post_categories_posts',
-		:foreign_key => 'spud_post_category_id'
+  has_and_belongs_to_many :posts,
+    class_name: 'SpudPost',
+    join_table: 'spud_post_categories_posts',
+    foreign_key: 'spud_post_category_id'
 
-	validates_presence_of :name, :url_name
-	validates_uniqueness_of :name, :url_name
-	before_validation :set_url_name
+  validates :name, :url_name, presence: true
+  validates :name, :url_name, uniqueness: true
+  before_validation :set_url_name
 
-	after_update :touch_posts
-	after_destroy :touch_posts
+  after_update :touch_posts
+  after_destroy :touch_posts
 
-	scope :ordered, ->{ order('name asc') }
+  scope :ordered, -> { order('name asc') }
 
-private
+  private
 
-	def set_url_name
-		self.url_name = self.name.parameterize
-	end
+  def set_url_name
+    self.url_name = name.parameterize
+  end
 
-	def touch_posts
-		if self.name_changed?
-			self.posts.update_all(:updated_at => Time.now)
-		end
-	end
+  def touch_posts
+    posts.update_all(updated_at: Time.now) if name_changed?
+  end
 
 end

data/app/models/spud_post_site.rb

@@ -4,5 +4,5 @@ class SpudPostSite < ActiveRecord::Base
   def spud_site
     return Spud::Core.site_config_for_id(spud_site_id)
   end
-  
+
 end

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

@@ -75,7 +75,7 @@
 </div>
 
 <%= render :partial => '/admin/posts/custom_fields', :locals => {:f => f} %>
-	
+
 <h4>Meta Data</h4>
 
 <div class="form-group">
@@ -104,11 +104,12 @@
 
 <div class="form-group">
   <div class="col-sm-offset-2 col-sm-10">
-    <%= f.submit "Save Post", :class => "btn btn-primary", "data-loading-text" => "Saving..." %> 
+    <%= f.submit "Save Post", :class => "btn btn-primary", "data-loading-text" => "Saving..." %>
+    <%= f.submit "Preview", :class => "btn btn-info btn-preview", data: { loading_text: 'Please Wait...' } %> or
     <%= link_to "Cancel", request.referer, :class => "btn btn-default" %>
   </div>
 </div>
 
 <script type="text/javascript">
 	$(document).ready(spud.admin.posts.edit);
-</script>
+</script>

data/app/views/admin/posts/edit.html.erb

@@ -1,3 +1,11 @@
-<%= tb_form_for @post, :url => admin_post_path(@post), :html => {:class => 'form-horizontal'}, :remote => true, :data => {:errors => :inline, :success => admin_posts_path} do |f| %>	
+<%= tb_form_for @post,
+	url: admin_post_path(@post),
+	remote: true,
+	data: {
+		errors: :inline,
+		success: admin_posts_path,
+		preview_action: admin_post_preview_path(@post)
+	},
+	html: { :class => 'form-horizontal' } do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
+<% end %>

data/app/views/admin/posts/new.html.erb

@@ -1,3 +1,11 @@
-<%= tb_form_for @post, :url => admin_posts_path, :html => {:class => 'form-horizontal'}, :remote => true, :data => {:errors => :inline, :success => admin_posts_path} do |f| %>	
+<%= form_for @post,
+	url: admin_posts_path(),
+	remote: true,
+	data: {
+		errors: :inline,
+		success: admin_posts_path,
+		preview_action: admin_post_preview_path(@post)
+	},
+	html: { class: "form-horizontal page_form" } do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

data/config/routes.rb

@@ -8,7 +8,9 @@ Rails.application.routes.draw do
     blog_key = config.key
 
     namespace :admin do
-      resources :posts, :path => blog_key, :blog_key => blog_key
+      resources :posts, :path => blog_key, :blog_key => blog_key do
+        match :preview, on: :collection, via: [:post, :patch]
+      end
     end
 
     scope config.path do

data/lib/generators/spud/blog/blog_generator.rb

@@ -1,22 +1,22 @@
 class Spud::Blog::BlogGenerator < ::Rails::Generators::Base
 
-  argument :blog_name, :type => :string
+  argument :blog_name, type: :string
 
   source_root File.join(Spud::Blog::Engine.root, 'app/views/posts')
 
   def generate
     @name = blog_name
     @key = blog_name.parameterize.underscore
-    @path = ask("What is your blog path?", :default => '/'+@name.parameterize)
-    @layout = ask("What layout should your blog use?", :default => 'application')
+    @path = ask('What is your blog path?', default: '/' + @name.parameterize)
+    @layout = ask('What layout should your blog use?', default: 'application')
     environment(blog_config())
-    if ask("Do you want to use custom views?", :limited_to => ['y', 'n']) == 'y'
+    if ask('Do you want to use custom views?', limited_to: ['y', 'n']) == 'y'
       copy_file 'index.html.erb', Rails.root.join('app/views', @key, 'index.html.erb')
       copy_file 'show.html.erb', Rails.root.join('app/views', @key, 'show.html.erb')
     end
   end
 
-private
+  private
 
   def blog_config
     return <<EOF

data/lib/generators/spud/blog/random_posts_generator.rb

@@ -12,7 +12,7 @@ class Spud::Blog::RandomPostsGenerator < ::Rails::Generators::Base
       random_posts(true)
     end
     puts 'Assigning categories...'
-    category_ids = SpudPostCategory.all.collect{ |c| c.id }
+    category_ids = SpudPostCategory.all.collect(&:id)
     SpudPost.all.each do |p|
       p.category_ids = [category_ids[rand(category_ids.length)]]
       p.save
@@ -24,31 +24,29 @@ class Spud::Blog::RandomPostsGenerator < ::Rails::Generators::Base
 
   def random_posts(is_news)
     100.times do
-      post = SpudPost.create({
-        :title => random_title,
-        :content => random_content,
-        :published_at => random_time,
-        :visible => 1,
-        :spud_user_id => 1,
-        :is_news => is_news
-      })
+      post = SpudPost.create(title: random_title,
+                             content: random_content,
+                             published_at: random_time,
+                             visible: 1,
+                             spud_user_id: 1,
+                             is_news: is_news)
     end
   end
 
   def random_word
     chars = 'abcdefghjkmnpqrstuvwxyz'
     length = rand(8) + 1
-    return (1..length).collect{ chars[rand(chars.length)] }.join('')
+    return (1..length).collect { chars[rand(chars.length)] }.join('')
   end
 
   def random_title
-    return (1..4).collect{ random_word.capitalize }.join(' ')
+    return (1..4).collect { random_word.capitalize }.join(' ')
   end
 
   def random_content
     content = ''
-    3.times do |i|
-      content += '<p>' + (1..30).collect{ random_word }.join(' ').capitalize + '.</p>'
+    3.times do |_i|
+      content += '<p>' + (1..30).collect { random_word }.join(' ').capitalize + '.</p>'
     end
     return content
   end
@@ -57,4 +55,4 @@ class Spud::Blog::RandomPostsGenerator < ::Rails::Generators::Base
     return Time.at(1.year.ago + rand * (Time.now.to_f - 1.year.ago.to_f))
   end
 
-end
+end

data/lib/generators/spud/blog/views_generator.rb

@@ -1,7 +1,7 @@
 require 'rails/generators/migration'
 
 class Spud::Blog::ViewsGenerator < ::Rails::Generators::Base
-  
+
   source_root File.join(Spud::Blog::Engine.root, 'app/views')
 
   def install

data/lib/spud_blog/configuration.rb

@@ -3,8 +3,7 @@ module Spud
     include ActiveSupport::Configurable
     config_accessor(
       :base_layout, :news_layout, :blogs, :news_enabled, :blog_enabled, :blog_path, :news_path, :posts_per_page,
-      :permitted_attributes, :query_for_user,
-      :disqus_shortname
+      :permitted_attributes, :query_for_user, :disqus_shortname
     )
     self.base_layout = 'application'
     self.posts_per_page = 5

data/lib/spud_blog/engine.rb

@@ -25,20 +25,16 @@ module Spud
         # This provides support for the legacy :blog_enabled and :news_enabled config options
         # Blog and News handle 90% of the typical use cases
         if Spud::Blog.config.blog_enabled
-          SpudBlogConfig.push({
-            :key => 'blog',
-            :name => 'Blog',
-            :path => Spud::Blog.config.blog_path,
-            :layout => Spud::Blog.config.base_layout
-          })
+          SpudBlogConfig.push(key: 'blog',
+                              name: 'Blog',
+                              path: Spud::Blog.config.blog_path,
+                              layout: Spud::Blog.config.base_layout)
         end
         if Spud::Blog.config.news_enabled
-          SpudBlogConfig.push({
-            :key => 'news',
-            :name => 'News',
-            :path => Spud::Blog.config.news_path,
-            :layout => Spud::Blog.config.news_layout
-          })
+          SpudBlogConfig.push(key: 'news',
+                              name: 'News',
+                              path: Spud::Blog.config.news_path,
+                              layout: Spud::Blog.config.news_layout)
         end
       end
 
@@ -46,12 +42,12 @@ module Spud
         # Build admin modules for each configure blog
         SpudBlogConfig.each do |config|
           blog_app = {
-            :name => "#{config.name} Posts",
-            :url => "admin/#{config.key}",
-            :thumbnail => 'admin/posts_thumb.png'
+            name: "#{config.name} Posts",
+            url: "admin/#{config.key}",
+            thumbnail: 'admin/posts_thumb.png'
           }
           Spud::Core.config.admin_applications += [blog_app]
-        end        
+        end
       end
 
       initializer 'tb_blog.assets' do

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
-	module Blog
-	  VERSION = "1.3.3"
-	end
+  module Blog
+    VERSION = '1.3.4'.freeze
+  end
 end

data/lib/tasks/spud_blog_tasks.rake

@@ -5,7 +5,7 @@
 
 namespace :tb_blog do
 
-  task :apply_blog_keys => :environment do
+  task apply_blog_keys: :environment do
     SpudPost.all.each do |post|
       if post.is_news?
         post.update_column(:blog_key, 'news')

data/lib/tb_blog.rb

@@ -1,6 +1,6 @@
 module Spud
   module Blog
- 		require 'spud_blog/configuration'
-		require 'spud_blog/engine' if defined?(Rails)
+    require 'spud_blog/configuration'
+    require 'spud_blog/engine' if defined?(Rails)
   end
 end