tb_blog 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c07afcec9d3eb4f9a2038a5dc331496148f6c40
-  data.tar.gz: 5921d46580058b1faf06f56f81c2b700b48e2a27
+  metadata.gz: 7ea87e773003046128ce6898ed2d3503f4c3c356
+  data.tar.gz: f8ef87cc40c3c462b7b40078e66a916fc63c49c5
 SHA512:
-  metadata.gz: 971e90879dde94f36ed70c28019f57c50610a4b8d829b93348a72e9af54d0e01d0f109aa35803d72f2cdf4290411b3fe3eaa11630ddf09179f30311073f59750
-  data.tar.gz: 78244e37a50fcfbbd516554e8554047d9f9dbf01dfa6da0d887c0160ce0098613a429f4fa649358b8630f04b2acb817873a6efbb08157f52685493da2ce32e20
+  metadata.gz: 6f86f21e95dc402fc6d73df5f3caaf2cf6b550ce3473e51753d2192b310615cba3202cd9c764c2af8534c6765c72e3be1c4d222b314b10a29efb9248f4fa7dd9
+  data.tar.gz: 14d0eee6497a0ffc52d8d94f38ea820989ef477d777200c04e0d8ecdc78b46084efce791ea37a3270bb0491777e7f15b15e5b975a7e5017754b9a8adf136ba86

data/Rakefile

@@ -20,10 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
 require 'rake'
-

data/app/assets/javascripts/admin/blog/posts.js

@@ -6,6 +6,7 @@ spud.admin.posts = {
     $('body').on('submit', '.spud-post-category-form', submittedPostCategoryForm);
     $('body').on('blur', '.spud-post-title', blurredPostTitle);
     $('body').on('click', '.spud-post-url-name-regen', clickedUrlNameRegen);
+    $(".btn-preview").on('click', clickedPreviewButton);
   }
 };
 
@@ -91,4 +92,45 @@ var encodeTitleForUrlName = function(title){
   return string;
 };
 
+var clickedPreviewButton = function(e){
+  e.preventDefault();
+  var $button = $(this);
+  var $form = $button.parents('form');
+
+  // Build a temporary form
+  $previewForm = $('<form />', {
+    action: $form.data('previewAction'),
+    target: '_blank',
+    method: 'POST',
+    css: { display: 'none' }
+  });
+  $('body').append($previewForm);
+
+  // Tell tinymce to write out to the textarea
+  tinyMCE.triggerSave();
+
+  // Copy fields into our temp form
+  $form.find('input, select, textarea').each(function(i, el){
+    var input = document.createElement('input');
+    input.name = el.name;
+    input.value = el.value;
+    $previewForm.append(input);
+  });
+
+  // Cross site scripting tag
+  var csrf = document.createElement('input');
+  csrf.name = 'authenticity_token';
+  csrf.value = tb.util.getCsrfToken();
+  $previewForm.append(csrf);
+
+  // Submit it
+  $button.button('loading');
+  $previewForm.submit();
+
+  setTimeout(function(){
+    $previewForm.remove();
+    $button.button('reset');
+  }, 2000);
+};
+
 })();

data/app/controllers/admin/post_categories_controller.rb

@@ -1,61 +1,61 @@
 class Admin::PostCategoriesController < Admin::ApplicationController
 
-	layout false
-	respond_to :html, :json
-
-	before_filter :find_category, :only => [:show, :edit, :update, :destroy]
-
-	def index
-		@post_categories = SpudPostCategory.ordered
-		respond_with @post_categories
-	end
-
-	def edit
-		respond_with @post_category
-	end
-
-	def update
-		if @post_category.update_attributes(category_params)
-			flash.now[:notice] = 'Post Category was successfully updated'
-			respond_with @post_category, :location => admin_post_categories_path
-		else
-			render 'new', :status => 422
-		end
-	end
-
-	def new
-		@post_category = SpudPostCategory.new
-		respond_with @post_category
-	end
-
-	def create
-		@post_category = SpudPostCategory.new(category_params)
-		if @post_category.save
-			flash.now[:notice] = 'Post Category was successfully created'
-			respond_with @post_category, :location => admin_post_categories_path
-		else
-			render 'new', :status => 422
-		end
-	end
-
-	def destroy
-		if @post_category.destroy
-			flash.now[:notice] = 'Post Category was successfully deleted'
-			@post_categories = SpudPostCategory.ordered
-			render 'index'
-		else
-			respond_with @post_category, :location => admin_post_categories_path
-		end
-	end
-
-	private
-
-	def find_category
-		@post_category = SpudPostCategory.find(params[:id])
-	end
-
-	def category_params
-		params.require(:spud_post_category).permit(:name)
-	end
+  layout false
+  respond_to :html, :json
+
+  before_action :find_category, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @post_categories = SpudPostCategory.ordered
+    respond_with @post_categories
+  end
+
+  def edit
+    respond_with @post_category
+  end
+
+  def update
+    if @post_category.update_attributes(category_params)
+      flash.now[:notice] = 'Post Category was successfully updated'
+      respond_with @post_category, location: admin_post_categories_path
+    else
+      render 'new', status: 422
+    end
+  end
+
+  def new
+    @post_category = SpudPostCategory.new
+    respond_with @post_category
+  end
+
+  def create
+    @post_category = SpudPostCategory.new(category_params)
+    if @post_category.save
+      flash.now[:notice] = 'Post Category was successfully created'
+      respond_with @post_category, location: admin_post_categories_path
+    else
+      render 'new', status: 422
+    end
+  end
+
+  def destroy
+    if @post_category.destroy
+      flash.now[:notice] = 'Post Category was successfully deleted'
+      @post_categories = SpudPostCategory.ordered
+      render 'index'
+    else
+      respond_with @post_category, location: admin_post_categories_path
+    end
+  end
+
+  private
+
+  def find_category
+    @post_category = SpudPostCategory.find(params[:id])
+  end
+
+  def category_params
+    params.require(:spud_post_category).permit(:name)
+  end
 
 end

data/app/controllers/admin/posts_controller.rb

@@ -1,104 +1,113 @@
 class Admin::PostsController < Admin::ApplicationController
-	include BlogUrlHelpers
-
-	respond_to :html, :xml, :json
-	before_action :load_blog
-	before_action :find_post, :only => [:show, :edit, :update, :destroy]
-	around_action :create_redirect_if_necessary, :only => :update
-
-	def index
-		@posts = SpudPost.for_blog(params[:blog_key]).ordered.paginate(:page => params[:page], :per_page => 15)
-		if params[:search]
-			@posts = @posts.search(params[:search])
-		end
-		respond_with @posts
-	end
-
-	def edit
-		respond_with @post
-	end
-
-	def update
-		if @post.update_attributes(post_params)
-			flash[:notice] = 'Post was successfully updated.'
-		end
-    respond_with @post, :location => admin_posts_path
-	end
-
-	def new
-		@categories = SpudPostCategory.ordered
-		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id)
-		respond_with @post
-	end
-
-	def create
-		@categories = SpudPostCategory.ordered
-		@post = SpudPost.new(post_params)
-		@post.blog_key = params[:blog_key]
-		if @post.save
-	    flash[:notice] = 'Post was successfully created.'
-		end
-    respond_with @post, :location => admin_posts_path
-	end
-
-	def destroy
-		if @post.destroy
-	    flash[:notice] = 'Post was successfully deleted.'
-		end
-    respond_with @post, :location => admin_posts_path
-	end
-
-private
-
-	def find_post
-		@post = SpudPost.find(params[:id])
-		if @post.blank?
-			flash[:error] = "Post not found!"
-			redirect_to admin_posts_path and return false
-		end
-	end
-
-	def post_params
-		permitted = [:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :custom_author, :category_ids => []]
-		if Spud::Blog.permitted_attributes.present?
-			permitted = permitted + Spud::Blog.permitted_attributes
-		end
-		p = params.require(:spud_post).permit(permitted)
-		p[:updated_at] = DateTime.now
-		return p
-	end
-
-	def load_blog
-		@config = SpudBlogConfig.find(params[:blog_key])
-		if @config.blank?
-			redirect_to admin_root_path
-			return false
-		else
-			act_as_app "#{@config.name} Posts".parameterize.underscore.to_sym
-			add_breadcrumb "#{@config.name} Posts", admin_posts_path(blog_key: @config.key)
-		end
-	end
-
-	# Create a redirect if the post URL has changed
-	#
-	# Normally this sort of thing might belong in a model after_update hook, but the model
-	# layer has no knowledge of URL helpers.
-	#
-	def create_redirect_if_necessary
-		@_redirect_source = post_path(@post.url_name, :blog_key => @post.blog_key, :only_path => true)
-		yield
-	ensure
-		if @post.errors.empty?
-			@_redirect_destination = post_path(@post.url_name, :blog_key => @post.blog_key, :only_path => true)
-			if @_redirect_source != @_redirect_destination
-				TbRedirect.create_smart({
-					:source => @_redirect_source,
-					:destination => @_redirect_destination,
-					:created_by => 'blog',
-					:owner => @post
-				})
-			end
-		end
-	end
+  include BlogUrlHelpers
+  include PostViewForAction
+
+  respond_to :html, :xml, :json
+  before_action :load_blog
+  before_action :find_post, only: [:edit, :update, :destroy]
+  around_action :create_redirect_if_necessary, only: :update
+
+  def index
+    @posts = SpudPost.for_blog(params[:blog_key]).ordered.paginate(page: params[:page], per_page: 15)
+    @posts = @posts.search(params[:search]) if params[:search]
+    respond_with @posts
+  end
+
+  def edit
+    respond_with @post
+  end
+
+  def show
+  end
+
+  def update
+    if @post.update_attributes(post_params)
+      flash[:notice] = 'Post was successfully updated.'
+    end
+    respond_with @post, location: admin_posts_path
+  end
+
+  def new
+    @post = SpudPost.new(published_at: Time.zone.now, spud_user_id: current_user.id)
+    respond_with @post
+  end
+
+  def create
+    @post = SpudPost.new(post_params)
+    @post.blog_key = params[:blog_key]
+    flash[:notice] = 'Post was successfully created.' if @post.save
+    respond_with @post, location: admin_posts_path
+  end
+
+  def destroy
+    flash[:notice] = 'Post was successfully deleted.' if @post.destroy
+    respond_with @post, location: admin_posts_path
+  end
+
+  def preview
+    @post = if params[:post_id]
+              SpudPost.find_by!(id: params[:post_id])
+            else
+              SpudPost.new
+            end
+    @post.assign_attributes(post_params)
+    @post.postprocess_content()
+    render template: post_view_for_action(:show), controller: :posts, layout: @config.layout
+   end
+
+  def render_preview
+    render template: post_view_for_action(:show), controller: :posts, layout: @config.layout
+  end
+
+  private
+
+  def find_post
+    @post = SpudPost.find(params[:id])
+    if @post.blank?
+      flash[:error] = 'Post not found!'
+      redirect_to(admin_posts_path) && (return false)
+    end
+  end
+
+  def post_params
+    permitted = [:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :custom_author, category_ids: []]
+    if Spud::Blog.permitted_attributes.present?
+      permitted += Spud::Blog.permitted_attributes
+    end
+    p = params.require(:spud_post).permit(permitted)
+    p[:updated_at] = DateTime.now
+    return p
+  end
+
+  def load_blog
+    @config = SpudBlogConfig.find(params[:blog_key])
+    if @config.blank?
+      redirect_to admin_root_path
+      return false
+    else
+      act_as_app "#{@config.name} Posts".parameterize.underscore.to_sym
+      add_breadcrumb "#{@config.name} Posts", admin_posts_path(blog_key: @config.key)
+    end
+  end
+
+  # Create a redirect if the post URL has changed
+  #
+  # Normally this sort of thing might belong in a model after_update hook, but the model
+  # layer has no knowledge of URL helpers.
+  #
+  def create_redirect_if_necessary
+    @_redirect_source = post_path(@post.url_name, blog_key: @post.blog_key, only_path: true)
+    yield
+  ensure
+    if @post.errors.empty?
+      @_redirect_destination = post_path(@post.url_name, blog_key: @post.blog_key, only_path: true)
+      if @_redirect_source != @_redirect_destination
+        TbRedirect.create_smart(source: @_redirect_source,
+                                destination: @_redirect_destination,
+                                created_by: 'blog',
+                                owner: @post)
+      end
+    end
+  end
 
 end

data/app/controllers/concerns/blog_url_helpers.rb

@@ -3,49 +3,53 @@ module BlogUrlHelpers
 
   included do
     helper_method :posts_path, :post_path, :post_category_path, :post_archive_path,
-      :admin_posts_path, :admin_post_path, :new_admin_post_path, :edit_admin_post_path
+      :admin_posts_path, :admin_post_path, :new_admin_post_path, :edit_admin_post_path,
+      :admin_post_preview_path
   end
 
-  def posts_path(opts={})
-    url_for opts.merge({:controller => '/posts', :action => 'index', :blog_key => params[:blog_key]})
+  def posts_path(opts = {})
+    url_for opts.merge(controller: '/posts', action: 'index', blog_key: params[:blog_key])
   end
 
-  def post_path(url_name, opts={})
-    url_for opts.merge({:controller => '/posts', :action => 'show', :id => url_name, :blog_key => params[:blog_key]})
+  def post_path(url_name, opts = {})
+    url_for opts.merge(controller: '/posts', action: 'show', id: url_name, blog_key: params[:blog_key])
   end
 
-  def post_category_path(category_url_name, opts={})
-    url_for opts.merge({:controller => '/posts', :action => 'category', :category_url_name => category_url_name, :blog_key => params[:blog_key]})
+  def post_category_path(category_url_name, opts = {})
+    url_for opts.merge(controller: '/posts', action: 'category', category_url_name: category_url_name, blog_key: params[:blog_key])
   end
 
-  def post_archive_path(archive_date, opts={})
-    url_for opts.merge({:controller => '/posts', :action => 'archive', :archive_date => archive_date, :blog_key => params[:blog_key]})
+  def post_archive_path(archive_date, opts = {})
+    url_for opts.merge(controller: '/posts', action: 'archive', archive_date: archive_date, blog_key: params[:blog_key])
   end
 
-  def post_category_archive_path(category_url_name, archive_date, opts={})
-    url_for opts.merge({:controller => '/posts', :action => 'category', :category_url_name => category_url_name, :archive_date => archive_date, :blog_key => params[:blog_key]})
+  def post_category_archive_path(category_url_name, archive_date, opts = {})
+    url_for opts.merge(controller: '/posts', action: 'category', category_url_name: category_url_name, archive_date: archive_date, blog_key: params[:blog_key])
   end
 
-#
-# Admin
-#
+  #
+  # Admin
+  #
 
   def admin_posts_path(blog_key: nil)
     blog_key ||= params[:blog_key]
-    url_for :controller => '/admin/posts', :action => 'index', :blog_key => blog_key
+    url_for controller: '/admin/posts', action: 'index', blog_key: blog_key
   end
 
   def new_admin_post_path(blog_key: nil)
     blog_key ||= params[:blog_key]
-    url_for :controller => '/admin/posts', :action => 'new', :blog_key => blog_key
+    url_for controller: '/admin/posts', action: 'new', blog_key: blog_key
   end
 
   def admin_post_path(post)
-    url_for :controller => '/admin/posts', :action => 'show', :id => post.id, :blog_key => post.blog_key
+    url_for controller: '/admin/posts', action: 'show', id: post.id, blog_key: post.blog_key
   end
 
   def edit_admin_post_path(post)
-    url_for :controller => '/admin/posts', :action => 'edit', :id => post.id, :blog_key => post.blog_key
+    url_for controller: '/admin/posts', action: 'edit', id: post.id, blog_key: post.blog_key
   end
 
+  def admin_post_preview_path(post)
+    url_for controller: '/admin/posts', action: :preview, post_id: post.id, blog_key: (post.blog_key || params[:blog_key])
+  end
 end

data/app/controllers/concerns/post_view_for_action.rb

@@ -0,0 +1,11 @@
+module PostViewForAction
+  extend ActiveSupport::Concern
+
+  def post_view_for_action(action)
+    if File.exist?(Rails.root.join("app/views/#{@config.key}/#{action}.html.erb"))
+      return "/#{@config.key}/#{action}"
+    else
+      return "/posts/#{action}"
+    end
+  end
+end

data/app/controllers/posts_controller.rb

@@ -1,21 +1,20 @@
 class PostsController < ApplicationController
   include BlogUrlHelpers
+  include PostViewForAction
 
-	respond_to :html, :json, :rss
+  respond_to :html, :json, :rss
 
   before_action :load_blog
-  before_action :load_page_number, :only => [:index, :archive, :category]
-  before_action :find_post, :only => [:show, :create_comment]
+  before_action :load_page_number, only: [:index, :archive, :category]
+  before_action :find_post, only: [:show, :create_comment]
 
   def index
-    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).ordered.paginate(:page => @page_number, :per_page => Spud::Blog.config.posts_per_page)
-    if params[:search]
-      @posts = @posts.search(params[:search])
-    end
+    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).ordered.paginate(page: @page_number, per_page: Spud::Blog.config.posts_per_page)
+    @posts = @posts.search(params[:search]) if params[:search]
     respond_with @posts do |format|
-      format.html{
-        render view_for_action('index')
-      }
+      format.html do
+        render post_view_for_action(:index)
+      end
     end
   end
 
@@ -33,37 +32,35 @@ class PostsController < ApplicationController
   end
 
   def category
-    if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-      @posts = @post_category.posts.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(:page => @page_number, :per_page => Spud::Blog.config.posts_per_page)
+    if @post_category = SpudPostCategory.find_by(url_name: params[:category_url_name])
+      @posts = @post_category.posts.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(page: @page_number, per_page: Spud::Blog.config.posts_per_page)
     else
       redirect_to posts_path
       return
     end
     respond_with @posts do |format|
-      format.html { render view_for_action 'index' }
+      format.html { render post_view_for_action :index }
     end
   end
 
   def archive
-    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(:page => @page_number, :per_page => Spud::Blog.config.posts_per_page)
+    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(page: @page_number, per_page: Spud::Blog.config.posts_per_page)
     respond_with @posts do |format|
-      format.html { render view_for_action 'index' }
+      format.html { render post_view_for_action :index }
     end
   end
 
   def show
-  	respond_with @post do |format|
-      format.html { render view_for_action 'show' }
+    respond_with @post do |format|
+      format.html { render post_view_for_action :show }
     end
   end
 
-private
+  private
 
   def find_post
-    @post = SpudPost.for_user(current_user).for_blog(params[:blog_key]).where(:url_name => params[:id]).first
-		if @post.blank? || @post.is_private?
-			raise Spud::NotFoundError.new(:item => 'post')
-		end
+    @post = SpudPost.for_user(current_user).for_blog(params[:blog_key]).where(url_name: params[:id]).first
+    raise Spud::NotFoundError, item: 'post' if @post.blank? || @post.is_private?
   end
 
   def load_page_number
@@ -71,10 +68,10 @@ private
     if params[:page].present?
       page = params[:page].to_i
       if page.to_s != params[:page].to_s
-        if(page > 1)
-          redirect_to posts_path(:page => page), :status => :moved_permanently and return
+        if page > 1
+          redirect_to(posts_path(page: page), status: :moved_permanently) && return
         else
-          redirect_to posts_path(:page => nil), :status => :moved_permanently and return
+          redirect_to(posts_path(page: nil), status: :moved_permanently) && return
         end
       end
     end
@@ -84,19 +81,11 @@ private
   def load_blog
     @config = SpudBlogConfig.find(params[:blog_key])
     if @config.blank?
-      raise Spud::NotFoundError(:item => 'blog')
+      raise Spud::NotFoundError(item: 'blog')
       return false
     else
       self.class.layout(@config.layout)
     end
   end
 
-  def view_for_action(action)
-    if File.exist?(Rails.root.join("app/views/#{@config.key}/#{action}.html.erb"))
-      return "#{@config.key}/#{action}"
-    else
-      return action
-    end
-  end
-
 end