alchemy_cms 2.4.0 → 2.4.1

data/alchemy_cms.gemspec

@@ -38,7 +38,7 @@ POST_INSTALL
   s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths         = ["lib"]
 
-  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.8"]
+  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.11"]
   s.add_runtime_dependency %q<authlogic>,                  ["~> 3.1.3"]
   s.add_runtime_dependency %q<awesome_nested_set>,         ["~> 2.0"]
   s.add_runtime_dependency %q<acts-as-taggable-on>,        ["~> 2.1"]
@@ -60,7 +60,7 @@ POST_INSTALL
   s.add_development_dependency %q<bumpy>
   s.add_development_dependency %q<capybara>
   s.add_development_dependency %q<factory_girl_rails>
-  s.add_development_dependency %q<rspec-rails>
+  s.add_development_dependency %q<rspec-rails>,            ['2.12.0']
   s.add_development_dependency %q<sqlite3>
   s.add_development_dependency %q<yard>
 

data/app/controllers/alchemy/base_controller.rb

@@ -60,8 +60,6 @@ module Alchemy
         session[:current_locale] = ::I18n.locale = params[:locale]
       elsif current_user && current_user.language.present?
         ::I18n.locale = current_user.language
-      elsif Rails.env == 'test' # OMG I hate to do this. But it helps...
-        ::I18n.locale = 'en'
       else
         ::I18n.locale = request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /^[a-z]{2}/).try(:first)
       end

data/lib/alchemy/upgrader.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'active_record'
 
 module Alchemy
   class Upgrader < Alchemy::Seeder
@@ -114,8 +115,8 @@ module Alchemy
       def strip_alchemy_from_schema_version_table
         desc "Strip -alchemy suffix from schema_version table."
         database_yml = YAML.load_file(Rails.root.join("config", "database.yml"))
-        connection = Mysql2::Client.new(database_yml.fetch(Rails.env.to_s).symbolize_keys)
-        connection.query "UPDATE schema_migrations SET `schema_migrations`.`version` = REPLACE(`schema_migrations`.`version`,'-alchemy','')"
+        adapter = ActiveRecord::Base.establish_connection(database_yml.fetch(Rails.env.to_s).symbolize_keys)
+        adapter.connection.update("UPDATE schema_migrations SET version = REPLACE(`schema_migrations`.`version`,'-alchemy','')")
       end
 
       def convert_essence_texts_displayed_as_select_into_essence_selects

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 
   def self.version
     VERSION

data/spec/dummy/config/application.rb

@@ -37,7 +37,7 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    config.i18n.default_locale = :en
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

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/helpers/admin/elements_helper_spec.rb

@@ -12,7 +12,7 @@ describe Alchemy::Admin::ElementsHelper do
     end
 
     it "should render an element editor partial" do
-      helper.render_editor(@element).should match(/class="content_editor".+id="essence_text_\d{1,}"/)
+      helper.render_editor(@element).should match(/class="essence_text content_editor".+id="essence_text_\d{1,}"/)
     end
 
     it "should render a picture gallery editor partial" do

data/spec/integration/translation_integration_spec.rb

@@ -4,33 +4,34 @@ describe "Translation integration" do
 
   context "in admin backend" do
 
-    before do
-      authorize_as_admin
-    end
-
     it "should be possible to set the locale of the admin backend via params" do
+      authorize_as_admin
       visit admin_dashboard_path(:locale => :de)
       page.should have_content('Willkommen')
     end
 
     it "should store the current locale in the session" do
+      authorize_as_admin
       visit admin_dashboard_path(:locale => :de)
       visit admin_dashboard_path
       page.should have_content('Willkommen')
     end
 
     it "should be possible to change the current locale in the session" do
+      authorize_as_admin
       visit admin_dashboard_path(:locale => :de)
       visit admin_dashboard_path(:locale => :en)
       page.should have_content('Welcome')
     end
 
     it "should not be possible to switch the locale of the admin backend to an unknown locale" do
+      authorize_as_admin
       visit admin_dashboard_path(:locale => :ko)
       page.should have_content('Welcome')
     end
 
     it "should use the current users language setting if no other parameter is given" do
+      authorize_as_admin(locale = nil)
       Alchemy::User.first.update_attributes(:language => :de)
       visit admin_dashboard_path
       page.should have_content('Willkommen')
@@ -38,4 +39,17 @@ describe "Translation integration" do
 
   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
+
 end

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

data/spec/spec_helper.rb

@@ -39,6 +39,9 @@ def configure
   Capybara.default_driver = :rack_test
   Capybara.default_selector = :css
   Capybara.javascript_driver = :poltergeist
+  Capybara.register_driver(:rack_test_translated_header) do |app|
+    Capybara::RackTest::Driver.new(app, :headers => { 'HTTP_ACCEPT_LANGUAGE' => 'de' })
+  end
 
   # Load support files
   Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/alchemy/specs_helpers.rb

@@ -15,9 +15,9 @@ module Alchemy
       #   * create_admin_user
       #   * login_into_alchemy
       #
-      def authorize_as_admin
+      def authorize_as_admin(locale = 'en')
         create_admin_user
-        login_into_alchemy
+        login_into_alchemy(locale)
       end
 
       # Capybara actions to login into Alchemy Backend
@@ -26,8 +26,8 @@ module Alchemy
       #
       # See: create_admin_user method
       #
-      def login_into_alchemy
-        visit '/alchemy/admin/login'
+      def login_into_alchemy(locale = 'en')
+        visit "/alchemy/admin/login?locale=#{locale}"
         fill_in('alchemy_user_session_login', :with => 'jdoe')
         fill_in('alchemy_user_session_password', :with => 's3cr3t')
         click_on('Login')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2013-01-10 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
@@ -1100,7 +1100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3242922462543667303
+      hash: 1834932849568995813
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: