alchemy_cms 2.4.1 → 2.5.0.b2

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -14,7 +14,7 @@ module Alchemy
         else
           search_terms = ActiveRecord::Base.sanitize("%#{params[:query]}%")
           items = resource_handler.model.where(resource_handler.searchable_attributes.map { |attribute|
-            "#{resource_handler.namespaced_model_name.pluralize}.#{attribute[:name]} LIKE #{search_terms}"
+            "`#{resource_handler.model.table_name}`.`#{attribute[:name]}` LIKE #{search_terms}"
           }.join(" OR "))
         end
         instance_variable_set("@#{resource_handler.resources_name}", items.page(params[:page] || 1).per(per_page_value_for_screen_size))

data/app/controllers/alchemy/admin/sites_controller.rb

@@ -0,0 +1,6 @@
+module Alchemy
+  module Admin
+    class SitesController < ResourcesController
+    end
+  end
+end

data/app/controllers/alchemy/base_controller.rb

@@ -6,6 +6,7 @@ module Alchemy
 
     protect_from_forgery
 
+    before_filter :set_current_site
     before_filter :set_language
     before_filter :mailer_set_url_options
 
@@ -45,6 +46,11 @@ module Alchemy
 
   private
 
+    # Sets the current site.
+    def set_current_site
+      Site.current = Site.where(host: request.host).first || Site.default
+    end
+
     # Sets Alchemy's GUI translation to users preffered language and stores it in the session.
     #
     # Guesses the language from browser locale. If not successful it takes the default.
@@ -60,6 +66,8 @@ module Alchemy
         session[:current_locale] = ::I18n.locale = params[:locale]
       elsif current_user && current_user.language.present?
         ::I18n.locale = current_user.language
+      elsif Rails.env == 'test' # OMG I hate to do this. But it helps...
+        ::I18n.locale = 'en'
       else
         ::I18n.locale = request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /^[a-z]{2}/).try(:first)
       end

data/app/controllers/alchemy/elements_controller.rb

@@ -4,19 +4,49 @@ module Alchemy
     filter_access_to :show, :attribute_check => true, :model => Alchemy::Element, :load_method => :load_element
     layout false
 
-    # Returns the element partial as HTML or as JavaScript that tries to replace a given +container_id+ with the partial content via jQuery.
+    # == Renders the element view partial
+    #
+    # === Accepted Formats
+    #
+    # * html
+    # * js (Tries to replace a given +container_id+ with the elements view partial content via jQuery.)
+    # * json (A JSON object that includes all contents and their ingredients)
+    #
     def show
       @page = @element.page
+      @options = params[:options]
+
       respond_to do |format|
         format.html
-        format.js
+        format.js { @container_id = params[:container_id] }
+        format.json do
+          render json: @element.to_json(
+            only: [:id, :name, :updated_at],
+            methods: [:tag_list],
+            include: {
+              contents: {
+                only: [:id, :name, :updated_at, :essence_type],
+                methods: [:ingredient],
+                include: {
+                  essence: {
+                    except: [:created_at, :creator_id, :do_not_index, :public, :updater_id]
+                  }
+                }
+              }
+            }
+          )
+        end
       end
     end
 
   private
 
     def load_element
-      @element = Element.find(params[:id])
+      element = Element.available
+      if !current_user
+        element = element.not_restricted
+      end
+      @element = element.find(params[:id])
     end
 
   end

data/app/controllers/alchemy/messages_controller.rb

@@ -1,44 +1,48 @@
-# == Sending Messages:
-# To send Messages via contact forms you can create your form fields in the config.yml
-#
-# === Example:
-# Make an Element with this options inside your @elements.yml file:
-#
-#   - name: contactform
-#     contents:
-#     - name: mail_to
-#       type: EssenceText
-#     - name: subject
-#       type: EssenceText
-#     - name: mail_from
-#       type: EssenceText
-#     - name: success_page
-#       type: EssenceText
-#
-# The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
-# The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.
-#
-# Then make a page layout for your contact page in the +page_layouts.yml+ file:
-#
-#   - name: contact
-#     unique: true
-#     cache: false
-#     elements: [pageheading, heading, contactform]
-#     autogenerate: [contactform]
-#
-# Disabling the page caching is stronlgy recommended!
-#
-# The editor view for your element should have this layout:
-#
-#   <%= render_essence_editor_by_name(element, 'mail_from') %>
-#   <%= render_essence_editor_by_name(element, 'mail_to') %>
-#   <%= render_essence_editor_by_name(element, 'subject') %>
-#   <%= page_selector(element, 'success_page', :page_attribute => :urlname) %>
-#
-# Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
-
 module Alchemy
+  #
+  # == Sending Messages:
+  #
+  # To send Messages via contact forms you can create your form fields in the config.yml
+  #
+  # === Example:
+  #
+  # Make an Element with this options inside your @elements.yml file:
+  #
+  #   - name: contactform
+  #     contents:
+  #     - name: mail_to
+  #       type: EssenceText
+  #     - name: subject
+  #       type: EssenceText
+  #     - name: mail_from
+  #       type: EssenceText
+  #     - name: success_page
+  #       type: EssenceText
+  #
+  # The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
+  # The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.
+  #
+  # Then make a page layout for your contact page in the +page_layouts.yml+ file:
+  #
+  #   - name: contact
+  #     unique: true
+  #     cache: false
+  #     elements: [pageheading, heading, contactform]
+  #     autogenerate: [contactform]
+  #
+  # Disabling the page caching is stronlgy recommended!
+  #
+  # The editor view for your element should have this layout:
+  #
+  #   <%= render_essence_editor_by_name(element, 'mail_from') %>
+  #   <%= render_essence_editor_by_name(element, 'mail_to') %>
+  #   <%= render_essence_editor_by_name(element, 'subject') %>
+  #   <%= page_selector(element, 'success_page', :page_attribute => :urlname) %>
+  #
+  # Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
+  #
   class MessagesController < Alchemy::BaseController
+    include Alchemy::FerretSearch
 
     before_filter :get_page, :except => :create
 
@@ -57,6 +61,9 @@ module Alchemy
       @message = Message.new(params[:message])
       @message.ip = request.remote_ip
       @element = Element.find_by_id(@message.contact_form_id)
+      if @element.nil?
+        raise ActiveRecord::RecordNotFound, "Contact form id not found. Please pass the :contact_form_id in a hidden field. Example: <%= f.hidden_field :contact_form_id, :value => element.id %>"
+      end
       @page = @element.page
       @root_page = @page.get_language_root
       if @message.valid?
@@ -67,7 +74,7 @@ module Alchemy
       end
     end
 
-    private
+  private
 
     def mailer_config
       Alchemy::Config.get(:mailer)

data/app/controllers/alchemy/pages_controller.rb

@@ -1,7 +1,6 @@
 module Alchemy
   class PagesController < Alchemy::BaseController
-
-    rescue_from ActionController::RoutingError, :with => :render_404
+    include Alchemy::FerretSearch
 
     # We need to include this helper because we need the breadcrumb method.
     # And we cannot define the breadcrump method as helper_method, because rspec does not see helper_methods.
@@ -9,6 +8,8 @@ module Alchemy
     # Anyone with a better idea please provide a patch.
     include Alchemy::BaseHelper
 
+    rescue_from ActionController::RoutingError, :with => :render_404
+
     before_filter :render_page_or_redirect, :only => [:show, :sitemap]
     before_filter :perform_search, :only => :show, :if => proc { configuration(:ferret) }
 
@@ -18,8 +19,10 @@ module Alchemy
       :cache_path => proc { @page.cache_key(request) },
       :if => proc {
         if @page && Alchemy::Config.get(:cache_pages)
-           pagelayout = PageLayout.get(@page.page_layout)
-           pagelayout['cache'].nil? || pagelayout['cache']
+          pagelayout = PageLayout.get(@page.page_layout)
+          if (pagelayout['cache'].nil? || pagelayout['cache']) && pagelayout['searchresults'] != true
+            true
+          end
         else
           false
         end
@@ -62,7 +65,7 @@ module Alchemy
         @page = Page.language_root_for(Language.get_default.id)
       else
         if params[:lang].blank?
-          @page = Page.contentpages.find_by_urlname(params[:urlname])
+          @page = Page.contentpages.where(urlname: params[:urlname], language_id: Language.get_default).first
           store_language_in_session(@page.language) if @page.present?
           return @page
         else
@@ -110,32 +113,6 @@ module Alchemy
       end
     end
 
-    # Performs a search on EssenceRichtext and EssenceText for params['query'].
-    # Only performing the search when ferret is enabled in the alchemy/config.yml and
-    # a Page gets found where the searchresults can be rendered. This Page gets found
-    # when a page_layout is marked for rendering searchresults:
-    # 'searchresults: true' in alchemy/page_layouts.yml
-    def perform_search
-      searchresult_page_layouts = PageLayout.get_all_by_attributes({:searchresults => true})
-      if searchresult_page_layouts.any?
-        @search_result_page = Page.find_by_page_layout_and_public_and_language_id(searchresult_page_layouts.first["name"], true, session[:language_id])
-        if !params[:query].blank? && @search_result_page
-          @search_results = []
-          %w(Alchemy::EssenceText Alchemy::EssenceRichtext).each do |e|
-            @search_results += e.constantize.includes(:contents => {:element => :page}).find_with_ferret(
-              "*#{params[:query]}*",
-              {:limit => :all},
-              {:conditions => [
-                'alchemy_pages.public = ? AND alchemy_pages.layoutpage = ? AND alchemy_pages.restricted = ? AND alchemy_pages.language_id = ?',
-                true, false, false, session[:language_id]
-              ]}
-            )
-          end
-          return @search_results.sort { |y, x| x.ferret_score <=> y.ferret_score } if @search_results.any?
-        end
-      end
-    end
-
     def redirect_to_public_child
       @page = @page.self_and_descendants.published.not_restricted.first
       if @page

data/app/controllers/alchemy/pictures_controller.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class PicturesController < Alchemy::BaseController
 
+    ALLOWED_IMAGE_TYPES = %w(png jpeg gif)
+
     caches_page :show, :thumbnail, :zoom
 
     before_filter :load_picture, :ensure_secure_params
@@ -9,42 +11,60 @@ module Alchemy
     filter_access_to :thumbnail
 
     def show
-      @size = params[:size]
-      @crop = !params[:crop].nil?
-      @crop_from = normalized_size(params[:crop_from])
-      @crop_size = params[:crop_size]
-      @padding = params[:padding]
-      @upsample = !params[:upsample].nil? ? true : false
-      @effects = params[:effects]
-      respond_to do |format|
-        format.jpg
-        format.png
-        format.gif
+      image_file = @picture.image_file
+
+      if image_file.nil?
+        raise MissingImageFileError, "Missing image file for #{@picture.inspect}"
+      end
+
+      upsample = params[:upsample] == 'true'
+      crop_from = normalized_size(params[:crop_from])
+      crop_size = params[:crop_size]
+      size = params[:size]
+
+      if params[:crop_size].present? && params[:crop_from].present?
+        crop_from = params[:crop_from].split('x')
+        image_file = image_file.process(:thumb, "#{params[:crop_size]}+#{crop_from[0]}+#{crop_from[1]}")
+      elsif params[:crop] == 'crop' && size.present?
+        image_file = image_file.process(:thumb, "#{size}#")
       end
+
+      if size.present?
+        image_file = image_file.process(:resize, size + '>')
+      end
+
+      respond_to { |format| send_image(image_file, format) }
     end
 
     def thumbnail
+      image_file = @picture.image_file
+
       case params[:size]
-      when "small"
-        @size = "80x60"
-      when "medium"
-        @size = "160x120"
-      when "large"
-        @size = "240x180"
-      when nil
-        @size = "111x93"
+        when "small" then size = "80x60"
+        when "medium" then size = "160x120"
+        when "large" then size = "240x180"
+        when nil then size = "111x93"
       else
-        @size = params[:size]
+        size = params[:size]
       end
-      if !params[:crop_size].blank? && !params[:crop_from].blank?
-        @crop = true
-      elsif params[:crop] == 'crop'
-        @default_crop = true
+
+      if params[:crop_size].present? && params[:crop_from].present?
+        crop_from = params[:crop_from].split('x')
+        image_file = image_file.process(:thumb, "#{params[:crop_size]}+#{crop_from[0]}+#{crop_from[1]}")
+      elsif params[:crop] == 'crop' && size.present?
+        image_file = image_file.process(:thumb, "#{size}#")
       end
+
+      if size.present?
+        image_file = image_file.process(:resize, size + '>')
+      end
+
+      respond_to { |format| send_image(image_file, format) }
     end
 
     def zoom
-      #
+      image_file = @picture.image_file
+      respond_to { |format| send_image(image_file, format) }
     end
 
   private
@@ -62,18 +82,32 @@ module Alchemy
 
     def ensure_secure_params
       token = params[:sh]
-      digest = Digest::SHA1.hexdigest(secured_params)[0..15]
+      digest = PictureAttributes.secure(params)
       bad_request unless token && (token == digest)
     end
 
-    def secured_params
-      [params[:id], params[:size], params[:crop], params[:crop_from], params[:crop_size], Rails.configuration.secret_token].join('-')
-    end
-
     def bad_request
       render :text => "Bad picture parameters in #{request.path}", :status => 400
       return false
     end
 
+    def send_image(image_file, format)
+      ALLOWED_IMAGE_TYPES.each do |type|
+        format.send(type) do
+          if type == "jpeg"
+            quality = params[:quality] || Config.get(:output_image_jpg_quality)
+            image_file = image_file.encode(type, "-quality #{quality}")
+          else
+            image_file = image_file.encode(type)
+          end
+          render :text => image_file.data
+        end
+      end
+    end
+
   end
+
+  class MissingImageFileError < StandardError
+  end
+
 end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -539,6 +539,13 @@ module Alchemy
         taglist.uniq.join(',')
       end
 
+      def render_hint_for(element)
+        return unless element.has_hint?
+        link_to '#', :class => 'element_hint' do
+          render_icon(:hint) + content_tag(:span, element.hint, :class => 'bubble')
+        end
+      end
+
     end
   end
 end

data/app/helpers/alchemy/admin/pages_helper.rb

@@ -81,6 +81,18 @@ module Alchemy
         custom_config_string.html_safe
       end
 
+      def preview_sizes_for_select
+        options_for_select([
+          'auto',
+          [t('240', :scope => 'preview_sizes'), 240],
+          [t('320', :scope => 'preview_sizes'), 320],
+          [t('480', :scope => 'preview_sizes'), 480],
+          [t('768', :scope => 'preview_sizes'), 768],
+          [t('1024', :scope => 'preview_sizes'), 1024],
+          [t('1280', :scope => 'preview_sizes'), 1280]
+        ])
+      end
+
     end
   end
 end

data/app/helpers/alchemy/elements_helper.rb

@@ -2,6 +2,8 @@ module Alchemy
   module ElementsHelper
 
     include Alchemy::EssencesHelper
+    include Alchemy::UrlHelper
+    include Alchemy::ElementsBlockHelper
 
     # Renders all elements from current page.
     #