alchemy_cms 3.4.2 → 3.5.0.rc1

data/config/locales/alchemy.it.yml

@@ -161,6 +161,7 @@ it:
         aliases: Separa i domini aggiuntivi con uno spazio od un ritorno a capo.
 
     anchor: 'Collegamento'
+    attribute_fixed: Il valore non può essere modificato
     back: 'indietro'
     create_tree_as_new_language: "Crea una nuova struttura della lingua per %{language}"
     locked_pages: "Pagine attive"
@@ -417,7 +418,7 @@ it:
     login: "login"
     logout: "logout"
     mail_to: "Destinatario"
-    main_content: "Contanuto principale"
+    main_content: "Contenuto principale"
     male: "Maschio"
     me: "Me"
     medium_thumbnails: "Thumbnail di meda dimensione"
@@ -511,6 +512,7 @@ it:
     rename_file: "Rinomina questo file."
     rename: "Rinomina"
     replace: sostituisci
+    replace_file: Sostituire il file
     'Replaced Tag': "Il tag '%{old_tag}' è stato sostiuito con '%{new_tag}'"
     resources:
       relation_select:

data/config/locales/alchemy.nl.yml

@@ -160,6 +160,7 @@ nl:
         aliases: Specificeer andere domeinen gescheiden met witte ruimte of lege regel
 
     anchor: 'Anchor'
+    attribute_fixed: Waarde kan niet worden gewijzigd
     back: 'back'
     create_tree_as_new_language: "%{language} aanmaken als nieuwe boomstructuur"
     locked_pages: "Actieve pagina's"
@@ -505,6 +506,7 @@ nl:
     rename_file: "Dit bestand hernoemen."
     rename: hernoemen
     replace: vervangen
+    replace_file: Vervang file
     'Replaced Tag': "De tag '%{old_tag}' wordt door de tag '%{new_tag}' vervangen"
     resources:
       relation_select:

data/config/locales/alchemy.ru.yml

@@ -160,6 +160,7 @@ ru:
         aliases: Разделяйте дополнительные домены с помощью пробелов или переходом на новую строку.
 
     anchor: 'Анкор'
+    attribute_fixed: Значение не может быть изменен
     back: 'назад'
     create_tree_as_new_language: "Создать дерево языка %{language}"
     locked_pages: "Активные страницы"
@@ -507,6 +508,7 @@ ru:
     rename_file: "Свойства файла"
     rename: "Переименовать"
     replace: "Заменить"
+    replace_file: "Заменить файл"
     'Replaced Tag': "Метка '%{old_tag}' заменена на '%{new_tag}'"
     resources:
       relation_select:

data/config/routes.rb

@@ -124,14 +124,6 @@ Alchemy::Engine.routes.draw do
   get '/attachment/:id/show' => 'attachments#show',
       as: :show_attachment
 
-  # Picture urls
-  get "/pictures/:id/show(/:size)(/:crop)(/:crop_from/:crop_size)(/:quality)/:name.:format" => 'pictures#show',
-      as: :show_picture
-  get '/pictures/:id/zoom/:name.:format' => 'pictures#zoom',
-      as: :zoom_picture
-  get "/pictures/:id/thumbnails(/:size)(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
-      as: :thumbnail, :defaults => {format: 'png', name: "thumbnail"}
-
   resources :messages, only: [:index, :new, :create]
   resources :elements, only: :show
   resources :contents, only: :show
@@ -147,6 +139,9 @@ Alchemy::Engine.routes.draw do
     resources :pages, only: [:index] do
       get 'elements' => 'elements#index', as: 'elements'
       get 'elements/:named' => 'elements#index', as: 'named_elements'
+      collection do
+        get :nested
+      end
     end
 
     get '/pages/*urlname(.:format)' => 'pages#show', as: 'page'

data/db/migrate/20160912223112_add_index_to_alchemy_pages_rgt.rb

@@ -0,0 +1,9 @@
+class AddIndexToAlchemyPagesRgt < ActiveRecord::Migration
+  def up
+    add_index :alchemy_pages, :rgt
+  end
+
+  def down
+    remove_index :alchemy_pages, :rgt
+  end
+end

data/db/migrate/20160927205604_add_foreign_key_indices_and_null_constraints.rb

@@ -0,0 +1,20 @@
+class AddForeignKeyIndicesAndNullConstraints < ActiveRecord::Migration
+  def change
+    change_column_null :alchemy_cells, :page_id, false, 0
+    change_column_null :alchemy_contents, :element_id, false, 0
+    change_column_null :alchemy_contents, :essence_id, false, 0
+    change_column_null :alchemy_contents, :essence_type, false, 'Alchemy::EssenceText'
+    change_column_null :alchemy_elements, :page_id, false, 0
+    change_column_null :alchemy_folded_pages, :page_id, false, 0
+    change_column_null :alchemy_folded_pages, :user_id, false, 0
+    change_column_null :alchemy_languages, :site_id, false, 0
+
+    add_index :alchemy_cells, :page_id
+    add_index :alchemy_contents, [:essence_id, :essence_type], unique: true
+    add_index :alchemy_elements, :cell_id
+    add_index :alchemy_essence_files, :attachment_id
+    add_index :alchemy_essence_pictures, :picture_id
+    add_index :alchemy_folded_pages, [:page_id, :user_id], unique: true
+    add_index :alchemy_legacy_page_urls, :page_id
+  end
+end

data/db/migrate/20160928080104_add_foreign_keys.rb

@@ -0,0 +1,27 @@
+class AddForeignKeys < ActiveRecord::Migration
+  def change
+    add_foreign_key :alchemy_cells, :alchemy_pages,
+      column: :page_id,
+      on_update: :cascade,
+      on_delete: :cascade,
+      name: :alchemy_cells_page_id_fkey
+
+    add_foreign_key :alchemy_contents, :alchemy_elements,
+      column: :element_id,
+      on_update: :cascade,
+      on_delete: :cascade,
+      name: :alchemy_contents_element_id_fkey
+
+    add_foreign_key :alchemy_elements, :alchemy_pages,
+      column: :page_id,
+      on_update: :cascade,
+      on_delete: :cascade,
+      name: :alchemy_elements_page_id_fkey
+
+    add_foreign_key :alchemy_elements, :alchemy_cells,
+      column: :cell_id,
+      on_update: :cascade,
+      on_delete: :cascade,
+      name: :alchemy_elements_cell_id_fkey
+  end
+end

data/lib/alchemy/admin/locale.rb

@@ -38,8 +38,8 @@ module Alchemy
       #  * the locale of the browser
       #
       def available_locale
-        locales = [params[:admin_locale], locale_from_user, locale_from_browser].compact
-        locales.detect { |locale| ::I18n.available_locales.include?(locale.to_sym) }
+        locales = [params[:admin_locale], locale_from_user, locale_from_browser].compact.map(&:to_sym)
+        locales.detect { |locale| ::I18n.available_locales.include?(locale) }
       end
 
       # Try to get the locale from user settings.
@@ -54,7 +54,8 @@ module Alchemy
       def user_has_preferred_language?
         return if !current_alchemy_user
         current_alchemy_user.respond_to?(:language) &&
-          current_alchemy_user.language.present?
+          current_alchemy_user.language.present? &&
+          current_alchemy_user.language.respond_to?(:to_sym)
       end
 
       # Try to get the locale from browser headers.

data/lib/alchemy/engine.rb

@@ -1,12 +1,11 @@
 # Require globally used external libraries
-require 'actionpack/page_caching'
 require 'acts_as_list'
 require 'acts-as-taggable-on'
 require 'action_view/dependency_tracker'
 require 'active_model_serializers'
 require 'awesome_nested_set'
+require 'bourbon'
 require 'cancan'
-require 'compass-rails'
 require 'dragonfly'
 require 'jquery-rails'
 require 'jquery-ui-rails'
@@ -15,8 +14,6 @@ require 'non-stupid-digest-assets'
 require 'ransack'
 require 'request_store'
 require 'responders'
-require 'sass-rails'
-require 'sassy-buttons'
 require 'simple_form'
 require 'select2-rails'
 require 'turbolinks'
@@ -46,6 +43,7 @@ require_relative './page_layout'
 require_relative './paths'
 require_relative './permissions'
 require_relative './picture_attributes'
+require_relative './sass_support'
 require_relative './ssl_protection'
 require_relative './resource'
 require_relative './tinymce'

data/lib/alchemy/errors.rb

@@ -41,8 +41,15 @@ module Alchemy
     end
   end
 
-  class MissingImageFileError < StandardError
-    # Raised if calling +image_file+ on a Picture object returns nil.
+  # Raised if calling +image_file+ on a Picture object returns nil.
+  class MissingImageFileError < StandardError; end
+
+  # Raised if calling +image_file+ on a Picture object returns nil.
+  class WrongImageFormatError < StandardError
+    def message
+      allowed_filetypes = Alchemy::Picture.allowed_filetypes.map(&:upcase).to_sentence
+      "Requested image format is not one of allowed filetypes (#{allowed_filetypes})."
+    end
   end
 
   class NotMountedError < StandardError

data/lib/alchemy/forms/builder.rb

@@ -5,6 +5,14 @@ module Alchemy
       #
       def input(attribute_name, options = {}, &block)
         options[:wrapper] = :alchemy
+
+        if object.respond_to?(:attribute_fixed?) && object.attribute_fixed?(attribute_name)
+          options[:disabled] = true
+          options[:input_html] = options.fetch(:input_html, {}).merge(
+            'data-alchemy-tooltip' => Alchemy.t(:attribute_fixed, attribute_name)
+          )
+        end
+
         super
       end
 

data/lib/alchemy/modules.rb

@@ -22,7 +22,7 @@ module Alchemy
     #     }
     #
     def self.register_module(module_definition)
-      @@alchemy_modules << module_definition.stringify_keys
+      @@alchemy_modules << module_definition.deep_stringify_keys
     end
 
     # Get the module definition for given module name
@@ -30,46 +30,47 @@ module Alchemy
     # You can also pass a hash of an module definition.
     # It then tries to find the module defintion from controller name and action name
     #
-    def module_definition_for(name)
-      case name
+    def module_definition_for(name_or_params)
+      case name_or_params
       when String
-        alchemy_modules.detect { |p| p['name'] == name }
+        alchemy_modules.detect { |m| m['name'] == name_or_params }
       when Hash
+        name_or_params.stringify_keys!
         alchemy_modules.detect do |alchemy_module|
-          definition_from_subnavi(alchemy_module, name.symbolize_keys)
+          module_navi = alchemy_module.fetch('navigation', {})
+          definition_from_mainnavi(module_navi, name_or_params) ||
+            definition_from_subnavi(module_navi, name_or_params)
         end
       else
-        raise ArgumentError, "Could not find module definition for #{name}"
+        raise ArgumentError, "Could not find module definition for #{name_or_params}"
       end
     end
 
     private
 
-    def alchemy_module_navigation(alchemy_module)
-      alchemy_module.stringify_keys!
-      alchemy_module.fetch('navigation', {}).stringify_keys
+    def definition_from_mainnavi(module_navi, params)
+      controller_matches?(module_navi, params) && action_matches?(module_navi, params)
     end
 
-    def definition_from_subnavi(alchemy_module, name)
-      module_navi = alchemy_module_navigation(alchemy_module)
+    def definition_from_subnavi(module_navi, params)
       subnavi = module_navi['sub_navigation']
       return if subnavi.nil?
 
-      subnavi.map(&:stringify_keys).detect do |sn|
-        controller_matches?(sn, name) && action_matches?(sn, name)
+      subnavi.any? do |navi|
+        controller_matches?(navi, params) && action_matches?(navi, params)
       end
     end
 
-    def controller_matches?(subnavi, name)
-      remove_slash(subnavi['controller']) == remove_slash(name[:controller])
+    def controller_matches?(navi, params)
+      remove_slash(navi['controller']) == remove_slash(params['controller'])
     end
 
-    def action_matches?(subnavi, name)
-      subnavi['action'] == name[:action]
+    def action_matches?(navi, params)
+      navi['action'] == params['action']
     end
 
-    def remove_slash(name)
-      name.gsub(/^\//, '')
+    def remove_slash(str)
+      str.gsub(/^\//, '')
     end
   end
 end

data/lib/alchemy/permissions.rb

@@ -113,9 +113,9 @@ module Alchemy
         can :manage,                Alchemy::EssenceFile
         can :manage,                Alchemy::EssencePicture
         can :manage,                Alchemy::LegacyPageUrl
-        can :edit_content,          Alchemy::Page
         can :read,                  Alchemy::Picture
         can [:read, :autocomplete], Alchemy::Tag
+        can(:edit_content,          Alchemy::Page) { |p| p.editable_by?(@user) }
       end
     end
 
@@ -142,15 +142,26 @@ module Alchemy
         can [
           :copy,
           :copy_language_tree,
-          :create,
-          :destroy,
           :flush,
           :order,
-          :publish,
           :sort,
           :switch_language
         ], Alchemy::Page
 
+        # Resources which may be locked via template permissions
+        #
+        #     # config/alchemy/page_layouts.yml
+        #     - name: contact
+        #       editable_by:
+        #         - freelancer
+        #         - admin
+        #
+        can([
+          :create,
+          :destroy,
+          :publish
+        ], Alchemy::Page) { |p| p.editable_by?(@user) }
+
         can :manage, Alchemy::Picture
         can :manage, Alchemy::Attachment
         can :manage, Alchemy::Tag

data/lib/alchemy/resources_helper.rb

@@ -96,8 +96,10 @@ module Alchemy
       when 'date', 'datetime'
         options.merge as: 'string',
           input_html: {
-            type: 'date',
-            value: l(resource_instance_variable.send(attribute[:name]) || Time.current, format: :datepicker)
+            type: attribute[:type].to_s,
+            value: l(resource_instance_variable.send(attribute[:name]) || Time.current,
+              format: "#{attribute[:type]}picker".to_sym
+            )
           }
       when 'time'
         options.merge(as: 'time')

data/lib/alchemy/sass_support.rb

@@ -0,0 +1,9 @@
+begin
+  require 'sassc-rails'
+rescue LoadError, Gem::LoadError
+  begin
+    require 'sass-rails'
+  rescue LoadError, Gem::LoadError
+    raise LoadError, "Could not find the `sass-rails` or `sassc-rails` gem for AlchemyCMS! Please add one of them to your project's Gemfile."
+  end
+end

data/lib/alchemy/seeder.rb

@@ -11,7 +11,14 @@ module Alchemy
       #
       def seed!
         create_default_site
-        create_root_page
+        if create_root_page
+          try_seed_pages
+        elsif page_seeds_file.file?
+          desc "Seeding Alchemy pages"
+          log "There are already pages present in your database. " \
+              "Please use `rake db:reset' if you want to rebuild your database.", :skip
+        end
+        seed_users if user_seeds_file.file?
       end
 
       protected
@@ -40,9 +47,61 @@ module Alchemy
         if root.new_record?
           if root.save!
             log "Created Alchemy root page."
+            return true
           end
         else
           log "Alchemy root page was already present.", :skip
+          return false
+        end
+      end
+
+      def try_seed_pages
+        if page_seeds_file.file?
+          seed_pages if contentpages.present?
+          seed_layoutpages if layoutpages.present?
+        end
+      end
+
+      def seed_pages
+        desc "Seeding Alchemy content pages from #{page_seeds_file}"
+        if contentpages.length > 1
+          abort "The pages seed file must only contain one root page! You have #{contentpages.length}."
+        end
+
+        contentpages.each do |page|
+          create_page(page, {
+            parent: Alchemy::Page.root,
+            language: Alchemy::Language.default,
+            language_root: true
+          })
+        end
+      end
+
+      def seed_layoutpages
+        desc "Seeding Alchemy layout pages from #{page_seeds_file}"
+        language = Alchemy::Language.default
+        layout_root = Alchemy::Page.find_or_create_layout_root_for(language.id)
+        layoutpages.each do |page|
+          create_page(page, {
+            parent: layout_root,
+            language: language
+          })
+        end
+      end
+
+      def seed_users
+        desc "Seeding Alchemy users from #{user_seeds_file}"
+
+        if Alchemy.user_class.exists?
+          log "There are already users present in your database. " \
+              "Please use `rake db:reset' if you want to rebuild your database.", :skip
+          return false
+        else
+          users = YAML.load_file(user_seeds_file)
+          users.each do |draft|
+            user = Alchemy.user_class.create!(draft)
+            log "Created user: #{user.try(:email) || user.try(:login) || user.id}"
+          end
         end
       end
 
@@ -51,6 +110,35 @@ module Alchemy
       def site_config
         @_site_config ||= Alchemy::Config.get(:default_site)
       end
+
+      def page_seeds_file
+        @_page_seeds_file ||= Rails.root.join('db', 'seeds', 'alchemy', 'pages.yml')
+      end
+
+      def page_yml
+        @_page_yml ||= YAML.load_file(page_seeds_file)
+      end
+
+      def contentpages
+        page_yml.select { |p| !p['layoutpage'] }
+      end
+
+      def layoutpages
+        page_yml.select { |p| p['layoutpage'] }
+      end
+
+      def user_seeds_file
+        @_user_seeds_file ||= Rails.root.join('db', 'seeds', 'alchemy', 'users.yml')
+      end
+
+      def create_page(draft, attributes = {})
+        children = draft.delete('children') || []
+        page = Alchemy::Page.create!(draft.merge(attributes))
+        log "Created page: #{page.name}"
+        children.each do |child|
+          create_page(child, parent: page)
+        end
+      end
     end
   end
 end