alchemy_cms 2.9.1 → 3.0.0.rc5

data/app/models/alchemy/picture/sweeping.rb

@@ -0,0 +1,17 @@
+module Alchemy
+  module Picture::Sweeping
+    extend ActiveSupport::Concern
+
+    included do
+      after_update  { expire_cache_for(self) }
+      after_destroy { expire_cache_for(self) }
+    end
+
+    private
+
+    # Removing all variants of the picture with FileUtils.
+    def expire_cache_for(picture)
+      FileUtils.rm_rf(Rails.root.join('public', Alchemy::MountPoint.get.gsub(/^\//, ''), 'pictures', picture.id.to_s))
+    end
+  end
+end

data/app/models/alchemy/site.rb

@@ -1,7 +1,19 @@
+# == Schema Information
+#
+# Table name: alchemy_sites
+#
+#  id                       :integer          not null, primary key
+#  host                     :string(255)
+#  name                     :string(255)
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  public                   :boolean          default(FALSE)
+#  aliases                  :text
+#  redirect_to_primary_host :boolean
+#
+
 module Alchemy
   class Site < ActiveRecord::Base
-    attr_accessible :host, :aliases, :name, :public, :redirect_to_primary_host
-
     # validations
     validates_presence_of :host
     validates_uniqueness_of :host

data/app/models/alchemy/tag.rb

@@ -1,3 +1,11 @@
+# == Schema Information
+#
+# Table name: tags
+#
+#  id   :integer          not null, primary key
+#  name :string(255)
+#
+
 # Just holds some useful tag methods.
 # The original Tag model is ActsAsTaggableOn::Tag
 module Alchemy

data/app/serializers/alchemy/attachment_serializer.rb

@@ -0,0 +1,15 @@
+module Alchemy
+  class AttachmentSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :name,
+      :file_name,
+      :file_mime_type,
+      :file_size,
+      :tag_list,
+      :created_at,
+      :updated_at
+
+  end
+end

data/app/serializers/alchemy/cell_serializer.rb

@@ -0,0 +1,18 @@
+module Alchemy
+  class CellSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :name,
+      :page_id,
+      :created_at,
+      :updated_at
+
+    has_many :elements
+
+    def elements
+      object.elements.published
+    end
+
+  end
+end

data/app/serializers/alchemy/content_serializer.rb

@@ -0,0 +1,27 @@
+module Alchemy
+  class ContentSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :name,
+      :ingredient,
+      :element_id,
+      :position,
+      :created_at,
+      :updated_at
+
+    has_one :essence, polymorphic: true
+
+    def ingredient
+      case object.essence_type
+      when 'Alchemy::EssencePicture'
+        object.essence.picture_url
+      when 'Alchemy::EssenceFile'
+        object.essence.attachment_url
+      else
+        object.ingredient
+      end
+    end
+
+  end
+end

data/app/serializers/alchemy/element_serializer.rb

@@ -0,0 +1,17 @@
+module Alchemy
+  class ElementSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :name,
+      :position,
+      :page_id,
+      :cell_id,
+      :tag_list,
+      :created_at,
+      :updated_at
+
+    has_many :contents
+
+  end
+end

data/app/serializers/alchemy/essence_boolean_serializer.rb

@@ -0,0 +1,11 @@
+module Alchemy
+  class EssenceBooleanSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :value,
+      :created_at,
+      :updated_at
+
+  end
+end

data/app/serializers/alchemy/essence_date_serializer.rb

@@ -0,0 +1,11 @@
+module Alchemy
+  class EssenceDateSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :date,
+      :created_at,
+      :updated_at
+
+  end
+end

data/app/serializers/alchemy/essence_file_serializer.rb

@@ -0,0 +1,12 @@
+module Alchemy
+  class EssenceFileSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :title,
+      :css_class
+
+    has_one :attachment
+
+  end
+end

data/app/serializers/alchemy/essence_html_serializer.rb

@@ -0,0 +1,11 @@
+module Alchemy
+  class EssenceHtmlSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :source,
+      :created_at,
+      :updated_at
+
+  end
+end

data/app/serializers/alchemy/essence_link_serializer.rb

@@ -0,0 +1,14 @@
+module Alchemy
+  class EssenceLinkSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :link,
+      :link_title,
+      :link_target,
+      :link_class_name,
+      :created_at,
+      :updated_at
+
+  end
+end

data/app/serializers/alchemy/essence_picture_serializer.rb

@@ -0,0 +1,28 @@
+module Alchemy
+  class EssencePictureSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :picture_id,
+      :caption,
+      :title,
+      :alt_tag,
+      :css_class,
+      :link,
+      :created_at,
+      :updated_at
+
+    has_one :picture
+
+    def link
+      return if object.link.blank?
+      {
+        url: object.link,
+        css_class: object.link_class_name,
+        title: object.link_title,
+        target: object.link_target
+      }
+    end
+
+  end
+end

data/app/serializers/alchemy/essence_richtext_serializer.rb

@@ -0,0 +1,12 @@
+module Alchemy
+  class EssenceRichtextSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :body,
+      :stripped_body,
+      :created_at,
+      :updated_at
+
+  end
+end

data/app/serializers/alchemy/essence_select_serializer.rb

@@ -0,0 +1,11 @@
+module Alchemy
+  class EssenceSelectSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :value,
+      :created_at,
+      :updated_at
+
+  end
+end

data/app/serializers/alchemy/essence_text_serializer.rb

@@ -0,0 +1,22 @@
+module Alchemy
+  class EssenceTextSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :body,
+      :link,
+      :created_at,
+      :updated_at
+
+    def link
+      return if object.link.blank?
+      {
+        url: object.link,
+        title: object.link_title,
+        css_class: object.link_class_name,
+        target: object.link_target
+      }
+    end
+
+  end
+end

data/app/serializers/alchemy/page_serializer.rb

@@ -0,0 +1,29 @@
+module Alchemy
+  class PageSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :name,
+      :urlname,
+      :page_layout,
+      :title,
+      :language_code,
+      :meta_keywords,
+      :meta_description,
+      :tag_list,
+      :created_at,
+      :updated_at,
+      :status
+
+    has_many :elements, :cells
+
+    def elements
+      if object.has_cells?
+        object.elements.not_in_cell.published
+      else
+        object.elements.published
+      end
+    end
+
+  end
+end

data/app/serializers/alchemy/picture_serializer.rb

@@ -0,0 +1,16 @@
+module Alchemy
+  class PictureSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :name,
+      :image_file_name,
+      :image_file_width,
+      :image_file_height,
+      :image_file_size,
+      :tag_list,
+      :created_at,
+      :updated_at
+
+  end
+end

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

@@ -0,0 +1,16 @@
+<% 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>
+        <%= form_tag Alchemy.logout_path, method: 'delete' do %>
+          <%= button _t(:logout) %>
+        <% end %>
+      </li>
+    </ul>
+  </div>
+
+  <%= stylesheet_link_tag("alchemy/menubar") %>
+  <%= javascript_include_tag('alchemy/menubar') %>
+<% end %>

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

@@ -1,34 +1,32 @@
-<div id="alchemy_window_body">
-  <div id="overlay_toolbar">
-    <div class="button_with_label">
-      <%= link_to_overlay_window(
-          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'
-          },
+<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),
-          class: 'icon_button'
-        ) %>
-      <label><%= _t(:upload_file) %></label>
-    </div>
-    <%= render 'alchemy/admin/partials/remote_search_form' %>
+          size: '540x550'
+        },
+        title: _t(:upload_file),
+        class: 'icon_button'
+      ) %>
+    <label><%= _t(:upload_file) %></label>
   </div>
-  <div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
-    <% if any_tags = Alchemy::Attachment.tag_counts.any? %>
-    <div id="library_sidebar">
-      <div id="tag_list">
-        <%= render 'tag_list' %>
-      </div>
-    </div>
-    <% end %>
-    <div id="overlay_file_list" class="<%= any_tags ? 'with_tag_list' : nil %>">
-      <%= render 'overlay_file_list' %>
+  <%= render 'alchemy/admin/partials/remote_search_form' %>
+</div>
+<div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
+  <% if any_tags = Alchemy::Attachment.tag_counts.any? %>
+  <div id="library_sidebar">
+    <div id="tag_list">
+      <%= render 'tag_list' %>
     </div>
   </div>
+  <% end %>
+  <div id="overlay_file_list" class="<%= any_tags ? 'with_tag_list' : nil %>">
+    <%= render 'overlay_file_list' %>
+  </div>
 </div>

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

@@ -3,16 +3,16 @@
     <%= render_icon attachment.icon_css_class %>
   </td>
   <td class="name">
-  <% if permitted_to?(:show, :alchemy_attachments) && %w(audio image video flash pdf text).include?(attachment.icon_css_class) %>
-    <%= link_to_overlay_window(
+  <% if can?(:show, attachment) && %w(audio image video flash pdf text).include?(attachment.icon_css_class) %>
+    <%= link_to_dialog(
       attachment.name,
       alchemy.admin_attachment_path(attachment),
       {
-        :title => attachment.name,
-        :size => "fullscreen"
+        title: attachment.name,
+        size: "fullscreen"
       },
       {
-        :title => _t('View File')
+        title: _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: :short) %></td>
   <td class="tools long">
-  <% permitted_to?(:download, :alchemy_attachments) do %>
+  <% if can?(:download, attachment) %>
     <%= link_to(
       "",
       alchemy.download_admin_attachment_path(attachment),
-      :title => _t("download_file", :filename => attachment.file_name),
-      :class => "icon file_download"
+      title: _t("download_file", filename: attachment.file_name),
+      class: "icon file_download"
     ) %>
   <% end %>
-  <% permitted_to?(:destroy, :alchemy_admin_attachments) do %>
-    <%= link_to_confirmation_window(
+  <% if can?(:destroy, attachment) %>
+    <%= link_to_confirm_dialog(
       "",
       _t(:confirm_to_delete_file),
       alchemy.admin_attachment_path(
-        :id => attachment,
-        :query => params[:query],
-        :page => params[:page],
-        :per_page => params[:per_page]
+        id: attachment,
+        query: params[:query],
+        page: params[:page],
+        per_page: params[:per_page]
       ),
       {
-        :class => 'icon file_delete',
-        :title => _t(:delete_file)
+        class: 'icon file_delete',
+        title: _t(:delete_file)
       }
     ) %>
   <% end %>
-  <% permitted_to?(:edit, :alchemy_admin_attachments) do %>
-    <%= link_to_overlay_window("",
-      alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
+  <% if can?(:edit, attachment) %>
+    <%= link_to_dialog("",
+      alchemy.edit_admin_attachment_path(attachment, query: params[:query], page: params[:page]),
       {
-        :title => _t(:rename_file),
-        :size => '380x220'
+        title: _t(:rename_file),
+        size: '380x250'
       },
-      :class => 'icon file_edit',
-      :title => _t(:rename_file)
+      class: 'icon file_edit',
+      title: _t(:rename_file)
     ) %>
   <% end %>
   </td>