alchemy_cms 4.3.2 → 4.4.0

data/config/initializers/assets.rb

@@ -1,14 +1,2 @@
 # Add Alchemy assets for precompiling
-Rails.application.config.assets.precompile += [
-  'alchemy/admin/all.css',
-  'alchemy/admin/all.js',
-  'alchemy/alchemy-logo.svg',
-  'alchemy/favicon.ico',
-  'alchemy/preview.js',
-  'alchemy/menubar.css',
-  'alchemy/menubar.js',
-  'alchemy/print.css',
-  'alchemy/welcome.css',
-  'Jcrop.gif',
-  'tinymce/*'
-]
+Rails.application.config.assets.precompile << 'alchemy_manifest.js'

data/config/locales/alchemy.en.yml

@@ -159,6 +159,7 @@ en:
 
     add_nested_element: "Add %{name}"
     anchor: 'Anchor'
+    anchor_link_headline: "You can link to an element anchor from the actual page."
     attribute_fixed: Value can't be changed for this page type
     back: 'back'
     create_tree_as_new_language: "Create %{language} as a new language tree"
@@ -305,13 +306,12 @@ en:
     assign_file: "Assign a file"
     assign_file_from_archive: "assign a file from your archive"
     assign_image: "Assign an image"
+    attached_to: "attached to"
     attachment_filename_notice: "* Please do not use any special characters for the filename."
     auto_play: "Play movie after load"
     big_thumbnails: "Big thumbnails"
     cancel: "cancel"
     cannot_delete_picture_notice: "Cannot delete Picture %{name}, because it's still in use."
-    choose_element_as_target: "Please choose an element as target"
-    choose_element_to_link: "Please choose an element"
     choose_file_to_link: "Please choose a file to link"
     "clear clipboard": "clear clipboard"
     "clear trash": "clear trash"
@@ -320,6 +320,8 @@ en:
     confirm_to_delete_image: "Do you really want to delete this image from server?"
     confirm_to_delete_image_from_server: "Do you really want to delete this image from the server?"
     confirm_to_delete_images_from_server: "Do you really want to delete these images from the server?"
+    confirm_to_delete_menu: "Do you really want to delete this menu?"
+    confirm_to_delete_node: "Do you really want to delete this menu node?"
     confirm_to_delete_page: "Do you really want to delete this page? All its elements (even trashed ones) will get lost!"
     content_essence_not_found: "Content essence not found"
     content_not_found: "Field for content not present."
@@ -335,12 +337,16 @@ en:
     "Create language": "Create a new language"
     "Create site": "Create a new site"
     create_language_tree_heading: "Create empty language tree"
+    create_menu: "Add a menu"
+    create_node: "Add a menu node"
     create_page: "Create a new subpage"
     currently_edited_by: "This page is locked by"
     cut_element: "Cut this element."
     delete_file: "Delete this file from server."
     delete_image: "Remove this image"
     delete_language: "Delete this language"
+    delete_menu: "Delete this menu"
+    delete_node: "Delete this menu node"
     delete_page: "Delete this page"
     delete_tag: 'Delete tag'
     document: "File"
@@ -351,6 +357,8 @@ en:
     edit_file_properties: "Edit file properties."
     edit_image_properties: "Edit image properties."
     edit_language: "Edit language"
+    edit_menu: "Edit menu"
+    edit_node: "Edit menu node"
     edit_page: "Edit this page"
     edit_page_properties: "Edit page properties"
     edit_tag: 'Edit tag'
@@ -390,9 +398,8 @@ en:
     image_caption: "Caption"
     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."
+    internal_link_headline: "Search for a page to link to by entering its name into the Page select."
+    internal_link_page_elements_explanation: "Additionally you can choose an anchor to an element from selected 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"
@@ -406,6 +413,7 @@ en:
     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: "Link this image."
     link_overlay_tab_label:
+      anchor: "Anchor"
       contactform: "Contact form"
       external: "External"
       file: "File"
@@ -418,6 +426,7 @@ en:
     male: "Male"
     me: "Me"
     medium_thumbnails: "Medium thumbnails"
+    menu: Menu
     meta_data: "Meta-Data"
     meta_description: "Meta-Description"
     meta_keywords: "Meta-Keywords"
@@ -428,6 +437,7 @@ en:
       languages: "Languages"
       layoutpages: "Global Pages"
       library: "Library"
+      menus: "Menus"
       pages: "Pages"
       tags: "Tags"
       sites: "Sites"
@@ -435,7 +445,7 @@ en:
       users: "Users"
     name: "Name"
     names: "Names"
-    navigation_name: "Navigation name"
+    node_url_hint: "Please use either a leading slash (/) or an url with protocol (ie. https:)"
     no_image_for_cropper_found: "No image found. Please save the element first."
     no: "No"
     "no pages": "no pages"
@@ -445,13 +455,12 @@ en:
     no_files_in_archive: "You do not have any files in your archive."
     no_images_in_archive: "You don't have any images in your archive."
     no_more_elements_to_add: "No more elements available."
+    no_resource_found: "No %{resource} found. Please add your first one below."
     no_search_results: "Your search did not return any results."
     "not a valid image": "This is not an valid image."
     "or": 'or'
     or_replace_it_with_an_existing_tag: 'Or replace it with an existing tag'
     "Page created": "Page: '%{name}' created."
-    page_for_links:
-      choose_page: "Choose %{name}"
     page_infos: 'Page info'
     page_layout_changed_notice: "Page type was changed. Elements not usable anymore have been moved into the trash."
     page_properties: "Page properties"
@@ -524,7 +533,6 @@ en:
     select_element: "Select element"
     seperate_tags_with_comma: "Seperate tags with comma"
     show_element_content: "Show content of this element."
-    show_elements_from_page: "Show all elements from this page"
     show_eq: "Show EQ"
     show_navigation: "Show in navigation"
     show_page_in_sitemap: "Show page in sitemap."
@@ -704,6 +712,9 @@ en:
       alchemy/language:
         one: "Language"
         other: "Languages"
+      alchemy/node:
+        one: "Menu node"
+        other: "Menu nodes"
       alchemy/page:
         one: "Page"
         other: "Pages"
@@ -762,6 +773,13 @@ en:
         code: ISO Code
       alchemy/legacy_page_url:
         urlname: "URL path"
+      alchemy/node:
+        name: "Name"
+        title: "Title"
+        nofollow: "Search engine must not follow"
+        url: "URL"
+        page: "Page"
+        external: "Open link in new tab"
       alchemy/page:
         created_at: "Created at"
         language: "Language"

data/config/routes.rb

@@ -17,13 +17,18 @@ Alchemy::Engine.routes.draw do
   namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
     resources :contents, only: [:create]
 
+    resources :nodes do
+      member do
+        patch :toggle
+      end
+    end
+
     resources :pages do
       resources :elements
       collection do
         post :order
         post :flush
         post :copy_language_tree
-        get :switch_language
         get :create_language
         get :link
         get :sort
@@ -43,7 +48,6 @@ Alchemy::Engine.routes.draw do
     resources :elements do
       resources :contents
       collection do
-        get :list
         post :order
       end
       member do
@@ -88,7 +92,11 @@ Alchemy::Engine.routes.draw do
     end
 
     resources :legacy_page_urls
-    resources :languages
+    resources :languages do
+      collection do
+        get :switch
+      end
+    end
 
     resource :clipboard, only: :index, controller: 'clipboard' do
       collection do

data/db/migrate/20191016073858_create_alchemy_essence_pages.rb

@@ -0,0 +1,8 @@
+class CreateAlchemyEssencePages < ActiveRecord::Migration[5.0]
+  def change
+    create_table :alchemy_essence_pages do |t|
+      t.references :page, null: true, foreign_key: { to_table: :alchemy_pages }
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191029212236_create_alchemy_nodes.rb

@@ -0,0 +1,24 @@
+class CreateAlchemyNodes < ActiveRecord::Migration[5.0]
+  def change
+    create_table :alchemy_nodes do |t|
+      t.string :name
+      t.string :title
+      t.string :url
+      t.boolean :nofollow, null: false, default: false
+      t.boolean :external, null: false, default: false
+      t.boolean :folded, null: false, default: false
+
+      t.integer :parent_id, index: true
+      t.integer :lft, null: false, index: true
+      t.integer :rgt, null: false, index: true
+      t.integer :depth, null: false, default: 0
+
+      t.references :page, foreign_key: { to_table: :alchemy_pages, on_delete: :cascade }
+      t.references :language, null: false, foreign_key: { to_table: :alchemy_languages }
+      t.references :creator, index: true
+      t.references :updater, index: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/alchemy/admin/locale.rb

@@ -41,7 +41,7 @@ module Alchemy
       #
       def available_locale
         locales = [params[:admin_locale], locale_from_user, locale_from_browser].compact.map(&:to_sym)
-        locales.detect { |locale| ::I18n.available_locales.include?(locale) }
+        locales.detect { |locale| Alchemy::I18n.available_locales.include?(locale) }
       end
 
       # Try to get the locale from user settings.

data/lib/alchemy/auth_accessors.rb

@@ -9,6 +9,7 @@
 # +Alchemy.signup_path defaults to +'/signup'+
 # +Alchemy.login_path defaults to +'/login'+
 # +Alchemy.logout_path defaults to +'/logout'+
+# +Alchemy.logout_method defaults to +'delete'+
 #
 # Anyway, you can tell Alchemy about your authentication model configuration:
 #
@@ -18,6 +19,7 @@
 #   3. The path to the signup form - @see: Alchemy.signup_path
 #   4. The path to the login form - @see: Alchemy.login_path
 #   5. The path to the logout method - @see: Alchemy.logout_path
+#   6. The http verb for the logout method - @see: Alchemy.logout_method
 #
 # == Example
 #
@@ -27,6 +29,7 @@
 #     Alchemy.signup_path = '/auth/signup'
 #     Alchemy.login_path = '/auth/login'
 #     Alchemy.logout_path = '/auth/logout'
+#     Alchemy.logout_method = 'get'
 #
 # If you don't have your own user model or don't want to provide one,
 # add the `alchemy-devise` gem into your App's Gemfile.
@@ -42,7 +45,8 @@ module Alchemy
     :current_user_method,
     :signup_path,
     :login_path,
-    :logout_path
+    :logout_path,
+    :logout_method
 
   # Defaults
   #
@@ -51,6 +55,7 @@ module Alchemy
   @@signup_path = '/signup'
   @@login_path = '/login'
   @@logout_path = '/logout'
+  @@logout_method = 'delete'
 
   # Returns the user class
   #
@@ -80,7 +85,8 @@ module Alchemy
         Please add a user class and tell Alchemy about it or, if you don't want
         to create your own class, add the `alchemy-devise` gem to your Gemfile.
 
-        gem 'alchemy-devise', '~> 2.1.0'
+            bundle add alchemy-devise
+
       MSG
     else
       raise e

data/lib/alchemy/cache_digests/template_tracker.rb

@@ -15,12 +15,15 @@ module Alchemy
         case @name.to_s
         when /^alchemy\/pages\/show/
           PageLayout.all.map { |p| "alchemy/page_layouts/_#{p['name']}" }
-        when /^alchemy\/page_layouts\/_(.+)/
+        when /^alchemy\/page_layouts\/_(\w+)/
           page_layout = PageLayout.get($1)
-          page_layout.fetch('elements', []).map { |name| "alchemy/elements/_#{name}_view" }
-        when /alchemy\/elements\/_(.+)_view/
-          essences = essence_types($1)
-          essences.map { |name| "alchemy/essences/_#{name.underscore}_view" }.uniq
+          layout_elements = page_layout.fetch('elements', [])
+          layout_elements.map { |name| "alchemy/elements/_#{name}_view" } +
+            layout_elements.map { |name| "alchemy/elements/_#{name}" }
+        when /^alchemy\/elements\/_(\w+)_view/, /^alchemy\/elements\/_(\w+)/
+          essence_types($1).map { |name|
+            "alchemy/essences/_#{name.underscore}_view"
+          }.uniq
         else
           ActionView::DependencyTracker::ERBTracker.call(@name, @template)
         end

data/lib/alchemy/elements_finder.rb

@@ -57,13 +57,15 @@ module Alchemy
 
     attr_reader :page, :options
 
-    def find_elements(page)
-      elements = Alchemy::Element
-        .where(page_id: page_ids(page))
-        .merge(Alchemy::Element.not_nested)
-        .where(fixed: !!options[:fixed])
-        .order(position: :asc)
-        .available
+    def find_elements(page_or_layout)
+      @page = get_page(page_or_layout)
+      return Alchemy::Element.none unless page
+
+      if options[:fixed]
+        elements = page.fixed_elements
+      else
+        elements = page.elements
+      end
 
       if options[:only]
         elements = elements.named(options[:only])
@@ -76,15 +78,16 @@ module Alchemy
       elements
     end
 
-    def page_ids(page)
-      case page
+    def get_page(page_or_layout)
+      case page_or_layout
+      when Alchemy::Page
+        page_or_layout
       when String
-        Alchemy::Language.current.pages.where(
-          page_layout: page,
+        Alchemy::Page.find_by(
+          language: Alchemy::Language.current,
+          page_layout: page_or_layout,
           restricted: false
-        ).pluck("#{Alchemy::Page.table_name}.id")
-      when Alchemy::Page
-        page.id
+        )
       end
     end
 

data/lib/alchemy/engine.rb

@@ -4,6 +4,10 @@ module Alchemy
     engine_name 'alchemy'
     config.mount_at = '/'
 
+    initializer 'alchemy.lookup_context' do
+      Alchemy::LOOKUP_CONTEXT = ActionView::LookupContext.new(Rails.root.join('app', 'views', 'alchemy'))
+    end
+
     initializer 'alchemy.dependency_tracker' do
       [:erb, :slim, :haml].each do |handler|
         ActionView::DependencyTracker.register_tracker(handler, CacheDigests::TemplateTracker)

data/lib/alchemy/essence.rb

@@ -3,6 +3,18 @@
 require 'active_record'
 
 module Alchemy #:nodoc:
+  # A bogus association that skips eager loading for essences not having an ingredient association
+  class IngredientAssociation < ActiveRecord::Associations::BelongsToAssociation
+    # Skip eager loading if called by Rails' preloader
+    def klass
+      if caller.any? { |line| line =~ /preloader\.rb/ }
+        nil
+      else
+        super
+      end
+    end
+  end
+
   module Essence #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)
@@ -31,13 +43,15 @@ module Alchemy #:nodoc:
           ingredient_column: 'body'
         }.update(options)
 
+        @_classes_with_ingredient_association ||= []
+
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           attr_writer :validation_errors
           include Alchemy::Essence::InstanceMethods
           stampable stamper_class_name: Alchemy.user_class_name
           validate :validate_ingredient, on: :update, if: -> { validations.any? }
 
-          has_one :content, as: :essence, class_name: "Alchemy::Content"
+          has_one :content, as: :essence, class_name: "Alchemy::Content", inverse_of: :essence
           has_one :element, through: :content, class_name: "Alchemy::Element"
           has_one :page,    through: :element, class_name: "Alchemy::Page"
 
@@ -66,8 +80,31 @@ module Alchemy #:nodoc:
             '#{configuration[:preview_text_column] || configuration[:ingredient_column]}'
           end
         RUBY
+
+        if configuration[:belongs_to]
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            belongs_to :ingredient_association, #{configuration[:belongs_to]}
+
+            alias_method :#{configuration[:ingredient_column]}, :ingredient_association
+            alias_method :#{configuration[:ingredient_column]}=, :ingredient_association=
+          RUBY
+
+          @_classes_with_ingredient_association << self
+        end
       end
 
+      # Overwrite ActiveRecords method to return a bogus association class that skips eager loading
+      # for essence classes that do not have an ingredient association
+      def _reflect_on_association(name)
+        if name == :ingredient_association && !in?(@_classes_with_ingredient_association)
+          OpenStruct.new(association_class: Alchemy::IngredientAssociation)
+        else
+          super
+        end
+      end
+
+      private
+
       # Register the current class as has_many association on +Alchemy::Page+ and +Alchemy::Element+ models
       def register_as_essence_association!
         klass_name = model_name.to_s
@@ -231,4 +268,5 @@ module Alchemy #:nodoc:
     end
   end
 end
-ActiveRecord::Base.class_eval { include Alchemy::Essence } if defined?(Alchemy::Essence)
+
+ActiveRecord::Base.include(Alchemy::Essence)