alchemy_cms 3.2.0.beta → 3.2.0.rc1

data/app/models/alchemy/page/page_scopes.rb

@@ -83,7 +83,7 @@ module Alchemy
       # All pages from +Alchemy::Site.current+
       #
       scope :from_current_site, -> {
-        where(alchemy_languages: {site_id: Site.current || Site.default}).joins(:language)
+        where(Language.table_name => {site_id: Site.current || Site.default}).joins(:language)
       }
 
       # All pages for xml sitemap

data/app/models/alchemy/picture.rb

@@ -71,7 +71,7 @@ module Alchemy
     }
 
     scope :deletable, -> {
-      where("#{self.table_name}.id NOT IN (SELECT picture_id FROM alchemy_essence_pictures)")
+      where("#{table_name}.id NOT IN (SELECT picture_id FROM #{EssencePicture.table_name})")
     }
 
     scope :without_tag, -> {

data/app/views/alchemy/admin/pages/_create_language_form.html.erb

@@ -49,6 +49,6 @@
 <% else %>
 <%= render_message :error do %>
   <h2>Root page not found.</h2>
-  <p>Please run <code>rake alchemy:db:seed</code> task.</p>
+  <p>Please run <code>bin/rake db:seed</code> task.</p>
 <% end %>
 <% end %>

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -1,7 +1,7 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
   <%= f.input :page_layout,
     collection: @page_layouts,
-    label: @page.layout_description.blank? ? (%(<span class="inline warning icon" title="#{ _t(:page_layout_description_missing) }"></span>&nbsp;) + _t(:page_type)).html_safe : _t(:page_type),
+    label: page_layout_label(@page),
     include_blank: false,
     input_html: {class: 'alchemy_selectbox'} %>
   <div class="input check_boxes">

data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb

@@ -23,6 +23,6 @@
     class: 'thumbnail_background'
   ) %>
   <div class="picture_name" title="<%= picture_to_assign.name %>">
-    <%= picture_to_assign.name.empty? ? "&nbsp;" : picture_to_assign.name %>
+    <%= picture_to_assign.name %>
   </div>
 </div>

data/app/views/alchemy/breadcrumb/_page.html.erb

@@ -4,12 +4,13 @@
 <% elsif page == pages.last %>
   <% css_classes << "last" %>
 <% end %>
+
 <%= link_to_unless(
   !options[:link_active_page] && options[:page] == page,
   h(page.name),
   show_alchemy_page_path(page),
   class: css_classes.compact.join(" "),
   title: page.title
-) do |name, url, html_options| %>
+) do |name, _url, html_options| %>
   <%= content_tag :span, name, html_options %>
-<% end %>
+<% end %>

data/app/views/alchemy/breadcrumb/_separator.html.erb

@@ -0,0 +1 @@
+<span class="separator"><%= sanitize options[:separator] %></span>

data/app/views/alchemy/breadcrumb/_wrapper.html.erb

@@ -0,0 +1,13 @@
+<% if pages.any? %>
+  <div class="breadcrumb">
+    <%= render({
+        collection: pages,
+        partial: 'alchemy/breadcrumb/page',
+        spacer_template: 'alchemy/breadcrumb/separator',
+        locals: {
+          pages: pages,
+          options: options
+        }
+      }.delete_if { |k, _v| k == :spacer_template && options[:separator].blank? }) %>
+  </div>
+<% end %>

data/app/views/alchemy/language_links/_language.html.erb

@@ -6,7 +6,7 @@
 
 <%= link_to(
   content_tag(:span, language.label(options[:linkname])).html_safe,
-  show_alchemy_page_path(language.pages.language_roots.first, lang: language.code),
+  show_alchemy_page_path(language.pages.language_roots.first, locale: language.code),
   class: css_classes.join(" "),
   title: link_title
 ) %>

data/app/views/alchemy/navigation/_link.html.erb

@@ -13,7 +13,7 @@
     {
       class: (page_active?(page) ? 'active' : nil),
       title: (options[:show_title] ? page.title : nil),
-      lang: page.language_code,
+      locale: page.language_code,
       data: {'page-id' => page.id}
     }
   ) %>

data/app/views/alchemy/pages/show.rss.builder

@@ -1,22 +1,20 @@
-xml.instruct! :xml, :version => "1.0"
-xml.rss :version => "2.0" do
+xml.instruct! :xml, version: "1.0"
+xml.rss version: "2.0" do
 
   xml.channel do
 
     xml.title @page.title
     xml.description @page.meta_description
-    xml.link show_page_url(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
+    xml.link show_page_url(urlname: @page.urlname, locale: multi_language? ? @page.language_code : nil)
 
     @page.feed_elements.each do |element|
       xml.item do
         xml.title element.content_for_rss_title.try(:ingredient)
         xml.description element.content_for_rss_description.try(:ingredient)
         xml.pubDate element.ingredient('date').to_s(:rfc822) if element.has_ingredient?('date')
-        xml.link show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
-        xml.guid show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
+        xml.link show_page_url(urlname: @page.urlname, anchor: element_dom_id(element), locale: multi_language? ? @page.language_code : nil)
+        xml.guid show_page_url(urlname: @page.urlname, anchor: element_dom_id(element), locale: multi_language? ? @page.language_code : nil)
       end
     end
-
   end
-
 end

data/app/views/layouts/alchemy/admin.html.erb

@@ -86,6 +86,11 @@
         <%= select_tag 'change_locale',
           options_for_select(translations_for_select, ::I18n.locale),
           class: 'alchemy_selectbox tiny' %>
+        <%- if multi_site? -%>
+        <%= select_tag 'change_site',
+          options_for_select(sites_for_select, Alchemy::Site.current.id),
+          class: 'alchemy_selectbox tiny' %>
+        <%- end -%>
       </div>
     </div>
     <% end %>

data/config/routes.rb

@@ -1,5 +1,6 @@
-Alchemy::Engine.routes.draw do
+require 'alchemy/routing_constraints'
 
+Alchemy::Engine.routes.draw do
   root :to => 'pages#show'
 
   get '/sitemap.xml' => 'pages#sitemap', format: 'xml'
@@ -34,20 +35,22 @@ Alchemy::Engine.routes.draw do
 
   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
 
   namespace :admin do
-
     resources :contents do
       collection do
         post :order
@@ -149,16 +152,16 @@ Alchemy::Engine.routes.draw do
     end
 
     resources :sites
-
   end
 
-  get '/:lang' => 'pages#show',
-      :constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
-      :as => :show_language_root
+  get '/:locale' => 'pages#show',
+    constraints: {locale: Alchemy::RoutingConstraints::LOCALE_REGEXP},
+    as: :show_language_root
 
   # The page show action has to be last route
-  get '(/:lang)/*urlname(.:format)' => 'pages#show',
-      :constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
-      :as => :show_page
-
+  constraints(locale: Alchemy::RoutingConstraints::LOCALE_REGEXP) do
+    get '(/:locale)/*urlname(.:format)' => 'pages#show',
+      constraints: Alchemy::RoutingConstraints.new,
+      as: :show_page
+  end
 end

data/lib/alchemy/configuration_methods.rb

@@ -0,0 +1,29 @@
+module Alchemy
+  module ConfigurationMethods
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :configuration, :multi_language?, :multi_site?
+    end
+
+    # Returns the configuration value of given key.
+    #
+    # Config file is in +config/alchemy/config.yml+
+    #
+    def configuration(name)
+      Config.get(name)
+    end
+
+    # Returns true if more than one language is published.
+    #
+    def multi_language?
+      Language.published.count > 1
+    end
+
+    # Returns true if more than one site exists.
+    #
+    def multi_site?
+      Site.count > 1
+    end
+  end
+end

data/lib/alchemy/controller_actions.rb

@@ -46,7 +46,16 @@ module Alchemy
     # Returns the current site.
     #
     def current_alchemy_site
-      @current_alchemy_site ||= Site.find_for_host(request.host)
+      @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
     end
 
     # Ensures usage of Alchemy's permissions class.
@@ -95,8 +104,8 @@ module Alchemy
     end
 
     def load_alchemy_language_from_params
-      if params[:lang].present?
-        Language.find_by_code(params[:lang])
+      if params[:locale].present?
+        Language.find_by_code(params[:locale])
       end
     end
 
@@ -125,6 +134,5 @@ module Alchemy
         Language.current = language
       end
     end
-
   end
 end

data/lib/alchemy/engine.rb

@@ -25,6 +25,7 @@ require 'userstamp'
 require_relative './auth_accessors'
 require_relative './cache_digests/template_tracker'
 require_relative './config'
+require_relative './configuration_methods'
 require_relative './controller_actions'
 require_relative './errors'
 require_relative './essence'
@@ -37,9 +38,11 @@ require_relative './logger'
 require_relative './modules'
 require_relative './mount_point'
 require_relative './name_conversions'
+require_relative './on_page_layout'
 require_relative './page_layout'
 require_relative './permissions'
 require_relative './picture_attributes'
+require_relative './ssl_protection'
 require_relative './resource'
 require_relative './tinymce'
 require_relative './touching'

data/lib/alchemy/errors.rb

@@ -13,7 +13,7 @@ module Alchemy
   class DefaultLanguageNotFoundError < StandardError
     # Raised if no default language can be found.
     def message
-      "No default language found. Have you run the rake alchemy:db:seed task?"
+      "No default language found! Please run the `bin/rake db:seed` task."
     end
   end
 

data/lib/alchemy/essence.rb

@@ -36,12 +36,12 @@ module Alchemy #:nodoc:
           stampable stamper_class_name: Alchemy.user_class_name
           validate :validate_ingredient, :on => :update, :if => 'validations.any?'
 
-          has_one :content, :as => :essence
-          has_one :element, :through => :content
-          has_one :page,    :through => :element
+          has_one :content, :as => :essence, class_name: "Alchemy::Content"
+          has_one :element, :through => :content, class_name: "Alchemy::Element"
+          has_one :page,    :through => :element, class_name: "Alchemy::Page"
 
-          scope :available,    -> { joins(:element).merge(Element.available) }
-          scope :from_element, ->(name) { joins(:element).where(alchemy_elements: { name: name }) }
+          scope :available,    -> { joins(:element).merge(Alchemy::Element.available) }
+          scope :from_element, ->(name) { joins(:element).where(Element.table_name => { name: name }) }
 
           delegate :restricted?, to: :page,    allow_nil: true
           delegate :trashed?,    to: :element, allow_nil: true
@@ -124,7 +124,9 @@ module Alchemy #:nodoc:
       def validate_ingredient
         validations.each do |validation|
           if validation.respond_to?(:keys)
-            validation.map { |key, _value| self.send("validate_#{key}", validation) }
+            validation.map do |key, value|
+              self.send("validate_#{key}", value)
+            end
           else
             self.send("validate_#{validation}")
           end
@@ -139,23 +141,23 @@ module Alchemy #:nodoc:
         @validation_errors ||= []
       end
 
-      def validate_presence
-        if ingredient.blank?
+      def validate_presence(validate = true)
+        if validate && ingredient.blank?
           errors.add(ingredient_column, :blank)
           validation_errors << :blank
         end
       end
 
-      def validate_uniqueness
-        return if !public?
+      def validate_uniqueness(validate = true)
+        return if !validate || !public?
         if duplicates.any?
           errors.add(ingredient_column, :taken)
           validation_errors << :taken
         end
       end
 
-      def validate_format(validation)
-        matcher = Config.get('format_matchers')["#{validation['format']}"] || validation['format']
+      def validate_format(format)
+        matcher = Config.get('format_matchers')[format] || format
         if ingredient.to_s.match(Regexp.new(matcher)).nil?
           errors.add(ingredient_column, :invalid)
           validation_errors << :invalid

data/lib/alchemy/on_page_layout.rb

@@ -0,0 +1,58 @@
+module Alchemy
+
+  # = Adds before filter to pages show action
+  #
+  # Use this mixin to add the +on_page_layout+ class method
+  # into your +ApplicationController+.
+  #
+  # Pass a block or method name in which you have the +@page+ object and can do
+  # everything as if you where in a normal controller action.
+  #
+  # Pass a +Alchemy::PageLayout+ name or +:all+ to
+  # call this callback only on specific pages or all pages.
+  #
+  # == Example:
+  #
+  #     class ApplicationController < ActionController::Base
+  #       extend Alchemy::OnPageLayout
+  #
+  #       on_page_layout :all do
+  #         @my_stuff = Stuff.all
+  #       end
+  #
+  #       on_page_layout :contact, :do_something
+  #
+  #       private
+  #
+  #       def do_something
+  #         @contacts = Contact.all
+  #         if @page.tag_list.include?('something')
+  #           do_something
+  #         end
+  #       end
+  #     end
+  #
+  module OnPageLayout
+
+    def on_page_layout(page_layout, callback = nil)
+      Alchemy::PagesController.class_eval do
+
+        append_before_action only: :show, if: -> { call_page_layout_callback_for?(page_layout) } do
+          if block_given?
+            instance_eval(&Proc.new)
+          elsif callback
+            self.send(callback)
+          else
+            raise "You need to either pass a block or method name as callback for `on_page_layout`"
+          end
+        end
+
+        private
+
+        def call_page_layout_callback_for?(page_layout)
+          page_layout.to_sym == :all || @page.page_layout.to_sym == page_layout.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/page_layout.rb

@@ -157,7 +157,7 @@ module Alchemy
       #
       def read_layouts_file
         if File.exists?(layouts_file_path)
-          YAML.load_file(layouts_file_path) || []
+          YAML.load(ERB.new(File.read(layouts_file_path)).result) || []
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/lib/alchemy/permissions.rb

@@ -46,7 +46,7 @@ module Alchemy
           p.public? && !p.restricted?
         end
         can :see,               Alchemy::Page,       restricted: false, visible: true
-        can([:show, :download], Alchemy::Picture)    { |p| !p.restricted? }
+        can(:display,           Alchemy::Picture)    { |p| !p.restricted? }
       end
     end
 
@@ -72,7 +72,7 @@ module Alchemy
           p.public?
         end
         can :see,               Alchemy::Page,      restricted: true, visible: true
-        can [:show, :download], Alchemy::Picture
+        can :display,           Alchemy::Picture
         can [:read, :update],   Alchemy.user_class, id: @user.id
       end
     end
@@ -99,22 +99,22 @@ module Alchemy
         ]
 
         # Controller actions
-        can :leave,                     :alchemy_admin
-        can [:info, :help],             :alchemy_admin_dashboard
-        can :manage,                    :alchemy_admin_clipboard
-        can :index,                     :trash
-        can :edit,                      :alchemy_admin_layoutpages
+        can :leave,                 :alchemy_admin
+        can [:info, :help],         :alchemy_admin_dashboard
+        can :manage,                :alchemy_admin_clipboard
+        can :index,                 :trash
+        can :edit,                  :alchemy_admin_layoutpages
 
         # Resources
-        can [:read, :download],         Alchemy::Attachment
-        can :manage,                    Alchemy::Content
-        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
+        can [:read, :download],     Alchemy::Attachment
+        can :manage,                Alchemy::Content
+        can :manage,                Alchemy::Element
+        can :manage,                Alchemy::EssenceFile
+        can :manage,                Alchemy::EssencePicture
+        can :manage,                Alchemy::LegacyPageUrl
+        can :edit_content,          Alchemy::Page
+        can [:read, :info],         Alchemy::Picture
+        can [:read, :autocomplete], Alchemy::Tag
       end
     end
 
@@ -203,6 +203,11 @@ module Alchemy
         :unlock,
         :visit,
         to: :edit_content
+
+      alias_action :show,
+        :thumbnail,
+        :zoom,
+        to: :display
     end
 
     # Include the role specific permissions.