alchemy_cms 3.2.1 → 3.3.0.rc1

data/app/models/alchemy/site.rb

@@ -23,6 +23,9 @@ module Alchemy
 
     scope :published, -> { where(public: true) }
 
+    # Callbacks
+    before_create :create_default_language, unless: -> { languages.any? }
+
     # concerns
     include Alchemy::Site::Layout
 
@@ -38,7 +41,7 @@ module Alchemy
     # Please use <tt>rails g alchemy:site_layouts</tt> to generate partials for all your sites.
     #
     def to_partial_path
-      "alchemy/site_layouts/#{layout_partial_name}"
+      "alchemy/site_layouts/#{partial_name}"
     end
 
     class << self
@@ -58,7 +61,7 @@ module Alchemy
         # These are split up into two separate queries in order to run the
         # fastest query first (selecting the domain by its primary host name).
         #
-        where(host: host).first || find_in_aliases(host) || default
+        find_by(host: host) || find_in_aliases(host) || default
       end
 
       def find_in_aliases(host)
@@ -70,22 +73,21 @@ module Alchemy
       end
     end
 
-    before_create do
-      # If no languages are present, create a default language based
-      # on the host app's Alchemy configuration.
+    private
 
-      if languages.empty?
-        default_language = Alchemy::Config.get(:default_language)
-        languages.build(
-          name:           default_language['name'],
-          language_code:  default_language['code'],
-          frontpage_name: default_language['frontpage_name'],
-          page_layout:    default_language['page_layout'],
-          public:         true,
-          default:        true
-        )
-      end
+    # If no languages are present, create a default language based
+    # on the host app's Alchemy configuration.
+    def create_default_language
+      default_language = Alchemy::Config.get(:default_language)
+      languages.build(
+        name:           default_language['name'],
+        language_code:  default_language['code'],
+        locale:         default_language['code'],
+        frontpage_name: default_language['frontpage_name'],
+        page_layout:    default_language['page_layout'],
+        public:         true,
+        default:        true
+      )
     end
-
   end
 end

data/app/models/alchemy/site/layout.rb

@@ -1,23 +1,23 @@
 module Alchemy
   module Site::Layout
     extend ActiveSupport::Concern
-    SITE_LAYOUTS_FILE = Rails.root.join('config/alchemy/site_layouts.yml')
+    SITE_DEFINITIONS_FILE = Rails.root.join('config/alchemy/site_layouts.yml')
 
     module ClassMethods
       # Returns the site layouts definition defined in +site_layouts.yml+ file
       #
-      def layout_definitions
-        @layout_definitions ||= read_site_layouts
+      def definitions
+        @definitions ||= read_site_definitions
       end
 
-    private
+      private
 
       # Reads the site layouts definition file named +site_layouts.yml+ in +config/alchemy/+
       #
       # It returns empty Array if no file is present
       #
-      def read_site_layouts
-        YAML.load_file(SITE_LAYOUTS_FILE) || []
+      def read_site_definitions
+        YAML.load_file(SITE_DEFINITIONS_FILE) || []
       rescue Errno::ENOENT
         []
       end
@@ -25,13 +25,13 @@ module Alchemy
 
     # Returns site's layout definition
     #
-    def layout_definition
-      self.class.layout_definitions.detect { |l| l['name'] == layout_partial_name }
+    def definition
+      self.class.definitions.detect { |l| l['name'] == partial_name }
     end
 
     # Returns the name for the layout partial
     #
-    def layout_partial_name
+    def partial_name
       name.parameterize.underscore
     end
   end

data/app/models/alchemy/tag.rb

@@ -10,7 +10,6 @@
 # The original Tag model is ActsAsTaggableOn::Tag
 module Alchemy
   class Tag < ActsAsTaggableOn::Tag
-
     # Replaces tag with new tag on all models tagged with tag.
     def self.replace(tag, new_tag)
       tag.taggings.collect(&:taggable).each do |taggable|
@@ -19,6 +18,5 @@ module Alchemy
         taggable.save
       end
     end
-
   end
 end

data/app/models/alchemy/tree_node.rb

@@ -1,4 +1,5 @@
-module Alchemy
-  class TreeNode < Struct.new(:left, :right, :parent, :depth, :url, :restricted)
-  end
-end
+# Represents a node in the admin page tree
+#
+# Used by page reorder
+#
+Alchemy::TreeNode = Struct.new(:left, :right, :parent, :depth, :url, :restricted)

data/app/serializers/alchemy/attachment_serializer.rb

@@ -10,6 +10,5 @@ module Alchemy
       :tag_list,
       :created_at,
       :updated_at
-
   end
 end

data/app/serializers/alchemy/base_serializer.rb

@@ -0,0 +1,30 @@
+module Alchemy
+  class BaseSerializer
+    include ActiveModel::Serializers::JSON
+
+    attr_reader :object, :opts
+
+    def initialize(object, opts = {})
+      @object = object
+      @opts = opts
+    end
+
+    # The attributes to be serialized. See ActiveModel::Serialization.
+    # By default, serialize all columns from the AR object.
+    def attributes
+      Hash[object.class.column_names.map { |c| [c, nil] }]
+    end
+
+    private
+
+    # If the presenter implements an attribute, use that. Otherwise, delegate to
+    # the object.
+    def read_attribute_for_serialization(key)
+      if respond_to?(key)
+        send(key)
+      else
+        object.send(key)
+      end
+    end
+  end
+end

data/app/serializers/alchemy/cell_serializer.rb

@@ -13,6 +13,5 @@ module Alchemy
     def elements
       object.elements.published
     end
-
   end
 end

data/app/serializers/alchemy/essence_boolean_serializer.rb

@@ -6,6 +6,5 @@ module Alchemy
       :value,
       :created_at,
       :updated_at
-
   end
 end

data/app/serializers/alchemy/essence_date_serializer.rb

@@ -6,6 +6,5 @@ module Alchemy
       :date,
       :created_at,
       :updated_at
-
   end
 end

data/app/serializers/alchemy/essence_file_serializer.rb

@@ -7,6 +7,5 @@ module Alchemy
       :css_class
 
     has_one :attachment
-
   end
 end

data/app/serializers/alchemy/essence_html_serializer.rb

@@ -6,6 +6,5 @@ module Alchemy
       :source,
       :created_at,
       :updated_at
-
   end
 end

data/app/serializers/alchemy/essence_link_serializer.rb

@@ -9,6 +9,5 @@ module Alchemy
       :link_class_name,
       :created_at,
       :updated_at
-
   end
 end

data/app/serializers/alchemy/essence_picture_serializer.rb

@@ -23,6 +23,5 @@ module Alchemy
         target: object.link_target
       }
     end
-
   end
 end

data/app/serializers/alchemy/essence_richtext_serializer.rb

@@ -7,6 +7,5 @@ module Alchemy
       :stripped_body,
       :created_at,
       :updated_at
-
   end
 end

data/app/serializers/alchemy/essence_select_serializer.rb

@@ -6,6 +6,5 @@ module Alchemy
       :value,
       :created_at,
       :updated_at
-
   end
 end

data/app/serializers/alchemy/essence_text_serializer.rb

@@ -17,6 +17,5 @@ module Alchemy
         target: object.link_target
       }
     end
-
   end
 end

data/app/serializers/alchemy/legacy_element_serializer.rb

@@ -12,6 +12,5 @@ module Alchemy
       :updated_at
 
     has_many :contents
-
   end
 end

data/app/serializers/alchemy/page_serializer.rb

@@ -24,6 +24,5 @@ module Alchemy
         object.elements.published
       end
     end
-
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -0,0 +1,90 @@
+module Alchemy
+  class PageTreeSerializer < BaseSerializer
+    def attributes
+      {'pages' => nil}
+    end
+
+    def pages
+      tree = []
+      path = [{id: object.parent_id, children: tree}]
+      page_list = object.self_and_descendants
+      skip_branch = false
+      base_level = object.level - 1
+
+      page_list.each_with_index do |page, i|
+        has_children = page_list[i + 1] && page_list[i + 1].parent_id == page.id
+        folded = has_children && page.folded?(opts[:user])
+
+        if skip_branch
+          next if page.parent_id == path.last[:children].last[:id]
+
+          skip_branch = false
+        end
+
+        # Do not walk my children if I'm folded and you don't need to have the
+        # full tree.
+        if folded && !opts[:full]
+          skip_branch = true
+        end
+
+        if page.parent_id != path.last[:id]
+          if path.map { |o| o[:id] }.include?(page.parent_id) # Lower level
+            path.pop while path.last[:id] != page.parent_id
+          else # One level up
+            path << path.last[:children].last
+          end
+        end
+
+        level = path.count + base_level
+
+        path.last[:children] << page_hash(page, has_children, level, folded)
+      end
+
+      tree
+    end
+
+    protected
+
+    def page_hash(page, has_children, level, folded)
+      {
+        id: page.id,
+        name: page.name,
+        permissions: page_permissions(page, opts[:ability]),
+        public: page.public?,
+        visible: page.visible?,
+        restricted: page.restricted?,
+        status_titles: page_status_titles(page),
+        page_layout: page.page_layout,
+        slug: page.slug,
+        redirects_to_external: page.redirects_to_external?,
+        locked: page.locked,
+        definition_missing: page.definition.blank?,
+        urlname: page.urlname,
+        external_urlname: page.external_urlname,
+        level: level,
+        root: level == 1,
+        folded: folded,
+        root_or_leaf: level == 1 || !has_children,
+        children: []
+      }
+    end
+
+    def page_permissions(page, ability)
+      {
+        info: ability.can?(:info, page),
+        configure: ability.can?(:configure, page),
+        copy: ability.can?(:copy, page),
+        destroy: ability.can?(:destroy, page),
+        create: ability.can?(:create, Alchemy::Page)
+      }
+    end
+
+    def page_status_titles(page)
+      {
+        public: page.status_title(:public),
+        visible: page.status_title(:visible),
+        restricted: page.status_title(:restricted)
+      }
+    end
+  end
+end

data/app/serializers/alchemy/picture_serializer.rb

@@ -11,6 +11,5 @@ module Alchemy
       :tag_list,
       :created_at,
       :updated_at
-
   end
 end

data/app/views/alchemy/_menubar.html.erb

@@ -1,11 +1,11 @@
 <% if !@preview_mode && can?(:edit_content, @page) %>
   <div id="alchemy_menubar" style="display: none">
     <ul>
-      <li><%= link_to _t(:to_alchemy), alchemy.admin_dashboard_path %></li>
-      <li><%= link_to _t(:edit_page), alchemy.edit_admin_page_path(@page) %></li>
+      <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>
+      <li><%= link_to Alchemy.t(:edit_page), alchemy.edit_admin_page_url(@page) %></li>
       <li>
         <%= form_tag Alchemy.logout_path, method: 'delete' do %>
-          <%= button_tag _t(:logout) %>
+          <%= button_tag Alchemy.t(:logout) %>
         <% end %>
       </li>
     </ul>

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -1,21 +1,16 @@
 <div id="overlay_toolbar">
-  <div class="button_with_label">
-    <%= link_to_dialog(
-        render_icon('upload'),
-        alchemy.new_admin_attachment_path(
-          content_id: @content.blank? ? nil : @content.id,
-          swap: @swap,
-          options: @options.to_json
-        ),
-        {
-          title: _t(:upload_file),
-          size: '540x550'
-        },
-        title: _t(:upload_file),
-        class: 'icon_button'
+  <% if can? :create, Alchemy::Attachment %>
+    <%= render 'alchemy/admin/uploader/button',
+      model_class: Alchemy::Attachment,
+      dropzone: '#assign_file_list',
+      file_attribute: 'file',
+      in_dialog: true,
+      redirect_url: admin_attachments_path(
+        element_id: @element.try(:id),
+        content_id: @content.try(:id),
+        options: @options ? @options.to_json : nil
       ) %>
-    <label><%= _t(:upload_file) %></label>
-  </div>
+  <% end %>
   <%= render 'alchemy/admin/partials/remote_search_form' %>
 </div>
 <div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -12,7 +12,7 @@
         size: "fullscreen"
       },
       {
-        title: _t('View File')
+        title: Alchemy.t('View File')
       }
     ) %>
   <% else %>
@@ -22,41 +22,41 @@
   <td class="file_name"><%= attachment.file_name %></td>
   <td class="file_type"><%= mime_to_human(attachment.file_mime_type) %></td>
   <td class="file_size"><%= number_to_human_size(attachment.file_size) %></td>
-  <td class="date"><%= l(attachment.created_at, format: :short) %></td>
+  <td class="date"><%= l(attachment.created_at, format: :default) %></td>
   <td class="tools long">
   <% if can?(:download, attachment) %>
     <%= link_to(
       "",
       alchemy.download_admin_attachment_path(attachment),
-      title: _t("download_file", filename: attachment.file_name),
+      title: Alchemy.t("download_file", filename: attachment.file_name),
       class: "icon file_download"
     ) %>
   <% end %>
   <% if can?(:destroy, attachment) %>
     <%= link_to_confirm_dialog(
       "",
-      _t(:confirm_to_delete_file),
+      Alchemy.t(:confirm_to_delete_file),
       alchemy.admin_attachment_path(
         id: attachment,
-        query: params[:query],
+        q: params[:q],
         page: params[:page],
         per_page: params[:per_page]
       ),
       {
         class: 'icon file_delete',
-        title: _t(:delete_file)
+        title: Alchemy.t(:delete_file)
       }
     ) %>
   <% end %>
   <% if can?(:edit, attachment) %>
     <%= link_to_dialog("",
-      alchemy.edit_admin_attachment_path(attachment, query: params[:query], page: params[:page]),
+      alchemy.edit_admin_attachment_path(attachment, q: params[:q], page: params[:page]),
       {
-        title: _t(:rename_file),
+        title: Alchemy.t(:rename_file),
         size: '380x250'
       },
       class: 'icon file_edit',
-      title: _t(:rename_file)
+      title: Alchemy.t(:rename_file)
     ) %>
   <% end %>
   </td>