alchemy_cms 2.6.0.rc5 → 2.6.0

data/app/views/alchemy/language_links/_spacer.html.erb

@@ -0,0 +1 @@
+<%= options[:spacer].html_safe %>

data/config/locales/alchemy.de.yml

@@ -186,6 +186,7 @@ de:
       site:
         aliases: Weitere Domains bitte mit Leerzeichen oder Leerzeile getrennt angeben.
 
+    back: 'zurück'
     create_tree_as_new_language: "%{language} als neuen Sprachbaum anlegen"
     "<a href=\"http://get.adobe.com/flashplayer\" target=\"_blank\">%{value}</a>": ""
     "Active Pages": "Aktive Seiten"
@@ -193,6 +194,7 @@ de:
     "Adobe Website": "Adobe Webseite"
     "Alchemy is open software and itself uses open software and free resources:": "Alchemy ist offene Software und benutzt selbst offene Software und freie Ressourcen:"
     "Alchemy is up to date": 'Alchemy ist aktuell'
+    'An error happened': 'Es ist leider ein Fehler aufgetreten!'
     "Change password": "Passwort ändern"
     "Choose page": "Seite wählen"
     "Cleared trash": "Der Papierkorb wurde geleert"
@@ -220,7 +222,7 @@ de:
     "File successfully updated": "Datei wurde erfolgreich gespeichert."
     "File upload error: %{error}": "Datei konnte nicht hochgeladen werden: %{error}"
     "File: '%{name}' deleted successfully": "%{name} wurde gelöscht"
-    "Filter by tag": "Nach Tags filtern"
+    "Filter by tag": "Nach Tag filtern"
     "Flush page cache": "Seitencache löschen"
     "Flush picture cache": "Bildercache löschen"
     "Hide childpages": "Unterseiten ausblenden"
@@ -520,8 +522,9 @@ de:
     picture_gallery_editor: 'Bilder'
     picture_library:
       filter:
-        last_upload: "Zuletzt hochgeladene Bilder"
-        recent: "Bilder der letzten 24 Stunden"
+        last_upload: "die zuletzt hochgeladen wurden"
+        recent: "aus den letzten 24 Stunden"
+        without_tag: "ohne Tag"
     place_link: "Text verlinken"
     player_version: "Flashplayer Version"
     "please enter subject and mail address": "Bitte geben Sie den Betreff und eine Empfängeradresse an."
@@ -594,6 +597,7 @@ de:
     "We need at least one default.": "Es muss eine Standardsprache geben."
     welcome_please_identify_notice: "Willkommen! Bitte identifizieren Sie sich."
     width: "Breite"
+    without_tag: 'Ohne Tag'
     you_can_rename_this_tag: "Sie können dieses Tag umbenennen"
     zoom_image: "Bild in voller Größe anzeigen."
     "Leave Alchemy": "Alchemy verlassen"

data/config/locales/alchemy.en.yml

@@ -333,7 +333,7 @@ en:
         "false": ""
       restricted:
         "true": "Page is restricted."
-        "false": ""
+        "false": "Page is not restricted."
     page_status: "Status"
     page_title: "Title"
     page_type: "Type"
@@ -352,8 +352,9 @@ en:
     pictures_deleted_successfully: "Pictures %{name} deleted"
     picture_library:
       filter:
-        last_upload: "Showing only pictures from last upload"
-        recent: "Showing only recently uploaded pictures"
+        last_upload: "from last upload"
+        recent: "that where recently uploaded"
+        without_tag: "without tag"
     place_link: "Link text"
     player_version: "Flashplayer Version"
     "please enter subject and mail address": "Please enter recipient and subject."
@@ -611,6 +612,10 @@ en:
         one: File
         other: Files
 
+      alchemy/picture:
+        one: Picture
+        other: Pictures
+
     attributes:
 
       alchemy/attachment:

data/lib/alchemy/page_layout.rb

@@ -8,7 +8,7 @@ module Alchemy
           puts "\n+++ Warning: No Layout Description for #{page_layout} found! in page_layouts.yml\n"
           return []
         else
-          layout_description["elements"]
+          layout_description["elements"] || []
         end
       end
 

data/lib/alchemy/tinymce.rb

@@ -20,7 +20,7 @@ module Alchemy
       :theme => 'advanced',
       :skin => 'o2k7',
       :skin_variant => 'silver',
-      :inlinepopups_skin => 'alchemy',
+      :inlinepopups_skin => 'alchemy-tinymce-dialog',
       :popup_css => "/assets/alchemy/tinymce_dialog.css",
       :content_css => "/assets/alchemy/tinymce_content.css",
       :dialog_type => "modal",

data/lib/alchemy/upgrader.rb

@@ -20,11 +20,37 @@ module Alchemy
         Rake::Task['alchemy:install:migrations'].invoke
         Rake::Task['db:migrate'].invoke
         Seeder.seed!
+        convert_attachment_storage
         copy_new_config_file
       end
 
     private
 
+      def convert_attachment_storage
+        desc "Convert the attachment storage"
+        converted_files = []
+        files = Dir.glob Rails.root.join 'uploads/attachments/**/*.*'
+        if files.blank?
+          log "No attachments found", :skip
+        else
+          files.each do |file|
+            file_uid = file.gsub(/#{Rails.root.to_s}\/uploads\/attachments\//, '')
+            file_id = file_uid.split('/')[1].to_i
+            attachment = Alchemy::Attachment.find_by_id(file_id)
+            if attachment && attachment.file_uid.blank?
+              attachment.file_uid = file_uid
+              attachment.file_size = File.new(file).size
+              attachment.file_name = attachment.sanitized_filename
+              if attachment.save!
+                log "Converted #{file_uid}"
+              end
+            else
+              log "Attachment with id #{file_id} not found or already converted.", :skip
+            end
+          end
+        end
+      end
+
       def copy_new_config_file
         desc "Copy configuration file."
         config_file = Rails.root.join('config/alchemy/config.yml')

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.6.0.rc5"
+  VERSION = "2.6.0"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb

@@ -3,6 +3,9 @@ require 'rails'
 module Alchemy
   module Generators
     class ScaffoldGenerator < ::Rails::Generators::Base
+
+      ALCHEMY_VIEWS = %w(breadcrumb language_links messages navigation notifications search)
+
       desc "This generator generates the Alchemy scaffold."
       class_option :copy_views, :default => false, :type => :boolean, :desc => "Copy all Alchemy views into your app.", :aliases => '-v'
       source_root File.expand_path('templates', File.dirname(__FILE__))
@@ -37,7 +40,7 @@ module Alchemy
       end
 
       def copy_alchemy_views
-        %w(breadcrumb messages navigation notifications search).each do |dir|
+        ALCHEMY_VIEWS.each do |dir|
           src = File.expand_path("../../../../../app/views/alchemy/#{dir}", File.dirname(__FILE__))
           dest = Rails.root.join('app/views/alchemy', dir)
           directory src, dest

data/lib/tasks/ferret.rake

@@ -2,6 +2,7 @@ namespace :ferret do
 
   desc "Updates the Ferret index."
   task :rebuild_index => :environment do
+    abort 'Enable ferret search in Alchemy config first.' if !Alchemy::Config.get(:ferret)
     Alchemy::EssenceText.where(:do_not_index => false).rebuild_index
     Alchemy::EssenceRichtext.where(:do_not_index => false).rebuild_index
   end

data/spec/controllers/admin/users_controller_spec.rb

@@ -49,17 +49,17 @@ describe Alchemy::Admin::UsersController do
 
     context "if user is permitted to update roles" do
       it "updates the user including role" do
-        controller.stub(:permitted_to?).with(:update_role).and_return { true }
-        Alchemy::User.any_instance.should_receive(:update_attributes).with({'role' => 'Administrator'})
-        post :update, :id => user.id, :user => {:role => 'Administrator'}, :format => :js
+        controller.stub(:permitted_to?).with(:update_roles).and_return { true }
+        Alchemy::User.any_instance.should_receive(:update_attributes).with({'roles' => ['Administrator']})
+        post :update, :id => user.id, :user => {:roles => ['Administrator']}, :format => :js
       end
     end
 
     context "if the user is not permitted to update roles" do
       it "updates user without role" do
-        controller.stub(:permitted_to?).with(:update_role).and_return { false }
+        controller.stub(:permitted_to?).with(:update_roles).and_return { false }
         Alchemy::User.any_instance.should_receive(:update_attributes).with({})
-        post :update, :id => user.id, :user => {'role' => 'Administrator'}, :format => :js
+        post :update, :id => user.id, :user => {'roles' => ['Administrator']}, :format => :js
       end
     end
 

data/spec/features/admin/pages_controller_spec.rb

@@ -18,7 +18,7 @@ module Alchemy
 
         before do
           klingonian_root
-          Capybara.default_wait_time = 3 # Raising this helps this test to pass, even on travis-ci
+          Capybara.default_wait_time = 4 # Raising this helps this test to pass, even on travis-ci
         end
 
         it "one should be able to switch the language tree" do

data/spec/helpers/admin/pages_helper_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Alchemy::Admin::PagesHelper do
+
+  describe '#tinymce_javascript_tags' do
+    it "renders script tag for tinymce initalization" do
+      helper.tinymce_javascript_tags.squish.should match(/script.+Alchemy\.Tinymce/)
+    end
+  end
+
+  describe '#custom_tinymce_javascript_tags' do
+    it "renders script tag for custom tinymce initalization" do
+      helper.custom_tinymce_javascript_tags.squish.should match(/Alchemy\.Tinymce\.customInits/)
+    end
+  end
+
+  describe '#preview_sizes_for_select' do
+    it "returns a options string of preview screen sizes for select tag" do
+      helper.preview_sizes_for_select.should include('option', 'auto', '240', '320', '480', '768', '1024', '1280')
+    end
+  end
+
+  describe '#combined_page_status' do
+    let(:page) { FactoryGirl.build(:page, public: true, visible: true, restricted: false, locked: false)}
+
+    it "returns the translated page status" do
+      helper.combined_page_status(page).should == 'Page is visible in navigation.<br>Page is published.<br>Page is not restricted.'
+    end
+  end
+
+end

data/spec/helpers/pages_helper_spec.rb

@@ -263,93 +263,81 @@ module Alchemy
 
     end
 
-    describe "#language_switcher" do
+    describe "#language_links" do
 
-      before do
-        # simulates link_to_public_child = true
-        helper.stub(:multi_language?).and_return(true)
-        helper.stub(:configuration) { |arg| arg == :redirect_to_public_child ? true : false }
-      end
-
-      it "should return nil when having only one public language" do
-        helper.language_switcher.should be nil
-      end
-
-      context "with two public languages and two language_roots" do
-
-        before do
-          language_root
-        end
-
-        context "and config redirect_to_public_child is set to TRUE" do
-
-          it "should return nil if only one language_root is public and both do not have children" do
-            klingonian_language_root.update_attributes(:public => false)
-            helper.language_switcher.should == nil
-          end
+      context "with two public languages" do
+        
+        # Always create second language
+        before { klingonian }
 
-          it "should return nil if only one language_root is public and both have none public children" do
-            klingonian_language_root.update_attributes(:public => false)
-            FactoryGirl.create(:page)
-            FactoryGirl.create(:page, :language => klingonian, :parent_id => klingonian_language_root.id)
-            helper.language_switcher.should == nil
+        context "with only one language root page" do
+          it "should return nil" do
+            expect(helper.language_links).to be_nil
           end
+        end
 
-          it "should render two links when having two public language_root pages" do
-            klingonian_language_root
-            helper.language_switcher.should have_selector('a', :count => 2)
-          end
+        context "with two language root pages" do
 
-          it "should render two links when having just one public language_root but a public children in both language_roots" do
-            klingonian_language_root.update_attributes(:public => false)
-            public_page
-            klingonian_public_page
-            helper.language_switcher.should have_selector('a', :count => 2)
-          end
+          # Always create a language root page for klingonian
+          before { klingonian_language_root }
 
-          it "should render two links when having two not public language_roots but a public children in both" do
-            language_root.update_attributes(:public => false)
-            klingonian_language_root.update_attributes(:public => false)
-            public_page
-            klingonian_public_page
-            helper.language_switcher.should have_selector('a', :count => 2)
+          it "should render two language links" do
+            expect(helper.language_links).to have_selector('a', :count => 2)
           end
 
-          it "should return nil when having two not public language_roots and a public children in only one of them" do
-            language_root.update_attributes(:public => false)
-            klingonian_language_root.update_attributes(:public => false)
-            FactoryGirl.create(:page)
-            klingonian_public_page
-            helper.language_switcher.should == nil
+          it "should render language links referring to their language root page" do
+            code = klingonian_language_root.language_code
+            urlname = klingonian_language_root.urlname
+            expect(helper.language_links).to have_selector("a.#{code}[href='/#{code}/#{urlname}']")
           end
 
-        end
-
-        context "and config redirect_to_public_child is set to FALSE" do
-
-          before do
-            klingonian_language_root
-            # simulates link_to_public_child = false
-            helper.stub(:configuration).and_return(false)
+          context "with options[:linkname]" do
+            context "set to 'name'" do
+              it "should render the name of the language" do
+                expect(helper.language_links(linkname: 'name')).to have_selector("span[contains('#{klingonian_language_root.language.name}')]")
+              end
+            end
+
+            context "set to 'code'" do
+              it "should render the code of the language" do
+                expect(helper.language_links(linkname: 'code')).to have_selector("span[contains('#{klingonian_language_root.language.code}')]")
+              end
+            end
           end
 
-          it "should render two links when having two public language_root pages" do
-            helper.language_switcher.should have_selector('a', :count => 2)
+          context "spacer set to '\o/'" do
+            it "should render the given string as a spacer" do
+              expect(helper.language_links(spacer: '<span>\o/</span>')).to have_selector('span[contains("\o/")]', :count => 1)
+            end
           end
 
-          it "should render nil when having just one public language_root but a public children in both language_roots" do
-            klingonian_language_root.update_attributes(:public => false)
-            public_page
-            klingonian_public_page
-            helper.language_switcher.should == nil
+          context "with options[:reverse]" do
+            context "set to false" do
+              it "should render the language links in an ascending order" do
+                expect(helper.language_links(reverse: false)).to have_selector("a.de + a.kl")
+              end
+            end
+
+            context "set to true" do
+              it "should render the language links in a descending order" do
+                expect(helper.language_links(reverse: true)).to have_selector("a.kl + a.de")
+              end
+            end
           end
-
-          it "should render nil when having two not public language_roots but a public children in both" do
-            language_root.update_attributes(:public => false)
-            klingonian_language_root.update_attributes(:public => false)
-            public_page
-            klingonian_public_page
-            helper.language_switcher.should == nil
+          
+          context "with options[:show_title]" do
+            context "set to true" do
+              it "should render the language links with titles" do
+                helper.stub!(:_t).and_return("my title")
+                expect(helper.language_links(show_title: true)).to have_selector('a[title="my title"]')
+              end
+            end
+
+            context "set to false" do
+              it "should render the language links without titles" do
+                expect(helper.language_links(show_title: false)).to_not have_selector('a[title]')
+              end
+            end
           end
 
         end

data/spec/models/content_spec.rb

@@ -133,8 +133,9 @@ module Alchemy
     describe "#descriptions" do
 
       context "without any descriptions in elements.yml file" do
+        before { Element.stub(:descriptions).and_return([]) }
+
         it "should return an empty array" do
-          Element.stub(:descriptions).and_return([])
           Content.descriptions.should == []
         end
       end

data/spec/models/page_layout_spec.rb

@@ -27,5 +27,34 @@ module Alchemy
       PageLayout.selectable_layouts(Language.get_default).each { |e| e["hide"].should_not == true }
     end
 
+    describe ".element_names_for" do
+
+      it "should return all element names for the given pagelayout" do
+        PageLayout.stub(:get).with('default').and_return({'name' => 'default', 'elements' => ['element_1', 'element_2']})
+        expect(PageLayout.element_names_for('default')).to eq(['element_1', 'element_2'])
+      end
+
+      context "when given page_layout name does not exist" do
+        it "should return an empty array" do
+          expect(PageLayout.element_names_for('layout_does_not_exist!')).to eq([])
+        end
+      end
+
+      context "when page_layout description does not contain the elements key" do
+        it "should return an empty array" do
+          PageLayout.stub(:get).with('layout_without_elements_key').and_return({'name' => 'layout_without_elements_key'})
+          expect(PageLayout.element_names_for('layout_without_elements_key')).to eq([])
+        end
+      end
+
+    end
+
+    describe ".get" do
+      it "should return the page_layout description found by given name" do
+        PageLayout.stub(:all).and_return([{'name' => 'default'}, {'name' => 'contact'}])
+        expect(PageLayout.get('default')).to eq({'name' => 'default'})
+      end
+    end
+
   end
 end

data/spec/models/page_spec.rb

@@ -733,8 +733,11 @@ module Alchemy
         before { page.tag_list = 'red, yellow'; page.save }
 
         it "the copy should have source tag_list" do
+          # The order of tags varies between postgresql and sqlite/mysql
+          # This is related to acts-as-taggable-on v.2.4.1
+          # To fix the spec we sort the tags until the issue is solved (https://github.com/mbleigh/acts-as-taggable-on/issues/363)
           subject.tag_list.should_not be_empty
-          subject.tag_list.should == page.tag_list
+          subject.tag_list.sort.should == page.tag_list.sort
         end
       end
 
@@ -890,5 +893,34 @@ module Alchemy
       end
     end
 
+    describe "page status methods" do
+      let(:page) { FactoryGirl.build(:page, public: true, visible: true, restricted: false, locked: false)}
+
+      describe '#status' do
+        it "returns a combined status hash" do
+          page.status.should == {public: true, visible: true, restricted: false, locked: false}
+        end
+      end
+
+      describe '#status_title' do
+        it "returns a translated status string for public status" do
+          page.status_title(:public).should == 'Page is published.'
+        end
+
+        it "returns a translated status string for visible status" do
+          page.status_title(:visible).should == 'Page is visible in navigation.'
+        end
+
+        it "returns a translated status string for locked status" do
+          page.status_title(:locked).should == ''
+        end
+
+        it "returns a translated status string for restricted status" do
+          page.status_title(:restricted).should == 'Page is not restricted.'
+        end
+      end
+
+    end
+
   end
 end