alchemy_cms 2.5.0.b9 → 2.5.0.rc3

data/lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt

@@ -1,32 +1,6 @@
 # == This file defines the page_layouts for new pages.
-# 
-# Please make your own page_layouts for your app in your own Rails.root/config/alchemy/page_layouts.yml file.
 #
-# === DSL:
-#   - name: String                  # The name of the layout used for views and inside the database. You can render a layout with the render_page_layout(name) helper.
-#     unique: Bool                  # Pass true and the user can only choose this layout once inside a language tree.
-#     hide: Bool                    # Pass true to hide this layout from the user.
-#     elements: Array               # A list of element names that can be placed on this layout i.e. [text, picture]. Elements are defined inside the elements.yml file.
-#     autogenerate: Array           # A list of element names that are autogenerated after creating the Page.
-#     layoutpage: Bool              # Layoutpages are outside the normal pagetree and can be used to place "global" language independent Elements.
-#     cache: Bool                   # Pass false to disable the caching for this pages.
-#     feed: Bool                    # Pass true to enable a RSS feed of news elements from this page.
-#     redirects_to_external: Bool   # Pass true to disable normal page rendering and redirect to a external page instead.
-#     controller: controller_name   # Controller to use instead of the default PagesController
-#     action: action_name           # Controllers action to use instead of the default PagesController#show
-#
-# === Translate page layout names
-# 
-# Page layout names are passed through the I18n library. So you can translate them in your config/locales language yml file.
-# 
-# Example:
-#   
-#   de:
-#     alchemy:
-#       page_layout_names:
-#         contact: Kontakt
-#         search: Suche
-# 
+# For further informations please see http://guides.alchemy-cms.com/create_page_layouts.html
 
 - name: <%= Alchemy::Config.get(:default_language)['page_layout'] %>
   unique: true

data/lib/tasks/ferret.rake

@@ -1,12 +1,12 @@
 namespace :ferret do
 
-  desc "Updates the ferret index for the application."
+  desc "Updates the Ferret index."
   task :rebuild_index => :environment do
-    puts "Rebuilding Ferret Index for EssenceText"
-    Alchemy::EssenceText.rebuild_index
-    puts "Rebuilding Ferret Index for EssenceRichtext"
-    Alchemy::EssenceRichtext.rebuild_index
-    puts "Completed Ferret Index Rebuild"
+    puts "Rebuilding Ferret index for EssenceText"
+    Alchemy::EssenceText.where(:do_not_index => false).rebuild_index
+    puts "Rebuilding Ferret index for EssenceRichtext"
+    Alchemy::EssenceRichtext.where(:do_not_index => false).rebuild_index
+    puts "Completed Ferret index rebuild"
   end
 
 end

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -7,9 +7,8 @@ module Alchemy
     let(:element)         { FactoryGirl.create(:element, :page => page) }
     let(:another_element) { FactoryGirl.create(:element, :page => page) }
 
-    before(:each) do
-      activate_authlogic
-      UserSession.create(FactoryGirl.create(:admin_user))
+    before do
+      sign_in :user, FactoryGirl.create(:admin_user)
       session[:clipboard] = Clipboard.new
     end
 

data/spec/controllers/admin/contents_controller_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Alchemy::Admin::ContentsController do
 
   before(:each) do
-    activate_authlogic
-    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
+    sign_in :user, FactoryGirl.create(:admin_user)
   end
 
   describe '#create' do

data/spec/controllers/admin/elements_controller_spec.rb

@@ -4,8 +4,7 @@ module Alchemy
   describe Admin::ElementsController do
 
     before(:each) do
-      activate_authlogic
-      Alchemy::UserSession.create FactoryGirl.create(:admin_user)
+      sign_in :user, FactoryGirl.create(:admin_user)
     end
 
     let(:page) { FactoryGirl.create(:page, :urlname => 'lulu') }

data/spec/controllers/admin/languages_controller_spec.rb

@@ -5,9 +5,8 @@ end
 
 describe Alchemy::Admin::LanguagesController do
 
-  before(:each) do
-    activate_authlogic
-    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
+  before do
+    sign_in :user, FactoryGirl.create(:admin_user)
   end
 
   describe "new" do

data/spec/controllers/admin/pages_controller_spec.rb

@@ -3,9 +3,8 @@ require 'spec_helper'
 module Alchemy
   describe Admin::PagesController do
 
-    before(:each) do
-      activate_authlogic
-      UserSession.create FactoryGirl.create(:admin_user)
+    before do
+      sign_in :user, FactoryGirl.create(:admin_user)
     end
 
     describe "#flush" do

data/spec/controllers/admin/trash_controller_spec.rb

@@ -16,8 +16,7 @@ module Alchemy
       end
 
       before do
-        activate_authlogic
-        UserSession.create FactoryGirl.create(:admin_user)
+        sign_in :user, FactoryGirl.create(:admin_user)
         element.trash
       end
 

data/spec/controllers/admin/users_controller_spec.rb

@@ -7,13 +7,44 @@ describe Alchemy::Admin::UsersController do
     let!(:user) { FactoryGirl.create(:admin_user) }
 
     before do
-      activate_authlogic
-      Alchemy::UserSession.create user
+      sign_in :user, user
     end
 
-    it "assigns user to @user" do
-      post :update, :id => user.id, :user => {}, :format => :js
-      assigns(:user).should eq(user)
+    describe '#update' do
+      before { ActionMailer::Base.deliveries = [] }
+
+      it "assigns user to @user" do
+        post :update, :id => user.id, :user => {}, :format => :js
+        assigns(:user).should eq(user)
+      end
+
+      context "with empty password passed" do
+        it "should update the user" do
+          post :update, :id => user.id, :user => {:firstname => 'Johnny', :password => '', :password_confirmation => ''}, :format => :js
+          assigns(:user).should be_valid
+        end
+      end
+
+      context "with new password passed" do
+        it "should update the user" do
+          post :update, :id => user.id, :user => {:firstname => 'Johnny', :password => 'newpassword', :password_confirmation => 'newpassword'}, :format => :js
+          assigns(:user).password.should == 'newpassword'
+        end
+      end
+
+      context "with send_credentials set to true" do
+        it "should send an email notification" do
+          post :update, :id => user.id, :send_credentials => true, :user => {}
+          ActionMailer::Base.deliveries.should_not be_empty
+        end
+      end
+
+      context "with send_credentials left blank" do
+        it "should not send an email notification" do
+          post :update, :id => user.id, :user => {}
+          ActionMailer::Base.deliveries.should be_empty
+        end
+      end
     end
 
     context "if user is permitted to update roles" do

data/spec/controllers/attachments_controller_spec.rb

@@ -27,8 +27,7 @@ module Alchemy
     context "as registered user" do
 
       before do
-        activate_authlogic
-        UserSession.create(FactoryGirl.create(:registered_user))
+        sign_in :user, FactoryGirl.create(:registered_user)
       end
 
       it "should be possible to download attachments from restricted pages" do
@@ -47,8 +46,7 @@ module Alchemy
     context "as registered user" do
 
       before do
-        activate_authlogic
-        UserSession.create(FactoryGirl.create(:registered_user))
+        sign_in :user, FactoryGirl.create(:registered_user)
       end
 
       it "should be possible to see attachments from restricted pages" do

data/spec/controllers/base_controller_spec.rb

@@ -95,5 +95,30 @@ module Alchemy
 
     end
 
+    describe '#store_user_request_time' do
+
+      context "user not logged in" do
+        before { controller.stub!(:user_signed_in?).and_return(false) }
+
+        it "should not store the current request time" do
+          controller.send(:store_user_request_time).should == nil
+        end
+
+      end
+
+      context "user logged in" do
+        before do
+          controller.stub!(:user_signed_in?).and_return(true)
+          controller.stub!(:current_user).and_return(FactoryGirl.create(:user))
+        end
+
+        it "should not store the current request time" do
+          controller.send(:store_user_request_time).should == true
+        end
+
+      end
+
+    end
+
   end
 end

data/spec/controllers/elements_controller_spec.rb

@@ -33,8 +33,7 @@ module Alchemy
 
       context "for registered user" do
         before do
-          activate_authlogic
-          UserSession.create(FactoryGirl.create(:registered_user))
+          sign_in :user, FactoryGirl.create(:registered_user)
         end
 
         it "should render elements of restricted pages" do

data/spec/controllers/passwords_controller_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+module Alchemy
+  describe PasswordsController do
+    let(:user) { FactoryGirl.create(:admin_user) }
+
+    describe '#post' do
+      it "should send email with reset password instructions" do
+        ActionMailer::Base.deliveries = []
+        @request.env["devise.mapping"] = Devise.mappings[:user]
+        post :create, :user => {:email => user.email}
+        ActionMailer::Base.deliveries.should_not be_empty
+      end
+    end
+  end
+end

data/spec/controllers/pictures_controller_spec.rb

@@ -57,8 +57,7 @@ module Alchemy
 
       context "as registered user" do
         before do
-          activate_authlogic
-          UserSession.create(FactoryGirl.create(:registered_user))
+          sign_in :user, FactoryGirl.create(:registered_user)
         end
 
         it "should render the picture" do

data/spec/controllers/user_sessions_controller_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module Alchemy
+  describe UserSessionsController do
+
+    let(:user) { FactoryGirl.create(:admin_user) }
+    let(:page) { FactoryGirl.create(:page) }
+
+    before { sign_in :user, user }
+
+    describe "signout" do
+      it "should unlock all pages" do
+        @request.env["devise.mapping"] = Devise.mappings[:user]
+        page.lock(user)
+        delete :destroy
+        user.locked_pages.should be_empty
+      end
+    end
+
+  end
+end

data/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+module Alchemy
+  describe UsersController do
+
+    context "with users present" do
+      before { FactoryGirl.create(:admin_user) }
+
+      it "should redirect to admin dashboard" do
+        get :new
+        response.should redirect_to(admin_dashboard_path)
+      end
+    end
+
+    describe '#new' do
+      render_views
+
+      before { get :new }
+
+      it "should not render tag list input" do
+        response.body.should_not have_selector('.autocomplete_tag_list')
+      end
+
+      it "should render hidden field for role" do
+        response.body.should have_selector('input[type="hidden"]#user_role')
+      end
+
+      it "should set the role to admin" do
+        assigns(:user).role.should == "admin"
+      end
+    end
+
+    describe '#create' do
+      before { ActionMailer::Base.deliveries = [] }
+
+      context "with send_credentials set to true" do
+        it "should send an email notification" do
+          post :create, {
+            :user => FactoryGirl.attributes_for(:admin_user),
+            :send_credentials => true
+          }
+          ActionMailer::Base.deliveries.should_not be_empty
+        end
+      end
+
+      context "with send_credentials left blank" do
+        it "should not send an email notification" do
+          post :create, {
+            :user => FactoryGirl.attributes_for(:admin_user)
+          }
+          ActionMailer::Base.deliveries.should be_empty
+        end
+      end
+
+      context "with valid params" do
+        it "should sign in the user" do
+          post :create, {
+            :user => FactoryGirl.attributes_for(:admin_user)
+          }
+          controller.send(:user_signed_in?).should be_true
+        end
+      end
+
+    end
+
+  end
+end

data/spec/dummy/db/migrate/20130121092645_migrate_to_devise.rb

@@ -0,0 +1,24 @@
+class MigrateToDevise < ActiveRecord::Migration
+  def change
+    change_table :alchemy_users do |t|
+      t.rename :crypted_password, :encrypted_password
+      t.rename :login_count, :sign_in_count
+      t.rename :current_login_at, :current_sign_in_at
+      t.rename :last_login_at, :last_sign_in_at
+      t.rename :current_login_ip, :current_sign_in_ip
+      t.rename :last_login_ip, :last_sign_in_ip
+      t.rename :failed_login_count, :failed_attempts
+
+      t.remove :persistence_token
+      t.remove :perishable_token
+      t.remove :single_access_token
+
+      t.column :reset_password_token, :string
+      t.column :reset_password_sent_at, :datetime
+
+      t.index :email, :unique => true
+      t.index :login, :unique => true
+      t.index :reset_password_token, :unique => true
+    end
+  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 => 20130110212411) do
+ActiveRecord::Schema.define(:version => 20130121092645) do
 
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"
@@ -271,28 +271,29 @@ ActiveRecord::Schema.define(:version => 20130110212411) do
     t.string   "login"
     t.string   "email"
     t.string   "gender"
-    t.string   "role",                               :default => "registered"
+    t.string   "role",                                  :default => "registered"
     t.string   "language"
-    t.string   "crypted_password",    :limit => 128, :default => "",           :null => false
-    t.string   "password_salt",       :limit => 128, :default => "",           :null => false
-    t.integer  "login_count",                        :default => 0,            :null => false
-    t.integer  "failed_login_count",                 :default => 0,            :null => false
+    t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
+    t.string   "password_salt",          :limit => 128, :default => "",           :null => false
+    t.integer  "sign_in_count",                         :default => 0,            :null => false
+    t.integer  "failed_attempts",                       :default => 0,            :null => false
     t.datetime "last_request_at"
-    t.datetime "current_login_at"
-    t.datetime "last_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
-    t.string   "persistence_token",                                            :null => false
-    t.string   "single_access_token",                                          :null => false
-    t.string   "perishable_token",                                             :null => false
-    t.datetime "created_at",                                                   :null => false
-    t.datetime "updated_at",                                                   :null => false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.datetime "created_at",                                                      :null => false
+    t.datetime "updated_at",                                                      :null => false
     t.integer  "creator_id"
     t.integer  "updater_id"
     t.text     "cached_tag_list"
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
   end
 
-  add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"
+  add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
+  add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
+  add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
 
   create_table "events", :force => true do |t|
     t.string   "name"

data/spec/factories.rb

@@ -1,6 +1,8 @@
 FactoryGirl.define do
 
   factory :user, :class => 'Alchemy::User' do
+    firstname "John"
+    lastname "Doe"
     email 'john@doe.com'
     login "jdoe"
     password 's3cr3t'