alchemy_cms 2.8.3 → 2.9.0

data/lib/alchemy/upgrader.rb

@@ -5,13 +5,14 @@ module Alchemy
 
     Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].each { |f| require f }
 
-    extend TwoPointSix
-    extend TwoPointFive
-    extend TwoPointFour
-    extend TwoPointThree
-    extend TwoPointTwo
-    extend TwoPointOne
-    extend TwoPointZero
+    extend Alchemy::Upgrader::TwoPointNine
+    extend Alchemy::Upgrader::TwoPointSix
+    extend Alchemy::Upgrader::TwoPointFive
+    extend Alchemy::Upgrader::TwoPointFour
+    extend Alchemy::Upgrader::TwoPointThree
+    extend Alchemy::Upgrader::TwoPointTwo
+    extend Alchemy::Upgrader::TwoPointOne
+    extend Alchemy::Upgrader::TwoPointZero
 
     class << self
 

data/lib/alchemy/upgrader/two_point_nine.rb

@@ -0,0 +1,33 @@
+module Alchemy
+  module Upgrader::TwoPointNine
+
+    private
+
+    def alchemy_29_todos
+      notice = <<-NOTE
+
+Alchemy User Class Removed
+--------------------------
+
+We removed the user model from the Alchemy core!
+
+You have to provide your own user model or
+add the `alchemy-devise` gem to your Gemfile.
+
+If you want to use the default user class from Alchemy:
+
+  # Gemfile
+  gem 'alchemy-devise', '~> 1.1'
+
+  $ bin/rake alchemy_devise:install:migrations db:migrate
+
+In order to add your own user class to Alchemy, please
+make shure it meets the API:
+
+https://github.com/magiclabs/alchemy_cms/blob/2.9-stable/lib/alchemy/auth_accessors.rb
+
+NOTE
+      todo notice
+    end
+  end
+end

data/lib/alchemy/userstamp.rb

@@ -0,0 +1,10 @@
+# Adds the model stamper ability to the provided user class
+#
+# It only adds it, if the user model is a active_record model.
+#
+if Alchemy.user_class < ActiveRecord::Base
+  Alchemy.user_class.class_eval do
+    model_stamper
+    stampable stamper_class_name: Alchemy.user_class_name
+  end
+end

data/lib/alchemy/version.rb

@@ -1,9 +1,7 @@
 module Alchemy
-
-  VERSION = "2.8.3"
+  VERSION = "2.9.0"
 
   def self.version
     VERSION
   end
-
 end

data/lib/rails/templates/alchemy.rb

@@ -2,6 +2,7 @@
 require File.expand_path('../../../alchemy/version', __FILE__)
 
 gem 'alchemy_cms', "~> #{Alchemy::VERSION}"
+gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: '1.1-stable'
 
 if yes?("\nDo you want to use Capistrano for deployment? (y/N)")
   gem 'capistrano', group: 'development'

data/lib/tasks/alchemy/db.rake

@@ -1,4 +1,6 @@
 require 'alchemy/seeder'
+require 'alchemy/tasks/helpers'
+include Alchemy::Tasks::Helpers
 
 namespace :alchemy do
   namespace :db do
@@ -8,13 +10,11 @@ namespace :alchemy do
       Alchemy::Seeder.seed!
     end
 
-    desc "Dumps the database to STDOUT (Pass DUMP_FILENAME to store the dump into a file). NOTE: This only works with MySQL yet."
+    desc "Dumps the database to STDOUT (Pass DUMP_FILENAME to store the dump into a file)."
     task :dump => :environment do
-      db_conf = Rails.configuration.database_configuration.fetch(Rails.env)
-      raise "Sorry, but Alchemy only supports MySQL database dumping at the moment." unless db_conf['adapter'] =~ /mysql/
       dump_store = ENV['DUMP_FILENAME'] ? " > #{ENV['DUMP_FILENAME']}" : ""
-      cmd = "mysqldump --user='#{db_conf['username']}'#{db_conf['password'].present? ? " --password='#{db_conf['password']}'" : nil} #{db_conf['database']}#{dump_store}"
-      system cmd
+      dump_cmd = database_dump_command(database_config['adapter'])
+      system "#{dump_cmd}#{dump_store}"
     end
 
   end

data/spec/controllers/admin/attachments_controller_spec.rb

@@ -8,7 +8,7 @@ module Alchemy
     before do
       sign_in(admin_user)
     end
-    
+
     describe "#index" do
 
       it "should always paginate the records" do
@@ -44,9 +44,9 @@ module Alchemy
       end
 
     end
-    
+
     describe "#new" do
-      
+
       context "in overlay" do
 
         before do

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -2,59 +2,81 @@ require 'spec_helper'
 
 module Alchemy
   describe Admin::DashboardController do
+    let(:user) { admin_user }
 
-    before do
-      sign_in(admin_user)
-    end
+    before { sign_in(user) }
 
     describe '#index' do
       before do
         Page.stub_chain(:from_current_site, :all_last_edited_from).and_return([])
         Page.stub_chain(:from_current_site, :all_locked).and_return([])
-        User.stub!(:logged_in).and_return([controller.current_user])
-        controller.current_user.stub!(:sign_in_count).and_return(5)
+        User.stub(:logged_in).and_return([user])
+        user.stub(:sign_in_count).and_return(5)
       end
 
-      it "should assign @last_edited_pages" do
+      it "assigns @last_edited_pages" do
         get :index
         expect(assigns(:last_edited_pages)).to eq([])
       end
 
-      it "should assign @locked_pages" do
+      it "assigns @locked_pages" do
         get :index
         expect(assigns(:locked_pages)).to eq([])
       end
 
-      it "should assign @online_users" do
-        get :index
-        expect(assigns(:online_users)).to eq([])
+      context 'with user class having logged_in scope' do
+        context 'with other users online' do
+          let(:another_user) { mock_model('User') }
+
+          before do
+            Alchemy.user_class.should_receive(:logged_in).and_return([another_user])
+          end
+
+          it "assigns @online_users" do
+            get :index
+            expect(assigns(:online_users)).to eq([another_user])
+          end
+        end
+
+        context 'without other users online' do
+          it "does not assign @online_users" do
+            get :index
+            expect(assigns(:online_users)).to eq([])
+          end
+        end
       end
 
-      it "should assign @first_time" do
-        get :index
-        expect(assigns(:first_time)).to eq(false)
+      context 'user having signed in before' do
+        before do
+          user.should_receive(:sign_in_count).and_return(5)
+          user.should_receive(:last_sign_in_at).and_return(Time.now)
+        end
+
+        it "assigns @first_time" do
+          get :index
+          expect(assigns(:first_time)).to eq(false)
+        end
       end
 
-      it "should assign @sites" do
+      it "assigns @sites" do
         get :index
         expect(assigns(:sites)).to eq(Site.scoped)
       end
     end
-    
+
     describe '#info' do
-      it "should assign @alchemy_version with the current Alchemy version" do
+      it "assigns @alchemy_version with the current Alchemy version" do
         get :info
         expect(assigns(:alchemy_version)).to eq(Alchemy.version)
       end
     end
 
     describe '#update_check' do
-
       context "if current Alchemy version equals the latest released version or it is newer" do
-        before do
-          controller.stub!(:latest_alchemy_version).and_return('2.6')
-          Alchemy.stub!(:version).and_return("2.6")
-        end
+        before {
+          controller.stub(:latest_alchemy_version).and_return('2.6')
+          Alchemy.stub(:version).and_return("2.6")
+        }
 
         it "should render 'false'" do
           get :update_check
@@ -63,10 +85,10 @@ module Alchemy
       end
 
       context "if current Alchemy version is older than latest released version" do
-        before do
-          controller.stub!(:latest_alchemy_version).and_return('2.6')
-          Alchemy.stub!(:version).and_return("2.5")
-        end
+        before {
+          controller.stub(:latest_alchemy_version).and_return('2.6')
+          Alchemy.stub(:version).and_return("2.5")
+        }
 
         it "should render 'true'" do
           get :update_check
@@ -75,12 +97,12 @@ module Alchemy
       end
 
       context "requesting rubygems.org" do
-        before do
+        before {
           Net::HTTP.any_instance.stub(:request).and_return(
             OpenStruct.new({code: '200', body: '[{"number": "2.6"}, {"number": "2.5"}]'})
           )
-          Alchemy.stub!(:version).and_return("2.6")
-        end
+          Alchemy.stub(:version).and_return("2.6")
+        }
 
         it "should have response code of 200" do
           get :update_check
@@ -89,12 +111,12 @@ module Alchemy
       end
 
       context "requesting github.com" do
-        before do
-          controller.stub!(:query_rubygems).and_return(OpenStruct.new({code: '503'}))
+        before {
+          controller.stub(:query_rubygems).and_return(OpenStruct.new({code: '503'}))
           Net::HTTP.any_instance.stub(:request).and_return(
             OpenStruct.new({code: '200', body: '[{"name": "2.6"}, {"name": "2.5"}]'})
           )
-        end
+        }
 
         it "should have response code of 200" do
           get :update_check
@@ -103,18 +125,17 @@ module Alchemy
       end
 
       context "rubygems.org and github.com are unavailable" do
-        before do
+        before {
           Net::HTTP.any_instance.stub(:request).and_return(
             OpenStruct.new({code: '503'})
           )
-        end
+        }
 
         it "should have status code 503" do
           get :update_check
           expect(response.code).to eq('503')
         end
       end
-
     end
 
   end

data/spec/controllers/admin/elements_controller_spec.rb

@@ -111,7 +111,7 @@ module Alchemy
       before(:each) do
         @element = FactoryGirl.create(:element, :public => false, :position => nil, :page_id => 58, :cell_id => 32)
         # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
-        @element.trash
+        @element.trash!
       end
 
       it "should set a new position to the element" do

data/spec/controllers/admin/essence_pictures_controller_spec.rb

@@ -41,7 +41,7 @@ module Alchemy
         before do
           picture.image_file_width = 300
           picture.image_file_height = 250
-          essence.should_receive(:picture).and_return(picture)
+          essence.should_receive(:picture).any_number_of_times.and_return(picture)
         end
 
         context 'with no render_size present in essence' do
@@ -67,14 +67,30 @@ module Alchemy
         end
 
         context 'with render_size present in essence' do
-          before do
+          it "sets sizes from these values" do
             essence.stub(:render_size).and_return('30x25')
-          end
 
-          it "sets sizes from these values" do
             get :crop, id: 1
-            expect(assigns(:size_x)).to eq('30')
-            expect(assigns(:size_y)).to eq('25')
+            expect(assigns(:size_x)).to eq(30)
+            expect(assigns(:size_y)).to eq(25)
+          end
+
+          context 'when width or height is not fixed' do
+            it 'infers the height from the image file preserving the aspect ratio' do
+              essence.stub(:render_size).and_return('30')
+
+              get :crop, id: 1
+              expect(assigns(:size_x)).to eq(30)
+              expect(assigns(:size_y)).to eq(25)
+            end
+
+            it 'infers the height from the image file preserving the aspect ratio' do
+              essence.stub(:render_size).and_return('x25')
+
+              get :crop, id: 1
+              expect(assigns(:size_x)).to eq(30)
+              expect(assigns(:size_y)).to eq(25)
+            end
           end
         end
 

data/spec/controllers/admin/pages_controller_spec.rb

@@ -3,9 +3,17 @@ require 'spec_helper'
 
 module Alchemy
   describe Admin::PagesController do
+    let(:user) { editor_user }
+    before { sign_in(user) }
 
-    before do
-      sign_in(admin_user)
+    describe '#index' do
+      let(:language_root) { FactoryGirl.build_stubbed(:language_root_page) }
+
+      it "assigns @page_root variable" do
+        Page.should_receive(:language_root_for).with(1).and_return(language_root)
+        get :index
+        assigns(:page_root).should be(language_root)
+      end
     end
 
     describe "#flush" do
@@ -21,11 +29,9 @@ module Alchemy
       context "pages in clipboard" do
 
         let(:clipboard) { session[:clipboard] = Clipboard.new }
-        let(:page) { mock_model('Page', name: 'Foobar') }
+        let(:page) { mock_model(Alchemy::Page, name: 'Foobar') }
 
-        before do
-          clipboard[:pages] = [{id: page.id, action: 'copy'}]
-        end
+        before { clipboard[:pages] = [{id: page.id, action: 'copy'}] }
 
         it "should load all pages from clipboard" do
           get :new, {page_id: page.id, format: :js}
@@ -36,21 +42,20 @@ module Alchemy
     end
 
     describe '#show' do
-
-      let(:page) { mock_model('Page', language_code: 'nl') }
+      let(:page) { mock_model(Alchemy::Page, language_code: 'nl') }
 
       before do
-        Page.stub!(:find).with("#{page.id}").and_return(page)
-        Page.stub!(:language_root_for).and_return(mock_model('Page'))
+        Page.should_receive(:find).with("#{page.id}").and_return(page)
+        Page.stub(:language_root_for).and_return(mock_model(Alchemy::Page))
       end
 
       it "should assign @preview_mode with true" do
-        post :show, id: page.id
+        get :show, id: page.id
         expect(assigns(:preview_mode)).to eq(true)
       end
 
       it "should set the I18n locale to the pages language code" do
-        post :show, id: page.id
+        get :show, id: page.id
         expect(::I18n.locale).to eq(:nl)
       end
     end
@@ -151,7 +156,7 @@ module Alchemy
         let(:page) { mock_model(Page, {name: 'Foobar', slug: 'foobar', urlname: 'root/parent/foobar', redirects_to_external?: false, layoutpage?: false, taggable?: false}) }
 
         it "should always show the slug" do
-          Page.stub!(:find).and_return(page)
+          Page.stub(:find).and_return(page)
           get :configure, {id: page.id, format: :js}
           response.body.should match /value="foobar"/
         end
@@ -160,30 +165,21 @@ module Alchemy
 
     describe '#create' do
       let(:language) { mock_model('Language', code: 'kl') }
-      let(:parent) { mock_model('Page', language: language) }
-      let(:page_params) do
-        {parent_id: parent.id, name: 'new Page'}
-      end
+      let(:parent) { mock_model(Alchemy::Page, language: language) }
+      let(:page_params) { {parent_id: parent.id, name: 'new Page'} }
 
-      context "" do
+      context "a new page" do
         before do
           Page.any_instance.stub(:set_language_from_parent_or_default_language)
-          Page.any_instance.stub(save: true)
+          Page.any_instance.stub(:save).and_return(true)
         end
 
-        it "nests a new page under given parent" do
-          controller.stub!(:edit_admin_page_path).and_return('bla')
+        it "is nested under given parent" do
+          controller.stub(:edit_admin_page_path).and_return('bla')
           post :create, {page: page_params, format: :js}
           expect(assigns(:page).parent_id).to eq(parent.id)
         end
 
-        it "redirects to edit page template" do
-          page = mock_model('Page')
-          controller.should_receive(:edit_admin_page_path).and_return('bla')
-          post :create, page: page_params
-          response.should redirect_to('bla')
-        end
-
         context "if new page can not be saved" do
           it "should redirect to admin_pages_path" do
             Page.any_instance.stub(:save).and_return(false)
@@ -198,14 +194,14 @@ module Alchemy
           end
 
           it "should redirect to given url" do
-            post :create, page: page_params, redirect_to: admin_users_path
-            response.should redirect_to(admin_users_path)
+            post :create, page: page_params, redirect_to: admin_pictures_path
+            response.should redirect_to(admin_pictures_path)
           end
 
           context "but new page can not be saved" do
             it "should redirect to admin_pages_path" do
               Page.any_instance.stub(:save).and_return(false)
-              post :create, page: {}, redirect_to: admin_users_path
+              post :create, page: {}, redirect_to: Alchemy.login_path
               response.should redirect_to(admin_pages_path)
             end
           end
@@ -221,7 +217,7 @@ module Alchemy
       end
 
       context "with paste_from_clipboard in parameters" do
-        let(:page_in_clipboard) { mock_model('Page') }
+        let(:page_in_clipboard) { mock_model(Alchemy::Page) }
 
         before do
           Page.stub!(:find_by_id).with(parent.id).and_return(parent)
@@ -279,12 +275,10 @@ module Alchemy
       let(:clipboard) { session[:clipboard] = Clipboard.new }
       let(:page) { FactoryGirl.create(:public_page) }
 
-      before do
-        clipboard[:pages] = [{id: page.id}]
-      end
+      before { clipboard[:pages] = [{id: page.id}] }
 
       it "should also remove the page from clipboard" do
-        post :destroy, {id: page.id, _method: :delete}
+        post :destroy, {id: page.id, _method: :delete, format: 'js'}
         clipboard[:pages].should be_empty
       end
 
@@ -306,7 +300,7 @@ module Alchemy
     end
 
     describe '#visit' do
-      let(:page) { mock_model('Page', urlname: 'home') }
+      let(:page) { mock_model(Alchemy::Page, urlname: 'home') }
 
       before do
         Page.stub!(:find).with("#{page.id}").and_return(page)
@@ -320,39 +314,30 @@ module Alchemy
     end
 
     describe '#fold' do
-      let(:page) { mock_model('Page') }
-
-      before do
-        Page.stub!(:find).with(page.id).and_return(page)
-      end
+      let(:page) { mock_model(Alchemy::Page) }
+      before { Page.stub(:find).and_return(page) }
 
       context "if page is currently not folded" do
-        before do
-          page.stub!(:folded?).and_return(false)
-        end
+        before { page.stub(:folded?).and_return(false) }
 
         it "should fold the page" do
-          page.should_receive(:fold!).with(controller.current_user.id, true).and_return(true)
+          page.should_receive(:fold!).with(user.id, true).and_return(true)
           post :fold, id: page.id, format: :js
         end
       end
 
       context "if page is already folded" do
-        before do
-          page.stub!(:folded?).and_return(true)
-        end
+        before { page.stub(:folded?).and_return(true) }
 
         it "should unfold the page" do
-          page.should_receive(:fold!).with(controller.current_user.id, false).and_return(true)
+          page.should_receive(:fold!).with(user.id, false).and_return(true)
           post :fold, id: page.id, format: :js
         end
       end
     end
 
     describe '#sort' do
-      before do
-        Page.stub!(:language_root_for).and_return(mock_model('Page'))
-      end
+      before { Page.stub(:language_root_for).and_return(mock_model(Alchemy::Page)) }
 
       it "should assign @sorting with true" do
         get :sort, format: :js
@@ -361,16 +346,15 @@ module Alchemy
     end
 
     describe '#unlock' do
-      let(:page) { mock_model('Page', name: 'Best practices') }
+      let(:page) { mock_model(Alchemy::Page, name: 'Best practices') }
 
       before do
-        page.stub!(:unlock!).and_return(true)
-        Page.stub!(:find).with("#{page.id}").and_return(page)
+        Page.stub(:find).with("#{page.id}").and_return(page)
         Page.stub_chain(:from_current_site, :all_locked_by).and_return(nil)
+        page.should_receive(:unlock!).and_return(true)
       end
 
       it "should unlock the page" do
-        page.should_receive(:unlock!)
         post :unlock, id: "#{page.id}", format: :js
       end
 
@@ -385,7 +369,6 @@ module Alchemy
           end
         end
       end
-
     end
 
   end