alchemy_cms 3.2.0.beta → 3.2.0.rc1

data/README.md

@@ -1,7 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
-
-**CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms/versions/3.0.0), or the [latest stable branch (3.1-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).**
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=3.2-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
 
 
 ## About
@@ -75,7 +73,7 @@ $ alchemy --help
 Put this into your `Gemfile`:
 
 ```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '3.2-stable'
 ```
 
 **NOTE:** You normally want to use a stable branch, like `3.0-stable`.
@@ -104,7 +102,7 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
 If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
 
 ```ruby
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '3.2-stable'
 ```
 
 **NOTE:** You normally want to use a stable branch, like `2.0-stable`.
@@ -194,70 +192,14 @@ Also, `git diff` is your friend. You are using git to track changes of your proj
 
 ## Deployment
 
-Alchemy ships with Capistrano based deployment receipts which takes care of everything you need to deploy an Alchemy site.
-
-### 1. Add Capistrano gem
-
-First you need to add Capistrano to your `Gemfile`:
-
-```ruby
-# Gemfile
-gem 'capistrano', '2.15.5', group: 'development'
-```
-
-**A note about Capistrano version:**
-
-Alchemy's deploy script is currently **only compatible with Capistrano 2.x** ([See this pull request](https://github.com/AlchemyCMS/alchemy_cms/pull/616) if you want to help us upgrade to 3.x).
-
-### 2. Generate the deploy file
-
-To generate the deploy file you need to use this generator:
-
-```shell
-$ bin/rails g alchemy:deploy_script
-```
-
-and follow the instructions.
-
-If you *have your own Capistrano receipts* you can require the Alchemy tasks in your `config/deploy.rb` file:
-
-```ruby
-# deploy.rb
-require 'alchemy/capistrano'
-```
-
-### Synchronize your data
-
-Alchemy Capistrano receipts offer much more then only deployment related tasks. We also have tasks to make your local development easier. To get a list of all receipts type:
+Alchemy has an official Capistrano extension which takes care of everything you need to deploy an Alchemy site.
 
-```shell
-$ bundle exec cap -T alchemy
-```
-
-#### Import data from server
-
-```shell
-$ bundle exec cap alchemy:import:all
-```
-
-This imports your servers data onto your local development machine. This is very handy if you want to clone the current server state.
-
-#### Export data to server
-
-That even works the other way around:
-
-```shell
-$ bundle exec cap alchemy:export:all
-```
-
-**NOTE:** This will **overwrite the database** on your server. But calm down my dear friend, Alchemy will ask you to perform a backup before overwriting it.
+Please use https://github.com/AlchemyCMS/capistrano-alchemy, if you want to deploy with Capistrano.
 
 ### Without Capistrano
 
 If you don't use Capistrano you have to **make sure** that the `uploads`, `tmp/cache/assets`, `public/assets` and `public/pictures` folders get **shared between deployments**, otherwise you **will loose data**. No, not really, but you know, just keep them in sync.
 
-Please take a look into Alchemys [Capistrano receipt](https://github.com/AlchemyCMS/alchemy_cms/blob/master/lib/alchemy/capistrano.rb) in order to see how you could achieve this.
-
 
 ## Testing
 

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -46,16 +46,17 @@ $.extend Alchemy,
   # fades the image after its been loaded
   ImageLoader: (scope = document, options = {color: '#fff'}) ->
     $('img', scope).each ->
-      image = $(this).hide()
-      $parent = image.parent()
-      spinner = Alchemy.Spinner.small options
-      spinner.spin $parent[0]
-      image.on 'load', ->
-        spinner.stop()
-        image.fadeIn 400
-      image.on 'error', ->
-        spinner.stop()
-        $parent.html('<span class="icon warn"/>')
+      if !this.complete
+        image = $(this).hide()
+        $parent = image.parent()
+        spinner = Alchemy.Spinner.small options
+        spinner.spin $parent[0]
+        image.on 'load', ->
+          spinner.stop()
+          image.fadeIn 400
+        image.on 'error', ->
+          spinner.stop()
+          $parent.html('<span class="icon warn"/>')
 
   removePicture: (selector) ->
     $form_field = $(selector)

data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee

@@ -30,6 +30,12 @@ Alchemy.Initializer = ->
     delimiter = if url.match(/\?/) then '&' else '?'
     window.location.href = "#{url}#{delimiter}locale=#{$(this).val()}"
 
+  # Site select handler
+  $('select#change_site').on 'change', (e) ->
+    url = window.location.pathname
+    delimiter = if url.match(/\?/) then '&' else '?'
+    window.location.href = "#{url}#{delimiter}site_id=#{$(this).val()}"
+
   # Submit forms of selects with `data-autosubmit="true"`
   $('select[data-auto-submit="true"]').on 'change', (e) ->
     Alchemy.pleaseWaitOverlay()

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

@@ -47,12 +47,6 @@
   line-height: 0;
 }
 
-%button-defaults {
-  @include sassy-button('simple', $sb-border-radius, $sb-font-size, $sb-base-color, $sb-second-color, $sb-text-color, $sb-text-style, $sb-pseudo-states, $sb-ie-support);
-  border-color: $button-border-color;
-  margin: $default-form-field-margin;
-}
-
 %field-with-error {
   border-color: $error_border_color;
   color: $error_text_color;

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

@@ -9,6 +9,12 @@
   }
 }
 
+@mixin button-defaults {
+  @include sassy-button('simple', $sb-border-radius, $sb-font-size, $sb-base-color, $sb-second-color, $sb-text-color, $sb-text-style, $sb-pseudo-states, $sb-ie-support);
+  border-color: $button-border-color;
+  margin: $default-form-field-margin;
+}
+
 @mixin default-label-style {
   font-size: 10px;
   text-shadow: #fff 0 1px 2px;

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

@@ -1,5 +1,5 @@
 button, input[type="submit"], a.button, input.button {
-  @extend %button-defaults;
+  @include button-defaults;
 
   &.small {
     padding: 2px 2*$default-padding;

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

@@ -305,12 +305,12 @@ div#cells {
   right: 0;
 
   .icon_button {
+    @include button-defaults;
     margin: 0 0 0 4px;
     padding: 3px;
     position: absolute;
     bottom: 4px;
     right: 28px;
-    @extend %button-defaults;
     @include border-radius(0);
 
     &.unlink {

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

@@ -62,7 +62,7 @@
       text-align: center;
 
       a, button {
-        @extend %button-defaults;
+        @include button-defaults;
         padding-left: $default-padding;
         padding-right: $default-padding;
         width: 100%;

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

@@ -1,5 +1,5 @@
 select {
-  @extend %button-defaults;
+  @include button-defaults;
   height: 29px;
   padding: 0.4em 0.6em;
 }
@@ -137,6 +137,10 @@ select {
 
   .select2-search {
     margin: $default-margin 0;
+
+    .select2-input {
+      width: inherit;
+    }
   }
 
   &.select2-with-searchbox .select2-results > .select2-result:first-child {

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

@@ -5,7 +5,7 @@ a#uploadswitcher, a.underline {
 .upload-container {
 
   label {
-    @extend %button-defaults;
+    @include button-defaults;
     text-align: center;
     width: 80px;
   }

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

@@ -153,7 +153,7 @@ module Alchemy
 
       def visit
         @page.unlock!
-        redirect_to show_page_path(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
+        redirect_to show_page_path(urlname: @page.urlname, locale: multi_language? ? @page.language_code : nil)
       end
 
       # Sets the page public and updates the published_at attribute that is used as cache_key

data/app/controllers/alchemy/base_controller.rb

@@ -2,16 +2,16 @@
 #
 module Alchemy
   class BaseController < ApplicationController
+    include Alchemy::ConfigurationMethods
     include Alchemy::ControllerActions
     include Alchemy::Modules
+    include Alchemy::SSLProtection
 
     protect_from_forgery
 
     before_action :mailer_set_url_options
     before_action :set_locale
 
-    helper_method :multi_site?
-
     helper 'alchemy/admin/form'
 
     rescue_from CanCan::AccessDenied do |exception|
@@ -26,24 +26,8 @@ module Alchemy
       ::I18n.locale = Language.current.code
     end
 
-    # Returns the configuration value of given key.
-    #
-    # Config file is in +config/alchemy/config.yml+
-    #
-    def configuration(name)
-      Alchemy::Config.get(name)
-    end
-
-    def multi_language?
-      Language.published.count > 1
-    end
-
-    def multi_site?
-      Site.count > 1
-    end
-
-    def raise_not_found_error
-      raise ActionController::RoutingError.new('Not Found')
+    def not_found_error!(msg = "Not found \"#{request.fullpath}\"")
+      raise ActionController::RoutingError.new(msg)
     end
 
     # Shortcut for Alchemy::I18n.translate method
@@ -61,38 +45,6 @@ module Alchemy
       ActionMailer::Base.default_url_options[:host] = request.host_with_port
     end
 
-    def render_404(exception = nil)
-      if exception
-        logger.info "Rendering 404: #{exception.message}"
-      end
-      render :file => Rails.root.join("public/404.html"), :status => 404, :layout => false
-    end
-
-    # Enforce ssl for login and all admin modules.
-    #
-    # Default is +false+
-    #
-    # === Usage
-    #
-    #   # config/alchemy/config.yml
-    #   ...
-    #   require_ssl: true
-    #   ...
-    #
-    # === Note
-    #
-    # You have to create a ssl certificate
-    # if you want to use the ssl protection.
-    #
-    def ssl_required?
-      !Rails.env.test? && configuration(:require_ssl)
-    end
-
-    # Redirects current request to https.
-    def enforce_ssl
-      redirect_to url_for(request.params.merge(protocol: 'https'))
-    end
-
     protected
 
     def permission_denied(exception = nil)
@@ -150,10 +102,5 @@ WARN
       Rails.logger.error("\n#{e.class} #{e.message} in #{e.backtrace.first}")
       Rails.logger.error(e.backtrace[1..50].each { |l| l.gsub(/#{Rails.root.to_s}/, '') }.join("\n"))
     end
-
-    def raise_authorization_exception(exception)
-      raise("Not permitted to #{exception.action} #{exception.subject}")
-    end
-
   end
 end

data/app/controllers/alchemy/messages_controller.rb

@@ -47,7 +47,7 @@ module Alchemy
     helper 'alchemy/pages'
 
     def index #:nodoc:
-      redirect_to show_page_path(urlname: @page.urlname, lang: multi_language? ? @page.language_code : nil)
+      redirect_to show_page_path(urlname: @page.urlname, locale: multi_language? ? @page.language_code : nil)
     end
 
     def new #:nodoc:
@@ -99,7 +99,7 @@ module Alchemy
       else
         urlname = Language.current_root_page.urlname
       end
-      redirect_to show_page_path(urlname: urlname, lang: multi_language? ? Language.current.code : nil)
+      redirect_to show_page_path(urlname: urlname, locale: multi_language? ? Language.current.code : nil)
     end
 
     def get_page

data/app/controllers/alchemy/pages_controller.rb

@@ -1,12 +1,5 @@
 module Alchemy
   class PagesController < Alchemy::BaseController
-    # 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.
-    # Not the best solution, but's working.
-    # Anyone with a better idea please provide a patch.
-    include Alchemy::BaseHelper
-
-    rescue_from ActionController::RoutingError, :with => :render_404
 
     before_action :enforce_primary_host_for_site
     before_action :render_page_or_redirect, only: [:show]
@@ -28,6 +21,8 @@ module Alchemy
           end
         end
       end
+    rescue ActionController::UnknownFormat
+      page_not_found!
     end
 
     # Renders a search engine compatible xml sitemap.
@@ -50,7 +45,7 @@ module Alchemy
         Page.contentpages.where(
           urlname:       params[:urlname],
           language_id:   Language.current.id,
-          language_code: params[:lang] || Language.current.code
+          language_code: params[:locale] || Language.current.code
         ).first
       else
         # No urlname was given, so just load the language root for the
@@ -73,25 +68,24 @@ module Alchemy
 
     def render_page_or_redirect
       @page ||= load_page
+
       if signup_required?
         redirect_to Alchemy.signup_path
-      elsif @page.nil? && last_legacy_url
+      elsif (@page.nil? || request.format.nil?) && last_legacy_url
         @page = last_legacy_url.page
-
         # This drops the given query string.
         redirect_legacy_page
-
       elsif @page.blank?
-        raise_not_found_error
-      elsif multi_language? && params[:lang].blank?
-        redirect_page(lang: Language.current.code)
-      elsif multi_language? && params[:urlname].blank? && !params[:lang].blank? && configuration(:redirect_index)
-        redirect_page(lang: params[:lang])
+        page_not_found!
+      elsif multi_language? && params[:locale].blank?
+        redirect_page(locale: Language.current.code)
+      elsif multi_language? && params[:urlname].blank? && !params[:locale].blank? && configuration(:redirect_index)
+        redirect_page(locale: params[:locale])
       elsif configuration(:redirect_to_public_child) && !@page.public?
         redirect_to_public_child
       elsif params[:urlname].blank? && configuration(:redirect_index)
         redirect_page
-      elsif !multi_language? && !params[:lang].blank?
+      elsif !multi_language? && !params[:locale].blank?
         redirect_page
       elsif @page.has_controller?
         redirect_to main_app.url_for(@page.controller_and_action)
@@ -114,17 +108,13 @@ module Alchemy
 
     def redirect_to_public_child
       @page = @page.self_and_descendants.published.not_restricted.first
-      if @page
-        redirect_page
-      else
-        raise_not_found_error
-      end
+      @page ? redirect_page : page_not_found!
     end
 
     # Redirects page to given url with 301 status while keeping all additional params
     def redirect_page(options = {})
       options = {
-        lang: (multi_language? ? @page.language_code : nil),
+        locale: (multi_language? ? @page.language_code : nil),
         urlname: @page.urlname
       }.merge(options)
 
@@ -135,11 +125,11 @@ module Alchemy
     # Don't use query string of legacy urlname
     def redirect_legacy_page(options={})
       defaults = {
-        :lang => (multi_language? ? @page.language_code : nil),
-        :urlname => @page.urlname
+        locale: (multi_language? ? @page.language_code : nil),
+        urlname: @page.urlname
       }
       options = defaults.merge(options)
-      redirect_to show_page_path(options), :status => 301
+      redirect_to show_page_path(options), status: 301
     end
 
     # Returns url parameters that are not internal show page params.
@@ -147,20 +137,18 @@ module Alchemy
     # * action
     # * controller
     # * urlname
-    # * lang
+    # * locale
     #
     def additional_params
       params.symbolize_keys.delete_if do |key, _|
-        [:action, :controller, :urlname, :lang].include?(key)
+        [:action, :controller, :urlname, :locale].include?(key)
       end
     end
 
     def legacy_urls
-
       # /slug/tree => slug/tree
       urlname = (request.fullpath[1..-1] if request.fullpath[0] == '/') || request.fullpath
-
-      LegacyPageUrl.joins(:page).where(urlname: urlname, alchemy_pages: {language_id: Language.current.id})
+      LegacyPageUrl.joins(:page).where(urlname: urlname, Page.table_name => {language_id: Language.current.id})
     end
 
     def last_legacy_url
@@ -216,5 +204,8 @@ module Alchemy
         public: !@page.restricted)
     end
 
+    def page_not_found!
+      not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
+    end
   end
 end