slices 1.0.5 → 2.0.0

data/app/models/site_map.rb

@@ -8,8 +8,6 @@ class SiteMap
     '{root}'
   end
 
-  private
-
   def self.set_children_for(parent_id, data)
     parent = Page.find(parent_id)
     data.each_with_index do |child_data, i|
@@ -21,4 +19,5 @@ class SiteMap
       set_children_for(child_data['id'], child_data['children']) if child_data['children']
     end
   end
+  private_class_method :set_children_for
 end

data/app/models/slice.rb

@@ -1,5 +1,6 @@
 class Slice
   include Mongoid::Document
+  include Slices::LocalizedFields
   include Slices::PositionHelper
 
   field :container
@@ -51,6 +52,23 @@ class Slice
     [_type, id].join(':')
   end
 
+  # Print out the cache key. This will use the updated_at time of the
+  # page which this document is embedded in.
+  #
+  # This is usually called inside a cache() block
+  #
+  # @example Returns the cache key
+  #   document.cache_key
+  #
+  # @return [ String ] the string with updated_at
+  def cache_key
+    if time = normal_or_set_page.try(:updated_at)
+      "#{model_key}/#{id}-#{time.to_s(:number)}"
+    else
+      super
+    end
+  end
+
   def client_id?
     attributes.include?('client_id')
   end
@@ -63,10 +81,38 @@ class Slice
     attributes.include?('_deleted')
   end
 
+  def write_attributes(attrs)
+    attrs = attrs.symbolize_keys
+    self.embedded_relations.each do |field, metadata|
+      field = field.to_sym
+      next unless attrs.has_key?(field)
+
+      attrs[field] = (attrs[field] || []).map do |embedded_attrs|
+        if embedded_attrs[:_id].present?
+          embedded_doc = send(field).find(embedded_attrs[:_id])
+          embedded_doc.write_attributes(embedded_attrs)
+          embedded_doc
+        else
+          metadata.class_name.constantize.new(embedded_attrs)
+        end
+      end
+    end
+
+    super
+  end
+
   def as_json(*args)
     attributes.symbolize_keys.except(:_id, :_type).tap do |result|
       result.merge!(id: id, type: type)
       result.merge!(client_id: client_id) if client_id? && new_record?
+
+      self.embedded_relations.each do |field, metadata|
+        result.merge!(field.to_sym => send(field).map(&:as_json))
+      end
+
+      localized_field_names.each do |name|
+        result.merge!(name => send(name))
+      end
     end
   end
 
@@ -77,4 +123,3 @@ class Slice
     text_fields.map { |field| self[field.name.to_sym] }.join(" ")
   end
 end
-

data/app/models/snippet.rb

@@ -3,12 +3,21 @@ class Snippet
 
   field :key
   field :value
-  index :key
+  index({ key: 1 })
 
-  scope :by_key, ascending(:key)
+  scope :by_key, ->{ ascending(:key) }
 
-  def self.find_value_by_key(key)
-    find(:first, conditions: { key: key }).try(:value)
+  # Finds the value of a snippet as a html_safe string
+  #
+  #   Snippet.find_for_key 'address'
+  #   # => "54B Downham Road"
+  #
+  # @param  [String]     key                         Snippet key to lookup
+  # @return [String]
+  #
+  def self.find_for_key(key)
+    find_by(key: key).value.try(:html_safe)
+  rescue Mongoid::Errors::DocumentNotFound
   end
 
   def as_json(*args)

data/app/presenters/page_presenter.rb

@@ -3,19 +3,6 @@ class PagePresenter < Presenter
     @source.id.to_s
   end
 
-  def available_slices
-    slices = {}
-    ObjectSpace.each_object do |object|
-      ActiveSupport::Deprecation.silence do
-        if object.class == Class && object.name =~ /\w+Slice$/
-          key = object.name.underscore.sub('_slice', '')
-          slices[key] = key.humanize
-        end
-      end
-    end
-    slices
-  end
-
   def name
     @source.name
   end
@@ -44,6 +31,14 @@ class PagePresenter < Presenter
     'page_meta_extra'
   end
 
+  def main_extra_templates
+    [main_extra_template]
+  end
+
+  def meta_extra_templates
+    [meta_extra_template]
+  end
+
   def breadcrumbs
     [@source] + @source.ancestors
   end

data/app/views/admin/auth/sessions/_form.html.erb

@@ -1,5 +1,8 @@
 <div class="login">
   <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+    <% if flash[:alert].present? %>
+      <p class="flash-message"><%= flash[:alert] %></p>
+    <% end %>
 
     <p>
       <%= f.label :email %><br />

data/app/views/admin/pages/_fields.html.erb

@@ -0,0 +1 @@
+<%= form.cms_select :layout, @layouts %>

data/app/views/admin/pages/_slices.html.erb

@@ -9,16 +9,20 @@ $(function() {
       mainTemplate: '<%= @page.main_template %>',
       metaTemplate: '<%= @page.meta_template %>',
 
-      mainExtraTemplate: '<%= @page.main_extra_template %>',
-      metaExtraTemplate: '<%= @page.meta_extra_template %>',
+      mainExtraTemplates: <%= raw @page.main_extra_templates.to_json %>,
+      metaExtraTemplates: <%= raw @page.meta_extra_templates.to_json %>,
 
       super_user: <%= current_admin.super? %>,
+      i18n: <%= Slices::Config.i18n? %>,
+
+      loadPagePath: '/admin/pages/{{id}}.json?locale=<%= I18n.locale %>',
+      savePagePath: '/admin/pages/{{id}}.json?locale=<%= I18n.locale %>',
 
       <% if @page.editing_entry_content_slices?(params[:entries]) %>
         mainTemplate: 'set_page_entry_content_main',
         metaTemplate: 'set_page_entry_content_meta',
-        loadPagePath: '/admin/pages/{{id}}?entries=1',
-        savePagePath: '/admin/pages/{{id}}?entries=1'
+        loadPagePath: '/admin/pages/{{id}}?locale=<%= I18n.locale %>&entries=1',
+        savePagePath: '/admin/pages/{{id}}?locale=<%= I18n.locale %>&entries=1'
       <% end %>
     }
   );

data/app/views/admin/pages/new.html.erb

@@ -6,7 +6,11 @@
       <%= hidden_field_tag :type, params[:type] %>
     <% end %>
     <%= form.cms_text_field :name, required: false %>
-    <%= form.cms_select :layout, @layouts %>
+
+    <%= render(
+      partial: Slices::Config.page_fields_template,
+      locals: { form: form }
+    ) %>
   </ul>
   <div class="bottom-toolbar">
     <%= form.submit value: "Create Page" %>

data/app/views/admin/pages/show.html.erb

@@ -1,18 +1,34 @@
 <form id="slices-form">
-  <div id="container-actions" class="toolbar">
-    <nav>
-      <ul>
-        <li class="back"><%= link_to "Cancel editing (lose unsaved changes)", admin_site_maps_path %></li>
-      </ul>
-    </nav>
-    <div class="actions">
-      <ul>
-        <li><a id="minimise" class="button">Minimise all slices</a></li>
-        <li>
-          <%= link_to "View page on site", @page.source.path, id: 'page-view-on-site', target: 'site', class: 'button standard' %>
-        </li>
-        <li><input type="submit" value="Save changes" id="save-changes" disabled></li>
-      </ul>
+  <div id="container-actions">
+    <% if Slices::Config.i18n? %>
+      <div class="toolbar translations">
+        <nav>
+          Edit in
+          <ul>
+            <% I18n.available_locales.each do |locale| %>
+              <li>
+                <%= link_to_if locale != I18n.locale, t("locales.#{locale}", default: locale.to_s), admin_page_path(@page.source, locale: locale) %>
+              </li>
+            <% end %>
+          </ul>
+        </nav>
+      </div>
+    <% end %>
+    <div class="toolbar">
+      <nav>
+        <ul>
+          <li class="back"><%= link_to "Cancel editing (lose unsaved changes)", admin_site_maps_path %></li>
+        </ul>
+      </nav>
+      <div class="actions">
+        <ul>
+          <li><a id="minimise" class="button">Minimise all slices</a></li>
+          <li>
+            <%= link_to_view_page(@page.source, id: 'page-view-on-site', target: 'site', class: 'button standard') %>
+          </li>
+          <li><input type="submit" value="Save changes" id="save-changes" disabled></li>
+        </ul>
+      </div>
     </div>
   </div>
 

data/app/views/admin/site_maps/_page_actions.html.erb

@@ -0,0 +1,2 @@
+<%= link_to_add_child page %>
+<%= link_to_view_page page %>

data/app/views/admin/site_maps/_page_li.html.erb

@@ -1,20 +1,31 @@
-<li class="page <%= "home" if page.home? %>" rel="<%= page.id %>">
-  <div>
+<li class="<%= page_classes(page) %>" rel="<%= page.id %>">
+  <div class="page-item">
     <h2><%= link_to(page.name, admin_page_path(page)) %></h2>
 
     <% unless page.virtual? %>
       <span class="item-actions primary">
-        <%= link_to_add_child page %>
-        <%= link_to_view_page page %>
+        <%= render(
+          partial: Slices::Config.page_actions_template,
+          locals: { page: page }
+        ) %>
       </span>
 
       <%= link_to_delete page unless page.home? %>
     <% end %>
+
+    <% if page.home? %>
+      <div class="toggle-actions">
+        <a class="hide-all-children button">Minimise all</a>
+        <a class="show-all-children button">Expand all</a>
+      </div>
+    <% elsif children.any? %>
+      <a class="toggle-children" href="#page-<%= page.id %>-children"></a>
+    <% end %>
   </div>
 
-  <% if page.children.any? %>
-    <ol>
-      <%= list_pages(page.children) %>
+  <% if children.any? %>
+    <ol id="page-<%= page.id %>-children" class="page-children">
+      <%= list_pages(children) %>
     </ol>
   <% end %>
 </li>

data/app/views/admin/site_maps/_set_page_li.html.erb

@@ -1,5 +1,5 @@
-<li class="set-page" rel="<%= page.id %>">
-  <div>
+<li class="<%= page_classes(page) %>" rel="<%= page.id %>">
+  <div class="page-item">
     <h2><%= link_to page.name, admin_page_entries_path(page) %></h2>
 
     <span class="item-actions primary">
@@ -15,9 +15,9 @@
 
   </div>
 
-  <% if page.page_children.any? %>
-    <ol>
-      <%= list_pages page.page_children %>
+  <% if children.any? %>
+    <ol class="page-children">
+      <%= list_pages children %>
     </ol>
   <% end %>
 </li>

data/app/views/layouts/admin.html.erb

@@ -6,7 +6,6 @@
   <title><%= cms_title %></title>
 
   <%= stylesheet_link_tag 'slices/slices' %>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
   <%= javascript_include_tag 'slices/slices' %>
   <%= render "admin/shared/asset_storage" %>
 
@@ -52,21 +51,5 @@
       <span class="path">{{path}}</span>
     </li>
   </script>
-
-  <% if Rails.env.production? %>
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-298580-55']);
-      _gaq.push(['_setDomainName', 'none']);
-      _gaq.push(['_setAllowLinker', true]);
-      _gaq.push(['_setCustomVar', 1, 'Slices Version', '<%= Slices::VERSION %>', 3]);
-      _gaq.push(['_trackPageview']);
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
-    </script>
-  <% end -%>
 </body>
 </html>

data/config/routes.rb

@@ -1,21 +1,18 @@
 class PageConstraints
   def matches?(request)
-    !request.path.start_with?("/admin/auth")
+    !request.path.start_with?('/admin/auth')
   end
 end
 
 Rails.application.routes.draw do
 
-  devise_for :admin, :path => "admin", :controllers => {
-    :passwords          => "admin/auth/passwords",
-    :sessions           => "admin/auth/sessions",
-  }
+  devise_for :admin, Slices::Config.devise_for_options
 
   namespace :admin do
-    match 'site_maps' => 'site_maps#index', :as => :root # Devise redirects here after sign in
-    match 'site_maps' => 'site_maps#index'
-    match 'site_maps/update' => 'site_maps#update'
-    match 'pages/search' => 'page_search#show'
+    get 'site_maps' => 'site_maps#index', as: :root # Devise redirects here after sign in
+    get 'site_maps' => 'site_maps#index'
+    put 'site_maps/update' => 'site_maps#update'
+    get 'pages/search' => 'page_search#show'
     resources :pages, :except => [:index, :edit] do
       resources :entries, :only => [:index]
     end
@@ -23,18 +20,18 @@ Rails.application.routes.draw do
     resources :snippets
     resources :admins
   end
-  match '/admin' => redirect('/admin/site_maps')
+  get '/admin' => redirect('/admin/site_maps')
 
-  match 'slices/templates(/:slice)/:name.:format' => 'static_assets#templates'
-  match ':action/:asset_type(/:folder)/*name.:format' => 'static_assets',
+  get 'slices/templates(/:slice)/:name.:format' => 'static_assets#templates'
+  get ':action/:asset_type(/:folder)/*name.:format' => 'static_assets',
     :constraints => {
     :asset_type => /(stylesheets|javascripts|images)/,
     :action => /(slices|sites)/
   }, :as => :static_assets
 
-  match ':status.html' => 'pages#virtual_error_pages'
-  match '*path' => 'pages#create', :via => :post
-  match '*path' => 'pages#show', :as => :page, :constraints => PageConstraints.new
+  get ':status.html' => 'pages#virtual_error_pages'
+  post '*path' => 'pages#create'
+  get '*path' => 'pages#show', as: :page, :constraints => PageConstraints.new
 
-  root :to => 'pages#show'
+  root to: 'pages#show'
 end

data/lib/generators/slice/templates/presenter.rb

@@ -18,25 +18,24 @@ class <%= page_name.classify %>Presenter < PagePresenter
   end
 
 <%- if options.with_entry_templates? -%>
-  def main_extra_template
-    '<%= file_name %>/<%= page_name %>_main'
+  def main_extra_templates
+    super + ['<%= file_name %>/<%= page_name %>_main']
   end
 
-  def meta_extra_template
-    '<%= file_name %>/<%= page_name %>_meta'
+  def meta_extra_templates
+    super + ['<%= file_name %>/<%= page_name %>_meta']
   end
 <%- else -%>
-  # If you want to display extra information while editing or creating a
-  # page (i.e. in the admin UI's side bar) you'll need to define some
-  # .hbs files, and then tell the CMS to use them by uncommenting these
-  # methods.
+  # If you want to display extra information while editing a page you'll need
+  # to define some .hbs files, and then tell the CMS to use them by
+  # uncommenting these methods.
 
-  # def main_extra_template
-  #   '<%= file_name %>/<%= page_name %>_main'
+  # def main_extra_templates
+  #   super + ['<%= file_name %>/<%= page_name %>_main']
   # end
 
-  # def meta_extra_template
-  #   '<%= file_name %>/<%= page_name %>_meta'
+  # def meta_extra_templates
+  #   super + ['<%= file_name %>/<%= page_name %>_meta']
   # end
 <%- end -%>
 

data/lib/generators/slice/templates/set.html.erb

@@ -1,8 +1,8 @@
-<%%= will_paginate slice.page_entries, renderer: SetLinkRenderer, class: 'pagination above' %>
+<%%= will_paginate slice.page_entries, class: 'pagination above' %>
 <ul class="entries">
   <%% slice.page_entries.each do |entry| -%>
     <li><%%= link_to entry.name, entry.path %></li>
   <%% end -%>
 </ul>
-<%%= will_paginate slice.page_entries, renderer: SetLinkRenderer, class: 'pagination below' %>
+<%%= will_paginate slice.page_entries, class: 'pagination below' %>