alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/app/models/alchemy/element.rb

@@ -1,5 +1,6 @@
 module Alchemy
   class Element < ActiveRecord::Base
+    include Logger
 
     FORBIDDEN_DEFINITION_ATTRIBUTES = %w(contents available_contents amount picture_gallery taggable hint)
     SKIPPED_ATTRIBUTES_ON_COPY = %w(id position folded created_at updated_at creator_id updater_id cached_tag_list)
@@ -58,7 +59,7 @@ module Alchemy
         if element_scratch
           new(element_scratch.merge(attributes).except(*FORBIDDEN_DEFINITION_ATTRIBUTES))
         else
-          raise "Element description for #{attributes[:name]} not found. Please check your elements.yml"
+          raise ElementDefinitionError, "Element description for #{attributes[:name]} not found. Please check your elements.yml"
         end
       end
 
@@ -70,24 +71,18 @@ module Alchemy
       end
 
       # Returns the descriptions from elements.yml file.
-      # Alchemy comes with its own elements.yml file. As so called standard set.
+      #
       # Place a elements.yml file inside your apps config/alchemy folder to define
       # your own set of elements
+      #
       def descriptions
         if ::File.exists? "#{::Rails.root}/config/alchemy/elements.yml"
-          element_definitions = ::YAML.load_file("#{::Rails.root}/config/alchemy/elements.yml")
-        end
-        if !element_definitions
-          if ::File.exists?(::File.join(::File.dirname(__FILE__), "../../../config/alchemy/elements.yml"))
-            element_definitions = ::YAML.load_file(::File.join(::File.dirname(__FILE__), "../../../config/alchemy/elements.yml"))
-          end
-        end
-        if !element_definitions
+          ::YAML.load_file("#{::Rails.root}/config/alchemy/elements.yml")
+        else
           raise LoadError, "Could not find elements.yml file! Please run: rails generate alchemy:scaffold"
         end
-        element_definitions
       rescue TypeError => e
-        Rails.logger.warn "\n++++ WARNING: Your elements.yml is empty.\n"
+        warn "Your elements.yml is empty."
         []
       end
       alias_method :definitions, :descriptions
@@ -108,7 +103,7 @@ module Alchemy
         # if page_layout has cells, collect elements from cells and group them by cellname
         page_layout = PageLayout.get(page.page_layout)
         if page_layout.blank?
-          logger.warn "\n++++++\nWARNING! Could not find page_layout description for page: #{page.name}\n++++++++\n"
+          warn "Could not find page_layout description for page: #{page.name}"
           return []
         end
         elements_for_layout = []
@@ -296,7 +291,7 @@ module Alchemy
     # Returns the description for given content_name
     def content_description_for(content_name)
       if content_descriptions.blank?
-        logger.warn("\n+++++++++++ Warning: Element #{self.name} is missing the content description for #{content_name}\n")
+        warn "Element #{self.name} is missing the content description for #{content_name}"
         return nil
       else
         content_descriptions.detect { |d| d['name'] == content_name }
@@ -313,7 +308,8 @@ module Alchemy
     def description
       description = self.class.descriptions.detect { |d| d['name'] == self.name }
       if description.blank?
-        raise "Could not find element definition for #{self.name}. Please check your elements.yml"
+        warn "Could not find element definition for #{self.name}. Please check your elements.yml!"
+        return {}
       else
         return description
       end
@@ -436,7 +432,7 @@ module Alchemy
 
     # Essence validation errors
     #
-    # Messages are translated via I18n.
+    # == Error messages are translated via I18n
     #
     # Inside your translation file add translations like:
     #
@@ -446,11 +442,11 @@ module Alchemy
     #         name_of_the_content:
     #           validation_error_type: Error Message
     #
-    # validation_error_type has to be one of:
+    # NOTE: +validation_error_type+ has to be one of:
     #
-    # * blank
-    # * taken
-    # * wrong_format
+    #   * blank
+    #   * taken
+    #   * invalid
     #
     # === Example:
     #
@@ -459,17 +455,44 @@ module Alchemy
     #       content_validations:
     #         contactform:
     #           email:
-    #             wrong_format: 'Die Email hat nicht das richtige Format'
+    #             invalid: 'Die Email hat nicht das richtige Format'
+    #
+    #
+    # == Error message translation fallbacks
+    #
+    # In order to not translate every single content for every element you can provide default error messages per content name:
+    #
+    # === Example
+    #
+    #   en:
+    #     alchemy:
+    #       content_validations:
+    #         fields:
+    #           email:
+    #             invalid: E-Mail has wrong format
+    #             blank: E-Mail can't be blank
+    #
+    # And even further you can provide general field agnostic error messages:
+    #
+    # === Example
+    #
+    #   en:
+    #     alchemy:
+    #       content_validations:
+    #         errors:
+    #           invalid: %{field} has wrong format
+    #           blank: %{field} can't be blank
     #
     def essence_error_messages
       messages = []
       essence_errors.each do |content_name, errors|
         errors.each do |error|
-          messages << I18n.t(error,
-            :scope => [:content_validations, self.name, content_name],
+          messages << I18n.t(
+            "#{name}.#{content_name}.#{error}",
+            :scope => :content_validations,
             :default => [
-              "alchemy.content_validations.fields.#{content_name}.#{error}".to_sym,
-              "alchemy.content_validations.errors.#{error}".to_sym
+              "fields.#{content_name}.#{error}".to_sym,
+              "errors.#{error}".to_sym
             ],
             :field => Content.translated_label_for(content_name)
           )
@@ -561,7 +584,7 @@ module Alchemy
     def create_contents
       contents = []
       if description["contents"].blank?
-        logger.warn "\n++++++\nWARNING! Could not find any content descriptions for element: #{self.name}\n++++++++\n"
+        warn "Could not find any content descriptions for element: #{self.name}"
       else
         description["contents"].each do |content_hash|
           contents << Content.create_from_scratch(self, content_hash.symbolize_keys)

data/app/models/alchemy/legacy_page_url.rb

@@ -0,0 +1,6 @@
+class Alchemy::LegacyPageUrl < ActiveRecord::Base
+  attr_accessible :page, :page_id, :urlname
+  belongs_to :page, class_name: 'Alchemy::Page'
+
+  validates_presence_of [:urlname, :page_id]
+end

data/app/models/alchemy/page.rb

@@ -48,6 +48,7 @@ module Alchemy
     has_many :cells, :dependent => :destroy
     has_many :elements, :dependent => :destroy, :order => :position
     has_many :contents, :through => :elements
+    has_many :legacy_urls, :class_name => 'Alchemy::LegacyPageUrl'
     has_and_belongs_to_many :to_be_sweeped_elements, :class_name => 'Alchemy::Element', :uniq => true, :join_table => 'alchemy_elements_alchemy_pages'
     belongs_to :language
 
@@ -72,6 +73,7 @@ module Alchemy
     after_create :autogenerate_elements, :unless => proc { |page| page.systempage? || page.do_not_autogenerate }
     after_update :trash_not_allowed_elements, :if => :page_layout_changed?
     after_update :autogenerate_elements, :if => :page_layout_changed?
+    after_update :create_legacy_url, :if => :urlname_changed?
 
     scope :language_roots, where(:language_root => true)
     scope :layoutpages, where(:layoutpage => true)
@@ -399,52 +401,23 @@ module Alchemy
       elements.select { |m| type.include? m.name }
     end
 
-    # Returns the translated explanation of seven the page stati.
-    # TODO: Let I18n do this!
-    def humanized_status
-      case self.status
-      when 0
-        return I18n.t('page_status_visible_public_locked')
-      when 1
-        return I18n.t('page_status_visible_unpublic_locked')
-      when 2
-        return I18n.t('page_status_invisible_public_locked')
-      when 3
-        return I18n.t('page_status_invisible_unpublic_locked')
-      when 4
-        return I18n.t('page_status_visible_public')
-      when 5
-        return I18n.t('page_status_visible_unpublic')
-      when 6
-        return I18n.t('page_status_invisible_public')
-      when 7
-        return I18n.t('page_status_invisible_unpublic')
-      end
+    # Returns a Hash of attributes describing the status of the Page.
+    #
+    def status
+      combined_status = {}
+      combined_status[:visible] = self.visible?
+      combined_status[:public] = self.public?
+      combined_status[:locked] = self.locked?
+      combined_status[:restricted] = self.restricted?
+      return combined_status
     end
 
-    # Returns the status code. Used by humanized_status and the page status icon inside the sitemap rendered by Pages.index.
-    def status
-      if self.locked
-        if self.public? && self.visible?
-          return 0
-        elsif !self.public? && self.visible?
-          return 1
-        elsif self.public? && !self.visible?
-          return 2
-        elsif !self.public? && !self.visible?
-          return 3
-        end
-      else
-        if self.public? && self.visible?
-          return 4
-        elsif !self.public? && self.visible?
-          return 5
-        elsif self.public? && !self.visible?
-          return 6
-        elsif !self.public? && !self.visible?
-          return 7
-        end
-      end
+    # Returns the translated status for given status type.
+    #
+    # @param [Symbol] status_type
+    #
+    def status_title(status_type)
+      I18n.t(self.send(status_type), :scope => "page_states.#{status_type}")
     end
 
     def has_controller?
@@ -463,7 +436,7 @@ module Alchemy
       return {} if self.systempage?
       description = PageLayout.get(self.page_layout)
       if description.nil?
-        raise "Description could not be found for page layout named #{self.page_layout}. Please check page_layouts.yml file."
+        raise PageLayoutDefinitionError, "Description could not be found for page layout named #{self.page_layout}. Please check page_layouts.yml file."
       else
         description
       end
@@ -649,5 +622,11 @@ module Alchemy
       elements.select { |e| !definition['elements'].include?(e.name) }.map(&:trash)
     end
 
+    # Stores the old urlname in a LegacyPageUrl
+    def create_legacy_url
+      legacy_url = legacy_urls.new(:urlname => urlname_was)
+      legacy_url.save!
+    end
+
   end
 end

data/app/models/alchemy/picture.rb

@@ -22,7 +22,7 @@ module Alchemy
     end
 
     validates_presence_of :image_file
-    validates_property :format, :of => :image_file, :in => Config.get('uploader')['allowed_filetypes']['pictures'].map(&:to_sym), :message => I18n.t("not a valid image")
+    validates_property :format, :of => :image_file, :in => Config.get('uploader')['allowed_filetypes']['pictures'], :case_sensitive => false, :message => I18n.t("not a valid image")
 
     acts_as_taggable
 
@@ -170,5 +170,4 @@ module Alchemy
     end
 
   end
-  class PictureInUseError < StandardError; end
 end

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

@@ -9,13 +9,13 @@
             :options => @options
           ),
           {
-            :title => t('upload_file'),
+            :title => _t('upload_file'),
             :size => '540x550'
           },
-          :title => t('upload_file'),
+          :title => _t('upload_file'),
           :class => 'icon_button'
         ) %>
-      <label><%= t('upload_file') %></label>
+      <label><%= _t('upload_file') %></label>
     </div>
     <%= js_filter_field(:onkeyup => "Alchemy.ListFilter('.assign_file_file')") %>
   </div>

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

@@ -8,7 +8,7 @@
       attachment.name,
       alchemy.admin_attachment_path(attachment),
       :target => '_blank',
-      :title => t('View File')
+      :title => _t('View File')
     ) %>
   <% else %>
     <%= attachment.name %>
@@ -23,14 +23,14 @@
     <%= link_to(
       "",
       alchemy.download_admin_attachment_path(attachment),
-      :title => t("download_file", :filename => attachment.filename),
+      :title => _t("download_file", :filename => attachment.filename),
       :class => "icon file_download"
     ) %>
   <% end %>
   <% permitted_to?(:destroy, :alchemy_admin_attachments) do %>
     <%= link_to_confirmation_window(
       "",
-      t("confirm_to_delete_file"),
+      _t("confirm_to_delete_file"),
       alchemy.admin_attachment_path(
         :id => attachment,
         :query => params[:query],
@@ -39,7 +39,7 @@
       ),
       {
         :class => 'icon file_delete',
-        :title => t('delete_file')
+        :title => _t('delete_file')
       }
     ) %>
   <% end %>
@@ -47,11 +47,11 @@
     <%= link_to_overlay_window("",
       alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
       {
-        :title => t('rename_file'),
+        :title => _t('rename_file'),
         :size => '380x220'
       },
       :class => 'icon file_edit',
-      :title => t('rename_file')
+      :title => _t('rename_file')
     ) %>
   <% end %>
   </td>

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

@@ -1,12 +1,12 @@
 <%- if @attachments.blank? && params[:query].nil? -%>
 <div class="info" id="no_files_notice">
   <%= render_icon('info') %>
-  <%= t("no_files_in_archive") %>
+  <%= _t("no_files_in_archive") %>
 </div>
 <%- elsif @attachments.blank? -%>
 <div class="info">
   <%= render_icon('info') %>
-  <%= t("no_search_results") %>
+  <%= _t("no_search_results") %>
 </div>
 <%- end -%>
 <table id="all_files" class="list">

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

@@ -6,7 +6,10 @@
     </tr>
     <tr>
       <td class="label"><%= f.label 'filename' %>*</td>
-      <td class="input"><%= f.text_field 'filename', :class => 'thin_border long' %></td>
+      <td class="input">
+        <%= f.text_field 'filename', :class => 'thin_border long' %>
+        <p class="foot_note"><%= _t(:attachment_filename_notice) %></p>
+      </td>
     </tr>
     <tr>
       <td class="label"><%= f.label 'tag_list' %></td>
@@ -16,9 +19,8 @@
     </tr>
     <tr>
       <td colspan="2" class="submit">
-        <%= f.button t('save'), :class => 'button' %>
+        <%= f.button _t('save'), :class => 'button' %>
       </td>
     </tr>
   </table>
-  <p class="foot_note"><%= t(:attachment_filename_notice) %></p>
 <% end %>

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

@@ -4,12 +4,12 @@
       :icon => 'upload',
       :url => alchemy.new_admin_attachment_path,
       :overlay_options => {
-        :title => t('upload_file'),
+        :title => _t('upload_file'),
         :size => '540x550'
       },
-      :title => t('upload_file'),
+      :title => _t('upload_file'),
       :class => 'icon_button',
-      :label => t('upload_file'),
+      :label => _t('upload_file'),
       :if_permitted_to => [:new, :alchemy_admin_attachments]
     }
   ]

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

@@ -3,9 +3,9 @@
     :partial => "alchemy/admin/partials/upload_form",
     :locals => {
       :file_types => configuration(:uploader)['allowed_filetypes']['attachments'],
-      :file_types_description => t('documents'),
+      :file_types_description => _t('documents'),
       :model_name => 'attachment',
-      :item_type => t('files')
+      :item_type => _t('files')
     }
   ) %>
 <% end %>

data/app/views/alchemy/admin/clipboard/clear.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 
-  $("#clipboard_items").replaceWith("<p><%= t('No items in your clipboard') -%></p>");
+  $("#clipboard_items").replaceWith("<p><%= _t('No items in your clipboard') -%></p>");
   $('#clipboard_button .icon.clipboard').removeClass('full');
   Alchemy.pleaseWaitOverlay(false);
 

data/app/views/alchemy/admin/clipboard/index.html.erb

@@ -2,7 +2,7 @@
   <%- if @clipboard_items.blank? -%>
   <div class="info">
     <%= render_icon('info') %>
-    <%= t('No items in your clipboard') %>
+    <%= _t('No items in your clipboard') %>
   </div>
   <%- else -%>
   <div id="clipboard_items">
@@ -11,12 +11,12 @@
       <% item_class = item.class.name.demodulize.underscore.pluralize %>
       <li id="clipboard_item_<%= item.id -%>" class="<%= item_class -%>">
         <%= item.class.to_s == 'Alchemy::Element' ? item.display_name_with_preview_text(60) : item.name %>
-        <span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(:remarkable_type => item_class, :remarkable_id => item.id), :remote => true, :method => :delete, :title => t('Remove item from clipboard')) %></span>
+        <span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(:remarkable_type => item_class, :remarkable_id => item.id), :remote => true, :method => :delete, :title => _t('Remove item from clipboard')) %></span>
       </li>
       <%- end -%>
     </ul>
     <p>
-      <%= link_to_confirmation_window(t('clear clipboard'), t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path(:remarkable_type => params[:remarkable_type]), :class => 'button') %>
+      <%= link_to_confirmation_window(_t('clear clipboard'), _t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path(:remarkable_type => params[:remarkable_type]), :class => 'button') %>
     </p>
   </div>
   <%- end -%>