landable 1.13.1 → 1.13.2

data/app/controllers/landable/api/audits_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
@@ -33,10 +33,11 @@ module Landable
       end
 
       private
-        def audit_params
-          params[:audit][:flags] ||= []
-          params.require(:audit).permit(:id, :approver, :notes, :created_at, flags: [])
-        end
+
+      def audit_params
+        params[:audit][:flags] ||= []
+        params.require(:audit).permit(:id, :approver, :notes, :created_at, flags: [])
+      end
     end
   end
 end

data/app/controllers/landable/api/configurations_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api

data/app/controllers/landable/api/directories_controller.rb

@@ -1,10 +1,10 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
     class DirectoriesController < ApiController
       def index
-        ids = params[:ids] if params[:ids].present? and params[:ids].is_a? Array
+        ids = params[:ids] if params[:ids].present? && params[:ids].is_a?(Array)
         ids ||= ['/']
 
         listings = ids.map { |id| Directory.listing id }

data/app/controllers/landable/api/page_revisions_controller.rb

@@ -1,11 +1,9 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
     class PageRevisionsController < ApiController
-      skip_before_filter :require_author!, if: proc { |c|
-        c.action_name == 'show' && c.request.format == :html
-      }
+      skip_before_filter :require_author!, if: proc { |c| c.action_name == 'show' && c.request.format == :html }
 
       def index
         page = Page.find(params[:page_id])

data/app/controllers/landable/api/pages_controller.rb

@@ -5,7 +5,7 @@ module Landable
     class PagesController < ApiController
       # filters
       before_filter :load_page, except: [:create, :index, :preview]
-      
+
       # RESTful methods
       def create
         page = Page.new page_params
@@ -14,53 +14,51 @@ module Landable
 
         respond_with page, status: :created, location: page_url(page)
       end
-      
+
       def destroy
         @page.updated_by_author = current_author
         @page.try(:deactivate)
 
         respond_with @page
       end
-      
+
       def index
         search = Landable::PageSearchEngine.new search_params.merge(ids: params[:ids]), limit: 100
-        
+
         respond_with search.results, meta: search.meta
       end
 
       def reactivate
         @page.try(:reactivate)
-        
+
         respond_with @page
       end
-      
+
       def show
         respond_with @page
       end
-      
+
       def update
         @page.updated_by_author = current_author
         @page.update_attributes!(page_params)
-        
+
         respond_with @page
       end
-      
+
       # custom  methods
       def publish
-        @page.publish! author_id: current_author.id, notes: params[:notes], is_minor: !!params[:is_minor]
-        
+        @page.publish! author_id: current_author.id, notes: params[:notes], is_minor: !params[:is_minor].nil?
+
         respond_with @page
       end
-      
+
       def preview
         page  = Page.where(page_id: page_params[:id]).first_or_initialize
         page.attributes = page_params
 
         # run the validators and render
-        if page.valid?
-          content = generate_preview_for(page)
-        end
-        
+        content = generate_preview_for(page) if page.valid?
+
         respond_to do |format|
           format.json do
             render json: {
@@ -72,38 +70,39 @@ module Landable
           end
         end
       end
-      
+
       def screenshots
         Landable::ScreenshotService.call Page.find(params[:id])
 
         # '{}' is valid json, which jquery will accept as a successful response. '' is not.
         render json: {}, status: 202
       end
-      
+
       private
-        def load_page
-          @page = Page.find(params[:id])
-        end
-      
-        def search_params
-          @search_params ||=
-            begin
-              hash = params.permit(search: [:path])
-              hash[:search] || {}
-            end
-        end
 
-        def page_params
-          params[:page][:audit_flags] ||= []
-          params.require(:page).permit(:id, :path, :theme_id,
-                                       :category_id, :title,
-                                       :head_content, :body,
-                                       :status_code, :redirect_url,
-                                       :lock_version, :abstract,
-                                       :hero_asset_name, :page_name,
-                                       audit_flags: [],
-                                       meta_tags: [:description, :keywords, :robots])
-        end
+      def load_page
+        @page = Page.find(params[:id])
+      end
+
+      def search_params
+        @search_params ||=
+          begin
+            hash = params.permit(search: [:path])
+            hash[:search] || {}
+          end
+      end
+
+      def page_params
+        params[:page][:audit_flags] ||= []
+        params.require(:page).permit(:id, :path, :theme_id,
+                                     :category_id, :title,
+                                     :head_content, :body,
+                                     :status_code, :redirect_url,
+                                     :lock_version, :abstract,
+                                     :hero_asset_name, :page_name,
+                                     audit_flags: [],
+                                     meta_tags: [:description, :keywords, :robots])
+      end
     end
   end
 end

data/app/controllers/landable/api/template_revisions_controller.rb

@@ -1,9 +1,8 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
     class TemplateRevisionsController < ApiController
-
       def index
         template = Template.find(params[:template_id])
         respond_with template.revisions.order(:ordinal).reverse

data/app/controllers/landable/api/templates_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
@@ -10,7 +10,7 @@ module Landable
       def create
         template = Template.new(template_params)
         template.save!
-        
+
         respond_with template, status: :created, location: template_url(template)
       end
 
@@ -31,20 +31,20 @@ module Landable
 
       def update
         @template.update_attributes!(template_params)
-        
+
         respond_with @template
       end
 
       # custom methods
       def publish
-        @template.publish! author_id: current_author.id, notes: params[:notes], is_minor: !!params[:is_minor]
-        
+        @template.publish! author_id: current_author.id, notes: params[:notes], is_minor: !params[:is_minor].nil?
+
         respond_with @template
       end
 
       def reactivate
         @template.try(:reactivate)
-        
+
         respond_with @template
       end
 
@@ -69,15 +69,16 @@ module Landable
       end
 
       private
-        def template_params
-          params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url, 
-                                           :slug, :is_layout, :is_publishable,
-                                           audit_flags: [])
-        end
 
-        def load_template
-          @template = Template.find(params[:id])
-        end
+      def template_params
+        params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url,
+                                         :slug, :is_layout, :is_publishable,
+                                         audit_flags: [])
+      end
+
+      def load_template
+        @template = Template.find(params[:id])
+      end
     end
   end
 end

data/app/controllers/landable/api/themes_controller.rb

@@ -10,13 +10,13 @@ module Landable
       def create
         theme = Theme.new(theme_params)
         theme.save!
-        
+
         respond_with theme, status: :created, location: theme_url(theme)
       end
 
       def destroy
         @theme.try(:deactivate)
-        
+
         respond_with @theme
       end
 
@@ -26,7 +26,7 @@ module Landable
 
       def reactivate
         @theme.try(:reactivate)
-        
+
         respond_with @theme
       end
 
@@ -36,7 +36,7 @@ module Landable
 
       def update
         @theme.update_attributes!(theme_params)
-        
+
         respond_with @theme
       end
 
@@ -48,31 +48,32 @@ module Landable
         params[:theme][:asset_ids].try(:each) do |asset_id|
           theme.attachments.add Asset.find(asset_id)
         end
-        
+
         content = render_to_string(
           text: RenderService.call(page),
           layout: page.theme.file || false
         )
-        
+
         respond_to do |format|
           format.html do
             render text: content, layout: false, content_type: 'text/html'
           end
-          
+
           format.json do
-            render json: {theme: {preview: content}}
+            render json: { theme: { preview: content } }
           end
         end
       end
 
       private
-        def load_theme
-          @theme = Theme.find(params[:id])
-        end
 
-        def theme_params
-          params.require(:theme).permit(:id, :name, :body, :description, :thumbnail_url)
-        end
+      def load_theme
+        @theme = Theme.find(params[:id])
+      end
+
+      def theme_params
+        params.require(:theme).permit(:id, :name, :body, :description, :thumbnail_url)
+      end
     end
   end
 end

data/app/controllers/landable/api_controller.rb

@@ -1,6 +1,6 @@
-require_dependency "landable/application_controller"
-require_dependency "landable/api_responder"
-require_dependency "landable/author"
+require_dependency 'landable/application_controller'
+require_dependency 'landable/api_responder'
+require_dependency 'landable/author'
 
 module Landable
   class ApiController < ApplicationController
@@ -16,7 +16,7 @@ module Landable
     respond_to :json
     self.responder = Landable::ApiResponder
 
-    rescue_from ActiveRecord::RecordNotFound do |ex|
+    rescue_from ActiveRecord::RecordNotFound do
       head 404
     end
 
@@ -24,7 +24,7 @@ module Landable
       render json: { errors: ex.record.errors }, status: :unprocessable_entity
     end
 
-    rescue_from ActionController::UnknownFormat do |ex|
+    rescue_from ActionController::UnknownFormat do
       head :not_acceptable
     end
 
@@ -36,15 +36,14 @@ module Landable
       if ex.message =~ /invalid input syntax for uuid/
         head :not_found
       else
-        raise ex
+        fail ex
       end
     end
 
-
     # here's looking at you, http://developer.github.com/v3/media/
     # mime type matching is still handled by rails - see lib/landable/mime_types.rb
 
-    API_MEDIA_REGEX = /^application\/vnd\.landable(\.v(?<version>[\w\-]+))?(\.(?<param>(?:[\w\-]+)))?(\+(?<format>[\w\-]+))?/
+    API_MEDIA_REGEX = %r{^application\/vnd\.landable(\.v(?<version>[\w\-]+))?(\.(?<param>(?:[\w\-]+)))?(\+(?<format>[\w\-]+))?}
 
     def api_media
       @api_media ||= begin
@@ -53,7 +52,7 @@ module Landable
         {
           version: Landable::VERSION::STRING,
           format:  request.format.symbol,
-          param:   accept['param'].presence,
+          param:   accept['param'].presence
         }
       end
     end
@@ -76,7 +75,8 @@ module Landable
     end
 
     def generate_preview_for(page)
-      if layout = page.theme.try(:file) || false
+      layout = page.theme.try(:file)
+      if layout
         with_format(:html) do
           render_to_string text: RenderService.call(page), layout: layout
         end
@@ -91,6 +91,5 @@ module Landable
         @current_author = Author.authenticate!(username, token)
       end
     end
-
   end
 end

data/app/controllers/landable/public/pages_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "landable/application_controller"
+require_dependency 'landable/application_controller'
 
 module Landable
   module Public
@@ -18,7 +18,7 @@ module Landable
       end
 
       def current_snapshot
-        @current_snapshot ||= current_page.published_revision.try(:snapshot) or Page.missing
+        @current_snapshot ||= current_page.published_revision.try(:snapshot) || Page.missing
       end
     end
   end

data/app/controllers/landable/public/preview/page_revisions_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "landable/application_controller"
+require_dependency 'landable/application_controller'
 
 module Landable
   module Public
@@ -13,4 +13,4 @@ module Landable
       end
     end
   end
-end
+end