slices 1.0.5 → 2.0.0

data/app/controllers/admin/admin_controller.rb

@@ -1,10 +1,25 @@
-class Admin::AdminController < SlicesController
+class Admin::AdminController < ActionController::Base
   before_filter :authenticate_admin!
+  around_filter :set_locale
+
+  append_view_path(File.join(Rails.root, *%w[app slices]))
 
   protected
 
   def presenter_class(page_class)
     Object.const_get("#{page_class.name}Presenter")
   end
+
+  private
+
+  def request_locale
+    params[:locale]
+  end
+
+  def set_locale
+    I18n.with_locale(request_locale || I18n.default_locale) do
+      yield
+    end
+  end
 end
 

data/app/controllers/admin/assets_controller.rb

@@ -32,7 +32,7 @@ class Admin::AssetsController < Admin::AdminController
 
   def destroy
     asset = Asset.find(params[:id])
-    asset.soft_destroy!
+    asset.destroy
     respond_to do |format|
       format.html { redirect_to admin_assets_path }
       format.json { render json: true }

data/app/controllers/admin/entries_controller.rb

@@ -4,7 +4,7 @@ class Admin::EntriesController < Admin::AdminController
   respond_to :json, :html
 
   def index
-    @page = Page.find_by_id! params[:page_id]
+    @page = Page.find params[:page_id]
 
     respond_to do |format|
       format.html do

data/app/controllers/admin/pages_controller.rb

@@ -6,7 +6,6 @@ class Admin::PagesController < Admin::AdminController
   respond_to :text, only: [:show]
 
   before_filter :find_all_slices, only: :update
-  after_filter :expire_fragments, only: [:update, :create, :destroy]
 
   def new
     @page = Page.new(parent_id: params[:parent_id]) # TODO: change parent_id to path
@@ -27,7 +26,7 @@ class Admin::PagesController < Admin::AdminController
   end
 
   def show
-    page = Page.find_by_id!(params[:id])
+    page = Page.find(params[:id])
     @page = presenter_class(page.class).new(page)
     @layout = Layout.new(page.layout)
 
@@ -44,12 +43,12 @@ class Admin::PagesController < Admin::AdminController
         render hbs_path
       end
     end
-  rescue Page::NotFound
+  rescue Mongoid::Errors::DocumentNotFound
     redirect_to admin_site_maps_path
   end
 
   def update
-    @page = Page.find_by_id!(params[:id])
+    @page = Page.find(params[:id])
     if entry_page?
       params[:page][:set_slices] = params[:page].delete(:slices)
     end
@@ -64,7 +63,7 @@ class Admin::PagesController < Admin::AdminController
   end
 
   def destroy
-    @page = Page.find_by_id!(params[:id])
+    @page = Page.find(params[:id])
     @page.destroy
     respond_to do |format|
       format.html { redirect_to admin_site_maps_path }
@@ -90,14 +89,6 @@ class Admin::PagesController < Admin::AdminController
       params.has_key?(:entries)
     end
 
-    def expire_fragments
-      record = @page
-      type = record.class.to_s.underscore
-      id = record.id.to_s
-      expire_fragment(/.*#{type}.*/)
-      expire_fragment(/.*#{id}.*/)
-    end
-
     def find_all_slices
       Slices::AvailableSlices.all
     end

data/app/controllers/admin/site_maps_controller.rb

@@ -8,8 +8,7 @@ class Admin::SiteMapsController < Admin::AdminController
 
   def update
     SiteMap.rebuild(params[:sitemap])
-    expire_fragment(/navigation/)
-    head status: :ok
+    head :no_content
   end
 end
 

data/app/controllers/slices_controller.rb

@@ -8,10 +8,11 @@ class SlicesController < ActionController::Base
 
   append_view_path(File.join(Rails.root, *%w[app slices]))
 
+  around_filter :set_locale
   define_callbacks :render_page, terminator: "response_body"
 
   def self.should_raise_exceptions?
-    ! Rails.env.production?
+    Rails.application.config.consider_all_requests_local
   end
 
   protected
@@ -59,5 +60,15 @@ class SlicesController < ActionController::Base
   def page_layout(page)
     page.layout
   end
+
+  def request_locale
+    params[:locale]
+  end
+
+  def set_locale
+    I18n.with_locale(request_locale || I18n.default_locale) do
+      yield
+    end
+  end
 end
 

data/app/helpers/admin/admin_helper.rb

@@ -60,4 +60,12 @@ module Admin::AdminHelper
     @page.try(:name) || "Slices CMS"
   end
 
+  # Create a link to view the current page on the live site
+  #
+  # @!visibility private
+  def link_to_view_page(page, options = {})
+    link_options = { class: 'view-page', target: '_blank' }.merge(options)
+    path = page_path(page.path, locale: I18n.locale).gsub('//', '/')
+    link_to 'View page on site', path, link_options
+  end
 end

data/app/helpers/admin/site_maps_helper.rb

@@ -3,12 +3,46 @@
 module Admin::SiteMapsHelper
   include Admin::AdminHelper
 
+  # Returns all pages that should appear in the sitemap
+  #
+  # @!visibility private
+  def sitemap_pages
+    @sitemap_pages ||= proper_pages.only(:id, :name, :page_id, :path).group_by(&:page_id)
+  end
+
+  # Returns children for a given page
+  #
+  # @!visibility private
+  def sitemap_children_for(page)
+    sitemap_pages.fetch(page.id, []).sort_by(&:position)
+  end
+
+  # Returns criteria for pages that aren't entries
+  #
+  # @!visibility private
+  def proper_pages
+    Page.where(:_type.in => proper_types)
+  end
+
+  # Returns page types that aren't for entries
+  #
+  # @!visibility private
+  def proper_types
+    Page.distinct(:_type).reject { |type| type.constantize.new.entry? }
+  end
+
   # Render a list of pages
   #
   # @!visibility private
   def list_pages(pages)
     pages.inject(''.html_safe) do |html, page|
-      html << render(partial: page_partial(page), locals: {page: page} )
+      html << render(
+        partial: page_partial(page),
+        locals: {
+          page: page,
+          children: sitemap_children_for(page),
+        }
+      )
     end
   end
 
@@ -93,12 +127,13 @@ module Admin::SiteMapsHelper
     link_to 'Edit Entry Template', url, class: 'button'
   end
 
-  # Create a link to view the current page on the live site
+  # Return HTMl class names for a page
   #
   # @!visibility private
-  def link_to_view_page(page)
-    return unless page.active?
-    link_to 'View page on site', page.path,
-            class: 'view-page', target: '_blank'
+  def page_classes(page)
+    classes = []
+    classes << 'home' if page.home?
+    classes << page.class.name.underscore.dasherize
+    classes.join ' '
   end
 end

data/app/helpers/navigation_helper.rb

@@ -23,7 +23,7 @@ module NavigationHelper
   # @return [String]
   #
   def primary_navigation(id = 'primary_navigation')
-    cache 'page/navigation/' + id + '/' + @page.id.to_s do
+    cache cache_key_for_navigation(id) do
       benchmark 'Rendered primary_navigation' do
         nav = navigation(page: Page.home, depth: 1, id: id)
         safe_concat nav
@@ -48,11 +48,12 @@ module NavigationHelper
   #
   # @param  [Hash]       options
   # @option options [Integer] :depth (1)                    Number of levels to render
-  # @option options [Integer] :id ('secondary_navigation')  Id of surrounding UL
+  # @option options [String] :id ('secondary_navigation')  Id of surrounding UL
   # @return [String]
   #
   def secondary_navigation(options = {})
-    cache 'page/navigation/secondary/' + @page.id.to_s do
+    name = options.fetch('id') { 'secondary_navigation' }
+    cache cache_key_for_navigation(name) do
       benchmark 'Rendered secondary_navigation' do
         secondary_ancestors = (@page.ancestors[-2] || @page).navigable_children
         nav = if secondary_ancestors.empty? || @page.home?
@@ -191,5 +192,9 @@ module NavigationHelper
   def nav_list_identifier(page)
     page.home? ? 'nav-home' : ('nav' + page.path.gsub('/', '-'))
   end
+
+  def cache_key_for_navigation(name)
+    ['pages', @page.id, name, Page.last_changed_at]
+  end
 end
 

data/app/helpers/pages_helper.rb

@@ -56,8 +56,8 @@ module PagesHelper
   def edit_in_cms
     if admin_signed_in?
       links = []
-      links << link_to("Edit #{@page.class.to_s.underscore.humanize} in CMS", admin_page_path(@page), target: '_blank')
-      links << link_to('Edit template in CMS', admin_page_path(@page.parent, entries: 1), target: '_blank') if @page.entry?
+      links << link_to("Edit #{@page.class.to_s.underscore.humanize} in CMS", admin_page_path(@page, locale: I18n.locale), target: '_blank')
+      links << link_to('Edit template in CMS', admin_page_path(@page.parent, entries: 1, locale: I18n.locale), target: '_blank') if @page.entry?
       content = links.collect {|l| content_tag(:p, l) }.join.html_safe
 
       content_tag(:div, content, id: 'edit_in_cms')

data/app/helpers/snippets_helper.rb

@@ -0,0 +1,26 @@
+module SnippetsHelper
+
+  # Renders a snippet on the page
+  #
+  #   snippet 'address'
+  #   # => "54B Downham Road"
+  #
+  # @param  [String]     key                         Snippet key to lookup
+  # @return [String]
+  #
+  def snippet(key = nil)
+    Snippet.find_for_key(key)
+  end
+
+  # Renders a localized snippet for the current locale
+  #
+  #   localized_snippet 'address'
+  #   # => "54B Downham Road"
+  #
+  # @param  [String]     key                         Snippet key to lookup
+  # @return [String]
+  #
+  def localized_snippet(key = nil)
+    snippet("#{I18n.locale}.#{key}")
+  end
+end

data/app/models/admin.rb

@@ -25,8 +25,7 @@ class Admin
 
   text_search_in :name, :email
 
-  validates_uniqueness_of :email, case_sensitive: false, scope: :site_id
-  validates_presence_of :email
+  validates_uniqueness_of :email, case_sensitive: false
   validates_presence_of :encrypted_password
 
   devise :database_authenticatable, :recoverable, :rememberable,
@@ -36,7 +35,7 @@ class Admin
     self.super_user == true
   end
 
-  def as_json(options)
+  def as_json(options = {})
     super(options).tap do |json|
       json[:last_sign_in_at] = last_sign_in_at
 

data/app/models/asset.rb

@@ -15,7 +15,6 @@ class Asset
   field :file_fingerprint, type: String
   field :file_dimensions, type: Hash, default: {}
 
-  field :destroyed_at, type: Time
   field :tags, type: String
   field :page_cache, type: Array, default: []
 
@@ -34,17 +33,12 @@ class Asset
   after_file_post_process :store_dimensions, if: :is_image?
   before_save :reset_file_dimensions!, if: :file_fingerprint_changed?
   before_save :rename_file
+  after_destroy :remove_asset_from_pages
 
   has_and_belongs_to_many :pages
 
-  index(
-    [
-      [ :destroyed_at, Mongo::ASCENDING ],
-      [ :created_at, Mongo::DESCENDING ]
-    ]
-  )
-  index :file_fingerprint
-  index :_keywords
+  index({ file_fingerprint: 1 })
+  index({ _keywords: 1 }, { background: true })
 
   def self.make(*args)
     Slices::Asset::Maker.run(*args)
@@ -59,7 +53,7 @@ class Asset
   end
 
   def self.ordered_active
-    where(destroyed_at: nil).desc(:created_at)
+    desc(:created_at)
   end
 
   def as_json(options = nil)
@@ -139,16 +133,11 @@ class Asset
     end
   end
 
-  def soft_destroy!
-    update_attributes!(destroyed_at: Time.now)
-  end
-
-  def soft_destroyed?
-    destroyed_at.present?
-  end
-
-  def soft_restore!
-    update_attributes!(destroyed_at: nil)
+  def remove_asset_from_pages
+    pages.each do |page|
+      page.remove_asset(self)
+      page.save if page.changed?
+    end
   end
 
   def name

data/app/models/attachment.rb

@@ -1,10 +1,19 @@
 class Attachment
   include Mongoid::Document
+  include Slices::LocalizedFields
 
   belongs_to :asset
 
+  embedded_in :object, polymorphic: true
+
   def as_json *args
-    attributes.as_json.merge asset: asset.as_json
+    result = attributes.symbolize_keys.merge asset: asset.as_json
+
+    localized_field_names.each do |name|
+      result.merge!(name => send(name))
+    end
+
+    result
   end
 
 end

data/app/models/page.rb

@@ -9,37 +9,30 @@ class Page
   include Slices::HasAttachments::PageInstanceMethods
 
   DESCRIPTION_DEPRECATION_WARNING = "Page#description is now meta_description. If you are upgrading, run 'rake slices:migrate:meta_description' to update."
+  LAST_CHANGED_AT_CACHE_KEY = 'page-last-changed'
 
-  field :name
+  field :name, localize: Slices::Config.i18n?
   field :role  # only relevant for virtual pages
   field :active, type: Boolean, default: false
   field :layout, type: String, default: 'default'
-  field :meta_description
-  field :title
+  field :meta_description, localize: Slices::Config.i18n?
+  field :title, localize: Slices::Config.i18n?
   field :has_content, type: Boolean, default: false
 
   belongs_to :author, class_name: 'Admin'
-
-  index :_keywords, background: true
-
   has_slices :slices
   has_and_belongs_to_many :assets
 
   text_search_in :introduction, :extended, :name
 
-  scope :entries, all
+  scope :entries, ->{ all }
+  scope :virtual, ->{ where(:role.ne => nil).asc(:name) }
 
-  def self.available_layouts
-    Layout.all.map do |human_name, machine_name|
-      { human_name: human_name, machine_name: machine_name }
-    end
-  end
-
-  scope :virtual, where(:role.ne => nil).asc(:name)
   validates_presence_of :name
 
   before_save :update_has_content
   before_destroy :destroy_children
+  after_save :update_last_changed_at
   after_save :cache_virtual_page
 
   class NotFound < RuntimeError; end
@@ -57,10 +50,16 @@ class Page
     end
   end
 
-  # Virtual pages don't live in the and are not associated with a
-  # specific URL. Instead, they can be rendered at any path, depending
-  # on the circumstances (e.g. when a page isn't found, or when an error
-  # occurs). Consequently they aren't created with a :parent attribute.
+  def self.available_layouts
+    Layout.all.map do |human_name, machine_name|
+      { human_name: human_name, machine_name: machine_name }
+    end
+  end
+
+  # Virtual pages are not associated with a specific URL. Instead, they
+  # can be rendered at any path, depending on the circumstances (e.g.
+  # when a page isn't found, or when an error occurs). Consequently they
+  # aren't created with a :parent attribute.
   def self.make(attributes = {})
     attributes = attributes.symbolize_keys
     parent = parent_from_attributes(attributes)
@@ -78,17 +77,27 @@ class Page
   end
 
   def self.find_by_id(id)
+    ActiveSupport::Deprecation::warn 'Page.find_by_id is depreciated, please use Page.find instead.'
     find(id)
-  rescue BSON::InvalidObjectId, Mongoid::Errors::DocumentNotFound
+  rescue Mongoid::Errors::DocumentNotFound
     nil
   end
 
   def self.find_by_id!(id)
+    ActiveSupport::Deprecation::warn 'Page.find_by_id is depreciated, please use Page.find instead.'
     find_by_id(id) || (raise NotFound)
   end
 
   def self.find_virtual(role)
-    first(conditions: { role: role })
+    find_by(role: role)
+  end
+
+  def update_last_changed_at
+    Rails.cache.write(LAST_CHANGED_AT_CACHE_KEY, Time.now.to_i)
+  end
+
+  def self.last_changed_at
+    Rails.cache.read(LAST_CHANGED_AT_CACHE_KEY) || 0
   end
 
   def cacheable_virtual_page?
@@ -177,23 +186,25 @@ class Page
     self.meta_description = value
   end
 
-  private
-    def self.parent_from_attributes(attributes)
-      if attributes.has_key?(:parent_path)
-        Page.find_by_path(attributes.delete(:parent_path))
-      elsif attributes.has_key?(:parent_id)
-        Page.find_by_id(attributes.delete(:parent_id))
-      else
-        attributes.delete(:parent)
-      end
+  def self.parent_from_attributes(attributes)
+    if attributes.has_key?(:parent_path)
+      Page.find_by_path(attributes.delete(:parent_path))
+    elsif attributes.has_key?(:parent_id)
+      Page.find(attributes.delete(:parent_id))
+    else
+      attributes.delete(:parent)
     end
+  end
+  private_class_method :parent_from_attributes
 
-    def self.page_exists?(path)
-      Page.find_by_path(path)
-    rescue NotFound
-      false
-    end
+  def self.page_exists?(path)
+    Page.find_by_path(path)
+  rescue NotFound
+    false
+  end
+  private_class_method :page_exists?
 
+  private
     def update_has_content
       self.has_content = slices.any?
       true # must be true otherwise save will fail