comfortable_mexican_sofa 1.12.11 → 2.0.0

data/app/controllers/comfy/admin/cms/revisions_controller.rb

@@ -1,18 +1,20 @@
 class Comfy::Admin::Cms::RevisionsController < Comfy::Admin::Cms::BaseController
 
   before_action :load_record
-  before_action :load_revision, :except => :index
+  before_action :load_revision, except: :index
   before_action :authorize
 
+  helper_method :record_path
+
   def index
-    redirect_to :action => :show, :id => @record.revisions.first.try(:id) || 0
+    redirect_to action: :show, id: @record.revisions.order(created_at: :desc).first.try(:id) || 0
   end
 
   def show
     case @record
-    when Comfy::Cms::Page
-      @current_content    = @record.blocks.inject({}){|c, b| c[b.identifier] = b.content; c }
-      @versioned_content  = @record.blocks.inject({}){|c, b| c[b.identifier] = @revision.data['blocks_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
+    when Comfy::Cms::Page, Comfy::Cms::Translation
+      @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
+      @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
     else
       @current_content    = @record.revision_fields.inject({}){|c, f| c[f] = @record.send(f); c }
       @versioned_content  = @record.revision_fields.inject({}){|c, f| c[f] = @revision.data[f]; c }
@@ -22,7 +24,7 @@ class Comfy::Admin::Cms::RevisionsController < Comfy::Admin::Cms::BaseController
   def revert
     @record.restore_from_revision(@revision)
     flash[:success] = I18n.t('comfy.admin.cms.revisions.reverted')
-    redirect_to_record
+    redirect_to record_path
   end
 
 protected
@@ -30,11 +32,14 @@ protected
   def load_record
     @record = if params[:layout_id]
       ::Comfy::Cms::Layout.find(params[:layout_id])
+    elsif params[:translation_id]
+      ::Comfy::Cms::Translation.find(params[:translation_id])
     elsif params[:page_id]
       ::Comfy::Cms::Page.find(params[:page_id])
     elsif params[:snippet_id]
       ::Comfy::Cms::Snippet.find(params[:snippet_id])
     end
+
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
     redirect_to comfy_admin_cms_path
@@ -44,15 +49,19 @@ protected
     @revision = @record.revisions.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.revisions.not_found')
-    redirect_to_record
+    redirect_to record_path
   end
 
-  def redirect_to_record
-    redirect_to case @record
-      when ::Comfy::Cms::Layout  then edit_comfy_admin_cms_site_layout_path(@site, @record)
-      when ::Comfy::Cms::Page    then edit_comfy_admin_cms_site_page_path(@site, @record)
-      when ::Comfy::Cms::Snippet then edit_comfy_admin_cms_site_snippet_path(@site, @record)
+  def record_path(record = @record)
+    case record
+      when ::Comfy::Cms::Layout
+        edit_comfy_admin_cms_site_layout_path(@site, @record)
+      when ::Comfy::Cms::Page
+        edit_comfy_admin_cms_site_page_path(@site, @record)
+      when ::Comfy::Cms::Translation
+        edit_comfy_admin_cms_site_page_translation_path(@site, @record.page, @record)
+      when ::Comfy::Cms::Snippet
+        edit_comfy_admin_cms_site_snippet_path(@site, @record)
     end
   end
-
-end
+end

data/app/controllers/comfy/admin/cms/sites_controller.rb

@@ -1,14 +1,14 @@
 class Comfy::Admin::Cms::SitesController < Comfy::Admin::Cms::BaseController
 
   skip_before_action  :load_admin_site,
-                      :load_fixtures
+                      :load_seeds
 
-  before_action :build_site,  :only => [:new, :create]
-  before_action :load_site,   :only => [:edit, :update, :destroy]
+  before_action :build_site,  only: [:new, :create]
+  before_action :load_site,   only: [:edit, :update, :destroy]
   before_action :authorize
 
   def index
-    return redirect_to :action => :new if ::Comfy::Cms::Site.count == 0
+    return redirect_to action: :new if ::Comfy::Cms::Site.count == 0
     @site = ::Comfy::Cms::Site.find_by_id(session[:site_id])
     @sites ||= ::Comfy::Cms::Site.all
   end
@@ -27,22 +27,22 @@ class Comfy::Admin::Cms::SitesController < Comfy::Admin::Cms::BaseController
     redirect_to comfy_admin_cms_site_layouts_path(@site)
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.sites.creation_failure')
-    render :action => :new
+    render action: :new
   end
 
   def update
     @site.update_attributes!(site_params)
     flash[:success] = I18n.t('comfy.admin.cms.sites.updated')
-    redirect_to :action => :edit, :id => @site
+    redirect_to action: :edit, id: @site
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.sites.update_failure')
-    render :action => :edit
+    render action: :edit
   end
 
   def destroy
     @site.destroy
     flash[:success] = I18n.t('comfy.admin.cms.sites.deleted')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
 protected
@@ -57,11 +57,10 @@ protected
     I18n.locale = ComfortableMexicanSofa.config.admin_locale || @site.locale
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.sites.not_found')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
   def site_params
     params.fetch(:site, {}).permit!
   end
-
 end

data/app/controllers/comfy/admin/cms/snippets_controller.rb

@@ -1,12 +1,12 @@
 class Comfy::Admin::Cms::SnippetsController < Comfy::Admin::Cms::BaseController
 
-  before_action :build_snippet, :only => [:new, :create]
-  before_action :load_snippet,  :only => [:edit, :update, :destroy]
+  before_action :build_snippet, only: [:new, :create]
+  before_action :load_snippet,  only: [:edit, :update, :destroy]
   before_action :authorize
 
   def index
-    return redirect_to :action => :new if @site.snippets.count == 0
-    @snippets = @site.snippets.includes(:categories).for_category(params[:category])
+    return redirect_to action: :new if @site.snippets.count == 0
+    @snippets = @site.snippets.includes(:categories).for_category(params[:categories]).order(:position)
   end
 
   def new
@@ -20,30 +20,30 @@ class Comfy::Admin::Cms::SnippetsController < Comfy::Admin::Cms::BaseController
   def create
     @snippet.save!
     flash[:success] = I18n.t('comfy.admin.cms.snippets.created')
-    redirect_to :action => :edit, :id => @snippet
+    redirect_to action: :edit, id: @snippet
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.snippets.creation_failure')
-    render :action => :new
+    render action: :new
   end
 
   def update
     @snippet.update_attributes!(snippet_params)
     flash[:success] = I18n.t('comfy.admin.cms.snippets.updated')
-    redirect_to :action => :edit, :id => @snippet
+    redirect_to action: :edit, id: @snippet
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.snippets.update_failure')
-    render :action => :edit
+    render action: :edit
   end
 
   def destroy
     @snippet.destroy
     flash[:success] = I18n.t('comfy.admin.cms.snippets.deleted')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
   def reorder
     (params[:comfy_cms_snippet] || []).each_with_index do |id, index|
-      ::Comfy::Cms::Snippet.where(:id => id).update_all(:position => index)
+      ::Comfy::Cms::Snippet.where(id: id).update_all(position: index)
     end
     head :ok
   end
@@ -58,7 +58,7 @@ protected
     @snippet = @site.snippets.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.snippets.not_found')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
   def snippet_params

data/app/controllers/comfy/admin/cms/translations_controller.rb

@@ -0,0 +1,98 @@
+class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseController
+
+  helper_method :translation_select_options
+
+  before_action :load_page
+  before_action :build_translation,   only: [:new, :create]
+  before_action :load_translation,    only: [:edit, :update, :destroy]
+  before_action :authorize
+  before_action :preview_translation, only: [:create, :update]
+
+  def new
+    render
+  end
+
+  def edit
+    render
+  end
+
+  def create
+    @translation.save!
+    flash[:success] = I18n.t('comfy.admin.cms.translations.created')
+    redirect_to action: :edit, id: @translation
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:danger] = I18n.t('comfy.admin.cms.translations.creation_failure')
+    render action: :new
+  end
+
+  def update
+    @translation.update_attributes!(translation_params)
+    flash[:success] = I18n.t('comfy.admin.cms.translations.updated')
+    redirect_to action: :edit, id: @translation
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:danger] = I18n.t('comfy.admin.cms.translations.update_failure')
+    render action: :edit
+  end
+
+  def destroy
+    @translation.destroy
+    flash[:success] = I18n.t('comfy.admin.cms.translations.deleted')
+    redirect_to edit_comfy_admin_cms_site_page_path(@site, @page)
+  end
+
+  def form_fragments
+    @translation = @page.translations.find_by(id: params[:id]) || @page.translations.new
+    @translation.layout = @site.layouts.find_by(id: params[:layout_id])
+  end
+
+private
+
+  def translation_select_options
+    all = ComfortableMexicanSofa.config.locales
+    taken = @page.translations.pluck(:locale) + [@site.locale] - [@translation.locale]
+    all.except(*taken).map{|k, v| ["#{v} (#{k})", k]}
+  end
+
+  def load_page
+    @page = @site.pages.find(params[:page_id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.pages.not_found')
+    redirect_to comfy_admin_cms_site_pages_path(@site)
+  end
+
+  def build_translation
+    @translation = @page.translations.new(translation_params)
+    @translation.layout ||= @page.layout
+  end
+
+  def load_translation
+    @translation = @page.translations.find(params[:id])
+    @translation.attributes = translation_params
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.translations.not_found')
+    redirect_to edit_comfy_admin_cms_site_page_path(@site, @page)
+  end
+
+  def translation_params
+    params.fetch(:translation, {}).permit!
+  end
+
+  def preview_translation
+    if params[:preview]
+      layout = @translation.layout.app_layout.blank?? false : @translation.layout.app_layout
+      @cms_site   = @page.site
+      @cms_layout = @translation.layout
+      @cms_page   = @page
+
+      # Make sure to use the site locale to render the preview becaue it might
+      # be different from the admin locale.
+      I18n.locale = @translation.locale
+
+      # Chrome chokes on content with iframes. Issue #434
+      response.headers['X-XSS-Protection'] = '0'
+
+      # raise
+      render inline: @translation.render, layout: layout, content_type: 'text/html'
+    end
+  end
+end

data/app/controllers/comfy/cms/assets_controller.rb

@@ -1,18 +1,18 @@
 class Comfy::Cms::AssetsController < Comfy::Cms::BaseController
-  
+
   skip_before_action :verify_authenticity_token
-  
+
   before_action :load_cms_layout,
                 :use_null_session
-                
+
   after_action :set_cache_control_header
-  
+
   def render_css
-    render :body => @cms_layout.css, :content_type => 'text/css'
+    render body: @cms_layout.css, content_type: 'text/css'
   end
 
   def render_js
-    render :body => @cms_layout.js, :content_type => 'application/javascript'
+    render body: @cms_layout.js, content_type: 'application/javascript'
   end
 
 protected
@@ -20,9 +20,9 @@ protected
   def load_cms_layout
     @cms_layout = @cms_site.layouts.find_by_identifier!(params[:identifier])
   rescue ActiveRecord::RecordNotFound
-    render :body => nil, :status => 404
+    render body: nil, status: 404
   end
-  
+
   # null_session avoids cookies and flash updates
   def use_null_session
     ActionController::RequestForgeryProtection::ProtectionMethods::NullSession.new(self)
@@ -34,5 +34,4 @@ protected
       response.headers['Cache-Control'] = "public, max-age=#{1.year.to_i}"
     end
   end
-  
-end
+end

data/app/controllers/comfy/cms/base_controller.rb

@@ -20,9 +20,7 @@ protected
           raise ActionController::RoutingError.new('Site Not Found')
         end
       end
-      I18n.locale = @locale = @cms_site.locale.to_sym
     else
-      I18n.locale = @locale = I18n.default_locale
       raise ActionController::RoutingError.new('Site Not Found')
     end
   end

data/app/controllers/comfy/cms/content_controller.rb

@@ -6,65 +6,84 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
   # Authorization module must have `authorize` method
   include ComfortableMexicanSofa.config.public_authorization.to_s.constantize
 
-  before_action :load_fixtures
+  before_action :load_seeds
   before_action :load_cms_page,
                 :authenticate,
                 :authorize,
-                :only => :show
-
-  rescue_from ActiveRecord::RecordNotFound, :with => :page_not_found
+                only: :show
 
   def show
     if @cms_page.target_page.present?
-      redirect_to @cms_page.target_page.url(:relative)
+      redirect_to @cms_page.target_page.url(relative: true)
     else
       respond_to do |format|
         format.html { render_page }
-        format.json { render :json => @cms_page }
+        format.json {
+          json_page = @cms_page.as_json(except: [:content_cache])
+          json_page.merge!(content: render_to_string(
+            inline: @cms_page.content_cache,
+            layout: false
+          ))
+          render json: json_page
+        }
       end
     end
   end
 
-  def render_sitemap
-    render
-  end
-
 protected
 
-  def render_page(status = 200)
-    if @cms_layout = @cms_page.layout
-      app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
-      render  :inline       => @cms_page.content_cache,
-              :layout       => app_layout,
-              :status       => status,
-              :content_type => mime_type
-    else
-      render :plain => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
-    end
+  def render_page(status = :ok)
+    render  inline:       @cms_page.content_cache,
+            layout:       app_layout,
+            status:       status,
+            content_type: mime_type
   end
 
   # it's possible to control mimetype of a page by creating a `mime_type` field
   def mime_type
-    mime_block = @cms_page.blocks.find_by_identifier(:mime_type)
-    mime_block && mime_block.content || 'text/html'
+    mime_block = @cms_page.fragments.detect{|f| f.identifier == "mime_type"}
+    mime_block && mime_block.content || "text/html"
   end
 
-  def load_fixtures
-    return unless ComfortableMexicanSofa.config.enable_fixtures
-    ComfortableMexicanSofa::Fixture::Importer.new(@cms_site.identifier).import!
+  def app_layout
+    return false if request.xhr? || !@cms_layout
+    @cms_layout.app_layout.present?? @cms_layout.app_layout : false
   end
 
+  def load_seeds
+    return unless ComfortableMexicanSofa.config.enable_seeds
+    ComfortableMexicanSofa::Seeds::Importer.new(@cms_site.identifier).import!
+  end
+
+  # Attempting to populate @cms_page and @cms_layout instance variables so they
+  # can be used in view helpers/partials
   def load_cms_page
-    @cms_page = @cms_site.pages.published.find_by_full_path!("/#{params[:cms_path]}")
+    unless find_cms_page_by_full_path("/#{params[:cms_path]}")
+      if find_cms_page_by_full_path("/404")
+        render_page(:not_found)
+      else
+        message = "Page Not Found at: \"#{params[:cms_path]}\""
+        raise ActionController::RoutingError.new(message)
+      end
+    end
   end
 
-  def page_not_found
-    @cms_page = @cms_site.pages.published.find_by_full_path!('/404')
+  # Getting page and setting content_cache and fragments data if we need to
+  # serve translation data
+  def find_cms_page_by_full_path(full_path)
+    @cms_page   = @cms_site.pages.published.find_by!(full_path: full_path)
+    @cms_layout = @cms_page.layout
 
-    respond_to do |format|
-      format.html { render_page(404) }
+    # There are translations for this page and locale is not the default site
+    # locale, so we need to grab translation data.
+    if @cms_page.translations.any? && @cms_site.locale != I18n.locale.to_s
+      @cms_page.translate!(I18n.locale)
+      @cms_layout = @cms_page.layout
     end
+
+    return @cms_page
+
   rescue ActiveRecord::RecordNotFound
-    raise ActionController::RoutingError.new("Page Not Found at: \"#{params[:cms_path]}\"")
+    nil
   end
 end