alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/spec/dummy/db/migrate/{20121026100815_alchemy_two_point_three.rb → 20121118000000_alchemy_two_point_four.rb}

@@ -1,11 +1,11 @@
-# This is a compressed migration for creating all Alchemy 2.3 tables at once.
+# This is a compressed migration for creating all Alchemy 2.4 tables at once.
 #
 # === Notice
 #
 # In order to upgrade from an old version of Alchemy, you have to run all migrations from
 # each version you missed up to the version you want to upgrade to, before running this migration.
 #
-class AlchemyTwoPointThree < ActiveRecord::Migration
+class AlchemyTwoPointFour < ActiveRecord::Migration
   def up
     # Do not run if Alchemy tables are already present
     return if table_exists?(:alchemy_pages)
@@ -17,8 +17,9 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.integer  "size"
       t.integer  "creator_id"
       t.integer  "updater_id"
-      t.datetime "created_at",   :null => false
-      t.datetime "updated_at",   :null => false
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.text     "cached_tag_list"
     end
 
     create_table "alchemy_cells", :force => true do |t|
@@ -46,14 +47,15 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.string   "name"
       t.integer  "position"
       t.integer  "page_id"
-      t.boolean  "public",     :default => true
-      t.boolean  "folded",     :default => false
-      t.boolean  "unique",     :default => false
-      t.datetime "created_at",                    :null => false
-      t.datetime "updated_at",                    :null => false
+      t.boolean  "public",          :default => true
+      t.boolean  "folded",          :default => false
+      t.boolean  "unique",          :default => false
+      t.datetime "created_at",                         :null => false
+      t.datetime "updated_at",                         :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.integer  "cell_id"
+      t.text     "cached_tag_list"
     end
 
     add_index "alchemy_elements", ["page_id", "position"], :name => "index_elements_on_page_id_and_position"
@@ -99,6 +101,17 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.datetime "updated_at", :null => false
     end
 
+    create_table "alchemy_essence_links", :force => true do |t|
+      t.string   "link"
+      t.string   "link_title"
+      t.string   "link_target"
+      t.string   "link_class_name"
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
     create_table "alchemy_essence_pictures", :force => true do |t|
       t.integer  "picture_id"
       t.string   "caption"
@@ -203,6 +216,7 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.integer  "language_id"
+      t.text     "cached_tag_list"
     end
 
     add_index "alchemy_pages", ["language_id"], :name => "index_pages_on_language_id"
@@ -219,7 +233,7 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.string   "upload_hash"
-      t.string   "cached_tag_list"
+      t.text     "cached_tag_list"
     end
 
     create_table "alchemy_users", :force => true do |t|
@@ -246,31 +260,40 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.datetime "updated_at",                                                   :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
+      t.text     "cached_tag_list"
     end
 
     add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"
 
-    # Skip migrations for acts-as-taggable-on, if the tables are already present
-    unless table_exists?(:taggings)
-      create_table "taggings", :force => true do |t|
-        t.integer  "tag_id"
-        t.integer  "taggable_id"
-        t.string   "taggable_type"
-        t.integer  "tagger_id"
-        t.string   "tagger_type"
-        t.string   "context"
-        t.datetime "created_at"
-      end
-
-      add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-      add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+    create_table "events", :force => true do |t|
+      t.string   "name"
+      t.string   "hidden_name"
+      t.datetime "starts_at"
+      t.datetime "ends_at"
+      t.text     "description"
+      t.decimal  "entrance_fee", :precision => 6, :scale => 2
+      t.boolean  "published"
+      t.integer  "location_id"
+      t.integer  "organizer_id"
+      t.datetime "created_at",                                 :null => false
+      t.datetime "updated_at",                                 :null => false
     end
 
-    unless table_exists?(:tags)
-      create_table "tags", :force => true do |t|
-        t.string "name"
-      end
+    create_table "taggings", :force => true do |t|
+      t.integer  "tag_id"
+      t.integer  "taggable_id"
+      t.string   "taggable_type"
+      t.integer  "tagger_id"
+      t.string   "tagger_type"
+      t.string   "context"
+      t.datetime "created_at"
     end
 
+    add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+    add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+
+    create_table "tags", :force => true do |t|
+      t.string "name"
+    end
   end
 end

data/spec/dummy/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb

@@ -0,0 +1,11 @@
+class CreateAlchemyLegacyPageUrls < ActiveRecord::Migration
+  def change
+    create_table :alchemy_legacy_page_urls do |t|
+      t.string  :urlname, null: false
+      t.integer :page_id, null: false
+
+      t.timestamps
+    end
+    add_index :alchemy_legacy_page_urls, :urlname
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121220102223) do
+ActiveRecord::Schema.define(:version => 20130110212411) do
 
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"
@@ -194,6 +194,15 @@ ActiveRecord::Schema.define(:version => 20121220102223) do
   add_index "alchemy_languages", ["language_code"], :name => "index_alchemy_languages_on_language_code"
   add_index "alchemy_languages", ["site_id"], :name => "index_alchemy_languages_on_site_id"
 
+  create_table "alchemy_legacy_page_urls", :force => true do |t|
+    t.string   "urlname",    :null => false
+    t.integer  "page_id",    :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "alchemy_legacy_page_urls", ["urlname"], :name => "index_alchemy_legacy_page_urls_on_urlname"
+
   create_table "alchemy_pages", :force => true do |t|
     t.string   "name"
     t.string   "urlname"

data/spec/factories.rb

@@ -5,6 +5,7 @@ FactoryGirl.define do
     login "jdoe"
     password 's3cr3t'
     password_confirmation 's3cr3t'
+    language 'en'
 
     factory :admin_user do
       role "admin"

data/spec/integration/admin/picture_library_integration_spec.rb

@@ -23,10 +23,16 @@ describe "Picture Library", :js => true do
     it "it should be possible to undo tag filtering by clicking on an active tag name" do
       visit '/alchemy/admin/pictures'
       click_on 'tag1 (1)'
-      click_on 'tag2 (1)'
+      page.should_not have_content 'TaggedWith2'
+      click_on 'tag1 (1)'
       page.should have_content 'TaggedWith2'
+    end
+
+    it "it should be possible to tighten the tag scope by clicking on another tag name" do
+      visit '/alchemy/admin/pictures'
+      click_on 'tag1 (1)'
       click_on 'tag2 (1)'
-      page.should_not have_content 'TaggedWith2'
+      page.should have_content "You don't have any images in your archive"
     end
 
   end

data/spec/integration/security_spec.rb

@@ -10,8 +10,8 @@ describe "Security: " do
   context "If no user is present" do
 
     it "render the signup view" do
-      visit '/alchemy/'
-      within('#alchemy_greeting') { page.should have_content('signup') }
+      visit '/alchemy'
+      current_path.should == '/alchemy/admin/signup'
     end
   end
 

data/spec/integration/translation_integration_spec.rb

@@ -21,6 +21,7 @@ describe "Translation integration" do
 
     it "should be possible to change the current locale in the session" do
       visit admin_dashboard_path(:locale => :de)
+      page.should have_content('Willkommen')
       visit admin_dashboard_path(:locale => :en)
       page.should have_content('Welcome')
     end
@@ -30,10 +31,25 @@ describe "Translation integration" do
       page.should have_content('Welcome')
     end
 
-    it "should use the current users language setting if no other parameter is given" do
-      Alchemy::User.first.update_attributes(:language => :de)
-      visit admin_dashboard_path
-      page.should have_content('Willkommen')
+    context "if no other parameter is given" do
+      it "should use the current users language setting" do
+        Alchemy::User.first.update_attributes!(language: 'de')
+        visit admin_dashboard_path
+        page.should have_content('Willkommen')
+      end
+    end
+
+  end
+
+  context "with translated header" do
+
+    before do
+      Capybara.current_driver = :rack_test_translated_header
+    end
+
+    it "should use the browsers language setting if no other parameter is given" do
+      visit root_path
+      ::I18n.locale.should == :de
     end
 
   end

data/spec/libraries/resources_helper_spec.rb

@@ -106,7 +106,7 @@ describe Alchemy::ResourcesHelper do
   describe "resource_window_size" do
     it "should return overlay size string depending on resource attributes length" do
       @controller.stub(:resource_handler).and_return(OpenStruct.new(:attributes => OpenStruct.new(:length => 4)))
-      @controller.resource_window_size.should == "400x240"
+      @controller.resource_window_size.should == "420x260"
     end
   end
 end

data/spec/models/cell_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Cell do
+
+    let(:cell) { FactoryGirl.build(:cell) }
+
+    describe "#available_elements" do
+
+      context "without assigned elements" do
+        it "should return an empty Array" do
+          cell.stub!(:description).and_return({})
+          cell.available_elements.should == []
+        end
+      end
+
+      context "with assigned elements" do
+        it "should return an Array of element names" do
+          cell.stub!(:description).and_return({'elements' => ['test_element', 'test_element_2']})
+          cell.available_elements.should == ['test_element', 'test_element_2']
+        end
+      end
+
+    end
+
+    describe "#description" do
+
+      context "without a definition for the expected cellname" do
+        it "should return an empty Hash" do
+          Cell.stub!(:definition_for).and_return({})
+          cell.description.should == {}
+        end
+      end
+
+      context "with a definition for the expected cellname found" do
+        it "should return its definition Hash" do
+          Cell.stub!(:definition_for).and_return({'name' => 'test_cell', 'elements' => ['test_element', 'test_element_2']})
+          cell.description.should == {'name' => 'test_cell', 'elements' => ['test_element', 'test_element_2']}
+        end
+      end
+
+    end
+
+  end
+end

data/spec/models/page_spec.rb

@@ -144,22 +144,39 @@ module Alchemy
 
     describe '#update' do
 
+      let(:page) { FactoryGirl.create(:page, :name => 'My Testpage', :language => language, :parent_id => language_root.id) }
+
       context "before/after filter" do
 
         it "should not set the title automatically if the name changed but title is not blank" do
-          page = FactoryGirl.create(:page, :name => 'My Testpage', :language => language, :parent_id => language_root.id)
           page.name = "My Renaming Test"
           page.save; page.reload
           page.title.should == "My Testpage"
         end
 
         it "should not automatically set the title if it changed its value" do
-          page = FactoryGirl.create(:page, :name => 'My Testpage', :language => language, :parent_id => language_root.id)
           page.title = "I like SEO"
           page.save; page.reload
           page.title.should == "I like SEO"
         end
 
+        context "urlname has changed" do
+          it "should store legacy url" do
+            page.urlname = 'new-urlname'
+            page.save!
+            page.legacy_urls.should_not be_empty
+            page.legacy_urls.first.urlname.should == 'my-testpage'
+          end
+        end
+
+        context "urlname has not changed" do
+          it "should not store a legacy url" do
+            page.urlname = 'my-testpage'
+            page.save!
+            page.legacy_urls.should be_empty
+          end
+        end
+
       end
 
     end

data/spec/models/picture_spec.rb

@@ -17,6 +17,18 @@ module Alchemy
       picture.should_not be_valid
     end
 
+    it "is valid with capitalized image file extension" do
+      image_file = File.new(File.expand_path('../../support/image2.PNG', __FILE__))
+      picture = Picture.new(:image_file => image_file)
+      picture.should be_valid
+    end
+
+    it "is valid with jpeg image file extension" do
+      image_file = File.new(File.expand_path('../../support/image3.jpeg', __FILE__))
+      picture = Picture.new(:image_file => image_file)
+      picture.should be_valid
+    end
+
     describe '#suffix' do
 
       it "should return the suffix of original filename" do

data/spec/routing_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "The Routing", :type => :routing do
 
-  before(:each) { @routes = Alchemy::Engine.routes }
+  before { @routes = Alchemy::Engine.routes }
 
   context "for downloads" do
 
@@ -10,44 +10,44 @@ describe "The Routing", :type => :routing do
       {
         :get => "/attachment/32/download/Presseveranstaltung.pdf"
       }.should route_to(
-                 :controller => "alchemy/attachments",
-                 :action => "download",
-                 :id => "32",
-                 :name => "Presseveranstaltung",
-                 :format => "pdf"
-               )
+        :controller => "alchemy/attachments",
+        :action => "download",
+        :id => "32",
+        :name => "Presseveranstaltung",
+        :format => "pdf"
+      )
     end
 
     it "should have a route for legacy Alchemy 1.x downloads" do
       {
         :get => "/attachment/32/download?name=Presseveranstaltung.pdf"
       }.should route_to(
-                 :controller => "alchemy/attachments",
-                 :action => "download",
-                 :id => "32"
-               )
+        :controller => "alchemy/attachments",
+        :action => "download",
+        :id => "32"
+      )
     end
 
     it "should have a route for legacy washAPP downloads" do
       {
         :get => "/wa_files/download/11"
       }.should route_to(
-                 :controller => "alchemy/attachments",
-                 :action => "download",
-                 :id => "11"
-               )
+        :controller => "alchemy/attachments",
+        :action => "download",
+        :id => "11"
+      )
     end
 
     it "should have a route for legacy WebMate downloads" do
       {
         :get => "/uploads/files/0000/0028/Pressetext.pdf"
       }.should route_to(
-                 :controller => "alchemy/attachments",
-                 :action => "download",
-                 :id => "0028",
-                 :name => "Pressetext",
-                 :suffix => "pdf"
-               )
+        :controller => "alchemy/attachments",
+        :action => "download",
+        :id => "0028",
+        :name => "Pressetext",
+        :suffix => "pdf"
+      )
     end
 
   end
@@ -60,11 +60,11 @@ describe "The Routing", :type => :routing do
         {
           :get => "/products/my-product"
         }.should route_to(
-                   :controller => "alchemy/pages",
-                   :action => "show",
-                   :level1 => "products",
-                   :urlname => "my-product"
-                 )
+          :controller => "alchemy/pages",
+          :action => "show",
+          :level1 => "products",
+          :urlname => "my-product"
+        )
       end
 
       context "and language" do
@@ -73,12 +73,12 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/products/my-product"
           }.should route_to(
-                     :controller => "alchemy/pages",
-                     :action => "show",
-                     :level1 => "products",
-                     :urlname => "my-product",
-                     :lang => "de"
-                   )
+            :controller => "alchemy/pages",
+            :action => "show",
+            :level1 => "products",
+            :urlname => "my-product",
+            :lang => "de"
+          )
         end
 
       end
@@ -91,12 +91,12 @@ describe "The Routing", :type => :routing do
         {
           :get => "/catalog/products/my-product"
         }.should route_to(
-                   :controller => "alchemy/pages",
-                   :action => "show",
-                   :level1 => "catalog",
-                   :level2 => "products",
-                   :urlname => "my-product"
-                 )
+          :controller => "alchemy/pages",
+          :action => "show",
+          :level1 => "catalog",
+          :level2 => "products",
+          :urlname => "my-product"
+        )
       end
 
       context "and language" do
@@ -105,13 +105,13 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/catalog/products/my-product"
           }.should route_to(
-                     :controller => "alchemy/pages",
-                     :action => "show",
-                     :level1 => "catalog",
-                     :level2 => "products",
-                     :urlname => "my-product",
-                     :lang => "de"
-                   )
+            :controller => "alchemy/pages",
+            :action => "show",
+            :level1 => "catalog",
+            :level2 => "products",
+            :urlname => "my-product",
+            :lang => "de"
+          )
         end
 
       end
@@ -124,13 +124,13 @@ describe "The Routing", :type => :routing do
         {
           :get => "/2011/12/08/my-post"
         }.should route_to(
-                   :controller => "alchemy/pages",
-                   :action => "show",
-                   :level1 => "2011",
-                   :level2 => "12",
-                   :level3 => "08",
-                   :urlname => "my-post"
-                 )
+          :controller => "alchemy/pages",
+          :action => "show",
+          :level1 => "2011",
+          :level2 => "12",
+          :level3 => "08",
+          :urlname => "my-post"
+        )
       end
 
       context "and language" do
@@ -139,14 +139,14 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/2011/12/08/my-post"
           }.should route_to(
-                     :controller => "alchemy/pages",
-                     :action => "show",
-                     :level1 => "2011",
-                     :level2 => "12",
-                     :level3 => "08",
-                     :urlname => "my-post",
-                     :lang => "de"
-                   )
+            :controller => "alchemy/pages",
+            :action => "show",
+            :level1 => "2011",
+            :level2 => "12",
+            :level3 => "08",
+            :urlname => "my-post",
+            :lang => "de"
+          )
         end
 
       end
@@ -161,97 +161,97 @@ describe "The Routing", :type => :routing do
       {
         :get => "/pictures/3/show/900x300/kitten.jpg"
       }.should route_to(
-                 :controller => "alchemy/pictures",
-                 :action => "show",
-                 :id => "3",
-                 :size => "900x300",
-                 :name => "kitten",
-                 :format => "jpg"
-               )
+        :controller => "alchemy/pictures",
+        :action => "show",
+        :id => "3",
+        :size => "900x300",
+        :name => "kitten",
+        :format => "jpg"
+      )
     end
 
     it "should route to cropped show action" do
       {
         :get => "/pictures/3/show/900x300/crop/kitten.jpg"
       }.should route_to(
-                 :controller => "alchemy/pictures",
-                 :action => "show",
-                 :id => "3",
-                 :size => "900x300",
-                 :crop => "crop",
-                 :name => "kitten",
-                 :format => "jpg"
-               )
+        :controller => "alchemy/pictures",
+        :action => "show",
+        :id => "3",
+        :size => "900x300",
+        :crop => "crop",
+        :name => "kitten",
+        :format => "jpg"
+      )
     end
 
     it "should route to cropped mask show action" do
       get(
         "/pictures/3/show/300x300/crop/200x50/100x100/kitten.jpg"
       ).should route_to(
-                 :controller => "alchemy/pictures",
-                 :action => "show",
-                 :id => "3",
-                 :size => "300x300",
-                 :crop => "crop",
-                 :crop_from => "200x50",
-                 :crop_size => "100x100",
-                 :name => "kitten",
-                 :format => "jpg"
-               )
+        :controller => "alchemy/pictures",
+        :action => "show",
+        :id => "3",
+        :size => "300x300",
+        :crop => "crop",
+        :crop_from => "200x50",
+        :crop_size => "100x100",
+        :name => "kitten",
+        :format => "jpg"
+      )
     end
 
     it "should route to thumbnail action" do
       get(
         "/pictures/3/thumbnails/small/kitten.jpg"
       ).should route_to(
-                 :controller => "alchemy/pictures",
-                 :action => "thumbnail",
-                 :id => "3",
-                 :size => "small",
-                 :name => "kitten",
-                 :format => "jpg"
-               )
+        :controller => "alchemy/pictures",
+        :action => "thumbnail",
+        :id => "3",
+        :size => "small",
+        :name => "kitten",
+        :format => "jpg"
+      )
     end
 
     it "should route to cropped thumbnail action" do
       get(
         "/pictures/3/thumbnails/small/crop/kitten.jpg"
       ).should route_to(
-                 :controller => "alchemy/pictures",
-                 :action => "thumbnail",
-                 :id => "3",
-                 :crop => "crop",
-                 :size => "small",
-                 :name => "kitten",
-                 :format => "jpg"
-               )
+        :controller => "alchemy/pictures",
+        :action => "thumbnail",
+        :id => "3",
+        :crop => "crop",
+        :size => "small",
+        :name => "kitten",
+        :format => "jpg"
+      )
     end
 
     it "should route to cropped and masked thumbnail" do
       get(
         "/pictures/3/thumbnails/small/0x0/200x200/kitten.jpg"
       ).should route_to(
-                 :controller => "alchemy/pictures",
-                 :action => "thumbnail",
-                 :id => "3",
-                 :crop_from => "0x0",
-                 :crop_size => "200x200",
-                 :size => "small",
-                 :name => "kitten",
-                 :format => "jpg"
-               )
+        :controller => "alchemy/pictures",
+        :action => "thumbnail",
+        :id => "3",
+        :crop_from => "0x0",
+        :crop_size => "200x200",
+        :size => "small",
+        :name => "kitten",
+        :format => "jpg"
+      )
     end
 
     it "should route to zoomed picture" do
       get(
         "/pictures/3/zoom/kitten.jpg"
       ).should route_to(
-                 :controller => "alchemy/pictures",
-                 :action => "zoom",
-                 :id => "3",
-                 :name => "kitten",
-                 :format => "jpg"
-               )
+        :controller => "alchemy/pictures",
+        :action => "zoom",
+        :id => "3",
+        :name => "kitten",
+        :format => "jpg"
+      )
     end
 
   end