alchemy_cms 3.3.0.rc2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b96881451c7611c03a33ac92666841c2bd6a03e
-  data.tar.gz: 0b5bbdccfe93eb0dd472e22bdd4bef342c5e5dfa
+  metadata.gz: 5b2de102b0ff3416c4b8bf164e88c121cad5b606
+  data.tar.gz: f9dbf2b258ed3432b88ec0a4e758fed0cb17abc1
 SHA512:
-  metadata.gz: 83f2371b4a3f76bc1fe5fa6aa1f716aebea9105d0891b878fa7620cb5f2e75b228e579670f1a03da00b24dcc4aa666e380738bda5312889d9cc85f730b1649c0
-  data.tar.gz: 58cf314fe01120b0bd00b18dcb891df015baed64fa0cb73611b76d50194b8227fb2d09f9185813568ad10346c3fb02f32a93f72aed54f3e0a515c32ef7600ce8
+  metadata.gz: 2ab2060c1bc6766ae4270371bff98e1a75ca6d373851b4ba9d998c9fee0316b95de227592d356c0d50388f5d6014572d98341492a490d9e9d524a20eb2eb618e
+  data.tar.gz: b54e16e8762347eadab4dd5f9aa4e0c641bf655851a572a7eb11aaa5ede8fa94451dd60d39e5024f5e4d899ff10ffc36680545a521f574ecf53e36635e8e7caa

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 3.3.0 (unreleased)
+## 3.3.0 (2016-05-18)
 
 __New Features__
 
@@ -19,6 +19,7 @@ __New Features__
 * Deprecate `redirect_index` configuration
 * Add Nestable elements feature
 * Default site in seeder is now configurable
+* Frontpage name and page layout are now editable when creating new language trees
 
 __Notable Changes__
 
@@ -57,8 +58,22 @@ __Fixed Bugs__
 * Eliminate an SQL lookup on frontend cached element partials
 * Add missing german and spanish translation for element toolbar
 * Use the site_id parameter and the session only in the Admin area
+* Render 404 if accessing an unpublished index page that has "on page layout" callbacks
 
-[Full Change Log](https://github.com/AlchemyCMS/alchemy_cms/compare/v3.2.0...HEAD)
+[Full Change Log](https://github.com/AlchemyCMS/alchemy_cms/compare/v3.2.1...v3.3.0)
+
+## 3.2.1 (2016-03-31)
+
+__Fixed Bugs__
+
+* Fix constant lookup issues with registered abilites
+* Fix: `EssenceSelect` grouped `select_values`
+* Respect `:reverse` option when sorting elements
+* Directly updates position in database while sorting contents
+* Don't show trashed elements when using a fallback
+* Fixes wrong week number in datepicker
+
+[Full Change Log](https://github.com/AlchemyCMS/alchemy_cms/compare/v3.2.0...v3.2.1)
 
 ## 3.2.0 (2015-07-31)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014, magic labs GmbH, Hamburg Germany
+Copyright (c) 2010-2016, magic labs GmbH, Hamburg Germany
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -1,19 +1,16 @@
 [![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)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=3.3-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)
 [![Slack Status](http://slack.alchemy-cms.com/badge.svg)](http://slack.alchemy-cms.com)
 
-**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.2.0), or the [latest stable branch (3.2-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/3.2-stable).**
-
-
 ## About
 
 ![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.svg)
 
 Alchemy is a powerful, flexible and user centric Rails CMS.
 
-Read more about Alchemy on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
+Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com/stable/).
 
 
 ## Features
@@ -78,11 +75,9 @@ $ 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.3-stable'
 ```
 
-**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
@@ -107,11 +102,9 @@ 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.3-stable'
 ```
 
-**NOTE:** You normally want to use a stable branch, like `2.0-stable`.
-
 Then run:
 
 ```shell
@@ -303,7 +296,7 @@ Alchemy specs are written **in RSpec 3**. Please **do not use deprecated RSpec 2
 
 ## License
 
-* BSD: <https://raw.github.com/magiclabs/alchemy_cms/master/LICENSE>
+* BSD: <https://raw.githubusercontent.com/AlchemyCMS/alchemy_cms/master/LICENSE>
 
 
 ## Spread the love

data/alchemy_cms.gemspec

@@ -20,7 +20,7 @@ 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.9']
+  gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.9.0']
   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']

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

@@ -198,7 +198,7 @@ div#filter_bar {
   }
 }
 
-#tag_list {
+.tag-list {
   @include box-sizing(border-box);
   height: 100%;
   padding-bottom: 138px;
@@ -281,22 +281,22 @@ div#filter_bar {
 #assign_image_list {
   padding-right: 244px;
 
-  #tag_list ul {
+  .tag-list ul {
     height: 316px;
   }
 
-  &.filtered #tag_list ul {
+  &.filtered .tag-list ul {
     height: 292px;
   }
 }
 
 #assign_file_list {
 
-  #tag_list ul {
+  .tag-list ul {
     height: 396px;
   }
 
-  &.filtered #tag_list ul {
+  &.filtered .tag-list ul {
     height: 372px;
   }
 }
@@ -374,6 +374,6 @@ div#filter_bar {
   }
 }
 
-table.list#tag_list .tag {
+.tags .list .tag {
   padding: 0;
 }

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

@@ -292,3 +292,11 @@ div#user_info {
     float: left;
   }
 }
+
+.full-iframe {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}

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

@@ -28,6 +28,7 @@ module Alchemy
         if !@page_root
           @language = Language.current
           @languages_with_page_tree = Language.with_root_page
+          @page_layouts = PageLayout.layouts_for_select(@language.id)
         end
       end
 
@@ -110,21 +111,26 @@ module Alchemy
         end
       end
 
+      # Fetches page via before filter, destroys it and redirects to page tree
       def destroy
-        # fetching page via before filter
-        name = @page.name
-        @page_id = @page.id
-        @layoutpage = @page.layoutpage?
         if @page.destroy
-          set_root_page
-          @message = Alchemy.t("Page deleted", name: name)
-          flash[:notice] = @message
-          respond_to do |format|
-            format.js
+          flash[:notice] = Alchemy.t("Page deleted", name: @page.name)
+
+          # Remove page from clipboard
+          clipboard = get_clipboard('pages')
+          clipboard.delete_if { |item| item['id'] == @page.id.to_s }
+        end
+
+        respond_to do |format|
+          format.js do
+            @redirect_url = if @page.layoutpage?
+                              alchemy.admin_layoutpages_path
+                            else
+                              alchemy.admin_pages_path
+                            end
+
+            render :redirect
           end
-          # remove from clipboard
-          @clipboard = get_clipboard('pages')
-          @clipboard.delete_if { |item| item['id'] == @page_id.to_s }
         end
       end
 

data/app/controllers/alchemy/pages_controller.rb

@@ -9,8 +9,13 @@ module Alchemy
     before_action :load_index_page, only: [:index]
     before_action :load_page, only: [:show]
 
-    # Page redirects need to run after the page was loaded. Order is important here!
+    # Legacy page redirects need to run after the page was loaded and before we render 404.
     include LegacyPageRedirects
+
+    # From here on, we need a +@page+ to work with!
+    before_action :page_not_found!, if: -> { @page.blank? }, only: [:index, :show]
+
+    # Page redirects need to run after the page was loaded and we're sure to have a +@page+ set.
     include PageRedirects
 
     # We only need to set the +@root_page+ if we are sure that no more redirects happen.
@@ -35,8 +40,6 @@ module Alchemy
     # If no public page can be found it renders a 404 error.
     #
     def index
-      @page || page_not_found!
-
       if Alchemy::Config.get(:redirect_index)
         ActiveSupport::Deprecation.warn("The configuration option `redirect_index` is deprecated and will be removed with the release of Alchemy v4.0")
         raise "Remove deprecated `redirect_index` configuration!" if Alchemy.version == "4.0.0.rc1"

data/app/controllers/concerns/alchemy/page_redirects.rb

@@ -7,13 +7,6 @@ module Alchemy
   module PageRedirects
     extend ActiveSupport::Concern
 
-    included do
-      # We need a +@page+ to work with
-      before_action :page_not_found!,
-        if: -> { @page.blank? },
-        only: [:show]
-    end
-
     private
 
     # Returns an URL to redirect the request to.

data/app/models/alchemy/essence_richtext.rb

@@ -25,26 +25,7 @@ module Alchemy
     private
 
     def strip_content
-      self.stripped_body = strip_tags(body)
-    end
-
-    # Stripping HTML Tags and only returns plain text.
-    def strip_tags(html)
-      return html if html.blank?
-      if html.index("<")
-        text = ""
-        tokenizer = ::HTML::Tokenizer.new(html)
-        while token = tokenizer.next
-          node = ::HTML::Node.parse(nil, 0, 0, token, false)
-          # result is only the content of any Text nodes
-          text << node.to_s if node.class == ::HTML::Text
-        end
-        # strip any comments, and if they have a newline at the end (ie. line with
-        # only a comment) strip that too
-        text.gsub(/<!--(.*?)-->[\n]?/m, "")
-      else
-        html # already plain text
-      end
+      self.stripped_body = Rails::Html::FullSanitizer.new.sanitize(body)
     end
   end
 end

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -16,7 +16,7 @@
 <div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
   <% if any_tags = Alchemy::Attachment.tag_counts.any? %>
   <div id="library_sidebar">
-    <div id="tag_list">
+    <div class="tag-list">
       <%= render 'tag_list' %>
     </div>
   </div>

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

@@ -1,6 +1,6 @@
 <% p = params.dup %>
 <h2><%= Alchemy.t("Filter by tag") %></h2>
-<%= js_filter_field '#tag_list li' %>
+<%= js_filter_field '.tag-list li' %>
 <ul>
   <%= render_tag_list('Alchemy::Attachment', p) %>
 </ul>

data/app/views/alchemy/admin/attachments/index.html.erb

@@ -1,4 +1,5 @@
 <% any_tags = Alchemy::Attachment.tag_counts.any? %>
+
 <% content_for(:toolbar) do %>
   <div class="toolbar_buttons">
     <% if can? :create, Alchemy::Attachment %>
@@ -8,13 +9,15 @@
         file_attribute: 'file' %>
     <% end %>
   </div>
+  <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
+
 <div id="archive_all" class="<%= any_tags ? 'with_tag_filter ' : nil %>resources-table-wrapper">
   <%= resources_header %>
   <%= render partial: 'files_list' %>
   <% if any_tags %>
   <div id="library_sidebar">
-    <div id="tag_list" class="<%= params[:tagged_with].present? ? 'filtered' : '' %>">
+    <div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
       <%= render partial: 'tag_list' %>
     </div>
   </div>

data/app/views/alchemy/admin/attachments/show.html.erb

@@ -1,3 +1,3 @@
-<iframe src="<%= alchemy.show_attachment_path(@attachment) %>" frameborder=0 style="width: 100%; min-height: 90%">
+<iframe src="<%= alchemy.show_attachment_path(@attachment) %>" frameborder=0 class="full-iframe">
   Your browser does not support frames.
 </iframe>

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

@@ -21,22 +21,26 @@
   <%- end -%>
 
   <%- if params[:action] == "index" -%>
-
-  <%= form_for([:admin, Alchemy::Page.new]) do |form| %>
-    <h3><%= Alchemy.t(:create_language_tree_heading) %></h3>
-    <p><%= Alchemy.t(:want_to_create_new_language) %></p>
-    <%= form.hidden_field :name, value: @language.frontpage_name %>
-    <%= form.hidden_field :language_id, value: @language.id %>
-    <%= form.hidden_field :language_code, value: @language.code %>
-    <%= form.hidden_field :page_layout, value: @language.page_layout %>
-    <%= form.hidden_field :language_root, value: true %>
-    <%= form.hidden_field :parent_id, value: root.id %>
-    <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
-    <div class="submit">
-      <%= form.button Alchemy.t("create_tree_as_new_language", language: @language.name), autofocus: true %>
-    </div>
-  <% end %>
-
+    <%= alchemy_form_for([:admin, Alchemy::Page.new], id: 'create_language_tree') do |form| %>
+      <% if @languages_with_page_tree.size >= 1 %>
+        <h3><%= Alchemy.t(:create_language_tree_heading) %></h3>
+        <p><%= Alchemy.t(:want_to_create_new_language) %></p>
+      <% end %>
+      <%= form.input :name, input_html: {value: @language.frontpage_name} %>
+      <%= form.input :page_layout,
+        collection: @page_layouts,
+        selected: @language.page_layout,
+        label: Alchemy.t(:page_type),
+        include_blank: false,
+        required: true,
+        input_html: {class: 'alchemy_selectbox'} %>
+      <%= form.hidden_field :language_id, value: @language.id %>
+      <%= form.hidden_field :language_code, value: @language.code %>
+      <%= form.hidden_field :language_root, value: true %>
+      <%= form.hidden_field :parent_id, value: root.id %>
+      <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
+      <%= form.submit Alchemy.t("create_tree_as_new_language", language: @language.name), autofocus: true %>
+    <% end %>
   <%- end -%>
 
 <%- else -%>

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

@@ -5,6 +5,7 @@
     collection: @page_layouts,
     label: Alchemy.t(:page_type),
     include_blank: false,
+    required: true,
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name %>
   <%= f.submit Alchemy.t(:create) %>

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

@@ -1,6 +1,6 @@
 <div id="library_sidebar">
   <%= render :partial => 'filter_bar' %>
-  <div id="tag_list" class="with_filter_bar<%= params[:tagged_with].present? ? ' filtered' : '' %>">
+  <div class="tag-list with_filter_bar<%= params[:tagged_with].present? ? ' filtered' : '' %>">
     <%= render :partial => 'tag_list' %>
   </div>
 </div>

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

@@ -4,7 +4,7 @@
 <div id="assign_image_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
   <div id="library_sidebar">
     <%= render 'filter_bar' %>
-    <div id="tag_list">
+    <div class="tag-list">
       <%= render 'tag_list' %>
     </div>
   </div>

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

@@ -1,7 +1,7 @@
 <% p = params.dup %>
 <% if Alchemy::Picture.tag_counts.any? %>
   <h2><%= Alchemy.t("Filter by tag") %></h2>
-  <%= js_filter_field '#tag_list li' %>
+  <%= js_filter_field '.tag-list li' %>
   <ul>
     <%= render_tag_list('Alchemy::Picture', p) %>
   </ul>

data/app/views/alchemy/admin/tags/edit.html.erb

@@ -13,8 +13,8 @@
     <div class="input tags">
       <label class="control-label"><%= Alchemy.t('Tags') %></label>
       <div class="control_group" id="tags_tag_list">
-        <%= js_filter_field '#tag_list li' %>
-        <ul id="tag_list" class="tags">
+        <%= js_filter_field '.tag-list li' %>
+        <ul class="tags tag-list">
           <%= render partial: "radio_tag", collection: @tags, locals: {name: "tag"} %>
         </ul>
       </div>

data/app/views/alchemy/admin/tags/index.html.erb

@@ -22,7 +22,7 @@
   </h1>
   <% if @tags.any? %>
 
-  <table class="list" id="tag_list">
+  <table class="list">
     <thead>
       <tr>
         <th class="icon"></th>

data/app/views/alchemy/admin/uploader/_button.html.erb

@@ -14,10 +14,8 @@
   <% end %>
 <% end %>
 
-<% file_types = (
-  local_assigns.fetch(:file_types, []).presence ||
-    configuration(:uploader)['allowed_filetypes'][model_class.model_name.collection]
-) %>
+<% file_types = local_assigns[:file_types].presence ||
+  configuration(:uploader)['allowed_filetypes'][model_class.model_name.collection] || ['*'] %>
 
 <script type='text/javascript'>
   $(function() {

data/config/locales/alchemy.de.yml

@@ -141,6 +141,7 @@ de:
       image/gif: 'GIF-Bild'
       image/jpeg: 'JPG-Bild'
       image/png: 'PNG-Bild'
+      image/svg+xml: SVG-Grafik
       video/x-msvideo: 'AVI-Video'
       video/x-ms-wmv: 'Windows Media Video'
       image/tiff: 'TIFF-Bild'

data/lib/alchemy/filetypes.rb

@@ -13,6 +13,7 @@ module Alchemy
       "image/gif",
       "image/jpeg",
       "image/png",
+      "image/svg+xml",
       "image/tiff"
     ]
 

data/lib/alchemy/test_support/factories/page_factory.rb

@@ -37,6 +37,12 @@ FactoryGirl.define do
       language nil
     end
 
+    trait :layoutpage do
+      name "Footer"
+      parent_id { Alchemy::Page.find_or_create_layout_root_for(Alchemy::Language.current.id).id }
+      page_layout "footer"
+    end
+
     trait :restricted do
       name "Restricted page"
       restricted true

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.3.0.rc2"
+  VERSION = "3.3.0"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc2
+  version: 3.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -670,7 +670,6 @@ files:
 - app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb
 - app/views/alchemy/admin/pages/configure.html.erb
 - app/views/alchemy/admin/pages/configure_external.html.erb
-- app/views/alchemy/admin/pages/destroy.js.erb
 - app/views/alchemy/admin/pages/edit.html.erb
 - app/views/alchemy/admin/pages/flush.js.erb
 - app/views/alchemy/admin/pages/fold.js.erb
@@ -988,9 +987,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 

data/app/views/alchemy/admin/pages/destroy.js.erb

@@ -1,18 +0,0 @@
-$('#locked_page_<%= @page_id %>').remove();
-
-<% if @layoutpage -%>
-
-window.location.href = '<%= alchemy.admin_layoutpages_path %>';
-
-<% elsif @page_root -%>
-
-$('#sitemap').replaceWith('<%= j render("sitemap") %>');
-Alchemy.growl('<%= j @message %>');
-
-<% else -%>
-
-window.location.href = '<%= alchemy.admin_pages_path %>';
-
-<% end -%>
-
-Alchemy.pleaseWaitOverlay(false);