alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

data/config/alchemy/config.yml

@@ -186,3 +186,4 @@ open_external_links_in_new_tab: true
 format_matchers:
   email: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
   url: !ruby/regexp '/\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix'
+  link_url: !ruby/regexp '/^(mailto:|\/|[a-z]+:\/\/)/'

data/config/locales/alchemy.de.yml

@@ -169,11 +169,13 @@ de:
       site:
         aliases: Weitere Domains bitte mit Leerzeichen oder Leerzeile getrennt angeben.
 
+    anchor: 'Sprungmarke'
     back: 'zurück'
     create_tree_as_new_language: "%{language} als neuen Sprachbaum anlegen"
     "<a href=\"http://get.adobe.com/flashplayer\" target=\"_blank\">%{value}</a>": ""
     "Active Pages": "Aktive Seiten"
     "Add global page": "Neue globale Seite"
+    "Add page link": "Verweis hinzufügen"
     "Adobe Website": "Adobe Webseite"
     "Alchemy is open software and itself uses open software and free resources:": "Alchemy ist offene Software und benutzt selbst offene Software und freie Ressourcen:"
     "Alchemy is up to date": 'Alchemy ist aktuell'
@@ -228,6 +230,7 @@ de:
     "New": "Neu"
     "New Element": "Element hinzufügen"
     "New page": "Neue Seite"
+    "No page links for this page found": "Keine Verweise vorhanden."
     "New password": "Neues Passwort"
     "New Tag": "Neues Tag"
     "New Tag Created": "Neues Tag wurde erstellt"
@@ -261,6 +264,7 @@ de:
     "Please log in": "Bitte melden Sie sich an."
     "Please seperate the tags with commata": "* Die Tags bitte mit Komma getrennt eingeben."
     use_alternative_uploader_instead: "Benutzen Sie bitte diesen alternativen Uploader."
+    "Properties": "Eigenschaften"
     "Publish page": "veröffentlichen"
     "Read the License": "Lizenz lesen"
     "Redirects to": "Leitet weiter auf"
@@ -423,7 +427,9 @@ de:
     image_name: "Name"
     image_title: "Titel-Tag"
     images: "Bilder"
-    internal_link_headline: "Wählen Sie eine Seite zum Verlinken."
+    internal_link_headline: "Wählen Sie eine Seite zum Verlinken aus."
+    internal_link_page_elements_explanation: "Zusätzlich können Sie rechts neben der jeweiligen Seite auf 'Elemente anzeigen' klicken, um eine Sprungmarke zu einem Element dieser Seite zu erstellen."
+    internal_link_page_anchors_explanation: "Alternativ können Sie auch eine Sprungmarke innerhalb der aktuellen Seite erstellen."
     "item copied to clipboard": "%{name} wurde in die Zwischenablage kopiert."
     "item moved to clipboard": "%{name} wurde in die Zwischenablage bewegt."
     "item removed from clipboard": "%{name} wurde aus der Zwischenablage entfernt."
@@ -434,6 +440,7 @@ de:
     language_pages_copied: "Der Sprachbaum wurde kopiert"
     last_upload_only: "Zuletzt hochgeladene"
     left: "links"
+    legacy_url_info_text: "Ein Verweis ist eine Weiterleitung einer alten URL auf die aktuelle URL dieser Seite. Diese Weiterleitung findet mit einem <a href='https://support.google.com/webmasters/answer/93633' target='_blank'>301-Status-Code</a> statt."
     link_image: "Bild verlinken"
     link_overlay_tab_label:
       contactform: "Kontaktformular"
@@ -822,6 +829,10 @@ de:
         one: "Element"
         other: "Elemente"
 
+      alchemy/legacy_page_url:
+        one: "Verweis"
+        other: "Verweise"
+
       alchemy/language:
         one: "Sprache"
         other: "Sprachen"
@@ -884,6 +895,9 @@ de:
         page_layout: "Seitentyp der Startseite"
         public: "Sprache veröffentlichen"
 
+      alchemy/legacy_page_url:
+        urlname: "URL-Pfad"
+
       alchemy/page:
         created_at: "Erstellt am"
         language: "Sprache"

data/config/locales/alchemy.en.yml

@@ -99,9 +99,9 @@ en:
         message: 'Message'
         send: 'Send'
         mandatory_fields: '*Mandatory fields.'
-      # The flash message shown after succesfully sending the message.
+      # The flash message shown after successfully sending the message.
       messages:
-        success: 'Your message was delivered succesfully.'
+        success: 'Your message was delivered successfully.'
 
     # == Translated language names for translation select
     translations:
@@ -159,8 +159,8 @@ en:
     "Page saved": "Page: '%{name}' saved."
     "Password": "Password"
     "Paste from clipboard": "Paste from clipboard"
-    "Successfully added content": "Succesfully added %{content}"
-    "Successfully deleted content": "Succesfully deleted %{content}"
+    "Successfully added content": "Successfully added %{content}"
+    "Successfully deleted content": "Successfully deleted %{content}"
     "User created": "User created"
     "User deleted": "User deleted"
     "User updated": "User updated"
@@ -210,11 +210,11 @@ en:
     download_file: "Download file '%{filename}'"
     "Drag an element over to the element window to restore it": "Drag an element over to the element window to restore it."
     drag_to_sort: "Drag'n'Drop to sort images"
-    edit_file_properties: "Edit Fileproperties"
+    edit_file_properties: "Edit file properties."
     edit_image_properties: "Edit image properties."
     edit_language: "Edit language"
     edit_page: "Edit this page"
-    edit_page_properties: "Edit the page´s properties."
+    edit_page_properties: "Edit the page's properties."
     edit_selected_pictures: "Edit selected pictures"
     element_description_missing: "WARNING! Missing description. Please check your elements.yml file."
     element_dirty_close_window_notice: "You have unsaved elements. Do you really want to close the elements window?"
@@ -232,12 +232,12 @@ en:
       step1: "Click the 'browse' button and navigate to your %{name} folder"
       step2: "Select all the %{name} you want to upload"
       step3: "Click the 'open' button. The upload starts!"
-    external_link_notice_1: "Please enter the complete url with http:// or a similiar protocol."
+    external_link_notice_1: "Please enter the complete url with http:// or a similar protocol."
     external_link_notice_2: "To refer a path from your website url, start with a /."
     female: "Female"
     file: "File"
     file_rename_error: "Error renaming file."
-    "File uploaded succesfully": "File %{name} succesfully uploaded"
+    "File uploaded succesfully": "File %{name} successfully uploaded"
     "File upload error": "File upload error: %{error}"
     from_at: "from %{by} at %{at}"
     'Global shortcuts': 'Global shortcuts'
@@ -249,7 +249,7 @@ en:
         "Open logout dialog": "Open logout dialog"
         "Focus search field": "Focus search field"
         "Create a new record": "Create a new record"
-        "Show page infos": "Show page infos"
+        "Show page infos": "Show page info"
         "Create new element": "Create new element"
         "Edit page properties": "Edit page properties"
         "Reload the preview": "Reload the preview"
@@ -264,6 +264,8 @@ en:
     image_name: "Name"
     image_title: "Title-tag"
     internal_link_headline: "Choose a page to link to."
+    internal_link_page_elements_explanation: "Additionally you can click right beside a page on 'Show Elements' to link to an anchor of an element from that page."
+    internal_link_page_anchors_explanation: "Alternatively you can link to an anchor of the actual page."
     "item copied to clipboard": "Copied %{name} to clipboard"
     "item moved to clipboard": "Moved %{name} to clipboard"
     "item removed from clipboard": "Removed %{name} from clipboard"
@@ -271,15 +273,16 @@ en:
     javascript_disabled_text: "Alchemy needs Javascript to run smoothly. Please enable it in your browser settings."
     language_code_placeholder: 'i.e. en'
     language_does_not_exist: "This language tree does not exist"
-    language_pages_copied: "Language tree succesfully copied."
+    language_pages_copied: "Language tree successfully copied."
+    legacy_url_info_text: "A link is a redirect from an old URL to the current URL of this page. This redirect happens with a <a href='https://support.google.com/webmasters/answer/93633' target='_blank'>301 status code</a>."
     "Library shortcuts": "Library shortcuts"
     link_image: "Link this image."
     link_overlay_tab_label:
-      contactform: "Contactform"
+      contactform: "Contact form"
       external: "External"
       file: "File"
       internal: "Internal"
-    link_title: "Linktitle"
+    link_title: "Link title"
     mail_to: "Recipient"
     male: "Male"
     medium_thumbnails: "Medium thumbnails"
@@ -298,7 +301,7 @@ en:
       sites: "Sites"
     name: "Name"
     names: "Names"
-    navigation_name: "Navigationname"
+    navigation_name: "Navigation name"
     no_default_language_found: "No default language found."
     no_element_given: "No element given."
     no_files_in_archive: "You do not have any files in your archive."
@@ -340,7 +343,7 @@ en:
         comma_seperated: "Separate by comma"
     password: "Password"
     picture_gallery_editor: 'Pictures'
-    "Picture uploaded succesfully": "Picture %{name} uploaded succesfully"
+    "Picture uploaded succesfully": "Picture %{name} uploaded successfully"
     "Picture validation error": "Error while uploading %{name}"
     "Picture renamed successfully": "Picture renamed successfully from %{from} to %{to}"
     "Picture deleted successfully": "Picture %{name} successfully deleted"
@@ -354,7 +357,7 @@ en:
         recent: "that where recently uploaded"
         without_tag: "without tag"
     place_link: "Link text"
-    player_version: "Flashplayer Version"
+    player_version: "Flash Player version"
     "please enter subject and mail address": "Please enter recipient and subject."
     please_confirm: "Please confirm"
     please_wait: "Please wait"
@@ -372,7 +375,7 @@ en:
     robot_follow: "robot may follow links."
     robot_index: "allow robot to index."
     saved_link: "Link saved."
-    search_engines: "Searchengines"
+    search_engines: "Search engines"
     select_element: "Select element"
     show_element_content: "Show content of this element."
     show_elements_from_page: "Show all elements from this page"
@@ -383,9 +386,9 @@ en:
     sitemap_editor_notice: "The sitemap is autogenerated."
     searchresults_editor_info: "This element displays the search and the searchresults."
     small_thumbnails: "Small thumbnails"
-    successfully_added_element: "Succesfully added new element."
-    successfully_restored_element: "Element restored succesfully."
-    successfully_saved_element_position: "Element position updated succesfully."
+    successfully_added_element: "Successfully added new element."
+    successfully_restored_element: "Element restored successfully."
+    successfully_saved_element_position: "Element position updated successfully."
     swap_image: "Change image"
     "These pictures could not be deleted, because they were in use": "These pictures could not be deleted, because they were in use: %{names}"
     insert_image: "Insert image"
@@ -614,6 +617,10 @@ en:
         one: File
         other: Files
 
+      alchemy/legacy_page_url:
+        one: "Link"
+        other: "Links"
+
       alchemy/picture:
         one: Picture
         other: Pictures
@@ -646,6 +653,9 @@ en:
         page_layout: "Pagetype of frontpage"
         public: "Public"
 
+      alchemy/legacy_page_url:
+        urlname: "URL path"
+
       alchemy/page:
         created_at: "Created at"
         language: "Language"

data/config/locales/alchemy.nl.yml

@@ -411,6 +411,8 @@ nl:
     image_title: "Titel-tag"
     images: "Bilder"
     internal_link_headline: "Kies een pagina om een snelkoppeling naar te maken."
+    internal_link_page_elements_explanation: "Additionally you can click right beside a page on 'Show Elements' to link to an anchor of an element from that page."
+    internal_link_page_anchors_explanation: "Alternativly you can link to an anchor of the actual page."
     "item copied to clipboard": "%{name} naar het klembord gekopieerd"
     "item moved to clipboard": "%{name} naar het klembord verplaatst"
     "item removed from clipboard": "%{name} van het klembord verwijderd"
@@ -421,6 +423,7 @@ nl:
     language_pages_copied: "Boomstructuur gekopieerd."
     last_upload_only: "Alleen de laatste upload"
     left: "links"
+    legacy_url_info_text: "A link is a redirect from an old URL to the current URL of this page. This redirect happens with a <a href='https://support.google.com/webmasters/answer/93633' target='_blank'>301 status code</a>."
     link_image: "Snelkoppeling naar deze afbeelding maken."
     link_overlay_tab_label:
       contactform: "Contactformulier"
@@ -692,7 +695,7 @@ nl:
         hour: "Uur"
         day: "Dag"
         month: "Maand"
-        year: "Jaar"	
+        year: "Jaar"
   number:
     format:
       precision: 2
@@ -828,6 +831,10 @@ nl:
         one: "Element"
         other: "Elementen"
 
+      alchemy/legacy_page_url:
+        one: "Link"
+        other: "Links"
+
       alchemy/language:
         one: "Taal"
         other: "Talen"
@@ -890,6 +897,9 @@ nl:
         page_layout: "Paginatype van voorpagina"
         public: "Publiek"
 
+      alchemy/legacy_page_url:
+        urlname: "URL path"
+
       alchemy/page:
         created_at: "Aangemaakt op"
         language: "Taal"

data/config/routes.rb

@@ -78,7 +78,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resources :layoutpages, :only => :index
+    resources :layoutpages, :only => [:index, :edit]
 
     resources :pictures do
       collection do
@@ -113,6 +113,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
+    resources :legacy_page_urls
     resources :languages
 
     resource :clipboard, :only => :index, :controller => 'clipboard' do

data/lib/alchemy/errors.rb

@@ -50,9 +50,9 @@ module Alchemy
   end
 
   class MissingActiveRecordAssociation < StandardError
-    # Raised if a resource_relation is defined without proper ActiveRecord association
+    # Raised if a alchemy_resource_relation is defined without proper ActiveRecord association
     def message
-      "You need to define proper ActiveRecord associations, if you want to use resource_relations."
+      "You need to define proper ActiveRecord associations, if you want to use alchemy_resource_relations."
     end
   end
 

data/lib/alchemy/permissions.rb

@@ -87,6 +87,7 @@ module Alchemy
         # Controller actions
         can [:info, :help],             :alchemy_admin_dashboard
         can :index,                     :trash
+        can :edit,                      :alchemy_admin_layoutpages
 
         # Resources
         can [:read, :download],         Alchemy::Attachment
@@ -95,6 +96,7 @@ module Alchemy
         can :manage,                    Alchemy::Element
         can :manage,                    Alchemy::EssenceFile
         can :manage,                    Alchemy::EssencePicture
+        can :manage,                    Alchemy::LegacyPageUrl
         can :edit_content,              Alchemy::Page
         can [:read, :thumbnail, :info], Alchemy::Picture
         can [:read, :autocomplete],     Alchemy::Tag

data/lib/alchemy/resource.rb

@@ -23,8 +23,14 @@ module Alchemy
   # Usually you don't want your users to edit all attributes provided by a model. Hence some default attributes,
   # namely id, updated_at, created_at, creator_id and updater_id are not returned by Resource#attributes.
   #
-  # If you want to skip a different set of attributes just define a skip_attributes class method in your model class
-  # that returns an array of strings: %W[id, updated_at]
+  # If you want to skip a different set of attributes just define a +skipped_alchemy_resource_attributes+ class method in your model class
+  # that returns an array of strings.
+  #
+  # === Example
+  #
+  #     def self.skipped_alchemy_resource_attributes
+  #       %w(id updated_at secret_token remote_ip)
+  #     end
   #
   # == Resource relations
   #
@@ -67,17 +73,17 @@ module Alchemy
   #     resource = Resource.new('/admin/tags', {"engine_name"=>"alchemy"}, ActsAsTaggableOn::Tag)
   #
   class Resource
-    attr_accessor :skip_attributes, :resource_relations, :model_associations
+    attr_accessor :skipped_attributes, :resource_relations, :model_associations
     attr_reader :model
 
-    DEFAULT_SKIPPED_ATTRIBUTES = %W[id updated_at created_at creator_id updater_id]
+    DEFAULT_SKIPPED_ATTRIBUTES = %w(id updated_at created_at creator_id updater_id)
     DEFAULT_SKIPPED_ASSOCIATIONS = %w(creator updater)
 
     def initialize(controller_path, module_definition=nil, custom_model=nil)
       @controller_path = controller_path
       @module_definition = module_definition
       @model = (custom_model or guess_model_from_controller_path)
-      self.skip_attributes = model.respond_to?(:skip_attributes) ? model.skip_attributes : DEFAULT_SKIPPED_ATTRIBUTES
+      self.skipped_attributes = model.respond_to?(:skipped_alchemy_resource_attributes) ? model.skipped_alchemy_resource_attributes : DEFAULT_SKIPPED_ATTRIBUTES
       if model.respond_to?(:alchemy_resource_relations)
         if not model.respond_to?(:reflect_on_all_associations)
           raise MissingActiveRecordAssociation
@@ -114,8 +120,12 @@ module Alchemy
 
     def attributes
       @_attributes ||= self.model.columns.collect do |col|
-        unless self.skip_attributes.include?(col.name)
-          { :name => col.name, :type => resource_relation_type(col.name) || col.type, :relation => resource_relation(col.name) }.delete_if { |k, v | v.nil? }
+        unless self.skipped_attributes.include?(col.name)
+          {
+            name: col.name,
+            type: resource_column_type(col),
+            relation: resource_relation(col.name)
+          }.delete_if { |k, v| v.nil? }
         end
       end.compact
     end
@@ -152,8 +162,7 @@ module Alchemy
       false
     end
 
-
-  private
+    private
 
     def guess_model_from_controller_path
       resource_array.join('/').classify.constantize
@@ -171,6 +180,10 @@ module Alchemy
       resource_relation(column_name).try(:[], :attr_type)
     end
 
+    def resource_column_type(col)
+      resource_relation_type(col.name) || (col.try(:array) ? :array : col.type)
+    end
+
     def resource_relation(column_name)
       resource_relations[column_name.to_sym] if resource_relations
     end

data/lib/alchemy/tinymce.rb

@@ -2,20 +2,22 @@ module Alchemy
   module Tinymce
     mattr_accessor :languages, :plugins
 
-    @@plugins = %w(alchemy_link autoresize charmap code directionality fullscreen link paste tabfocus table)
+    @@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link paste tabfocus table)
     @@languages = ['en', 'de']
     @@init = {
       skin: 'alchemy',
       width: '100%',
-      resize: false,
+      resize: true,
       autoresize_min_height: '105',
+      autoresize_max_height: '480',
       menubar: false,
-      statusbar: false,
+      statusbar: true,
       toolbar1: 'bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen',
-      toolbar2: 'pastetext charmap code | undo redo | alchemy_link unlink',
+      toolbar2: 'pastetext charmap hr | undo redo | alchemy_link unlink anchor | code',
       fix_list_elements: true,
       convert_urls: false,
-      entity_encoding: 'raw'
+      entity_encoding: 'raw',
+      element_format: 'html'
     }
 
     def self.init=(settings)
@@ -26,8 +28,12 @@ module Alchemy
       @@init
     end
 
-    def self.custom_config_contents
-      @@custom_config_contents ||= content_definitions_from_elements(Element.definitions)
+    def self.custom_config_contents(page = nil)
+      if page
+        content_definitions_from_elements(page.element_definitions)
+      else
+        content_definitions_from_elements(Element.definitions)
+      end
     end
 
     private

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.0.0.rc5"
+  VERSION = "3.0.0.rc6"
 
   def self.version
     VERSION

data/spec/controllers/admin/base_controller_spec.rb

@@ -32,4 +32,43 @@ describe Alchemy::Admin::BaseController do
     end
   end
 
+  describe '#raise_exception?' do
+    subject { controller.send(:raise_exception?) }
+
+    context 'in test mode' do
+      before { Rails.env.stub(test?: true) }
+      it { should be_true }
+    end
+
+    context 'in page preview' do
+      before { controller.stub(is_page_preview?: true) }
+      it { should be_true }
+    end
+
+    context 'not in test mode' do
+      before { Rails.env.stub(test?: false) }
+      it { should be_false }
+
+      context 'and not in page preview' do
+        before { controller.stub(is_page_preview?: false) }
+        it { should be_false }
+      end
+    end
+  end
+
+  describe '#is_page_preview?' do
+    subject { controller.send(:is_page_preview?) }
+
+    it { should be_false }
+
+    context 'is pages controller and show action' do
+      before do
+        controller.stub(controller_path: 'alchemy/admin/pages')
+        controller.stub(action_name: 'show')
+      end
+
+      it { should be_true }
+    end
+  end
+
 end