alchemy_cms 3.1.3 → 3.2.0.beta

data/.travis.yml

@@ -2,22 +2,26 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
+- 2.0.0
+- 2.1
+- 2.2.0
 branches:
   only:
-    - 3.1-stable
-before_script: 'bundle exec rake alchemy:spec:prepare'
-script: 'bundle exec rspec'
+  - master
+before_script: bundle exec rake alchemy:spec:prepare
+script: bundle exec rspec
 env:
-  - DB=mysql
-  - DB=postgresql
-  - RAILS_VERSION=4.0.13
+- DB=mysql
+- DB=postgresql
 notifications:
   irc:
     on_success: change
     on_failure: always
     use_notice: true
     channels:
-      - "irc.freenode.org#alchemy_cms"
+    - irc.freenode.org#alchemy_cms
+  slack:
+    secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=
+addons:
+  code_climate:
+    secure: qmOMqc4FUBRP25XqaYIKuxZQ/GrGLKjIc3vUqZa+XfkQKh6xLXvOF7YUM/XJZ5u6D6hk0Ly8UxjctvDY+tQxEAK49lFwK51i7bODfkQjfVBrFzfht7QhxY5HJKx7F0HHmpyNJet4n8mR0gGlhwVyXv+Tz7Rm6O3Hq3+TEbY9+pk=

data/Gemfile

@@ -2,21 +2,17 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['RAILS_VERSION']
-  gem 'rails', ENV['RAILS_VERSION']
-end
-
 gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
-gem 'mysql2', '~> 0.3.18' if ENV['DB'] == 'mysql'
+gem 'mysql2'  if ENV['DB'] == 'mysql'
 gem 'pg'      if ENV['DB'] == 'postgresql'
 
 group :development, :test do
   gem 'jasmine-rails',        github: 'searls/jasmine-rails'
   gem 'jasmine-jquery-rails', github: 'travisjeffery/jasmine-jquery-rails'
   if ENV['TRAVIS']
-    gem 'coveralls',          require: false
+    gem "codeclimate-test-reporter", require: false
   else
-    gem 'simplecov',          require: false
+    gem 'simplecov',                 require: false
   end
   unless ENV['CI']
     gem 'launchy'
@@ -27,6 +23,7 @@ group :development, :test do
     gem 'pry-byebug'
     gem 'spring'
     gem 'spring-commands-rspec'
+    gem 'rubocop', require: false
   end
 end
 

data/README.md

@@ -1,5 +1,7 @@
 [![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=3.1-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) [![Coverage Status](https://img.shields.io/coveralls/AlchemyCMS/alchemy_cms.svg)](https://coveralls.io/r/AlchemyCMS/alchemy_cms?branch=3.1-stable)
+[![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).**
 
 
 ## About
@@ -29,9 +31,9 @@ Read more about Alchemy on the [website](http://alchemy-cms.com) and in the [gui
 
 ## Rails Version
 
-**This version of Alchemy CMS runs with Rails 4 (including 4.1)**
+**This version of Alchemy CMS runs with Rails 4.2**
 
-* For Rails 4.2 support use the current [master branch](https://github.com/AlchemyCMS/alchemy_cms/tree/master).
+* For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
 * For a Rails 3.2 compatible version use the [`2.8-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.8-stable).
 * For a Rails 3.1 compatible version use the [`2.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.1-stable).
 * For a Rails 3.0 compatible version use the [`2.0-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.0-stable).
@@ -40,7 +42,9 @@ Read more about Alchemy on the [website](http://alchemy-cms.com) and in the [gui
 
 ## Ruby Version
 
-Alchemy runs with Ruby >= 1.9.3 (including Ruby 2.0 and 2.1).
+Alchemy runs with Ruby >= 2.0.0.
+
+For a Ruby 1.9.3 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
 
 For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.3-stable).
 
@@ -52,7 +56,7 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 Use the installer:
 
 ```shell
-$ gem install alchemy_cms
+$ gem install alchemy_cms --pre
 $ alchemy new my_magicpage
 ```
 
@@ -71,9 +75,11 @@ $ alchemy --help
 Put this into your `Gemfile`:
 
 ```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '3.1-stable'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `3.0-stable`.
+
 If you want to use Russian translation and have better i18n support, you should put:
 
 ```ruby
@@ -98,14 +104,16 @@ 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: '2.1-stable'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `2.0-stable`.
+
 Then run:
 
 ```shell
 $ bundle install
-$ bin/rails g alchemy:devise:install
+$ bin/rake alchemy_devise:install:migrations
 ```
 
 ##### Use your User model

data/alchemy_cms.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary               = 'A powerful, userfriendly and flexible CMS for Rails 4'
   gem.description           = 'Alchemy is a powerful, userfriendly and flexible Rails 4 CMS.'
   gem.requirements         << 'ImageMagick (libmagick), v6.6 or greater.'
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.0.0'
   gem.license               = 'BSD New'
   gem.files                 = `git ls-files`.split("\n")
   gem.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -20,22 +20,23 @@ Gem::Specification.new do |gem|
   gem.require_paths         = ['lib']
 
   gem.add_runtime_dependency 'actionpack-page_caching',          ['~> 1.0.0']
-  gem.add_runtime_dependency 'active_model_serializers',         ['>= 0.8.1', '< 0.9.1']
+  gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.9']
   gem.add_runtime_dependency 'acts_as_list',                     ['~> 0.3']
   gem.add_runtime_dependency 'acts-as-taggable-on',              ['~> 3.1']
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.0.0']
-  gem.add_runtime_dependency 'cancancan',                        ['~> 1.9', '< 1.13.0']
+  gem.add_runtime_dependency 'cancancan',                        ['~> 1.9']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
-  gem.add_runtime_dependency 'compass-rails',                    ['~> 1.1']
+  gem.add_runtime_dependency 'compass-rails',                    ['~> 2.0', '>= 2.0.4']
   gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0.1']
-  gem.add_runtime_dependency 'jquery-rails',                     ['~> 3.1.0']
+  gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0.3']
   gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 5.0.0']
   gem.add_runtime_dependency 'kaminari',                         ['~> 0.15']
   gem.add_runtime_dependency 'magiclabs-userstamp',              ['~> 2.1.0']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.3']
-  gem.add_runtime_dependency 'rails',                            ['>= 4.0', '< 4.2']
+  gem.add_runtime_dependency 'rails',                            ['>= 4.2.0', '< 5.0']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.1.0']
-  gem.add_runtime_dependency 'sass-rails',                       ['~> 4.0']
+  gem.add_runtime_dependency 'responders',                       ['~> 2.0']
+  gem.add_runtime_dependency 'sass-rails',                       ['~> 5.0']
   gem.add_runtime_dependency 'sassy-buttons',                    ['~> 0.2.6']
   gem.add_runtime_dependency 'select2-rails',                    ['>= 3.5.9.1', '< 4.0']
   gem.add_runtime_dependency 'simple_form',                      ['~> 3.0']

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

@@ -46,17 +46,16 @@ $.extend Alchemy,
   # fades the image after its been loaded
   ImageLoader: (scope = document, options = {color: '#fff'}) ->
     $('img', scope).each ->
-      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"/>')
+      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.js

@@ -1,6 +1,6 @@
 // Alchemy CMS Sprockets Manifest
 // ------------------------------
-//= require jquery
+//= require jquery2
 //= require jquery_ujs
 //= require turbolinks
 //= require jquery-ui/datepicker

data/app/assets/stylesheets/alchemy/{admin.css.scss → admin.scss}

@@ -1,5 +1,6 @@
 /*  Alchemy CMS Sprockets Manifest
  *  -------------------------------
+ *= require select2
  *= require_self
  */
 

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

@@ -1,5 +1,3 @@
-//= require select2
-
 select {
   @extend %button-defaults;
   height: 29px;
@@ -139,10 +137,6 @@ select {
 
   .select2-search {
     margin: $default-margin 0;
-
-    .select2-input {
-      width: inherit;
-    }
   }
 
   &.select2-with-searchbox .select2-results > .select2-result:first-child {

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

@@ -33,10 +33,9 @@ module Alchemy
       end
 
       def order
-        Content.transaction do
-          params[:content_ids].each_with_index do |id, idx|
-            Content.where(id: id).update_all(position: idx + 1)
-          end
+        params[:content_ids].each do |id|
+          content = Content.find(id)
+          content.move_to_bottom
         end
         @notice = _t("Successfully saved content position")
       end

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

@@ -3,8 +3,6 @@ module Alchemy
     class PicturesController < Alchemy::Admin::BaseController
       helper 'alchemy/admin/tags'
 
-      respond_to :html, :js
-
       before_action :load_picture,
         only: [:show, :edit, :update, :info, :destroy]
 

data/app/controllers/alchemy/api/contents_controller.rb

@@ -7,7 +7,7 @@ module Alchemy
     #
     def index
       @contents = Content.accessible_by(current_ability, :index)
-      if params[:element_id]
+      if params[:element_id].present?
         @contents = @contents.where(element_id: params[:element_id])
       end
       respond_with @contents

data/app/controllers/alchemy/api/elements_controller.rb

@@ -9,10 +9,10 @@ module Alchemy
     #
     def index
       @elements = Element.accessible_by(current_ability, :index)
-      if params[:page_id]
+      if params[:page_id].present?
         @elements = @elements.where(page_id: params[:page_id])
       end
-      if params[:named]
+      if params[:named].present?
         @elements = @elements.named(params[:named])
       end
       respond_with @elements

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

@@ -6,7 +6,7 @@ module Alchemy
     #
     def index
       @pages = Page.accessible_by(current_ability, :index)
-      if params[:page_layout]
+      if params[:page_layout].present?
         @pages = @pages.where(page_layout: params[:page_layout])
       end
       respond_with @pages

data/app/controllers/alchemy/elements_controller.rb

@@ -13,7 +13,6 @@ module Alchemy
     #
     # * 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
@@ -22,12 +21,7 @@ module Alchemy
       respond_to do |format|
         format.html
         format.js { @container_id = params[:container_id] }
-        format.json do
-          ActiveSupport::Deprecation.warn("The Alchemy elements json API moved to `api` namespace. Please use `/api/elements` for json requests instead.")
-          render json: @element, serializer: LegacyElementSerializer
-        end
       end
     end
-
   end
 end

data/app/controllers/alchemy/pages_controller.rb

@@ -26,10 +26,6 @@ module Alchemy
               render xml: {error: 'Not found'}, status: 404
             end
           end
-          format.json do
-            ActiveSupport::Deprecation.warn('The Alchemy pages json API moved to `api` namespace. Please use `/api/pages` for json requests instead.')
-            render json: @page
-          end
         end
       end
     end
@@ -125,13 +121,14 @@ module Alchemy
       end
     end
 
-    def redirect_page(options={})
-      defaults = {
-        :lang => (multi_language? ? @page.language_code : nil),
-        :urlname => @page.urlname
-      }
-      options = defaults.merge(options)
-      redirect_to show_page_path(additional_params.merge(options)), :status => 301
+    # 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),
+        urlname: @page.urlname
+      }.merge(options)
+
+      redirect_to show_page_path(additional_params.merge(options)), status: 301
     end
 
     # Use the bare minimum to redirect to @page
@@ -145,9 +142,16 @@ module Alchemy
       redirect_to show_page_path(options), :status => 301
     end
 
+    # Returns url parameters that are not internal show page params.
+    #
+    # * action
+    # * controller
+    # * urlname
+    # * lang
+    #
     def additional_params
-      params.each do |key, value|
-        params[key] = nil if ["action", "controller", "urlname", "lang"].include?(key)
+      params.symbolize_keys.delete_if do |key, _|
+        [:action, :controller, :urlname, :lang].include?(key)
       end
     end
 

data/app/controllers/alchemy/pictures_controller.rb

@@ -46,6 +46,7 @@ module Alchemy
     end
 
     def send_image(image, format)
+      request.session_options[:skip] = true
       ALLOWED_IMAGE_TYPES.each do |type|
         format.send(type) do
           if type == 'jpeg'

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

@@ -165,7 +165,7 @@ module Alchemy
           action: entry['action'],
           only_path: true,
           params: entry['params']
-        }
+        }.delete_if { |_k, v| v.nil? }
       end
 
       # Retrieves the current Alchemy module from controller and index action.

data/app/models/alchemy/element.rb

@@ -69,24 +69,32 @@ module Alchemy
     class << self
 
       # Builds a new element as described in +/config/alchemy/elements.yml+
-      def new_from_scratch(attributes)
+      #
+      # - Returns a new Alchemy::Element object if no name is given in attributes,
+      #   because the definition can not be found w/o name
+      # - Raises Alchemy::ElementDefinitionError if no definition for given attributes[:name]
+      #   could be found
+      #
+      def new_from_scratch(attributes = {})
         attributes = attributes.dup.symbolize_keys
+
         return new if attributes[:name].blank?
-        return nil if definitions.blank?
-        # clean the name from cell name
-        attributes[:name] = attributes[:name].split('#').first
-        if element_scratch = definitions.detect { |el| el['name'] == attributes[:name] }
-          new(element_scratch.merge(attributes).except(*FORBIDDEN_DEFINITION_ATTRIBUTES))
-        else
-          raise ElementDefinitionError, "Element definition for #{attributes[:name]} not found. Please check your elements.yml"
-        end
+
+        new_element_from_definition_by(attributes) ||
+          raise(ElementDefinitionError.new(attributes))
       end
 
-      # Builds a new element as described in +/config/alchemy/elements.yml+ and saves it
+      # Creates a new element as described in +/config/alchemy/elements.yml+
+      #
+      # - Returns a new Alchemy::Element object if no name is given in attributes,
+      #   because the definition can not be found w/o name
+      # - Raises Alchemy::ElementDefinitionError if no definition for given attributes[:name]
+      #   could be found
+      #
       def create_from_scratch(attributes)
         element = new_from_scratch(attributes)
         element.save if element
-        return element
+        element
       end
 
       # This methods does a copy of source and all depending contents and all of their depending essences.
@@ -127,6 +135,20 @@ module Alchemy
         }
       end
 
+      private
+
+      def new_element_from_definition_by(attributes)
+        remove_cell_name_from_element_name!(attributes)
+
+        element_scratch = definitions.detect { |el| el['name'] == attributes[:name] }
+        return if element_scratch.nil?
+
+        new(element_scratch.merge(attributes).except(*FORBIDDEN_DEFINITION_ATTRIBUTES))
+      end
+
+      def remove_cell_name_from_element_name!(attributes)
+        attributes[:name] = attributes[:name].split('#').first
+      end
     end
 
     # Returns next public element from same page.
@@ -192,9 +214,7 @@ module Alchemy
     #       rss_title: true
     #
     def content_for_rss_title
-      rss_title = content_descriptions.detect { |c| c['rss_title'] }
-      return if rss_title.blank?
-      contents.find_by_name(rss_title['name'])
+      content_for_rss_meta('title')
     end
 
     # Returns the content that is marked as rss description.
@@ -208,9 +228,7 @@ module Alchemy
     #       rss_description: true
     #
     def content_for_rss_description
-      rss_description = content_descriptions.detect { |c| c['rss_description'] }
-      return if rss_description.blank?
-      contents.find_by_name(rss_description['name'])
+      content_for_rss_meta('description')
     end
 
     # Returns the array with the hashes for all element contents in the elements.yml file
@@ -437,6 +455,12 @@ module Alchemy
 
     private
 
+    def content_for_rss_meta(type)
+      description = content_descriptions.detect { |c| c["rss_#{type}"] }
+      return if description.blank?
+      contents.find_by(name: description['name'])
+    end
+
     # creates the contents for this element as described in the elements.yml
     def create_contents
       contents = []