alchemy_cms 3.0.0.rc6 → 3.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46aef856d1de74f7fdd263bd44290ab72970a408
-  data.tar.gz: c8db252636d2e4af9b8172f89b27fc7d7ba209e9
+  metadata.gz: 02135f0ba23a59280b20309cec71a326a544ff42
+  data.tar.gz: 053e8ad503e06ae42a9c07435c41ef161828161e
 SHA512:
-  metadata.gz: 316bf6685dc74ea7a82a54a9f6f2c1f3efff0abf0ff24952fca2bb5de42315ae027cc154016dac6fc5075006f90104eaed1680b4bfba10d28e0ff10518366572
-  data.tar.gz: b86f3962f5e93226710495596dc5dc9ec7dd16ffbac5972b80fecd3e085b2feb812d4b11b51f260dad7c370ab03f61aa9939b1f229f4cd9af669a31f9617fc44
+  metadata.gz: 19c8cb6b48175d8b27345fff351ff9d5acea1e7a95af065e2c2094a44f6428474f79b6d1d5a8be2ac7aaf78068295c4a41131d4a9a6d1cdff975046a53462e47
+  data.tar.gz: e182d4b3f9a33a1e2c148e83b8b0824df7474d5c952cfdc3ab42c7c3bf612d8992df8dc4eab8ddd6db0ba614f214e3e2edd8a94469a568fbf829296d7a88a894

data/app/models/alchemy/page/page_users.rb

@@ -2,16 +2,22 @@ module Alchemy
   module Page::PageUsers
     extend ActiveSupport::Concern
 
+    # Returns the creator of this page.
+    #
     def creator
-      Alchemy.user_class.try(:find, creator_id)
+      Alchemy.user_class.try(:find_by, {id: creator_id})
     end
 
+    # Returns the last updater of this page.
+    #
     def updater
-      Alchemy.user_class.try(:find, updater_id)
+      Alchemy.user_class.try(:find_by, {id: updater_id})
     end
 
+    # Returns the user currently editing this page.
+    #
     def locker
-      Alchemy.user_class.try(:find, locked_by)
+      Alchemy.user_class.try(:find_by, {id: locked_by})
     end
 
     # Returns the name of the creator of this page.

data/lib/alchemy/test_support/factories.rb

@@ -1,5 +1,26 @@
 FactoryGirl.define do
 
+  factory :user, class: 'DummyUser' do
+    sequence(:email) { |n| "john.#{n}@doe.com" }
+    password 's3cr3t'
+
+    factory :admin_user do
+      alchemy_roles 'admin'
+    end
+
+    factory :member_user do
+      alchemy_roles 'member'
+    end
+
+    factory :author_user do
+      alchemy_roles 'author'
+    end
+
+    factory :editor_user do
+      alchemy_roles 'editor'
+    end
+  end
+
   factory :language, :class => 'Alchemy::Language' do
     name 'Deutsch'
     code 'de'

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.0.0.rc6"
+  VERSION = "3.0.0.rc7"
 
   def self.version
     VERSION

data/spec/controllers/admin/pages_controller_spec.rb

@@ -233,6 +233,61 @@ module Alchemy
       end
     end
 
+    describe '#edit' do
+      let!(:page)       { create(:page) }
+      let!(:other_user) { create(:author_user) }
+
+      context 'if page is locked by another user' do
+        before { page.lock_to!(other_user) }
+
+        context 'that is signed in' do
+          before { DummyUser.any_instance.stub(logged_in?: true) }
+
+          it 'redirects to sitemap' do
+            get :edit, id: page.id
+            expect(response).to redirect_to(admin_pages_path)
+          end
+        end
+
+        context 'that is not signed in' do
+          before { DummyUser.any_instance.stub(logged_in?: false) }
+
+          it 'renders the edit view' do
+            get :edit, id: page.id
+            expect(response).to render_template(:edit)
+          end
+        end
+      end
+
+      context 'if page is locked by myself' do
+        before do
+          Page.any_instance.stub(locker: user)
+          user.stub(logged_in?: true)
+        end
+
+        it 'renders the edit view' do
+          get :edit, id: page.id
+          expect(response).to render_template(:edit)
+        end
+      end
+
+      context 'if page is not locked' do
+        before do
+          Page.any_instance.stub(locker: nil)
+        end
+
+        it 'renders the edit view' do
+          get :edit, id: page.id
+          expect(response).to render_template(:edit)
+        end
+
+        it "lockes the page to myself" do
+          Page.any_instance.should_receive(:lock_to!)
+          get :edit, id: page.id
+        end
+      end
+    end
+
     describe '#destroy' do
       let(:clipboard) { session[:clipboard] = Clipboard.new }
       let(:page) { FactoryGirl.create(:public_page) }

data/spec/dummy/app/models/dummy_user.rb

@@ -1,17 +1,7 @@
-class DummyUser
-  include ActiveModel::Validations
-
-  attr_accessor :alchemy_roles, :language, :cache_key, :email, :password, :name, :id
+class DummyUser < ActiveRecord::Base
+  attr_accessor :alchemy_roles, :name
 
   def self.logged_in
     []
   end
-
-  def self.stamper_class_name
-    :DummyUser
-  end
-
-  def update_attributes(attributes)
-    attributes.each { |key,value| send("#{key}=".to_sym, value) }
-  end
 end

data/spec/features/admin/dashboard_spec.rb

@@ -33,7 +33,7 @@ describe 'Dashboard feature' do
         user = DummyUser.new
         user.update_attributes(alchemy_roles: %w(admin), name: "Sue Smith", id: 2)
         a_page.lock_to!(user)
-        DummyUser.stub(:find).and_return(user)
+        DummyUser.stub(:find_by).and_return(user)
         visit admin_dashboard_path
         locked_pages_widget = all('div[@class="widget"]').first
         expect(locked_pages_widget).to have_content "Currently locked pages:"

data/spec/models/page_spec.rb

@@ -1349,6 +1349,41 @@ module Alchemy
 
     context 'indicate page editors' do
       let(:page) { Page.new }
+      let(:user) { create(:editor_user) }
+
+      describe '#creator' do
+        before { page.update(creator_id: user.id) }
+
+        it "returns the user that created the page" do
+          expect(page.creator).to eq(user)
+        end
+      end
+
+      describe '#updater' do
+        before { page.update(updater_id: user.id) }
+
+        it "returns the user that created the page" do
+          expect(page.updater).to eq(user)
+        end
+      end
+
+      describe '#locker' do
+        before { page.update(locked_by: user.id) }
+
+        it "returns the user that created the page" do
+          expect(page.locker).to eq(user)
+        end
+      end
+
+      context 'with user that can not be found' do
+        it 'does not raise not found error' do
+          %w(creator updater locker).each do |user_type|
+            expect {
+              page.send(user_type)
+            }.to_not raise_error(ActiveRecord::RecordNotFound)
+          end
+        end
+      end
 
       context 'with user class having a name accessor' do
         let(:user) { double(name: 'Paul Page') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc6
+  version: 3.0.0.rc7
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails