alchemy_cms 2.5.0.b2 → 2.5.0.b5

data/app/assets/stylesheets/alchemy/archive.scss

@@ -266,35 +266,63 @@ div#filter_bar {
 }
 
 div#tag_list {
+  height: 90%;
+
+  .js_filter_field_box {
+
+    input { width: 200px }
+    label { display: none }
+  }
 
   ul {
     list-style-type: none;
     padding: 0;
     margin: $default-margin 0 3*$default-margin 0;
+    height: inherit;
+    width: 204px;
+    overflow-x: hidden;
+    overflow-y: auto;
 
     li {
-      @include inline-block;
-      padding: $default-padding 2*$default-padding;
-      margin: 0 $default-margin 2*$default-margin 0;
+      display: block;
+      padding: $default-padding 4*$default-padding $default-padding 6*$default-padding ;
+      margin: 2*$default-margin 0;
       background-color: $medium-gray;
       @include border-radius(16px);
       white-space: nowrap;
+      overflow: hidden;
+      position: relative;
+
+      &:before {
+        content: '';
+        position: absolute;
+        left: 8px;
+        top: 7px;
+        background: url("ui-icons_666666_256x240.png") -242px -100px;
+        width: 12px;
+        height: 12px;
+      }
 
       a {
         text-decoration: none;
+        display: block;
       }
 
+      &:hover { background-color: $very-light-blue }
+
       &.active {
         background-color: $dark-gray;
 
-        a {
-          color: $light-gray;
-        }
+        a { color: $light-gray }
       }
     }
   }
 }
 
+div#alchemy_window_body div#tag_list ul {
+  height: 364px;
+}
+
 div#pictures_page_list {
 
   h2 { margin: 0 8px }

data/app/assets/stylesheets/alchemy/elements.scss

@@ -19,9 +19,25 @@ img.add_element_spinner {
   bottom: 6px;
 }
 
-#element_area h2#no_elements_on_page_notice {
-  padding: 2*$default-padding;
-  text-align: center;
+div#element_area {
+  padding: 0;
+  margin: 0;
+  min-height: 90%;
+
+  .sortable_cell {
+    min-height: 100px;
+    padding: 8px 8px 2px;
+  }
+
+  textarea {
+    width: 100%;
+    height: 140px;
+  }
+
+  h2#no_elements_on_page_notice {
+    padding: 2*$default-padding;
+    text-align: center;
+  }
 }
 
 .element_handle {
@@ -294,21 +310,10 @@ div.picture_thumbnail div.picture_image {
   }
 }
 
-div#element_area {
-  padding: 0;
-  margin: 0;
-  min-height: 90%;
-}
-
 div#cells {
   min-height: 100px;
 }
 
-div#element_area .sortable_cell {
-  min-height: 100px;
-  padding: 8px 8px 2px;
-}
-
 .place_element_spinner {
   position: absolute;
   right: 8px;
@@ -776,15 +781,14 @@ div.pictures_for_element {
   margin-top: 4px;
 }
 
-#element_area textarea {
-  width: 97%;
-  height: 140px;
-}
-
 textarea.default_tinymce, textarea.custom_tinymce {
   visibility: hidden;
 }
 
+.essence_html_editor textarea {
+  font-family: $mono-font-face;
+}
+
 .text_short_float_left {
   width: 170px;
   float: left;
@@ -808,7 +812,7 @@ textarea.default_tinymce, textarea.custom_tinymce {
   }
 }
 
-a.element_hint {
+a.hint {
   position: absolute;
   right: 32px;
   top: 8px;
@@ -829,6 +833,7 @@ a.element_hint {
     padding: 8px;
     line-height: 1.5em;
     min-width: 180px;
+    font-size: 12px;
 
     &:before {
       content: '';
@@ -843,3 +848,24 @@ a.element_hint {
     }
   }
 }
+
+.content_editor .hint {
+  position: relative;
+  top: auto;
+  right: auto;
+  display: inline-block;
+  margin-right: 4px;
+  margin-top: -2px;
+  margin-left: -1px;
+
+  .bubble {
+    right: auto;
+    left: -4px;
+    top: 24px;
+
+    &:before {
+      right: auto;
+      left: 5px;
+    }
+  }
+}

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -329,3 +329,7 @@ h2#sitemap_heading {
     margin-left: 24px;
   }
 }
+
+select#language_tree_select {
+  margin: 0;
+}

data/app/assets/stylesheets/alchemy/variables.scss

@@ -11,6 +11,7 @@ $default-padding: 4px;
 $default-margin: $default-padding;
 
 $default-font-face: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+$mono-font-face: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
 $default-font-size: 12px;
 $default-font-style: $default-font-size $default-font-face;
 

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

@@ -219,7 +219,7 @@ module Alchemy
       end
 
       def switch_language
-        set_language_from(params[:language_id])
+        set_language(params[:language_id])
         redirect_path = request.referer.include?('admin/layoutpages') ? admin_layoutpages_path : admin_pages_path
         if request.xhr?
           @redirect_url = redirect_path

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

@@ -133,7 +133,8 @@ module Alchemy
       end
 
       def flush
-        FileUtils.rm_rf Rails.root.join('public', Alchemy.mount_point, 'pictures')
+        # FileUtils.rm_rf only takes arrays of folders...
+        FileUtils.rm_rf Dir.glob(Rails.root.join('public', Alchemy.mount_point, 'pictures', '*'))
         @notice = t('Picture cache flushed')
       end
 

data/app/controllers/alchemy/base_controller.rb

@@ -10,7 +10,7 @@ module Alchemy
     before_filter :set_language
     before_filter :mailer_set_url_options
 
-    helper_method :current_server, :t
+    helper_method :current_server, :current_site, :t
 
     # Returns a host string with the domain the app is running on.
     def current_server
@@ -46,9 +46,17 @@ module Alchemy
 
   private
 
-    # Sets the current site.
+    # Returns the current site.
+    #
+    def current_site
+      @current_site ||= Site.find_for_host(request.host)
+    end
+
+    # Sets the current site in a cvar so the Language model
+    # can be scoped against it.
+    #
     def set_current_site
-      Site.current = Site.where(host: request.host).first || Site.default
+      Site.current = current_site
     end
 
     # Sets Alchemy's GUI translation to users preffered language and stores it in the session.
@@ -73,44 +81,49 @@ module Alchemy
       end
     end
 
-    # Sets the language for rendering pages in pages controller
-    def set_language
-      if params[:lang].blank? and session[:language_id].blank?
-        set_language_to_default
-      elsif !params[:lang].blank?
-        ::I18n.locale = set_language_from(params[:lang])
+    # Sets the language for rendering pages in pages controller.
+    #
+    def set_language(lang = nil)
+      if lang
+        @language = lang.is_a?(Language) ? lang : load_language_from(lang)
+      else
+        # find the best language and remember it for later
+        @language = load_language_from_params ||
+                    load_language_from_session ||
+                    load_language_default
       end
+
+      # store language in session
+      store_language_in_session(@language)
+
+      # switch locale to selected language
+      ::I18n.locale = @language.code
     end
 
-    def set_language_from(language_code_or_id)
-      if language_code_or_id.is_a?(String) && language_code_or_id.match(/^\d+$/)
-        language_code_or_id = language_code_or_id.to_i
+    def load_language_from_params
+      if params[:lang].present?
+        Language.find_by_code(params[:lang])
       end
-      case language_code_or_id.class.name
-      when "String"
-        @language = Language.find_by_code(language_code_or_id)
-      when "Fixnum"
-        @language = Language.find(language_code_or_id)
-      end
-      store_language_in_session(@language)
     end
 
-    def set_language_to_default
-      @language = Language.get_default
-      if @language
-        store_language_in_session(@language)
-      else
-        raise "No Default Language found! Did you run `rake alchemy:db:seed` task?"
+    def load_language_from_session
+      if session[:language_id].present?
+        Language.find_by_id(session[:language_id])
       end
     end
 
+    def load_language_from(language_code_or_id)
+      Language.find_by_id(language_code_or_id) || Language.find_by_code(language_code_or_id)
+    end
+
+    def load_language_default
+      Language.get_default
+    end
+
     def store_language_in_session(language)
       if language && language.id
-        session[:language_id] = language.id
+        session[:language_id]   = language.id
         session[:language_code] = language.code
-      else
-        logger.warn "!!!! Language not found for #{language.inspect}. Setting to default!"
-        set_language_to_default
       end
     end
 

data/app/controllers/alchemy/pages_controller.rb

@@ -10,6 +10,7 @@ module Alchemy
 
     rescue_from ActionController::RoutingError, :with => :render_404
 
+    before_filter :enforce_primary_host_for_site
     before_filter :render_page_or_redirect, :only => [:show, :sitemap]
     before_filter :perform_search, :only => :show, :if => proc { configuration(:ferret) }
 
@@ -58,26 +59,37 @@ module Alchemy
 
   private
 
+    # Load the current page and store it in @page.
+    #
     def load_page
-      # we need this, because of a dec_auth bug (it calls this method after the before_filter again).
-      return @page if @page
-      if params[:urlname].blank?
-        @page = Page.language_root_for(Language.get_default.id)
+      @page ||= if params[:urlname].present?
+        # Load by urlname. If a language is specified in the request parameters,
+        # scope pages to it to make sure we can raise a 404 if the urlname
+        # is not available in that language.
+        Page.contentpages.where(
+          urlname:       params[:urlname],
+          language_id:   @language.id,
+          language_code: params[:lang] || @language.code
+        ).first
       else
-        if params[:lang].blank?
-          @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
-          @page = Page.contentpages.where(
-            :urlname => params[:urlname],
-            :language_id => session[:language_id],  # Make sure that the current language
-            :language_code => params[:lang]         # matches the requested language code.
-          ).first
-        end
+        # No urlname was given, so just load the language root for the
+        # currently active language.
+        Page.language_root_for(@language.id)
       end
     end
 
+    def enforce_primary_host_for_site
+      if needs_redirect_to_primary_host?
+        redirect_to url_for(host: current_site.host)
+      end
+    end
+
+    def needs_redirect_to_primary_host?
+      current_site.redirect_to_primary_host? &&
+        current_site.host != '*' &&
+        current_site.host != request.host
+    end
+
     def render_page_or_redirect
       @page ||= load_page
       if User.admins.count == 0 && @page.nil?
@@ -104,7 +116,7 @@ module Alchemy
         redirect_to main_app.url_for(@page.controller_and_action)
       else
         # setting the language to page.language to be sure it's correct
-        set_language_from(@page.language_id)
+        set_language(@page.language)
         if params[:urlname].blank?
           @root_page = @page
         else

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

@@ -90,17 +90,17 @@ module Alchemy
           :id => "search_field"
         }
         options = default_options.merge(options)
-        options[:onkeyup] << ";jQuery('#search_field').val().length >= 1 ? jQuery('.js_filter_field_clear').show() : jQuery('.js_filter_field_clear').hide();"
+        options[:onkeyup] << "; jQuery('##{options[:id]}').val().length >= 1 ? jQuery('.js_filter_field_clear').show() : jQuery('.js_filter_field_clear').hide();"
         filter_field = '<div class="js_filter_field_box">'
         filter_field << text_field_tag("filter", '', options)
         filter_field << content_tag('span', '', :class => 'icon search')
         filter_field << link_to('', '#', {
-          :onclick => "jQuery('##{options[:id]}').val('');#{options[:onkeyup]}",
+          :onclick => "jQuery('##{options[:id]}').val(''); #{options[:onkeyup]}",
           :class => "js_filter_field_clear",
-          :style => "display:none",
+          :style => "display: none",
           :title => t("click_to_show_all")
         })
-        filter_field << %(<label for="search_field">#{t(:search)}</label>)
+        filter_field << %(<label for="#{options[:id]}">#{t(:search)}</label>)
         filter_field << '</div>'
         filter_field.html_safe
       end
@@ -541,8 +541,8 @@ module Alchemy
 
       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')
+        link_to '#', :class => 'hint' do
+          render_icon(:hint) + content_tag(:span, element.hint.html_safe, :class => 'bubble')
         end
       end
 

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

@@ -108,7 +108,7 @@ module Alchemy
       # Renders the label and a remove link for a content.
       def label_and_remove_link(content)
         content_tag :label do
-          [render_content_name(content).to_s, delete_content_link(content).to_s].join(' ').html_safe
+          [render_hint_for(content), render_content_name(content), delete_content_link(content)].compact.join(' ').html_safe
         end
       end
 

data/app/helpers/alchemy/essences_helper.rb

@@ -44,7 +44,7 @@ module Alchemy
         return ""
       end
       content = element.content_by_name(name)
-      render_essence(content, :view, {:for_view => options}, html_options)
+      render_essence_view(content, options, html_options)
     end
 
     # Renders the +Essence+ view partial from given +Element+ and +Essence+ type.
@@ -130,12 +130,11 @@ module Alchemy
     #
     #   :image_size => "111x93"                        # Used by EssencePicture to render the image via RMagick to that size. [Default nil]
     #   :date_format => "Am %d. %m. %Y, um %H:%Mh"     # Especially for EssenceDate. See Rubys Date.strftime for date formatting options. [Default nil]
-    #   :show_caption => true                          # Pass Boolean to show/hide the caption of an EssencePicture. [Default true]
+    #   :show_caption => false                         # Pass Boolean to show/hide the caption of an EssencePicture. [Default true]
+    #   :disable_link => true                          # You can surpress the link of an EssencePicture. Default false
     #
     def render_essence_view(content, options = {}, html_options = {})
-      defaults = {
-        :show_caption => true
-      }
+      defaults = {:show_caption => true, :disable_link => false}
       render_essence(content, :view, {:for_view => defaults.update(options)}, html_options)
     end
 

data/app/models/alchemy/content.rb

@@ -151,6 +151,7 @@ module Alchemy
         end
       end
     end
+    alias_method :definition, :description
 
     # Gets the ingredient from essence
     def ingredient
@@ -265,5 +266,51 @@ module Alchemy
       end
     end
 
+    # Returns the hint for this content
+    #
+    # To add a hint to a content pass +hint: true+ to the element definition in its element.yml
+    #
+    # Then the hint itself is placed in the locale yml files.
+    #
+    # Alternativly you can pass the hint itself to the hint key.
+    #
+    # == Locale Example:
+    #
+    #   # elements.yml
+    #   - name: headline
+    #     contents:
+    #     - name: headline
+    #       type: EssenceText
+    #       hint: true
+    #
+    #   # config/locales/de.yml
+    #     de:
+    #       content_hints:
+    #         headline: Lorem ipsum
+    #
+    # == Hint Key Example:
+    #
+    #   - name: headline
+    #     contents:
+    #     - name: headline
+    #       type: EssenceText
+    #       hint: Lorem ipsum
+    #
+    # @return String
+    #
+    def hint
+      hint = definition['hint']
+      if hint == true
+        I18n.t(name, scope: :content_hints)
+      else
+        hint
+      end
+    end
+
+    # Returns true if the element has a hint
+    def has_hint?
+      hint.present?
+    end
+
   end
 end

data/app/models/alchemy/page.rb

@@ -561,7 +561,12 @@ module Alchemy
     end
 
     def cache_key(request = nil)
-      "alchemy/#{language_code}/#{urlname}"
+      if timestamp = updated_at
+        timestamp = timestamp.utc.to_s(:number)
+        "alchemy/pages/#{id}-#{timestamp}"
+      else
+        "alchemy/pages/#{id}"
+      end
     end
 
     def taggable?

data/app/models/alchemy/site.rb

@@ -1,8 +1,6 @@
 module Alchemy
   class Site < ActiveRecord::Base
-    cattr_accessor :current
-
-    attr_accessible :host, :name, :public
+    attr_accessible :host, :aliases, :name, :public, :redirect_to_primary_host
 
     # validations
     validates_presence_of :host
@@ -19,9 +17,32 @@ module Alchemy
     end
 
     class << self
+      def current=(v)
+        Thread.current[:alchemy_current_site] = v
+      end
+
+      def current
+        Thread.current[:alchemy_current_site]
+      end
+
       def default
         Site.first
       end
+
+      def find_for_host(host)
+        # These are split up into two separate queries in order to run the
+        # fastest query first (selecting the domain by its primary host name).
+        #
+        where(host: host).first || find_in_aliases(host) || default
+      end
+
+      def find_in_aliases(host)
+        return nil if host.blank?
+
+        all.find do |site|
+          site.aliases.split.include?(host) if site.aliases.present?
+        end
+      end
     end
 
     before_create do

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

@@ -1,9 +1,10 @@
 <% p = params.dup %>
 <h2><%= t("Filter by tag") %></h2>
+<%#= js_filter_field :onkeyup => "Alchemy.ListFilter('#tag_list li')", :id => 'tag_list_filter' %>
 <ul>
   <% Alchemy::Picture.tag_counts.each do |t| %>
     <% picture_tags = pictures_filtered_by_tag?(t) ? picture_tag_filter(:remove => t) : picture_tag_filter(:add => t) %>
-    <%= content_tag 'li', :class => p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
+    <%= content_tag 'li', :name => t.name, :class => p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
       <%= link_to(
         "#{t.name} (#{t.count})",
         url_for(

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

@@ -17,7 +17,7 @@
       </td>
       <%- elsif attribute[:type] == :text -%>
       <td class="label"><%= f.send :label, attribute[:name] %></td>
-      <td class="input"><%= f.send :text_area, attribute[:name] -%></td>
+      <td class="input"><%= f.send :text_area, attribute[:name], :rows => 4 -%></td>
       <%- elsif attribute[:type] == :datetime -%>
       <td class="label"><%= f.send :label, attribute[:name] %></td>
       <td class="input"><%= f.send :text_field, attribute[:name], :type => :date -%></td>

data/app/views/alchemy/essences/_essence_html_editor.html.erb

@@ -1,8 +1,8 @@
-<div class="content_editor content_text_editor"<%= " style=\"float: left;\"" if options[:css_class] == "text_short" %>>
+<div class="content_editor essence_html_editor"<%= " style=\"float: left;\"" if options[:css_class] == "text_short" %>>
   <%= label_and_remove_link(content) %>
-  <%= text_field_tag(
+  <%= text_area_tag(
     content.form_field_name,
     content.ingredient,
-    :class => 'thin_border text_long'
+    :class => 'thin_border'
   ) %>
-</div>
+</div>

data/app/views/alchemy/essences/_essence_picture_editor.html.erb

@@ -1,6 +1,11 @@
 <div id="<%= content_dom_id(content) %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>">
   <% unless options[:grouped] %>
-  <label><%= render_content_name(content) %></label>
+  <label>
+    <% if content.has_hint? %>
+      <%= render_hint_for(content) %>
+    <% end %>
+    <%= render_content_name(content) %>
+  </label>
   <% end %>
   <div class="picture_thumbnail">
     <span class="picture_tool delete">

data/app/views/alchemy/essences/_essence_picture_view.html.erb

@@ -1,42 +1,39 @@
 <% if content.essence.picture.present? %>
 
-  <% img_tag = image_tag(
-    show_alchemy_picture_url(content.essence.picture,
-      options.merge(
-        :size => options.delete(:image_size),
-        :crop_from => options[:crop] && !content.essence.crop_from.blank? ? content.essence.crop_from : nil,
-        :crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil
-      ).delete_if { |k,v| v.blank? || k.to_sym == :show_caption || k.to_sym == :disable_link }
-    ),
-    {
-      :alt => (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
-      :title => (content.essence.title.blank? ? nil : content.essence.title),
-      :class => (content.essence.css_class.blank? ? nil : content.essence.css_class)
-    }.merge(html_options)
-  ) %>
-
-  <% caption = content_tag("div", content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") %>
+<% img_tag = image_tag(
+  show_alchemy_picture_url(content.essence.picture,
+    options.merge(
+      :size => options.delete(:image_size),
+      :crop_from => options[:crop] && !content.essence.crop_from.blank? ? content.essence.crop_from : nil,
+      :crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil
+    ).delete_if { |k,v| v.blank? || k.to_sym == :show_caption || k.to_sym == :disable_link }
+  ),
+  {
+    :alt => (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
+    :title => (content.essence.title.blank? ? nil : content.essence.title),
+    :class => (content.essence.css_class.blank? ? nil : content.essence.css_class)
+  }.merge(html_options)
+) %>
+
+<% if content.essence.caption.present? && options[:show_caption] %>
+  <% caption = content_tag(:figcaption, content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") %>
+<figure>
+<% end %>
 
   <% if content.essence.link.blank? || options[:disable_link] %>
 
-    <%= img_tag %>
-
-    <% if options[:show_caption] && content.essence.caption.present? %>
-
-      <%= caption %>
-
-    <% end %>
+    <%= caption ? img_tag + caption : img_tag %>
 
   <% else %>
 
-    <%= link_to(
-      content.essence.caption.blank? || options[:show_caption] == false ? img_tag : img_tag + caption,
-      url_for(content.essence.link),
+    <%= link_to(url_for(content.essence.link), {
       :title => content.essence.link_title,
       :target => (content.essence.link_target == "blank" ? "_blank" : nil),
       'data-link-target' => content.essence.link_target
-    ) %>
+    }) do %>
+      <%= caption ? img_tag + caption : img_tag %>
+    <% end %>
 
   <% end %>
-
+<% if caption %></figure><% end %>
 <% end %>

data/config/locales/alchemy.de.yml

@@ -562,7 +562,7 @@ de:
       cancel_uploads: "Hochladen abbrechen"
     tag_list: Tags
     tags_get_created_if_used_the_first_time: 'Ein Tag wird automatisch erstellt, sobald Sie es das erste mal verwenden.'
-    this_picture_is_not_used_on_any_page: "Dieses Bild wird auf keiner Seiten benutzt."
+    this_picture_is_not_used_on_any_page: "Dieses Bild wird auf keiner Seite benutzt."
     this_picture_is_used_on_these_pages: "Dieses Bild wird auf folgenden Seiten benutzt"
     title: "Titel"
     "trash element": "Element in den Papierkorb legen"
@@ -930,8 +930,10 @@ de:
 
       alchemy/site:
         name: "Bezeichnung"
-        host: "Host/Domain"
+        host: "primäre Domain"
         public: "veröffentlicht"
+        aliases: "Domain-Aliases"
+        redirect_to_primary_host: "Auf primäre Domain weiterleiten"
 
     errors:
       <<: *errors

data/config/locales/alchemy.en.yml

@@ -652,7 +652,7 @@ en:
         role: "Userrole"
 
       alchemy/site:
-        host: Host/Domain
+        host: primary Host
 
     errors:
       <<: *errors

data/db/migrate/20121220102223_add_aliases_to_site.rb

@@ -0,0 +1,6 @@
+class AddAliasesToSite < ActiveRecord::Migration
+  def change
+    add_column :alchemy_sites, :aliases, :text
+    add_column :alchemy_sites, :redirect_to_primary_host, :boolean
+  end
+end

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.5.0.b2"
+  VERSION = "2.5.0.b5"
 
   def self.version
     VERSION

data/spec/controllers/base_controller_spec.rb

@@ -1,64 +1,84 @@
 require 'spec_helper'
 
+# Here's a tiny custom matcher making it a bit easier to check the
+# current session for a language configuration.
+#
+RSpec::Matchers.define :include_language_information_for do |expected|
+  match do |actual|
+    actual[:language_id] == expected.id && actual[:language_code] == expected.code
+  end
+end
+
 module Alchemy
   describe BaseController do
 
     let(:default_language) { Language.get_default }
     let(:klingonian) { FactoryGirl.create(:klingonian) }
 
-    describe "#set_language_from" do
+    describe "#set_language" do
 
-      it "should set the language from id" do
-        controller.send :set_language_from, default_language.id
-        controller.session[:language_id].should == default_language.id
+      context "with a Language argument" do
+        it "should set the language to the passed Language instance" do
+          controller.send :set_language, klingonian
+          assigns(:language).should == klingonian
+        end
       end
 
-      it "should set the language from code" do
-        controller.send :set_language_from, klingonian.code
-        controller.session[:language_id].should == klingonian.id
-        controller.session[:language_code].should == klingonian.code
+      context "with a language id argument" do
+        it "should set the language to the language specified by the passed id" do
+          controller.send :set_language, klingonian.id
+          assigns(:language).should == klingonian
+        end
       end
 
-      it "should set the language from id as string" do
-        controller.send :set_language_from, default_language.id.to_s
-        controller.session[:language_id].should == default_language.id
-        controller.session[:language_code].should == default_language.code
+      context "with a language code argument" do
+        it "should set the language to the language specified by the passed code" do
+          controller.send :set_language, klingonian.code
+          assigns(:language).should == klingonian
+        end
       end
 
-    end
-
-    describe "#set_language" do
-
       context "with no lang param" do
 
         it "should set the default language" do
           controller.stub!(:params).and_return({})
           controller.send :set_language
-          controller.session[:language_id].should == default_language.id
-          controller.session[:language_code].should == default_language.code
+          assigns(:language).should == default_language
+          controller.session.should include_language_information_for(default_language)
+        end
+
+      end
+
+      context "with language set in the session" do
+        before do
+          controller.stub!(:session).and_return(language_id: klingonian.id, language_code: klingonian.code)
         end
 
+        it "should use the language set in the session cookie" do
+          controller.send :set_language
+          assigns(:language).should == klingonian
+        end
       end
 
       context "with lang param" do
 
         it "should set the language" do
-          controller.stub!(:params).and_return({:lang => klingonian.code})
+          controller.stub!(:params).and_return(:lang => klingonian.code)
           controller.send :set_language
-          controller.session[:language_id].should == klingonian.id
-          controller.session[:language_code].should == klingonian.code
+          assigns(:language).should == klingonian
+          controller.session.should include_language_information_for(klingonian)
         end
 
         context "for language that does not exist" do
 
           before do
-            controller.stub!(:params).and_return({:lang => 'fo'})
+            controller.stub!(:params).and_return(:lang => 'fo')
             controller.send :set_language
           end
 
           it "should set the language to default" do
-            controller.session[:language_id].should == default_language.id
-            controller.session[:language_code].should == default_language.code
+            assigns(:language).should == default_language
+            controller.session.should include_language_information_for(default_language)
           end
 
           it "should set the rails locale to default language code" do

data/spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb

@@ -0,0 +1,6 @@
+class AddAliasesToSite < ActiveRecord::Migration
+  def change
+    add_column :alchemy_sites, :aliases, :text
+    add_column :alchemy_sites, :redirect_to_primary_host, :boolean
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121211163003) do
+ActiveRecord::Schema.define(:version => 20121220102223) do
 
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"
@@ -246,9 +246,11 @@ ActiveRecord::Schema.define(:version => 20121211163003) do
   create_table "alchemy_sites", :force => true do |t|
     t.string   "host"
     t.string   "name"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.boolean  "public",     :default => false
+    t.datetime "created_at",                                  :null => false
+    t.datetime "updated_at",                                  :null => false
+    t.boolean  "public",                   :default => false
+    t.text     "aliases"
+    t.boolean  "redirect_to_primary_host"
   end
 
   add_index "alchemy_sites", ["host", "public"], :name => "alchemy_sites_public_hosts_idx"

data/spec/models/site_spec.rb

@@ -8,7 +8,7 @@ module Alchemy
     describe 'new instances' do
       subject { FactoryGirl.build(:site) }
 
-      it 'should start out with on languages' do
+      it 'should start out with no languages' do
         subject.languages.should be_empty
       end
 
@@ -35,6 +35,46 @@ module Alchemy
       end
     end
 
+    describe '.find_for_host' do
+      # No need to create a default site, as it has already been added through the seeds.
+      # But let's add some more:
+      #
+      let(:default_site)    { Site.default }
+      let!(:magiclabs_site) { FactoryGirl.create(:site, host: 'www.magiclabs.de', aliases: 'magiclabs.de magiclabs.com www.magiclabs.com') }
+
+      subject { Site.find_for_host(host) }
+
+      context "when the request doesn't match anything" do
+        let(:host) { 'oogabooga.com' }
+        it { should == default_site }
+      end
+
+      context "when the request matches a site's host field" do
+        let(:host) { 'www.magiclabs.de' }
+        it { should == magiclabs_site }
+      end
+
+      context "when the request matches one of the site's aliases" do
+        let(:host) { 'magiclabs.com' }
+        it { should == magiclabs_site }
+      end
+
+      context "when the request matches the site's first alias" do
+        let(:host) { 'magiclabs.de' }
+        it { should == magiclabs_site }
+      end
+
+      context "when the request matches the site's last alias" do
+        let(:host) { 'www.magiclabs.com' }
+        it { should == magiclabs_site }
+      end
+
+      context "when the request host matches only part of a site's aliases" do
+        let(:host) { 'labs.com' }
+        it { should == default_site }
+      end
+    end
+
     describe '.current' do
       context 'when set to a site' do
         before { Site.current = site }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0.b2
+  version: 2.5.0.b5
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -769,6 +769,7 @@ files:
 - db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
 - db/migrate/20121205155004_create_alchemy_sites.rb
 - db/migrate/20121211163003_add_public_to_alchemy_sites.rb
+- db/migrate/20121220102223_add_aliases_to_site.rb
 - lib/alchemy/auth_engine.rb
 - lib/alchemy/authentication_helpers.rb
 - lib/alchemy/capistrano.rb
@@ -878,6 +879,7 @@ files:
 - spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
 - spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
 - spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
+- spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -1132,6 +1134,7 @@ test_files:
 - spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
 - spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
 - spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
+- spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html