alchemy_cms 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cda5be7267deaae5e113d0a626d74d6f3a18c269
-  data.tar.gz: 04e31e50bc6f7d66932cc15dcbee595a2a15eebe
+  metadata.gz: 4a98f349ff1159991c93354c2cd40b77793ade10
+  data.tar.gz: a7378076e929a7fe8f80fc59256041260f3ff7dd
 SHA512:
-  metadata.gz: 20760cb152ca71cfc3180bb3afd08d3ed3390e6e9cac648c78135c6bf85bf3c67655ed75423c9c7685af69f70d8f6ac7e012d5667aa60d8da53646487f815c10
-  data.tar.gz: 79f024717ee68637c13f7eaee22af24f387b0d03c6eb131b5938e1f24e339788a2979599725dec6fc89496d803eab6c5841c60dc95119516a6676763d0a9ab9e
+  metadata.gz: 081d537f1cc0a4528039e2466885fbe41b072f24131d08f4757cca4e91bafa6867c6ee4b255d90db5a3fb0b07f12f4c02714d4b4c6b5915781b652ab81c7e4f8
+  data.tar.gz: eea901691a4b7351154098e8ff0f8635b3233381e20529ef284d463213fab9b2b9a224f78183a83fb9924df9505844c3a8a3ada02451c326b04be525df54f5c8

data/.travis.yml

@@ -13,7 +13,7 @@ script: 'bundle exec rspec'
 env:
   - DB=mysql
   - DB=postgresql
-  - RAILS_VERSION=4.0.12
+  - RAILS_VERSION=4.0.13
 notifications:
   irc:
     on_success: change

data/app/models/alchemy/element.rb

@@ -421,6 +421,20 @@ module Alchemy
       "alchemy/elements/#{name}_view"
     end
 
+    # Returns the key that's taken for cache path.
+    #
+    # Uses the page's +published_at+ value that's updated when the user publishes the page.
+    #
+    # If the page is the current preview it uses the element's updated_at value as cache key.
+    #
+    def cache_key
+      if Page.current_preview == self.page
+        "alchemy/elements/#{id}-#{updated_at}"
+      else
+        "alchemy/elements/#{id}-#{page.published_at}"
+      end
+    end
+
     private
 
     # creates the contents for this element as described in the elements.yml

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -70,15 +70,15 @@
     <% end %>
     <label><%= _t(:page_properties) %></label>
   </div>
-  <% if configuration(:cache_pages) && !@page.layoutpage? %>
-  <div class="button_with_label">
-    <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
-      <button class="icon_button" title="<%= _t(:explain_publishing) %>">
-        <%= render_icon('publish') %>
-      </button>
-      <label><%= _t("Publish page") %></label>
-    <% end %>
-  </div>
+  <% if can?(:publish, @page) && !@page.layoutpage? %>
+    <div class="button_with_label">
+      <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
+        <%= button_tag class: 'icon_button', title: _t(:explain_publishing) do %>
+          <%= render_icon('publish') %>
+        <% end %>
+        <label><%= _t("Publish page") %></label>
+      <% end %>
+    </div>
   <% end %>
   <div class="toolbar_spacer"></div>
   <div class="select_with_label">

data/lib/alchemy/permissions.rb

@@ -130,6 +130,7 @@ module Alchemy
           :destroy,
           :flush,
           :order,
+          :publish,
           :sort,
           :switch_language
         ], Alchemy::Page
@@ -182,7 +183,6 @@ module Alchemy
         :fold,
         :info,
         :link,
-        :publish,
         :read,
         :update,
         :unlock,

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 
   def self.version
     VERSION

data/lib/rails/templates/alchemy.rb

@@ -1,6 +1,6 @@
 # This rails template installs Alchemy and all depending gems.
 require File.expand_path('../../../alchemy/version', __FILE__)
 
-gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: 'master'
-gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: 'master'
+gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '3.0-stable'
+gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: '2.0-stable'
 gem 'capistrano', '~> 2.15.5', group: 'development'

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

@@ -4,4 +4,8 @@ class DummyUser < ActiveRecord::Base
   def self.logged_in
     []
   end
+
+  def alchemy_roles
+    @alchemy_roles || %w(admin)
+  end
 end

data/spec/dummy/config/application.rb

@@ -18,7 +18,6 @@ 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
-
-    I18n.enforce_available_locales = true
+    config.i18n.enforce_available_locales = false
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -33,6 +33,4 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
-
-  I18n.enforce_available_locales = false
 end

data/spec/features/admin/page_editing_feature_spec.rb

@@ -1,75 +1,107 @@
 require 'spec_helper'
 
 describe 'Page editing feature' do
-  let(:a_page) { FactoryGirl.create(:public_page, visible: true) }
+  let(:a_page) { create(:page) }
 
-  before { authorize_as_admin }
+  context 'as author' do
+    before { authorize_as_admin(build(:author_user)) }
 
-  context "in configure overlay" do
+    it 'cannot publish page.' do
+      visit alchemy.edit_admin_page_path(a_page)
+      expect(page).to_not have_selector('#publish_page_form')
+    end
+  end
+
+  context 'as editor' do
+    before { authorize_as_admin(build(:editor_user)) }
+
+    it 'can publish page.' do
+      visit alchemy.edit_admin_page_path(a_page)
+      find('#publish_page_form button').click
+      expect(page).to have_content Alchemy::I18n.t(:page_published, name: a_page.name)
+    end
+
+    context 'while editing a global page' do
+      let(:a_page) { create(:page, layoutpage: true) }
 
-    context "when editing a normal page" do
-      it "should show all relevant input fields" do
-        visit alchemy.configure_admin_page_path(a_page)
-        expect(page).to have_selector('input#page_urlname')
-        expect(page).to have_selector('input#page_title')
-        expect(page).to have_selector('input#page_robot_index')
-        expect(page).to have_selector('input#page_robot_follow')
+      it 'cannot publish page.' do
+        visit alchemy.edit_admin_page_path(a_page)
+        expect(page).to_not have_selector('#publish_page_form')
       end
+    end
+  end
 
-      context "with sitemaps show_flag config option set to true" do
-        before do
-          Alchemy::Config.stub(:get) { |arg| arg == :sitemap ? {'show_flag' => true} : Alchemy::Config.show[arg.to_s] }
-        end
+  context 'as admin' do
+    let(:a_page) { FactoryGirl.create(:public_page, visible: true) }
 
-        it "should show sitemap checkbox" do
+    before { authorize_as_admin }
+
+    context "in configure overlay" do
+      context "when editing a normal page" do
+        it "should show all relevant input fields" do
           visit alchemy.configure_admin_page_path(a_page)
-          expect(page).to have_selector('input[type="checkbox"]#page_sitemap')
+          expect(page).to have_selector('input#page_urlname')
+          expect(page).to have_selector('input#page_title')
+          expect(page).to have_selector('input#page_robot_index')
+          expect(page).to have_selector('input#page_robot_follow')
         end
-      end
 
-      context "with sitemaps show_flag config option set to false" do
-        before do
-          Alchemy::Config.stub(:get) { |arg| arg == :sitemap ? {'show_flag' => false} : Alchemy::Config.show[arg.to_s] }
+        context "with sitemaps show_flag config option set to true" do
+          before do
+            Alchemy::Config.stub(:get) { |arg| arg == :sitemap ? {'show_flag' => true} : Alchemy::Config.show[arg.to_s] }
+          end
+
+          it "should show sitemap checkbox" do
+            visit alchemy.configure_admin_page_path(a_page)
+            expect(page).to have_selector('input[type="checkbox"]#page_sitemap')
+          end
         end
 
-        it "should show sitemap checkbox" do
-          visit alchemy.configure_admin_page_path(a_page)
-          expect(page).to_not have_selector('input[type="checkbox"]#page_sitemap')
+        context "with sitemaps show_flag config option set to false" do
+          before do
+            Alchemy::Config.stub(:get) { |arg| arg == :sitemap ? {'show_flag' => false} : Alchemy::Config.show[arg.to_s] }
+          end
+
+          it "should show sitemap checkbox" do
+            visit alchemy.configure_admin_page_path(a_page)
+            expect(page).to_not have_selector('input[type="checkbox"]#page_sitemap')
+          end
         end
       end
-    end
 
-    context "when editing a global page" do
-      let(:layout_page) { FactoryGirl.create(:page, layoutpage: true) }
+      context "when editing a global page" do
+        let(:layout_page) { FactoryGirl.create(:page, layoutpage: true) }
 
-      it "should not show the input fields for normal pages" do
-        visit alchemy.edit_admin_layoutpage_path(layout_page)
-        expect(page).to_not have_selector('input#page_urlname')
-        expect(page).to_not have_selector('input#page_title')
-        expect(page).to_not have_selector('input#page_robot_index')
-        expect(page).to_not have_selector('input#page_robot_follow')
+        it "should not show the input fields for normal pages" do
+          visit alchemy.edit_admin_layoutpage_path(layout_page)
+          expect(page).to_not have_selector('input#page_urlname')
+          expect(page).to_not have_selector('input#page_title')
+          expect(page).to_not have_selector('input#page_robot_index')
+          expect(page).to_not have_selector('input#page_robot_follow')
+        end
       end
-    end
 
-    context "when page is taggable" do
-      before { Alchemy::Page.any_instance.stub(:taggable?).and_return(true) }
-      it "should show the tag_list input field" do
-        visit alchemy.configure_admin_page_path(a_page)
-        expect(page).to have_selector('input#page_tag_list')
+      context "when page is taggable" do
+        before { Alchemy::Page.any_instance.stub(:taggable?).and_return(true) }
+
+        it "should show the tag_list input field" do
+          visit alchemy.configure_admin_page_path(a_page)
+          expect(page).to have_selector('input#page_tag_list')
+        end
       end
     end
-  end
 
-  context "in preview frame" do
-    it "the menubar does not render on the page" do
-      visit alchemy.admin_page_path(a_page)
-      page.should_not have_selector('#alchemy_menubar')
-    end
+    context "in preview frame" do
+      it "the menubar does not render on the page" do
+        visit alchemy.admin_page_path(a_page)
+        page.should_not have_selector('#alchemy_menubar')
+      end
 
-    it "navigation links are not clickable" do
-      visit alchemy.admin_page_path(a_page)
-      within('#navigation') do
-        page.should have_selector('a[href="javascript: void(0)"]')
+      it "navigation links are not clickable" do
+        visit alchemy.admin_page_path(a_page)
+        within('#navigation') do
+          page.should have_selector('a[href="javascript: void(0)"]')
+        end
       end
     end
   end

data/spec/libraries/permissions_spec.rb

@@ -122,7 +122,10 @@ describe Alchemy::Permissions do
       should be_able_to(:link, Alchemy::Page)
       should be_able_to(:visit, Alchemy::Page)
       should be_able_to(:unlock, Alchemy::Page)
-      should be_able_to(:publish, Alchemy::Page)
+    end
+
+    it "can not publish pages" do
+      should_not be_able_to(:publish, Alchemy::Page)
     end
 
     it "can manage elements" do
@@ -180,6 +183,10 @@ describe Alchemy::Permissions do
       should be_able_to(:switch_language, Alchemy::Page)
     end
 
+    it "can publish pages" do
+      should be_able_to(:publish, Alchemy::Page)
+    end
+
     it "can not see invisible pages" do
       should_not be_able_to(:see, not_visible_page)
     end

data/spec/models/element_spec.rb

@@ -538,6 +538,29 @@ module Alchemy
       end
     end
 
+    describe '#cache_key' do
+      let(:page) { stub_model(Page, published_at: Time.now - 1.week) }
+      let(:element) { stub_model(Element, page: page, updated_at: Time.now) }
+
+      subject { element.cache_key }
+
+      before do
+        expect(Page).to receive(:current_preview).and_return(preview)
+      end
+
+      context "when current page rendered in preview mode" do
+        let(:preview) { page }
+
+        it { is_expected.to eq("alchemy/elements/#{element.id}-#{element.updated_at}") }
+      end
+
+      context "when current page not in preview mode" do
+        let(:preview) { nil }
+
+        it { is_expected.to eq("alchemy/elements/#{element.id}-#{page.published_at}") }
+      end
+    end
+
     it_behaves_like "having a hint" do
       let(:subject) { Element.new }
     end

data/spec/models/page_spec.rb

@@ -715,9 +715,27 @@ module Alchemy
     end
 
     describe '#cache_key' do
-      let(:page) { stub_model(Page) }
-      subject { page }
-      its(:cache_key) { should match(page.id.to_s) }
+      let(:page) do
+        stub_model(Page, updated_at: Time.now, published_at: Time.now - 1.week)
+      end
+
+      subject { page.cache_key }
+
+      before do
+        expect(Page).to receive(:current_preview).and_return(preview)
+      end
+
+      context "when current page rendered in preview mode" do
+        let(:preview) { page }
+
+        it { is_expected.to eq("alchemy/pages/#{page.id}-#{page.updated_at}") }
+      end
+
+      context "when current page not in preview mode" do
+        let(:preview) { nil }
+
+        it { is_expected.to eq("alchemy/pages/#{page.id}-#{page.published_at}") }
+      end
     end
 
     describe '#cell_definitions' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1154,7 +1154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4