alchemy_cms 2.5.0.b9 → 2.5.0.rc3

data/spec/integration/pages_controller_spec.rb

@@ -88,7 +88,7 @@ module Alchemy
           before do
             element
             english_element
-            controller.stub!(:multi_language?).and_return(true)
+            PagesController.any_instance.stub(:multi_language?).and_return(true)
           end
 
           it "should not display search results from other languages then current" do
@@ -316,5 +316,13 @@ module Alchemy
       end
 
     end
+
+    context "with invalid byte code char in urlname parameter" do
+      it "should render page not found" do
+        visit '/alchemy/%ed'
+        page.status_code.should == 404
+      end
+    end
+
   end
 end

data/spec/models/content_spec.rb

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

data/spec/models/element_spec.rb

@@ -116,6 +116,15 @@ module Alchemy
 
     end
 
+    context "without any descriptions in elements.yml file" do
+
+      it "should return an empty array" do
+        YAML.stub(:load_file).and_return(false) # Yes, YAML.load_file returns false if an empty file exists.
+        Element.descriptions.should == []
+      end
+
+    end
+
     context "retrieving contents, essences and ingredients" do
 
       let(:element) { FactoryGirl.create(:element, :name => 'news', :create_contents_after_create => true) }
@@ -302,7 +311,7 @@ module Alchemy
       describe '#prev' do
 
         it "should return previous element on same page" do
-          @element2.prev.should == @element1
+          @element3.prev.should == @element2
         end
 
         context "with name as parameter" do
@@ -316,7 +325,7 @@ module Alchemy
       describe '#next' do
 
         it "should return next element on same page" do
-          @element1.next.should == @element2
+          @element2.next.should == @element3
         end
 
         context "with name as parameter" do

data/spec/models/essence_richtext_spec.rb

@@ -1,11 +1,47 @@
 require 'spec_helper'
 
-describe Alchemy::EssenceRichtext do
+module Alchemy
+  describe EssenceRichtext do
 
-  it "should save a HTML tag free version of body column" do
-    essence = Alchemy::EssenceRichtext.new(:body => '<h1>Hello!</h1><p>Welcome to Peters Petshop.</p>')
-    essence.save!
-    essence.stripped_body.should == "Hello!Welcome to Peters Petshop."
-  end
+    it "should save a HTML tag free version of body column" do
+      essence = EssenceRichtext.new(:body => '<h1>Hello!</h1><p>Welcome to Peters Petshop.</p>')
+      essence.save
+      essence.stripped_body.should == "Hello!Welcome to Peters Petshop."
+    end
+
+    describe '.after_save' do
+      let(:essence) { EssenceRichtext.create }
+
+      it "should update the value for `do_not_index`" do
+        essence.stub!(:description).and_return({'do_not_index' => true})
+        essence.update_attributes(:body => 'hello')
+        essence.do_not_index.should be_true
+      end
+
+      context "with `do_not_index` set to nil" do
+        it "should update the value to false" do
+          essence.stub!(:description).and_return({'do_not_index' => nil})
+          essence.update_attributes(:body => 'hello')
+          essence.do_not_index.should_not be_nil
+        end
+      end
+    end
 
+    context "with `do_not_index` set to true" do
+      it "should disable ferret indexing" do
+        EssenceRichtext.any_instance.stub(:description).and_return({'do_not_index' => true})
+        essence = EssenceRichtext.create
+        essence.ferret_enabled?.should be_false
+      end
+    end
+
+    context "with `do_not_index` set to false" do
+      it "should enable ferret indexing" do
+        EssenceRichtext.any_instance.stub(:description).and_return({'do_not_index' => false})
+        essence = EssenceRichtext.create
+        essence.ferret_enabled?.should be_true
+      end
+    end
+
+  end
 end

data/spec/models/essence_text_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+module Alchemy
+  describe EssenceText do
+
+    describe '.after_save' do
+      let(:essence) { EssenceText.create }
+
+      it "should update the value for `do_not_index`" do
+        essence.stub!(:description).and_return({'do_not_index' => true})
+        essence.update_attributes(:body => 'hello')
+        essence.do_not_index.should be_true
+      end
+
+      context "with `do_not_index` set to nil" do
+        it "should update the value to false" do
+          essence.stub!(:description).and_return({'do_not_index' => nil})
+          essence.update_attributes(:body => 'hello')
+          essence.do_not_index.should_not be_nil
+        end
+      end
+    end
+
+    context "with `do_not_index` set to true" do
+      it "should disable ferret indexing" do
+        EssenceText.any_instance.stub(:description).and_return({'do_not_index' => true})
+        essence = EssenceText.create!
+        essence.ferret_enabled?.should be_false
+      end
+    end
+
+    context "with `do_not_index` set to false" do
+      it "should enable ferret indexing" do
+        EssenceText.any_instance.stub(:description).and_return({'do_not_index' => false})
+        essence = EssenceText.create
+        essence.ferret_enabled?.should be_true
+      end
+    end
+
+  end
+end

data/spec/models/page_spec.rb

@@ -181,6 +181,23 @@ module Alchemy
 
     end
 
+    describe "#destroy" do
+
+      context "with trashed but still assigned elements" do
+
+        before do
+          news_page.elements.map(&:trash)
+        end
+
+        it "should not delete the trashed elements" do
+          news_page.destroy
+          Element.trashed.should_not be_empty
+        end
+
+      end
+
+    end
+
     describe '#first_public_child' do
 
       before do
@@ -689,6 +706,17 @@ module Alchemy
         end
       end
 
+      context "page with trashed elements" do
+        before do
+          page.elements << FactoryGirl.create(:element)
+          page.elements.first.trash
+        end
+
+        it "the copy should not hold a copy of the trashed elements" do
+          subject.elements.should be_empty
+        end
+      end
+
       context "page with cells" do
         before { page.cells << FactoryGirl.create(:cell) }
 
@@ -697,6 +725,17 @@ module Alchemy
           subject.cells.count.should == page.cells.length # It must be length, because!
         end
       end
+
+      context "page with autogenerate elements" do
+        before do
+          page = FactoryGirl.create(:page)
+          page.stub!(:definition).and_return({'name' => 'standard', 'elements' => ['headline'], 'autogenerate' => ['headline']})
+        end
+
+        it "the copy should not autogenerate elements" do
+          subject.elements.should be_empty
+        end
+      end
     end
 
   end

data/spec/models/user_spec.rb

@@ -1,11 +1,100 @@
 require 'spec_helper'
 
-describe Alchemy::User do
+module Alchemy
+  describe User do
 
-  it "should have a role" do
-    @user = FactoryGirl.build(:user)
-    @user.save_without_session_maintenance
-    @user.role.should_not be_nil
-  end
+    let(:user) { FactoryGirl.build(:user) }
+    let(:page) { FactoryGirl.create(:page) }
+
+    it "should have a role" do
+      user.save!
+      user.role.should_not be_nil
+    end
+
+    describe '#logged_in?' do
+      before { Config.stub!(:get).and_return 60 }
+
+      it "should return logged in status" do
+        user.last_request_at = 30.minutes.ago
+        user.save!
+        user.logged_in?.should be_true
+      end
+    end
+
+    describe '#logged_out?' do
+      before { Config.stub!(:get).and_return 60 }
+
+      it "should return logged in status" do
+        user.last_request_at = 2.hours.ago
+        user.save!
+        user.logged_out?.should be_true
+      end
+    end
+
+    describe "#pages_locked_by_me" do
+      it "should return all pages that are locked by user" do
+        user.save!
+        page.lock(user)
+        user.locked_pages.should include(page)
+      end
+    end
+
+    describe '#unlock_pages' do
+      before do
+        user.save!
+        page.lock(user)
+      end
 
+      it "should unlock all users lockes pages" do
+        user.unlock_pages!
+        user.locked_pages.should be_empty
+      end
+    end
+
+    describe '#is_admin?' do
+      it "should return true if the user has admin role" do
+        user.role = "admin"
+        user.save!
+        user.is_admin?.should be_true
+      end
+    end
+
+    describe '#fullname' do
+      it "should return the firstname and lastname" do
+        user.fullname.should == "John Doe"
+      end
+
+      context "user without firstname and lastname" do
+        it "should return the login" do
+          user.firstname = nil
+          user.lastname = nil
+          user.fullname.should == "jdoe"
+        end
+      end
+
+      context "with flipped option set to true" do
+        it "should return the lastname and firstname comma seperated" do
+          user.fullname(flipped: true).should == "Doe, John"
+        end
+      end
+
+      context "with blank firstname" do
+        it "should not have whitespace" do
+          user.firstname = nil
+          user.fullname.should == "Doe"
+        end
+      end
+    end
+
+    describe '#store_request_time!' do
+      it "should store the timestamp of the request" do
+        last_request_at = 2.hours.ago
+        user.last_request_at = last_request_at
+        user.save!
+        user.store_request_time!
+        user.last_request_at.should_not == last_request_at
+      end
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+
 begin
   require 'simplecov'
   SimpleCov.start('rails') do
@@ -17,9 +18,6 @@ def configure
 
   require File.expand_path("../dummy/config/environment.rb", __FILE__)
 
-  require 'authlogic/test_case'
-  include Authlogic::TestCase
-
   require "rails/test_help"
   require "rspec/rails"
   require 'factory_girl'
@@ -50,6 +48,7 @@ def configure
     require 'rspec/expectations'
     config.include RSpec::Matchers
     config.include Alchemy::Engine.routes.url_helpers
+    config.include Devise::TestHelpers, :type => :controller
     config.mock_with :rspec
     config.use_transactional_fixtures = true
     # Make sure the database is clean and ready for test

data/spec/support/alchemy/controller_hacks.rb

@@ -25,7 +25,7 @@ module Alchemy
         process_alchemy_action(action, parameters, session, flash, "DELETE")
       end
 
-      private
+    private
 
       def process_alchemy_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
         parameters ||= {}

data/spec/support/alchemy/specs_helpers.rb

@@ -31,9 +31,9 @@ module Alchemy
         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')
+        visit login_path
+        fill_in('user_login', :with => 'jdoe')
+        fill_in('user_password', :with => 's3cr3t')
         click_on('Login')
       end
 
@@ -57,7 +57,7 @@ module Alchemy
       #   end
       #
       def create_admin_user
-        FactoryGirl.build(:admin_user).save_without_session_maintenance
+        FactoryGirl.create(:admin_user)
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0.b9
+  version: 2.5.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,13 +32,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
-  name: authlogic
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,7 +46,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 2.2.3
+- !ruby/object:Gem::Dependency
+  name: devise-encryptable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -502,6 +518,7 @@ files:
 - app/assets/stylesheets/alchemy/tables.scss
 - app/assets/stylesheets/alchemy/tinymce_content.css.scss
 - app/assets/stylesheets/alchemy/tinymce_dialog.css.scss
+- app/assets/stylesheets/alchemy/toolbar.scss
 - app/assets/stylesheets/alchemy/upload.scss
 - app/assets/stylesheets/alchemy/variables.scss
 - app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss
@@ -527,8 +544,10 @@ files:
 - app/controllers/alchemy/elements_controller.rb
 - app/controllers/alchemy/messages_controller.rb
 - app/controllers/alchemy/pages_controller.rb
+- app/controllers/alchemy/passwords_controller.rb
 - app/controllers/alchemy/pictures_controller.rb
 - app/controllers/alchemy/user_sessions_controller.rb
+- app/controllers/alchemy/users_controller.rb
 - app/helpers/alchemy/admin/attachments_helper.rb
 - app/helpers/alchemy/admin/base_helper.rb
 - app/helpers/alchemy/admin/contents_helper.rb
@@ -570,7 +589,6 @@ files:
 - app/models/alchemy/site.rb
 - app/models/alchemy/tag.rb
 - app/models/alchemy/user.rb
-- app/models/alchemy/user_session.rb
 - app/sweepers/alchemy/content_sweeper.rb
 - app/sweepers/alchemy/pages_sweeper.rb
 - app/sweepers/alchemy/pictures_sweeper.rb
@@ -736,18 +754,22 @@ files:
 - app/views/alchemy/navigation/_image_link.html.erb
 - app/views/alchemy/navigation/_link.html.erb
 - app/views/alchemy/navigation/_renderer.html.erb
-- app/views/alchemy/notifications/admin_user_created.text.erb
+- app/views/alchemy/notifications/admin_user_created.de.text.erb
+- app/views/alchemy/notifications/admin_user_created.en.text.erb
 - app/views/alchemy/notifications/registered_user_created.text.erb
+- app/views/alchemy/notifications/reset_password_instructions.de.text.erb
+- app/views/alchemy/notifications/reset_password_instructions.en.text.erb
 - app/views/alchemy/pages/show.html.erb
 - app/views/alchemy/pages/show.rss.builder
 - app/views/alchemy/pages/sitemap.xml.erb
+- app/views/alchemy/passwords/edit.html.erb
+- app/views/alchemy/passwords/new.html.erb
 - app/views/alchemy/search/_form.html.erb
 - app/views/alchemy/search/_result.html.erb
 - app/views/alchemy/search/_results.html.erb
 - app/views/alchemy/user_sessions/leave.html.erb
-- app/views/alchemy/user_sessions/login.html.erb
-- app/views/alchemy/user_sessions/logout.html.erb
-- app/views/alchemy/user_sessions/signup.html.erb
+- app/views/alchemy/user_sessions/new.html.erb
+- app/views/alchemy/users/new.html.erb
 - app/views/kaminari/_gap.html.erb
 - app/views/kaminari/_next_page.html.erb
 - app/views/kaminari/_page.html.erb
@@ -761,10 +783,13 @@ files:
 - config/alchemy/modules.yml
 - config/authorization_rules.rb
 - config/initializers/cache_storage.rb
+- config/initializers/devise.rb
 - config/initializers/dragonfly.rb
 - config/initializers/kaminari_config.rb
 - config/locales/alchemy.de.yml
 - config/locales/alchemy.en.yml
+- config/locales/devise.de.yml
+- config/locales/devise.en.yml
 - config/routes.rb
 - db/migrate/20121118000000_alchemy_two_point_four.rb
 - db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
@@ -772,6 +797,7 @@ files:
 - 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
+- db/migrate/20130121092645_migrate_to_devise.rb
 - lib/alchemy/auth_engine.rb
 - lib/alchemy/authentication_helpers.rb
 - lib/alchemy/capistrano.rb
@@ -801,6 +827,7 @@ files:
 - lib/rails/generators/alchemy/base.rb
 - lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb
 - lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt
+- lib/rails/generators/alchemy/devise/devise_generator.rb
 - lib/rails/generators/alchemy/elements/elements_generator.rb
 - lib/rails/generators/alchemy/elements/templates/editor.html.erb
 - lib/rails/generators/alchemy/elements/templates/editor.html.haml
@@ -839,7 +866,10 @@ files:
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/elements_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
+- spec/controllers/passwords_controller_spec.rb
 - spec/controllers/pictures_controller_spec.rb
+- spec/controllers/user_sessions_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -881,6 +911,7 @@ files:
 - 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/migrate/20130121092645_migrate_to_devise.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -930,6 +961,7 @@ files:
 - spec/models/essence_picture_spec.rb
 - spec/models/essence_richtext_spec.rb
 - spec/models/essence_select_spec.rb
+- spec/models/essence_text_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_layout_spec.rb
 - spec/models/page_spec.rb
@@ -1094,7 +1126,10 @@ test_files:
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/elements_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
+- spec/controllers/passwords_controller_spec.rb
 - spec/controllers/pictures_controller_spec.rb
+- spec/controllers/user_sessions_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -1136,6 +1171,7 @@ test_files:
 - 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/migrate/20130121092645_migrate_to_devise.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -1185,6 +1221,7 @@ test_files:
 - spec/models/essence_picture_spec.rb
 - spec/models/essence_richtext_spec.rb
 - spec/models/essence_select_spec.rb
+- spec/models/essence_text_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_layout_spec.rb
 - spec/models/page_spec.rb