alchemy_cms 3.1.0.rc1 → 3.1.0.rc2

data/app/views/alchemy/_menubar.html.erb

@@ -5,7 +5,7 @@
       <li><%= link_to _t(:edit_page), alchemy.edit_admin_page_path(@page) %></li>
       <li>
         <%= form_tag Alchemy.logout_path, method: 'delete' do %>
-          <%= button _t(:logout) %>
+          <%= button_tag _t(:logout) %>
         <% end %>
       </li>
     </ul>

data/app/views/alchemy/admin/leave.html.erb

@@ -7,5 +7,5 @@
 </p>
 <%= form_tag Alchemy.logout_path, method: 'delete', class: 'buttons' do %>
   <label><%= _t('or to completely') %></label>
-  <%= button _t(:logout), autofocus: true %>
+  <%= button_tag _t(:logout), autofocus: true %>
 <% end %>

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

@@ -9,7 +9,8 @@
       style: local_assigns.fetch(:html_options, {})[:style] %>
     <label for="<%= content.form_field_id %>" style="display: inline">
       <%= render_content_name(content) %>
-      <%= delete_content_link(content) %>
     </label>
+    <%= delete_content_link(content) %>
+    <%= render_hint_for(content) %>
   </div>
 <% end %>

data/config/initializers/dragonfly.rb

@@ -6,8 +6,6 @@ Dragonfly.app(:alchemy_pictures).configure do
   datastore :file,
     root_path:  Rails.root.join('uploads/pictures').to_s,
     store_meta: false
-  url_format '/pictures/:job/:basename.:format'
-  url_path_prefix Alchemy::MountPoint.get
 end
 
 # Attachments

data/lib/alchemy/engine.rb

@@ -45,7 +45,6 @@ require_relative './touching'
 
 # Require hacks
 require_relative './kaminari/scoped_pagination_url_helper'
-require_relative '../extensions/action_view'
 
 # Middleware
 require_relative './middleware/rescue_old_cookies'

data/lib/alchemy/locale.rb

@@ -10,20 +10,17 @@ module Alchemy
 
     # Sets Alchemy's GUI translation.
     #
-    #   * If one passed a locale via +params[:locale]+ it uses this.
-    #   * Or it tries to get users preffered language.
-    #   * If not found it guesses the language from the browser locale.
-    #   * If that also fails it takes the default.
+    # Uses the most preferred locale or falls back to the default locale if none of the preferred is available.
     #
     # It respects the default translation from your +config/application.rb+ +default_locale+ config option.
     #
     def set_translation
       if locale_change_needed?
-        ::I18n.locale = session[:alchemy_locale] = locale_from_params ||
-          locale_from_user || locale_from_browser || ::I18n.default_locale
+        locale = available_locale || ::I18n.default_locale
       else
-        ::I18n.locale = session[:alchemy_locale]
+        locale = session[:alchemy_locale]
       end
+      ::I18n.locale = session[:alchemy_locale] = locale
     end
 
     # Checks if we need to change to locale or not.
@@ -31,12 +28,17 @@ module Alchemy
       params[:locale].present? || session[:alchemy_locale].blank?
     end
 
-    # Try to get the locale from +params[:locale]+.
-    def locale_from_params
-      return if params[:locale].blank?
-      if ::I18n.available_locales.include?(params[:locale].to_sym)
-        params[:locale]
-      end
+    # Returns either the most preferred locale that is within the list of available locales or nil
+    #
+    # The availability of the locales is checked in the exact order of either
+    #
+    #  * the passed parameter: +params[:locale]+
+    #  * the user's locale
+    #  * the locale of the browser
+    #
+    def available_locale
+      locales = [params[:locale], locale_from_user, locale_from_browser].compact
+      locales.detect { |locale| ::I18n.available_locales.include?(locale.to_sym) }
     end
 
     # Try to get the locale from user settings.

data/lib/alchemy/upgrader.rb

@@ -5,6 +5,7 @@ module Alchemy
 
     Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].each { |f| require f }
 
+    extend Alchemy::Upgrader::ThreePointOne
     extend Alchemy::Upgrader::ThreePointZero
 
     class << self

data/lib/alchemy/upgrader/three_point_zero.rb

@@ -3,16 +3,20 @@ module Alchemy
     private
 
     def rename_registered_role_ro_member
-      desc 'Rename the `registered` user role to `member`'
-      registered_users = Alchemy.user_class.where("alchemy_roles LIKE '%registered%'")
-      if registered_users.any?
-        registered_users.each do |user|
-          roles = user.read_attribute(:alchemy_roles).sub(/registered/, 'member')
-          user.update_column(:alchemy_roles, roles)
-          log "Renamed #{user.inspect} role to `member`"
+      if Alchemy.user_class.column_names.include?('alchemy_roles')
+        desc 'Rename the `registered` user role to `member`'
+        registered_users = Alchemy.user_class.where("alchemy_roles LIKE '%registered%'")
+        if registered_users.any?
+          registered_users.each do |user|
+            roles = user.read_attribute(:alchemy_roles).sub(/registered/, 'member')
+            user.update_column(:alchemy_roles, roles)
+            log "Renamed #{user.inspect} role to `member`"
+          end
+        else
+          log 'No users with `registered` role found.', :skip
         end
       else
-        log 'No users with `registered` role found.', :skip
+        log 'No users with `alchemy_roles` database column found.', :skip
       end
     end
 
@@ -29,7 +33,7 @@ module Alchemy
       end
     end
 
-    def alchemy_3_todos
+    def alchemy_3_0_todos
       notice = <<-NOTE
 
 Alchemy User Class Removed
@@ -67,6 +71,20 @@ also read the official TinyMCE documentation in how to upgrade.
 Alchemy default TinyMCE config: https://github.com/magiclabs/alchemy_cms/blob/master/lib/alchemy/tinymce.rb#L5-L19
 Offical TinyMCE documentation: http://www.tinymce.com/wiki.php/Configuration
 
+
+Essence Validation Syntax changed
+---------------------------------
+
+The API of the format validations for essences has changed.
+You can now define individual format matchers in the config.yml.
+
+* `format_as` and `format_with` options has been removed and renamed to simply `format`
+
+Pleae have a look at this commit:
+https://github.com/AlchemyCMS/alchemy_cms/commit/44866dbebaed00ffa3b77201f93a04616001b955
+
+for a detailed explanation.
+
 NOTE
       todo notice, 'Alchemy v3.0 changes'
     end

data/lib/alchemy/version.rb

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

data/lib/tasks/alchemy/tidy.rake

@@ -5,16 +5,21 @@ namespace :alchemy do
     task :up do
       Rake::Task['alchemy:tidy:cells'].invoke
       Rake::Task['alchemy:tidy:element_positions'].invoke
+      Rake::Task['alchemy:tidy:content_positions'].invoke
     end
 
     desc "Creates missing cells for pages."
     task :cells => :environment do
-      cells = Alchemy::Cell.definitions
-      page_layouts = Alchemy::PageLayout.all
-      if cells && page_layouts
-        Alchemy::Tidy.create_missing_cells(page_layouts, cells)
+      if !File.exist? Rails.root.join('config/alchemy/cells.yml')
+        puts "No page cell definitions found."
       else
-        puts "No page layouts or cell definitions found."
+        cells = Alchemy::Cell.definitions
+        page_layouts = Alchemy::PageLayout.all
+        if cells && page_layouts
+          Alchemy::Tidy.create_missing_cells(page_layouts, cells)
+        else
+          puts "No page layouts or cell definitions found."
+        end
       end
     end
 
@@ -23,6 +28,10 @@ namespace :alchemy do
       Alchemy::Tidy.update_element_positions
     end
 
+    desc "Fixes content positions."
+    task :content_positions => [:environment] do
+      Alchemy::Tidy.update_content_positions
+    end
   end
 end
 
@@ -31,7 +40,6 @@ module Alchemy
     extend Shell
 
     def self.create_missing_cells(page_layouts, cells)
-      desc "Create missing cells"
       page_layouts.each do |layout|
         next if layout['cells'].blank?
         cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
@@ -51,8 +59,10 @@ module Alchemy
     end
 
     def self.update_element_positions
-      desc "Update element positions"
       Alchemy::Page.all.each do |page|
+        if page.elements.any?
+          puts "\n## Updating element positions of page `#{page.name}`"
+        end
         page.elements.group_by(&:cell_id).each do |cell_id, elements|
           elements.each_with_index do |element, idx|
             position = idx + 1
@@ -60,23 +70,31 @@ module Alchemy
               log "Updating position for element ##{element.id} to #{position}"
               element.update_column(:position, position)
             else
-              log "Position for element ##{element.id} is already correct", :skip
+              log "Position for element ##{element.id} is already correct (#{position})", :skip
             end
           end
         end
       end
     end
 
-    # TODO: implement remove_orphan_cells
-    def self.remove_orphan_cells(page_layouts, cells)
-      puts "== Remove cell orphans"
-      Alchemy::Cell.all.each do |cell|
-        if cells.detect { |cell| cell['name'] == cell.name }.nil?
-          # move elements to page or into another cell of page
-          # remove cell from database
+    def self.update_content_positions
+      Alchemy::Element.all.each do |element|
+        if element.contents.any?
+          puts "\n## Updating content positions of element `#{element.name}`"
+        end
+        element.contents.group_by(&:essence_type).each do |essence_type, contents|
+          puts "-> Contents of type `#{essence_type}`"
+          contents.each_with_index do |content, idx|
+            position = idx + 1
+            if content.position != position
+              log "Updating position for content ##{content.id} to #{position}"
+              content.update_column(:position, position)
+            else
+              log "Position for content ##{content.id} is already correct (#{position})", :skip
+            end
+          end
         end
       end
     end
-
   end
 end

data/spec/controllers/admin/essence_files_controller_spec.rb

@@ -29,17 +29,22 @@ module Alchemy
     end
 
     describe '#update' do
+      let(:essence_file) { FactoryGirl.create(:essence_file) }
+
       before do
         expect(EssenceFile).to receive(:find).and_return(essence_file)
       end
 
       it "should update the attributes of essence_file" do
-        expect(essence_file).to receive(:update).and_return(true)
-        xhr :put, :update, id: essence_file.id
+        xhr :put, :update, id: essence_file.id, essence_file: {title: 'new title', css_class: 'left'}
+        expect(essence_file.title).to eq 'new title'
+        expect(essence_file.css_class).to eq 'left'
       end
     end
 
     describe '#assign' do
+      let(:content) { create(:content) }
+
       before do
         expect(Content).to receive(:find_by).and_return(content)
         expect(Attachment).to receive(:find_by).and_return(attachment)
@@ -55,6 +60,12 @@ module Alchemy
         expect(content.essence).to receive(:attachment=).with(attachment)
         xhr :put, :assign, content_id: content.id, attachment_id: attachment.id
       end
+
+      it "updates the @content.updated_at column" do
+        expect {
+          xhr :put, :assign, content_id: content.id, attachment_id: attachment.id
+        }.to change(content, :updated_at)
+      end
     end
   end
 end

data/spec/controllers/admin/essence_pictures_controller_spec.rb

@@ -179,6 +179,8 @@ module Alchemy
     end
 
     describe '#assign' do
+      let(:content) { create(:content) }
+
       before do
         expect(Content).to receive(:find).and_return(content)
         expect(content).to receive(:essence).at_least(:once).and_return(essence)
@@ -189,6 +191,12 @@ module Alchemy
         xhr :put, :assign, content_id: '1', picture_id: '1'
         expect(assigns(:content).essence.picture).to eq(picture)
       end
+
+      it "updates the content timestamp" do
+        expect {
+          xhr :put, :assign, content_id: '1', picture_id: '1'
+        }.to change(content, :updated_at)
+      end
     end
   end
 end

data/spec/controllers/pages_controller_spec.rb

@@ -229,5 +229,47 @@ module Alchemy
         end
       end
     end
+
+    describe '#cache_page?' do
+      subject { controller.send(:cache_page?) }
+
+      before do
+        Rails.application.config.action_controller.perform_caching = true
+        controller.instance_variable_set('@page', page)
+      end
+
+      it 'returns true when everthing is alright' do
+        expect(subject).to be true
+      end
+
+      it 'returns false when the Rails app does not perform caching' do
+        Rails.application.config.action_controller.perform_caching = false
+        expect(subject).to be false
+      end
+
+      it 'returns false when there is no page' do
+        controller.instance_variable_set('@page', nil)
+        expect(subject).to be false
+      end
+
+      it 'returns false when caching is deactivated in the Alchemy config' do
+        allow(Alchemy::Config).to receive(:get).with(:cache_pages).and_return(false)
+        expect(subject).to be false
+      end
+
+      it 'returns false when the page layout is set to cache = false' do
+        page_layout = PageLayout.get('news')
+        page_layout['cache'] = false
+        allow(PageLayout).to receive(:get).with('news').and_return(page_layout)
+        expect(subject).to be false
+      end
+
+      it 'returns false when the page layout is set to searchresults = true' do
+        page_layout = PageLayout.get('news')
+        page_layout['searchresults'] = true
+        allow(PageLayout).to receive(:get).with('news').and_return(page_layout)
+        expect(subject).to be false
+      end
+    end
   end
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -6,6 +6,10 @@ class ApplicationController < ActionController::Base
   private
 
   def current_user
-    nil
+    if Rails.env.test?
+      nil
+    else
+      DummyUser.new(email: "dummy@alchemy.com")
+    end
   end
 end

data/spec/dummy/app/models/dummy_user.rb

@@ -4,4 +4,8 @@ class DummyUser < ActiveRecord::Base
   def self.logged_in
     []
   end
+
+  def alchemy_roles
+    %w(admin)
+  end
 end

data/spec/dummy/config/environments/production.rb

@@ -27,7 +27,7 @@ Dummy::Application.configure do
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  config.assets.compile = true
 
   # Generate digests for assets URLs.
   config.assets.digest = true

data/spec/dummy/db/seeds.rb

@@ -0,0 +1 @@
+Alchemy::Seeder.seed!

data/spec/features/translation_integration_spec.rb

@@ -2,17 +2,19 @@ require 'spec_helper'
 
 describe "Translation integration" do
   context "in admin backend" do
-    before { authorize_as_admin(mock_model('DummyUser', alchemy_roles: %w(admin), language: 'de')) }
+    let(:dummy_user) { mock_model('DummyUser', alchemy_roles: %w(admin), language: 'de') }
+
+    before { authorize_as_admin(dummy_user) }
 
     it "should be possible to set the locale of the admin backend via params" do
-      visit admin_dashboard_path(locale: 'de')
-      expect(page).to have_content('Willkommen')
+      visit admin_dashboard_path(locale: 'nl')
+      expect(page).to have_content('Welkom')
     end
 
     it "should store the current locale in the session" do
-      visit admin_dashboard_path(locale: 'de')
+      visit admin_dashboard_path(locale: 'nl')
       visit admin_dashboard_path
-      expect(page).to have_content('Willkommen')
+      expect(page).to have_content('Welkom')
     end
 
     it "should be possible to change the current locale in the session" do
@@ -34,14 +36,15 @@ describe "Translation integration" do
         visit admin_dashboard_path
         expect(page).to have_content('Willkommen')
       end
-    end
 
-    context "with translated header" do
-      before { Capybara.current_driver = :rack_test_translated_header }
+      context "if user has no preferred locale" do
+        let(:dummy_user) { mock_model('DummyUser', alchemy_roles: %w(admin), language: nil) }
 
-      it "should use the browsers language setting if no other parameter is given" do
-        visit admin_dashboard_path
-        expect(page).to have_content('Willkommen')
+        it "should use the browsers language setting" do
+          page.driver.header 'ACCEPT-LANGUAGE', 'es-ES'
+          visit admin_dashboard_path
+          expect(page).to have_content('Bienvenido')
+        end
       end
     end
   end