alchemy_cms 3.2.1 → 3.3.0.rc1

data/config/routes.rb

@@ -1,56 +1,20 @@
 require 'alchemy/routing_constraints'
 
 Alchemy::Engine.routes.draw do
-  root :to => 'pages#show'
+  root to: 'pages#index'
 
   get '/sitemap.xml' => 'pages#sitemap', format: 'xml'
 
-  get '/admin' => redirect('admin/dashboard')
-  get '/admin/dashboard' => 'admin/dashboard#index',
-        :as => :admin_dashboard
-  get '/admin/dashboard/info' => 'admin/dashboard#info',
-        :as => :dashboard_info
-  get '/admin/help' => 'admin/dashboard#help',
-        :as => :help
-  get '/admin/dashboard/update_check' => 'admin/dashboard#update_check',
-        :as => :update_check
-
-  get '/attachment/:id/download(/:name)' => 'attachments#download',
-        :as => :download_attachment
-  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"}
-
-  get '/admin/leave' => 'admin/base#leave', :as => :leave_admin
-
-  resources :messages, :only => [:index, :new, :create]
-  resources :elements, :only => :show
-
-  namespace :api, defaults: {format: 'json'} do
-    resources :contents, only: [:index, :show]
-
-    resources :elements, only: [:index, :show] do
-      get '/contents' => 'contents#index', as: 'contents'
-      get '/contents/:name' => 'contents#show', as: 'content'
-    end
-
-    resources :pages, only: [:index] do
-      get 'elements' => 'elements#index', as: 'elements'
-      get 'elements/:named' => 'elements#index', as: 'named_elements'
-    end
-
-    get '/pages/*urlname(.:format)' => 'pages#show', as: 'page'
-    get '/admin/pages/:id(.:format)' => 'pages#show', as: 'preview_page'
+  scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
+    get '/' => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin
+    get '/dashboard' => 'admin/dashboard#index', as: :admin_dashboard
+    get '/dashboard/info' => 'admin/dashboard#info', as: :dashboard_info
+    get '/help' => 'admin/dashboard#help', as: :help
+    get '/dashboard/update_check' => 'admin/dashboard#update_check', as: :update_check
+    get '/leave' => 'admin/base#leave', as: :leave_admin
   end
 
-  namespace :admin do
+  namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
     resources :contents do
       collection do
         post :order
@@ -67,6 +31,7 @@ Alchemy::Engine.routes.draw do
         get :create_language
         get :link
         get :sort
+        get :tree
       end
       member do
         post :unlock
@@ -86,32 +51,32 @@ Alchemy::Engine.routes.draw do
         post :order
       end
       member do
+        patch :publish
         post :fold
         delete :trash
       end
     end
 
-    resources :layoutpages, :only => [:index, :edit]
+    resources :layoutpages, only: [:index, :edit]
 
-    resources :pictures do
+    resources :pictures, except: [:new] do
       collection do
         post :flush, :update_multiple
         delete :delete_multiple
         get :edit_multiple
       end
       member do
-        get :info
         delete :remove
       end
     end
 
-    resources :attachments do
+    resources :attachments, except: [:new] do
       member do
         get :download
       end
     end
 
-    resources :essence_pictures, :except => [:show, :new, :create] do
+    resources :essence_pictures, except: [:show, :new, :create] do
       collection do
         put :assign
       end
@@ -120,7 +85,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resources :essence_files, :only => [:edit, :update] do
+    resources :essence_files, only: [:edit, :update] do
       collection do
         put :assign
       end
@@ -129,7 +94,7 @@ Alchemy::Engine.routes.draw do
     resources :legacy_page_urls
     resources :languages
 
-    resource :clipboard, :only => :index, :controller => 'clipboard' do
+    resource :clipboard, only: :index, controller: 'clipboard' do
       collection do
         get :index
         delete :clear
@@ -138,7 +103,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resource :trash, :only => :index, :controller => 'trash' do
+    resource :trash, only: :index, controller: 'trash' do
       collection do
         get :index
         delete :clear
@@ -154,7 +119,41 @@ Alchemy::Engine.routes.draw do
     resources :sites
   end
 
-  get '/:locale' => 'pages#show',
+  get '/attachment/:id/download(/:name)' => 'attachments#download',
+      as: :download_attachment
+  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
+
+  namespace :api, defaults: {format: 'json'} do
+    resources :contents, only: [:index, :show]
+
+    resources :elements, only: [:index, :show] do
+      get '/contents' => 'contents#index', as: 'contents'
+      get '/contents/:name' => 'contents#show', as: 'content'
+    end
+
+    resources :pages, only: [:index] do
+      get 'elements' => 'elements#index', as: 'elements'
+      get 'elements/:named' => 'elements#index', as: 'named_elements'
+    end
+
+    get '/pages/*urlname(.:format)' => 'pages#show', as: 'page'
+    get '/admin/pages/:id(.:format)' => 'pages#show', as: 'preview_page'
+  end
+
+  get '/:locale' => 'pages#index',
     constraints: {locale: Alchemy::RoutingConstraints::LOCALE_REGEXP},
     as: :show_language_root
 

data/config/spring.rb

@@ -0,0 +1,2 @@
+Spring.application_root = './spec/dummy'
+Spring.watch 'lib/**/*'

data/db/migrate/20130827094554_alchemy_two_point_six.rb

@@ -7,7 +7,6 @@
 #
 class AlchemyTwoPointSix < ActiveRecord::Migration
   def up
-
     unless table_exists?('alchemy_attachments')
       create_table "alchemy_attachments" do |t|
         t.string   "name"
@@ -194,7 +193,7 @@ class AlchemyTwoPointSix < ActiveRecord::Migration
       create_table "alchemy_folded_pages" do |t|
         t.integer "page_id"
         t.integer "user_id"
-        t.boolean "folded",  default: false
+        t.boolean "folded", default: false
       end
     end
 
@@ -375,6 +374,5 @@ class AlchemyTwoPointSix < ActiveRecord::Migration
     if table_exists?('alchemy_sites')
       drop_table "alchemy_sites"
     end
-
   end
 end

data/db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb

@@ -0,0 +1,6 @@
+class AddParentElementIdToAlchemyElements < ActiveRecord::Migration
+  def change
+    add_column :alchemy_elements, :parent_element_id, :integer
+    add_index :alchemy_elements, [:page_id, :parent_element_id]
+  end
+end

data/db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb

@@ -0,0 +1,5 @@
+class AddLinkTextToAlchemyEssenceFiles < ActiveRecord::Migration
+  def change
+    add_column :alchemy_essence_files, :link_text, :string
+  end
+end

data/db/migrate/20150906195818_add_locale_to_alchemy_languages.rb

@@ -0,0 +1,7 @@
+class AddLocaleToAlchemyLanguages < ActiveRecord::Migration
+  def change
+    add_column :alchemy_languages, :locale, :string
+    execute \
+      "UPDATE #{Alchemy::Language.table_name} SET locale = language_code WHERE locale IS NULL;"
+  end
+end

data/lib/alchemy/auth_accessors.rb

@@ -70,7 +70,7 @@ module Alchemy
       end
     end
   rescue NameError => e
-    if e.message.match(/#{Regexp.escape(@@user_class_name)}/)
+    if e.message =~ /#{Regexp.escape(@@user_class_name)}/
       abort <<-MSG
 
 AlchemyCMS cannot find any user class!

data/lib/alchemy/cache_digests/template_tracker.rb

@@ -1,7 +1,6 @@
 module Alchemy
   module CacheDigests
     class TemplateTracker
-
       def self.call(name, template)
         new(name, template).dependencies
       end
@@ -17,12 +16,12 @@ module Alchemy
         when /^alchemy\/page_layouts\/_(.+)/
           page_layout = page_layout($1)
           return element_templates(page_layout) +
-            page_layout.fetch('cells', []).map { |name| "alchemy/cells/_#{name}" }
+                 page_layout.fetch('cells', []).map { |name| "alchemy/cells/_#{name}" }
         when /^alchemy\/cells\/_(.+)/
           return element_templates cell_definition($1)
         when /alchemy\/elements\/_(.+)_view/
           essences = essence_types($1)
-          element = element_description($1)
+          element = element_definition($1)
           if element && element['picture_gallery']
             essences += ['EssencePicture']
           end
@@ -46,20 +45,15 @@ module Alchemy
         Cell.definition_for(name)
       end
 
-      def element_description(name)
-        Element.descriptions.detect { |e| e['name'] == name }
+      def element_definition(name)
+        Element.definitions.detect { |e| e['name'] == name }
       end
 
       def essence_types(name)
-        element = element_description(name)
-        if element
-          (element.fetch('contents', []) +
-            element.fetch('available_contents', [])).collect { |c| c['type'] }
-        else
-          []
-        end
+        element = element_definition(name)
+        return [] unless element
+        element.fetch('contents', []).collect { |c| c['type'] }
       end
-
     end
   end
 end

data/lib/alchemy/config.rb

@@ -2,9 +2,7 @@
 
 module Alchemy
   class Config
-
     class << self
-
       # Returns the configuration for given parameter name.
       #
       # @param name [String]
@@ -16,18 +14,18 @@ module Alchemy
 
       # Returns a merged configuration of the following files
       #
-      # Alchemy´s default config: +gems/../alchemy_cms/config/alchemy/config.yml+
+      # Alchemys default config: +gems/../alchemy_cms/config/alchemy/config.yml+
       # Your apps default config: +your_app/config/alchemy/config.yml+
       # Environment specific config: +your_app/config/alchemy/development.config.yml+
       #
       # An environment specific config overwrites the settings of your apps default config,
-      # while your apps default config has precedence over Alchemy´s default config.
+      # while your apps default config has precedence over Alchemys default config.
       #
       def show
         @config ||= merge_configs!(alchemy_config, main_app_config, env_specific_config)
       end
 
-    private
+      private
 
       # Alchemy default configuration
       def alchemy_config
@@ -48,7 +46,7 @@ module Alchemy
       # If it does not exist, or its empty, it returns an empty Hash.
       #
       def read_file(file)
-        return YAML.load_file(file) || {} if File.exists?(file) # YAML.load_file returns false if file is empty.
+        return YAML.load_file(file) || {} if File.exist?(file) # YAML.load_file returns false if file is empty.
         {}
       end
 
@@ -57,7 +55,7 @@ module Alchemy
       def merge_configs!(*config_files)
         raise LoadError, 'No Alchemy config file found!' if config_files.map(&:blank?).all?
         config = {}
-        config_files.each {|h| config.merge!(h.stringify_keys!) }
+        config_files.each { |h| config.merge!(h.stringify_keys!) }
         config
       end
     end

data/lib/alchemy/configuration_methods.rb

@@ -3,7 +3,7 @@ module Alchemy
     extend ActiveSupport::Concern
 
     included do
-      helper_method :configuration, :multi_language?, :multi_site?
+      helper_method :configuration, :multi_language?, :multi_site?, :prefix_locale?
     end
 
     # Returns the configuration value of given key.
@@ -20,6 +20,16 @@ module Alchemy
       Language.published.count > 1
     end
 
+    # Decides if the locale should be prefixed to urls
+    #
+    # If the current language's locale (or the optionally passed in locale)
+    # matches the current I18n.locale then the prefix os omitted.
+    # Also, if only one published language exists.
+    #
+    def prefix_locale?(locale = Language.current.code)
+      multi_language? && locale != ::I18n.default_locale.to_s
+    end
+
     # Returns true if more than one site exists.
     #
     def multi_site?

data/lib/alchemy/controller_actions.rb

@@ -46,16 +46,7 @@ module Alchemy
     # Returns the current site.
     #
     def current_alchemy_site
-      @current_alchemy_site ||= begin
-        site_id = params[:site_id] || session[:site_id]
-        if site_id.nil?
-          session.delete :site_id
-          Site.find_for_host(request.host)
-        else
-          session[:site_id] = site_id
-          Site.find(site_id)
-        end
-      end
+      @current_alchemy_site ||= Site.find_for_host(request.host)
     end
 
     # Ensures usage of Alchemy's permissions class.
@@ -77,7 +68,7 @@ module Alchemy
           klass = "::#{klass}".constantize
           alchemy_permissions.merge(klass.new(current_alchemy_user))
         end
-        if (Object.const_get('::Ability') rescue false)
+        if host_app_ability_present?
           alchemy_permissions.merge(::Ability.new(current_alchemy_user))
         end
         alchemy_permissions
@@ -119,7 +110,7 @@ module Alchemy
 
     def load_alchemy_language_from_id_or_code(id_or_code)
       Language.find_by(id: id_or_code) ||
-      Language.find_by_code(id_or_code)
+        Language.find_by_code(id_or_code)
     end
 
     def load_default_alchemy_language
@@ -136,5 +127,11 @@ module Alchemy
         Language.current = language
       end
     end
+
+    def host_app_ability_present?
+      Object.const_get('::Ability')
+    rescue
+      false
+    end
   end
 end

data/lib/alchemy/engine.rb

@@ -12,6 +12,7 @@ require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'kaminari'
 require 'non-stupid-digest-assets'
+require 'ransack'
 require 'request_store'
 require 'responders'
 require 'sass-rails'
@@ -39,7 +40,9 @@ require_relative './modules'
 require_relative './mount_point'
 require_relative './name_conversions'
 require_relative './on_page_layout'
+require_relative './on_page_layout/callbacks_runner'
 require_relative './page_layout'
+require_relative './paths'
 require_relative './permissions'
 require_relative './picture_attributes'
 require_relative './ssl_protection'
@@ -50,50 +53,30 @@ require_relative './touching'
 # Require hacks
 require_relative './kaminari/scoped_pagination_url_helper'
 
-# Middleware
-require_relative './middleware/rescue_old_cookies'
-
 module Alchemy
   class Engine < Rails::Engine
     isolate_namespace Alchemy
     engine_name 'alchemy'
     config.mount_at = '/'
 
-    # Enabling assets precompiling
-    initializer 'alchemy.assets' do |app|
-      app.config.assets.precompile += [
-        'alchemy/alchemy.js',
-        'alchemy/preview.js',
-        'alchemy/admin.css',
-        'alchemy/menubar.css',
-        'alchemy/menubar.js',
-        'alchemy/print.css',
-        'tinymce/*'
-      ]
-    end
-
-    initializer 'alchemy.middleware.rescue_old_cookies' do |app|
-      app.middleware.insert_before(ActionDispatch::Cookies, Alchemy::Middleware::RescueOldCookies)
-    end
-
-    initializer 'alchemy.dependency_tracker' do |app|
+    initializer 'alchemy.dependency_tracker' do
       [:erb, :slim, :haml].each do |handler|
         ActionView::DependencyTracker.register_tracker(handler, CacheDigests::TemplateTracker)
       end
     end
 
-    initializer 'alchemy.non_digest_assets' do |app|
+    initializer 'alchemy.non_digest_assets' do
       NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
-    # We need to require each essence class in development mode,
+    # We need to reload each essence class in development mode on every request,
     # so it can register itself as essence relation on Page and Element models
+    #
     # @see lib/alchemy/essence.rb:71
-    initializer 'alchemy.load_essence_classes' do |app|
-      unless Rails.application.config.cache_classes
-        Dir.glob(File.join(File.dirname(__FILE__), '../../app/models/alchemy/essence_*.rb')).each do |essence|
-          require essence
-        end
+    config.to_prepare do
+      unless Rails.configuration.cache_classes
+        essences = File.join(File.dirname(__FILE__), '../../app/models/alchemy/essence_*.rb')
+        Dir.glob(essences).each { |essence| load(essence) }
       end
     end