alchemy_cms 3.0.0.rc7 → 3.0.0.rc8

data/spec/controllers/pictures_controller_spec.rb

@@ -164,10 +164,9 @@ module Alchemy
     end
 
     describe 'Picture processing' do
-      context "with crop and size parameters" do
-
-        let(:big_picture) { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png')) }
+      let(:big_picture) { Picture.create(:image_file => fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png')) }
 
+      context "with crop and size parameters" do
         it "should return a cropped image." do
           options = {
             crop: 'crop',
@@ -178,6 +177,19 @@ module Alchemy
           response.body[0x10..0x18].unpack('NN').should == [10,10]
         end
 
+        context "without a full size specification" do
+          it "should raise an error" do
+            options = {
+              :crop => 'crop',
+              :size => '10',
+              :format => 'png'
+            }
+            expect do
+              get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+            end.to raise_error ArgumentError
+          end
+        end
+
         context "without upsample parameter" do
           it "should not upsample the image." do
             options = {
@@ -203,6 +215,35 @@ module Alchemy
           end
         end
       end
+
+      context "without crop but with size parameter" do
+        it "should resize the image preserving aspect ratio" do
+          options = {
+            :size => '40x40',
+            :format => 'png'
+          }
+          get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+          response.body[0x10..0x18].unpack('NN').should == [40,30]
+        end
+
+        it "should resize the image inferring the height if not given" do
+          options = {
+            :size => '40x',
+            :format => 'png'
+          }
+          get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+          response.body[0x10..0x18].unpack('NN').should == [40,30]
+        end
+
+        it "should resize the image inferring the width if not given" do
+          options = {
+            :size => 'x30',
+            :format => 'png'
+          }
+          get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+          response.body[0x10..0x18].unpack('NN').should == [40,30]
+        end
+      end
     end
 
   end

data/spec/features/admin/link_overlay_spec.rb

@@ -46,6 +46,7 @@ describe "Link overlay" do
       Alchemy::Page.any_instance.stub(:definition).and_return({'redirects_to_external' => true})
       visit link_admin_pages_path
       page.should_not have_selector('ul#sitemap li div[name="/http-www-google-com"] a')
+      Alchemy::Page.any_instance.unstub(:definition)
     end
 
   end

data/spec/features/admin/locale_select_feature_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'Locale select' do
+  let(:a_page) { FactoryGirl.create(:public_page) }
+  before do
+    Alchemy::I18n.stub(translation_files: ['alchemy.kl.yml', 'alchemy.jp.yml', 'alchemy.cz.yml'])
+    authorize_as_admin
+  end
+
+  it "contains all locales in a selectbox" do
+    visit admin_dashboard_path
+    expect(page).to have_select('change_locale', options: ['Kl', 'Jp', 'Cz'])
+  end
+
+  context 'when having available_locales set for Alchemy::I18n' do
+    before { Alchemy::I18n.stub(available_locales: [:jp, :cz]) }
+    it "provides only that locales" do
+      visit admin_dashboard_path
+      expect(page).to have_select('change_locale', options: ['Jp', 'Cz'])
+    end
+  end
+end

data/spec/libraries/i18n_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module Alchemy
+  describe I18n do
+    describe '.translation_files' do
+      subject { I18n.translation_files }
+      it      { should be_a Array }
+      it      { should be_any { |f| f =~ /alchemy.*.yml/ } }
+    end
+
+    describe '.available_locales' do
+      subject { I18n.available_locales }
+      before  { I18n.stub(translation_files: ['alchemy.kl.yml']) }
+      it      { should be_a Array }
+      it      { should include :kl }
+
+      context 'when locales are already set in @@available_locales' do
+        before { I18n.class_variable_set(:@@available_locales, [:kl, :jp]) }
+        it     { should eq([:kl, :jp]) }
+      end
+    end
+
+    describe '.available_locales=' do
+      it "assigns the given locales to @@available_locales" do
+        I18n.available_locales = [:kl, :nl, :cn]
+        expect(I18n.class_variable_get(:@@available_locales)).to eq([:kl, :nl, :cn])
+      end
+    end
+  end
+end

data/spec/libraries/permissions_spec.rb

@@ -153,7 +153,7 @@ describe Alchemy::Permissions do
     end
 
     it "can manage the clipboard" do
-      should be_able_to(:manage, Alchemy::Clipboard)
+      should be_able_to(:manage, :alchemy_admin_clipboard)
     end
 
     it "can see tags" do

data/spec/models/element_spec.rb

@@ -122,11 +122,12 @@ module Alchemy
     describe '.all_from_clipboard_for_page' do
       let(:element_1) { FactoryGirl.build_stubbed(:element) }
       let(:element_2) { FactoryGirl.build_stubbed(:element, name: 'news') }
-      let(:page) { FactoryGirl.build_stubbed(:public_page) }
-      let(:clipboard) { [{id: element_1.id}, {id: element_2.id}] }
-      before {
+      let(:page)      { FactoryGirl.build_stubbed(:public_page) }
+      let(:clipboard) { [{'id' => element_1.id.to_s}, {'id' => element_2.id.to_s}] }
+
+      before do
         Element.stub(:all_from_clipboard).and_return([element_1, element_2])
-      }
+      end
 
       it "return all elements from clipboard that could be placed on page" do
         elements = Element.all_from_clipboard_for_page(clipboard, page)

data/spec/models/page_spec.rb

@@ -106,9 +106,20 @@ module Alchemy
           expect(external_page).to be_valid
         end
 
-        it "only be valid with urlname given" do
-          external_page.urlname = ''
-          expect(external_page).to_not be_valid
+        context 'on create' do
+          it "is valid without urlname given" do
+            external_page.urlname = ''
+            expect(external_page).to be_valid
+          end
+        end
+
+        context 'on update' do
+          before { external_page.save! }
+
+          it "is not valid without urlname given" do
+            external_page.urlname = ''
+            expect(external_page).to_not be_valid
+          end
         end
       end
     end
@@ -313,8 +324,8 @@ module Alchemy
           page_1 = FactoryGirl.create(:page, :language => language)
           page_2 = FactoryGirl.create(:page, :language => language, :name => 'Another page')
           clipboard = [
-            {:id => page_1.id, :action => "copy"},
-            {:id => page_2.id, :action => "copy"}
+            {'id' => page_1.id.to_s, 'action' => 'copy'},
+            {'id' => page_2.id.to_s, 'action' => 'copy'}
           ]
           Page.all_from_clipboard_for_select(clipboard, language.id).should include(page_1, page_2)
         end
@@ -324,7 +335,7 @@ module Alchemy
         it "should not return any pages" do
           page_1 = FactoryGirl.create(:page, :language => language, :page_layout => 'contact')
           clipboard = [
-            {:id => page_1.id, :action => "copy"}
+            {'id' => page_1.id.to_s, 'action' => 'copy'}
           ]
           Page.all_from_clipboard_for_select(clipboard, language.id).should == []
         end
@@ -335,8 +346,8 @@ module Alchemy
           page_1 = FactoryGirl.create(:page, :language => language, :page_layout => 'standard')
           page_2 = FactoryGirl.create(:page, :name => 'Another page', :language => language, :page_layout => 'contact')
           clipboard = [
-            {:id => page_1.id, :action => "copy"},
-            {:id => page_2.id, :action => "copy"}
+            {'id' => page_1.id.to_s, 'action' => 'copy'},
+            {'id' => page_2.id.to_s, 'action' => 'copy'}
           ]
           Page.all_from_clipboard_for_select(clipboard, language.id).should == [page_1]
         end
@@ -1265,6 +1276,124 @@ module Alchemy
       end
     end
 
+    describe "#update_node!" do
+
+      let(:original_url) { "sample-url" }
+      let(:page) { FactoryGirl.create(:page, :language => language, :parent_id => language_root.id, :urlname => original_url, restricted: false) }
+      let(:node) { TreeNode.new(10, 11, 12, 13, "another-url", true) }
+
+      context "when nesting is enabled" do
+        before { Alchemy::Config.stub(:get).with(:url_nesting) { true } }
+
+        context "when page is not external" do
+
+          before { page.stub(redirects_to_external?: false)}
+
+          it "should update all attributes" do
+            page.update_node!(node)
+            page.reload
+            expect(page.lft).to eq(node.left)
+            expect(page.rgt).to eq(node.right)
+            expect(page.parent_id).to eq(node.parent)
+            expect(page.depth).to eq(node.depth)
+            expect(page.urlname).to eq(node.url)
+            expect(page.restricted).to eq(node.restricted)
+          end
+
+          context "when url is the same" do
+            let(:node) { TreeNode.new(10, 11, 12, 13, original_url, true) }
+
+            it "should not create a legacy url" do
+              page.update_node!(node)
+              page.reload
+              expect(page.legacy_urls.size).to eq(0)
+            end
+          end
+
+          context "when url is not the same" do
+            it "should create a legacy url" do
+              page.update_node!(node)
+              page.reload
+              expect(page.legacy_urls.size).to eq(1)
+            end
+          end
+        end
+
+        context "when page is external" do
+
+          before { page.stub(redirects_to_external?: true) }
+
+          it "should update all attributes except url" do
+            page.update_node!(node)
+            page.reload
+            expect(page.lft).to eq(node.left)
+            expect(page.rgt).to eq(node.right)
+            expect(page.parent_id).to eq(node.parent)
+            expect(page.depth).to eq(node.depth)
+            expect(page.urlname).to eq(original_url)
+            expect(page.restricted).to eq(node.restricted)
+          end
+
+          it "should not create a legacy url" do
+            page.update_node!(node)
+            page.reload
+            expect(page.legacy_urls.size).to eq(0)
+          end
+        end
+      end
+
+      context "when nesting is disabled" do
+        before { Alchemy::Config.stub(:get).with(:url_nesting) { false } }
+
+        context "when page is not external" do
+
+          before { page.stub(redirects_to_external?: false)}
+
+          it "should update all attributes except url" do
+            page.update_node!(node)
+            page.reload
+            expect(page.lft).to eq(node.left)
+            expect(page.rgt).to eq(node.right)
+            expect(page.parent_id).to eq(node.parent)
+            expect(page.depth).to eq(node.depth)
+            expect(page.urlname).to eq(original_url)
+            expect(page.restricted).to eq(node.restricted)
+          end
+
+          it "should not create a legacy url" do
+            page.update_node!(node)
+            page.reload
+            expect(page.legacy_urls.size).to eq(0)
+          end
+
+        end
+
+        context "when page is external" do
+
+          before { page.stub(redirects_to_external?: true) }
+
+          before { Alchemy::Config.stub(get: true) }
+
+          it "should update all attributes except url" do
+            page.update_node!(node)
+            page.reload
+            expect(page.lft).to eq(node.left)
+            expect(page.rgt).to eq(node.right)
+            expect(page.parent_id).to eq(node.parent)
+            expect(page.depth).to eq(node.depth)
+            expect(page.urlname).to eq(original_url)
+            expect(page.restricted).to eq(node.restricted)
+          end
+
+          it "should not create a legacy url" do
+            page.update_node!(node)
+            page.reload
+            expect(page.legacy_urls.size).to eq(0)
+          end
+        end
+      end
+    end
+
     describe '#slug' do
       context "with parents path saved in urlname" do
         let(:page) { FactoryGirl.build(:page, urlname: 'root/parent/my-name')}

data/spec/spec_helper.rb

@@ -33,27 +33,14 @@ require 'alchemy/test_support/controller_requests'
 require 'alchemy/test_support/integration_helpers'
 require 'alchemy/test_support/factories'
 require 'alchemy/test_support/essence_shared_examples'
-require_relative "support/test_tweaks.rb"
 require_relative "support/hint_examples.rb"
 
-# Temporay fix for mavericks phantomjs bug
-if RUBY_PLATFORM =~ /darwin/
-  require_relative "support/phantomjs_mavericks_fix.rb"
-  Capybara.register_driver :poltergeist do |app|
-    Capybara::Poltergeist::Driver.new(app, {
-      phantomjs_logger: Alchemy::WarningSuppressor,
-      js_errors: false
-    })
-  end
-else
-  Capybara.register_driver :poltergeist do |app|
-    Capybara::Poltergeist::Driver.new(app, js_errors: false)
-  end
-end
-
 # Configure capybara for integration testing
 Capybara.default_driver = :rack_test
 Capybara.default_selector = :css
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, js_errors: false)
+end
 Capybara.register_driver(:rack_test_translated_header) do |app|
   Capybara::RackTest::Driver.new(app, headers: { 'HTTP_ACCEPT_LANGUAGE' => 'de' })
 end
@@ -70,15 +57,32 @@ RSpec.configure do |config|
   config.include Alchemy::TestSupport::IntegrationHelpers, type: :feature
   config.include FactoryGirl::Syntax::Methods
 
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
   # Make sure the database is clean and ready for test
   config.before(:suite) do
-    truncate_all_tables
+    DatabaseCleaner.clean_with(:truncation)
     Alchemy::Seeder.seed!
   end
-  # Ensuring that the locale is always resetted to :en before running any tests
+
+  # All specs are running in transactions, but feature specs not.
   config.before(:each) do
     Alchemy::Site.current = nil
     ::I18n.locale = :en
+    if example.metadata[:type] == :feature
+      DatabaseCleaner.strategy = :truncation
+    else
+      DatabaseCleaner.strategy = :transaction
+    end
+    DatabaseCleaner.start
+  end
+
+  # After each spec the database gets cleaned. (via rollback or truncate for feature specs)
+  # After every feature spec the database gets seeded so the next spec can rely on that data.
+  config.append_after(:each) do
+    DatabaseCleaner.clean
+    if example.metadata[:type] == :feature
+      Alchemy::Seeder.stub(:puts)
+      Alchemy::Seeder.seed!
+    end
   end
 end

data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js

@@ -168,7 +168,7 @@
 			var newList = document.createElement(o.listType);
 
 			this.beyondMaxLevels = 0;
-			
+
 			// If the item is moved to the left, send it to its parent's level unless there are siblings below it.
 			if (parentItem != null && nextItem == null &&
 					(o.rtl && (this.positionAbs.left + this.helper.outerWidth() > parentItem.offset().left + parentItem.outerWidth()) ||
@@ -284,8 +284,14 @@
 
 			function _recursiveItems(item) {
 				var id = ($(item).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+
+				var restricted = $(item).data("restricted");
+				var slug = $(item).data("slug");
+				var external = $(item).data("external");
+				var visible = $(item).data("visible");
+
 				if (id) {
-					var currentItem = {"id" : id[2]};
+					var currentItem = {"id" : id[2], "slug" : slug, "restricted" : restricted, "external" : external, "visible" : visible};
 					if ($(item).children(o.listType).children(o.items).length > 0) {
 						currentItem.children = [];
 						$(item).children(o.listType).children(o.items).each(function() {
@@ -372,7 +378,7 @@
 
 			if (this.options.listType) {
 				var list = item.closest(this.options.listType);
-				while (list && list.length > 0 && 
+				while (list && list.length > 0 &&
                     	!list.is('.ui-sortable')) {
 					level++;
 					list = list.parent().closest(this.options.listType);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc7
+  version: 3.0.0.rc8
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -543,7 +543,6 @@ files:
 - app/models/alchemy.rb
 - app/models/alchemy/attachment.rb
 - app/models/alchemy/cell.rb
-- app/models/alchemy/clipboard.rb
 - app/models/alchemy/content.rb
 - app/models/alchemy/content/factory.rb
 - app/models/alchemy/element.rb
@@ -575,6 +574,7 @@ files:
 - app/models/alchemy/site.rb
 - app/models/alchemy/site/layout.rb
 - app/models/alchemy/tag.rb
+- app/models/alchemy/tree_node.rb
 - app/serializers/alchemy/attachment_serializer.rb
 - app/serializers/alchemy/cell_serializer.rb
 - app/serializers/alchemy/content_serializer.rb
@@ -610,7 +610,7 @@ files:
 - app/views/alchemy/admin/clipboard/remove.js.erb
 - app/views/alchemy/admin/contents/_missing.html.erb
 - app/views/alchemy/admin/contents/create.js.erb
-- app/views/alchemy/admin/contents/destroy.js.coffee
+- app/views/alchemy/admin/contents/destroy.js.erb
 - app/views/alchemy/admin/contents/new.html.erb
 - app/views/alchemy/admin/contents/order.js.erb
 - app/views/alchemy/admin/dashboard/_locked_pages.html.erb
@@ -620,7 +620,6 @@ files:
 - app/views/alchemy/admin/dashboard/help.html.erb
 - app/views/alchemy/admin/dashboard/index.html.erb
 - app/views/alchemy/admin/dashboard/info.html.erb
-- app/views/alchemy/admin/elements/_add_element_button.html.erb
 - app/views/alchemy/admin/elements/_add_picture.html.erb
 - app/views/alchemy/admin/elements/_element.html.erb
 - app/views/alchemy/admin/elements/_element_foot.html.erb
@@ -727,7 +726,7 @@ files:
 - app/views/alchemy/admin/tags/edit.html.erb
 - app/views/alchemy/admin/tags/index.html.erb
 - app/views/alchemy/admin/tags/new.html.erb
-- app/views/alchemy/admin/trash/clear.js.coffee
+- app/views/alchemy/admin/trash/clear.js.erb
 - app/views/alchemy/admin/trash/index.html.erb
 - app/views/alchemy/attachments/show.html.erb
 - app/views/alchemy/base/500.html.erb
@@ -792,9 +791,11 @@ files:
 - config/initializers/simple_form.rb
 - config/locales/alchemy.de.yml
 - config/locales/alchemy.en.yml
+- config/locales/alchemy.fr.yml
 - config/locales/alchemy.nl.yml
 - config/locales/simple_form.de.yml
 - config/locales/simple_form.en.yml
+- config/locales/simple_form.fr.yml
 - config/locales/simple_form.nl.yml
 - config/routes.rb
 - db/migrate/20130827094554_alchemy_two_point_six.rb
@@ -817,6 +818,7 @@ files:
 - lib/alchemy/kaminari/scoped_pagination_url_helper.rb
 - lib/alchemy/locale.rb
 - lib/alchemy/logger.rb
+- lib/alchemy/middleware/rescue_old_cookies.rb
 - lib/alchemy/modules.rb
 - lib/alchemy/mount_point.rb
 - lib/alchemy/name_conversions.rb
@@ -959,6 +961,7 @@ files:
 - spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/legacy_page_url_management_spec.rb
 - spec/features/admin/link_overlay_spec.rb
+- spec/features/admin/locale_select_feature_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/page_creation_feature_spec.rb
 - spec/features/admin/page_editing_feature_spec.rb
@@ -1001,6 +1004,7 @@ files:
 - spec/libraries/auth_accessors_spec.rb
 - spec/libraries/config_spec.rb
 - spec/libraries/controller_actions_spec.rb
+- spec/libraries/i18n_spec.rb
 - spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb
 - spec/libraries/modules_spec.rb
 - spec/libraries/mount_point_spec.rb
@@ -1015,7 +1019,6 @@ files:
 - spec/mailers/messages_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
-- spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
 - spec/models/essence_boolean_spec.rb
@@ -1038,7 +1041,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/ci/install_phantomjs
 - spec/support/hint_examples.rb
-- spec/support/phantomjs_mavericks_fix.rb
 - spec/support/test_tweaks.rb
 - spec/tasks/helpers_spec.rb
 - spec/views/essences/essence_boolean_view_spec.rb
@@ -1199,6 +1201,7 @@ test_files:
 - spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/legacy_page_url_management_spec.rb
 - spec/features/admin/link_overlay_spec.rb
+- spec/features/admin/locale_select_feature_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/page_creation_feature_spec.rb
 - spec/features/admin/page_editing_feature_spec.rb
@@ -1241,6 +1244,7 @@ test_files:
 - spec/libraries/auth_accessors_spec.rb
 - spec/libraries/config_spec.rb
 - spec/libraries/controller_actions_spec.rb
+- spec/libraries/i18n_spec.rb
 - spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb
 - spec/libraries/modules_spec.rb
 - spec/libraries/mount_point_spec.rb
@@ -1255,7 +1259,6 @@ test_files:
 - spec/mailers/messages_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
-- spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
 - spec/models/essence_boolean_spec.rb
@@ -1278,7 +1281,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/ci/install_phantomjs
 - spec/support/hint_examples.rb
-- spec/support/phantomjs_mavericks_fix.rb
 - spec/support/test_tweaks.rb
 - spec/tasks/helpers_spec.rb
 - spec/views/essences/essence_boolean_view_spec.rb