alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/spec/spec_helper.rb

@@ -38,6 +38,9 @@ def configure
   require 'capybara/poltergeist'
   Capybara.default_driver = :rack_test
   Capybara.default_selector = :css
+  Capybara.register_driver(:rack_test_translated_header) do |app|
+    Capybara::RackTest::Driver.new(app, :headers => { 'HTTP_ACCEPT_LANGUAGE' => 'de' })
+  end
   Capybara.javascript_driver = :poltergeist
 
   # Load support files

data/spec/support/alchemy/specs_helpers.rb

@@ -27,7 +27,11 @@ module Alchemy
       # See: create_admin_user method
       #
       def login_into_alchemy
-        visit '/alchemy/admin/login'
+        # Ensure that phantomjs has always the same browser language.
+        if Capybara.current_driver == :poltergeist
+          page.driver.headers = { 'Accept-Language' => 'en' }
+        end
+        visit "/alchemy/admin/login"
         fill_in('alchemy_user_session_login', :with => 'jdoe')
         fill_in('alchemy_user_session_password', :with => 's3cr3t')
         click_on('Login')
@@ -53,7 +57,7 @@ module Alchemy
       #   end
       #
       def create_admin_user
-        @user ||= FactoryGirl.build(:admin_user).save_without_session_maintenance
+        FactoryGirl.build(:admin_user).save_without_session_maintenance
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0.b5
+  version: 2.5.0.b9
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
@@ -356,17 +356,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -563,6 +563,7 @@ files:
 - app/models/alchemy/folded_page.rb
 - app/models/alchemy/language.rb
 - app/models/alchemy/language/code.rb
+- app/models/alchemy/legacy_page_url.rb
 - app/models/alchemy/message.rb
 - app/models/alchemy/page.rb
 - app/models/alchemy/picture.rb
@@ -675,9 +676,13 @@ files:
 - app/views/alchemy/admin/pictures/info.html.erb
 - app/views/alchemy/admin/pictures/new.html.erb
 - app/views/alchemy/admin/pictures/show_in_window.html.erb
+- app/views/alchemy/admin/resources/_boolean.html.erb
+- app/views/alchemy/admin/resources/_datetime.html.erb
 - app/views/alchemy/admin/resources/_form.html.erb
 - app/views/alchemy/admin/resources/_resource.html.erb
+- app/views/alchemy/admin/resources/_string.html.erb
 - app/views/alchemy/admin/resources/_table.html.erb
+- app/views/alchemy/admin/resources/_text.html.erb
 - app/views/alchemy/admin/resources/destroy.js.erb
 - app/views/alchemy/admin/resources/edit.html.erb
 - app/views/alchemy/admin/resources/index.html.erb
@@ -761,23 +766,22 @@ files:
 - config/locales/alchemy.de.yml
 - config/locales/alchemy.en.yml
 - config/routes.rb
-- db/migrate/20121026100815_alchemy_two_point_three.rb
-- db/migrate/20121113115120_create_alchemy_essence_links.rb
-- db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb
-- db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb
-- db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb
+- db/migrate/20121118000000_alchemy_two_point_four.rb
 - db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
 - db/migrate/20121205155004_create_alchemy_sites.rb
 - db/migrate/20121211163003_add_public_to_alchemy_sites.rb
 - db/migrate/20121220102223_add_aliases_to_site.rb
+- db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb
 - lib/alchemy/auth_engine.rb
 - lib/alchemy/authentication_helpers.rb
 - lib/alchemy/capistrano.rb
 - lib/alchemy/config.rb
 - lib/alchemy/engine.rb
+- lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/ferret_search.rb
 - lib/alchemy/i18n.rb
+- lib/alchemy/logger.rb
 - lib/alchemy/modules.rb
 - lib/alchemy/mount_point.rb
 - lib/alchemy/page_layout.rb
@@ -870,16 +874,13 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20121026100815_alchemy_two_point_three.rb
 - spec/dummy/db/migrate/20121026104128_create_events.rb
-- spec/dummy/db/migrate/20121113115120_create_alchemy_essence_links.rb
-- spec/dummy/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb
-- spec/dummy/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb
-- spec/dummy/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb
+- spec/dummy/db/migrate/20121118000000_alchemy_two_point_four.rb
 - spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
 - spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
 - spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
 - spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb
+- spec/dummy/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -921,6 +922,7 @@ files:
 - spec/libraries/essence_spec.rb
 - spec/libraries/resource_spec.rb
 - spec/libraries/resources_helper_spec.rb
+- spec/models/cell_spec.rb
 - spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
@@ -942,6 +944,8 @@ files:
 - spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
 - spec/support/image.png
+- spec/support/image2.PNG
+- spec/support/image3.jpeg
 - spec/url_helpers_spec.rb
 - vendor/assets/images/Jcrop.gif
 - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
@@ -1125,16 +1129,13 @@ test_files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20121026100815_alchemy_two_point_three.rb
 - spec/dummy/db/migrate/20121026104128_create_events.rb
-- spec/dummy/db/migrate/20121113115120_create_alchemy_essence_links.rb
-- spec/dummy/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb
-- spec/dummy/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb
-- spec/dummy/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb
+- spec/dummy/db/migrate/20121118000000_alchemy_two_point_four.rb
 - spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
 - spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
 - spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
 - spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb
+- spec/dummy/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -1176,6 +1177,7 @@ test_files:
 - spec/libraries/essence_spec.rb
 - spec/libraries/resource_spec.rb
 - spec/libraries/resources_helper_spec.rb
+- spec/models/cell_spec.rb
 - spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
@@ -1197,5 +1199,7 @@ test_files:
 - spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
 - spec/support/image.png
+- spec/support/image2.PNG
+- spec/support/image3.jpeg
 - spec/url_helpers_spec.rb
 has_rdoc: 

data/db/migrate/20121113115120_create_alchemy_essence_links.rb

@@ -1,13 +0,0 @@
-class CreateAlchemyEssenceLinks < ActiveRecord::Migration
-  def change
-    create_table :alchemy_essence_links do |t|
-      t.string :link
-      t.string :link_title
-      t.string :link_target
-      t.string :link_class_name
-
-      t.timestamps
-      t.userstamps
-    end
-  end
-end

data/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb

@@ -1,7 +0,0 @@
-class AddCachedTagListToElementsPagesAndUsers < ActiveRecord::Migration
-  def change
-    add_column :alchemy_elements, :cached_tag_list, :text
-    add_column :alchemy_pages,    :cached_tag_list, :text
-    add_column :alchemy_users,    :cached_tag_list, :text
-  end
-end

data/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb

@@ -1,5 +0,0 @@
-class AddCachedTagListToAlchemyAttachments < ActiveRecord::Migration
-  def change
-    add_column :alchemy_attachments, :cached_tag_list, :text
-  end
-end

data/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb

@@ -1,9 +0,0 @@
-class ChangeAlchemyPicturesTagListColumn < ActiveRecord::Migration
-  def up
-    change_column :alchemy_pictures, :cached_tag_list, :text, :limit => nil
-  end
-
-  def down
-    change_column :alchemy_pictures, :cached_tag_list, :string
-  end
-end

data/spec/dummy/db/migrate/20121113115120_create_alchemy_essence_links.rb

@@ -1,13 +0,0 @@
-class CreateAlchemyEssenceLinks < ActiveRecord::Migration
-  def change
-    create_table :alchemy_essence_links do |t|
-      t.string :link
-      t.string :link_title
-      t.string :link_target
-      t.string :link_class_name
-
-      t.timestamps
-      t.userstamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb

@@ -1,7 +0,0 @@
-class AddCachedTagListToElementsPagesAndUsers < ActiveRecord::Migration
-  def change
-    add_column :alchemy_elements, :cached_tag_list, :text
-    add_column :alchemy_pages,    :cached_tag_list, :text
-    add_column :alchemy_users,    :cached_tag_list, :text
-  end
-end

data/spec/dummy/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb

@@ -1,5 +0,0 @@
-class AddCachedTagListToAlchemyAttachments < ActiveRecord::Migration
-  def change
-    add_column :alchemy_attachments, :cached_tag_list, :text
-  end
-end

data/spec/dummy/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb

@@ -1,9 +0,0 @@
-class ChangeAlchemyPicturesTagListColumn < ActiveRecord::Migration
-  def up
-    change_column :alchemy_pictures, :cached_tag_list, :text, :limit => nil
-  end
-
-  def down
-    change_column :alchemy_pictures, :cached_tag_list, :string
-  end
-end