tb_cms 1.2.3 → 1.3.beta1

data/app/controllers/admin/pages_controller.rb

@@ -1,164 +1,160 @@
 class Admin::PagesController < Admin::ApplicationController
-	add_breadcrumb "Pages", :admin_pages_path
-	belongs_to_app :pages
-	before_filter :load_page,:only => [:edit,:update,:show,:destroy]
+  add_breadcrumb 'Pages', :admin_pages_path
+  belongs_to_app :pages
+  before_action :load_page, only: [:edit, :update, :show, :destroy]
 
-	def index
-		@pages = SpudPage.where(:spud_page_id => nil).order(:page_order).includes(:spud_pages)
-    home_page = SpudPage.where(:url_name => Spud::Cms.root_page_name).first
+  def index
+    @pages = SpudPage.where(spud_page_id: nil).order(:page_order).includes(:spud_pages)
+    home_page = SpudPage.where(url_name: Spud::Cms.root_page_name).first
     if home_page.blank?
       flash.now[:warning] = "You have not setup your default CMS page. This page will be your homepage. To do so, create a page with the name '#{Spud::Cms.root_page_name.titlecase}'"
     end
-		respond_with @pages
-	end
-
-	def show
-		layout = @page.layout || Spud::Cms.default_page_layout
+    respond_with @pages
+  end
 
+  def show
+    layout = @page.layout || Spud::Cms.default_page_layout
 
-		render :layout => layout
-	end
+    render layout: layout
+  end
 
-	def new
-		add_breadcrumb "New", :new_admin_page_path
+  def new
+    add_breadcrumb 'New', :new_admin_page_path
 
     layouts = Spud::Cms::Engine.template_parser.layouts
-    layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
-		@page = SpudPage.new(:layout => layout)
-		parts = layout_info[:partials]
-
-		parts.each do |part|
-			@page.spud_page_partials.new(:name => part.strip)
-		end
-		respond_with @page
-	end
-
-	def create
-		@page = SpudPage.new(page_params)
-		if params[:preview] && params[:preview].to_i == 1
-			preview
-			return
-		end
-		flash[:notice] = "Page Saved successfully" if @page.save
-		respond_with @page,:location => admin_pages_url
-	end
-
-	def edit
-		add_breadcrumb @page.name, :edit_admin_page_path
+    layout, layout_info = layouts.select { |_k, v| v[:default] }.flatten
+    @page = SpudPage.new(layout: layout)
+    parts = layout_info[:partials]
+
+    parts.each do |part|
+      @page.spud_page_partials.new(name: part.strip)
+    end
+    respond_with @page
+  end
+
+  def create
+    @page = SpudPage.new(page_params)
+    if params[:preview] && params[:preview].to_i == 1
+      preview
+      return
+    end
+    flash[:notice] = 'Page Saved successfully' if @page.save
+    respond_with @page, location: admin_pages_url
+  end
+
+  def edit
+    add_breadcrumb @page.name, :edit_admin_page_path
 
     layouts = Spud::Cms::Engine.template_parser.layouts
-    layout, layout_info = layouts.select{|k,v| k == @page.layout}.flatten  if @page.layout.blank? == false
+    layout, layout_info = layouts.select { |k, _v| k == @page.layout }.flatten if @page.layout.blank? == false
     if layout.blank?
-      layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
+      layout, layout_info = layouts.select { |_k, v| v[:default] }.flatten
     end
-		@page.layout = layout
+    @page.layout = layout
 
-		layout_info[:partials].each do |part|
-			partial = @page.spud_page_partials.select{|p| p.name == part.strip}
-      if partial.blank?
-        @page.spud_page_partials.new(:name => part.strip)
-      end
-		end
-
-	end
-
-	def update
-		@page.assign_attributes(page_params)
-		if params[:preview] && params[:preview].to_i == 1
-			preview
-			return
-		end
-		if @page.save
-			flash[:notice] = "Page updated successfully!"
-			redirect_to admin_pages_url() and return
-		else
-			flash[:error] = "There was an error saving this page"
-			render :action => "edit"
-		end
-
-	end
-
-	def preview
+    layout_info[:partials].each do |part|
+      partial = @page.spud_page_partials.select { |p| p.name == part.strip }
+      @page.spud_page_partials.new(name: part.strip) if partial.blank?
+    end
+  end
+
+  def update
+    @page.assign_attributes(page_params)
+    if params[:preview] && params[:preview].to_i == 1
+      preview
+      return
+    end
+    if @page.save
+      flash[:notice] = 'Page updated successfully!'
+      redirect_to(admin_pages_url()) && return
+    else
+      flash[:error] = 'There was an error saving this page'
+      render action: 'edit'
+    end
+  end
+
+  def preview
     layout = @page.layout || Spud::Cms.default_page_layout
-		render :action => :show,:layout => layout
-	end
-
-	def destroy
-		status = 500
-
-		if @page.destroy
-			flash[:notice] = "Page removed successfully!"
-			status = 200
-		else
-			flash[:error] = "Error removing page"
-		end
-		respond_to do |format|
-			format.js {render :status => status}
-			format.html { redirect_to admin_pages_url()}
-		end
-	end
+    render action: :show, layout: layout
+  end
+
+  def destroy
+    status = 500
+
+    if @page.destroy
+      flash[:notice] = 'Page removed successfully!'
+      status = 200
+    else
+      flash[:error] = 'Error removing page'
+    end
+    respond_to do |format|
+      format.js { render status: status }
+      format.html { redirect_to admin_pages_url() }
+    end
+  end
 
   def page_parts
     layouts = Spud::Cms::Engine.template_parser.layouts
-    template =  params[:template] && !params[:template].blank? ? layouts[params[:template]] : nil
-    page = SpudPage.where(:id => params[:page]).includes(:spud_page_partials).first
+    template = params[:template] && !params[:template].blank? ? layouts[params[:template]] : nil
+    page = SpudPage.where(id: params[:page]).includes(:spud_page_partials).first
     page = SpudPage.new if page.blank?
-    
+
     old_page_partials = Array.new(page.spud_page_partials)
     new_page_partials = []
-    
+
     if !template.blank?
       template[:partials].each do |page_part|
-        old_partial = old_page_partials.find{|pp| page_part.strip == pp.name }
+        old_partial = old_page_partials.find { |pp| page_part.strip == pp.name }
         if old_partial
           new_page_partials << old_partial
           old_page_partials.delete(old_partial)
         else
-          new_page_partials << page.spud_page_partials.build(:name => page_part.strip)
+          new_page_partials << page.spud_page_partials.build(name: page_part.strip)
         end
       end
     else
-      layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
+      layout, layout_info = layouts.select { |_k, v| v[:default] }.flatten
       page.layout = layout
-    	layout_info[:partials].each do |part|
-  			new_page_partials << page.spud_page_partials.build(:name => part)
-  		end
+      layout_info[:partials].each do |part|
+        new_page_partials << page.spud_page_partials.build(name: part)
+      end
     end
 
     respond_to do |format|
-      format.js {
+      format.js do
         if response.status == 200
-          render(:partial => 'page_partials_form', :locals => {
-            :spud_page_partials => new_page_partials,
-            :remove_page_partials => old_page_partials
-          })
+          render(partial: 'page_partials_form', locals: {
+                   spud_page_partials: new_page_partials,
+                   remove_page_partials: old_page_partials
+                 })
         else
-          render(:text => message)
+          render(text: message)
         end
-      }
+      end
     end
   end
 
   def clear
     # noop
-    logger.debug("TODO: Clear Caches")
+    logger.debug('TODO: Clear Caches')
     redirect_to admin_pages_url
   end
 
-private
-	def load_page
-		@page = SpudPage.where(:id => params[:id]).includes(:spud_page_partials).first
-		if @page.blank?
-			flash[:error] = "Page not found!"
-			redirect_to admin_pages_url() and return false
-		end
-		return true
-	end
+  private
+
+  def load_page
+    @page = SpudPage.where(id: params[:id]).includes(:spud_page_partials).first
+    if @page.blank?
+      flash[:error] = 'Page not found!'
+      redirect_to(admin_pages_url()) && (return false)
+    end
+    return true
+  end
 
   def page_params
     params.require(:spud_page).permit(:name, :url_name, :created_by, :updated_by, :layout, :visibility, :spud_page_id,
       :publish_at, :format, :meta_description, :meta_keywords, :page_order, :spud_page_partials_attributes, :use_custom_url_name, :page_title,
-      :published, :notes, :spud_page_partials_attributes => [:id, :name, :content, :format, :_destroy])
+      :published, :notes, spud_page_partials_attributes: [:id, :name, :content, :format, :_destroy])
   end
 
 end

data/app/controllers/admin/snippets_controller.rb

@@ -1,53 +1,53 @@
 class Admin::SnippetsController < Admin::ApplicationController
   belongs_to_app :snippets
-  add_breadcrumb "Snippets", :admin_snippets_url
+  add_breadcrumb 'Snippets', :admin_snippets_url
 
-  before_filter :load_snippet, :only => [:show, :edit, :update, :destroy]
+  before_action :load_snippet, only: [:show, :edit, :update, :destroy]
 
   def index
-    @snippets = SpudSnippet.order(:name).paginate :page => params[:page]
+    @snippets = SpudSnippet.order(:name).paginate page: params[:page]
     respond_with @snippets
   end
 
   def new
-    add_breadcrumb "New", :new_admin_snippet_url
+    add_breadcrumb 'New', :new_admin_snippet_url
     @snippet = SpudSnippet.new
     respond_with @snippet
   end
 
   def create
-    add_breadcrumb "New", :new_admin_snippet_url
+    add_breadcrumb 'New', :new_admin_snippet_url
     @snippet = SpudSnippet.new(snippet_params)
 
     @snippet.save
 
-    respond_with @snippet, :location => admin_snippets_url
+    respond_with @snippet, location: admin_snippets_url
   end
 
   def edit
-    add_breadcrumb "Edit", :edit_admin_snippet_url
+    add_breadcrumb 'Edit', :edit_admin_snippet_url
 
     respond_with @snippet
   end
 
   def update
-    add_breadcrumb "Edit", :edit_admin_snippet_url
-    flash[:notice] = "Snippet saved successfully!" if @snippet.update_attributes(snippet_params)
-    respond_with @snippet, :location => admin_snippets_url
+    add_breadcrumb 'Edit', :edit_admin_snippet_url
+    flash[:notice] = 'Snippet saved successfully!' if @snippet.update_attributes(snippet_params)
+    respond_with @snippet, location: admin_snippets_url
   end
 
   def destroy
-    flash[:notice] = "Snippet removed!" if @snippet.destroy
-    respond_with @snippet,:location => admin_snippets_url
+    flash[:notice] = 'Snippet removed!' if @snippet.destroy
+    respond_with @snippet, location: admin_snippets_url
   end
 
+  private
 
-private
   def load_snippet
-    @snippet = SpudSnippet.where(:id => params[:id]).first
+    @snippet = SpudSnippet.where(id: params[:id]).first
     if @snippet.blank?
-      flash[:error] = "Snippet does not exist!"
-      redirect_to admin_snippets_url and return false
+      flash[:error] = 'Snippet does not exist!'
+      redirect_to(admin_snippets_url) && (return false)
     end
   end
 

data/app/controllers/cms/sitemaps_controller.rb

@@ -1,7 +1,7 @@
 class Cms::SitemapsController < Spud::ApplicationController
-	respond_to :xml
-	def show
-		@pages = SpudPage.published_pages.viewable.order(:spud_page_id)
-		respond_with @pages
-	end
+  respond_to :xml
+  def show
+    @pages = SpudPage.published_pages.viewable.order(:spud_page_id)
+    respond_with @pages
+  end
 end

data/app/controllers/pages_controller.rb

@@ -1,48 +1,44 @@
 class PagesController < ApplicationController
-	include SpudCmsLayoutActions
+  include SpudCmsLayoutActions
 
-	respond_to :html
-	before_filter :set_default_content_type
+  respond_to :html
+  before_action :set_default_content_type
 
-	def show
-		# prevents 500 errors if a url like "/home.jpg" is hit
-		if request.format != :html
-			render_404
-			return
-		end
+  def show
+    # prevents 500 errors if a url like "/home.jpg" is hit
+    if request.format != :html
+      render_404
+      return
+    end
 
-		url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
-		@page = SpudPage.published_pages.find_by(:url_name => url_name)
+    url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
+    @page = SpudPage.published_pages.find_by(url_name: url_name)
 
-		if @page.blank?
-			render_404
-			return
-		end
+    if @page.blank?
+      render_404
+      return
+    end
 
-		if @page.is_private?
-			return if defined?(require_user) && require_user == false
-		end
+    if @page.is_private?
+      return if defined?(require_user) && require_user == false
+    end
 
-		layout = @page.layout || Spud::Cms.default_page_layout
+    layout = @page.layout || Spud::Cms.default_page_layout
 
-		action_name = "#{layout}_action"
-		if respond_to?(action_name)
-			send(action_name, request.method.downcase.to_sym)
-		end
+    action_name = "#{layout}_action"
+    send(action_name, request.method.downcase.to_sym) if respond_to?(action_name)
 
-		render :layout => layout
-	end
+    render layout: layout
+  end
 
-private
+  private
 
-	def render_404
-		raise Spud::NotFoundError.new({:item => 'page'})
- 	end
+  def render_404
+    raise Spud::NotFoundError, item: 'page'
+   end
 
- 	def set_default_content_type
- 		if params[:format].blank?
-			request.format = :html
-		end
- 	end
+  def set_default_content_type
+    request.format = :html if params[:format].blank?
+   end
 
 end