alchemy_cms 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd3580d83b92bb7990cc1a34e3567ebe037a409
-  data.tar.gz: 88b2975b2529f4a9ec05a780705a8d7d3c193286
+  metadata.gz: da3fbeab242eee7ed6dde78b96f4a503df8168d1
+  data.tar.gz: 372a82e46f31f66b61776290d1c2e6a56fa340a6
 SHA512:
-  metadata.gz: a8e7aab4bbc54ca64d74829b148921fa122db90f1a7713e4aa554807a74ccd763ac23e97bdc8cad1643c49d4f31448b4d47fc0ff0bb63be9d867534f67935676
-  data.tar.gz: 43a18d1f7f2c31f76fccaa2f7b9afedf32ea6c5f192a65d9ff3aa71fdaeee94ff40e02b0d34e1e6015496c27ca976250ad4108edba0af319f0843e9a0eaedcf1
+  metadata.gz: c6d578e24ffa7c5c6dc715e9e6ce3f859e49d7acbc1d42ad2b83f64e1adb9ce91acb5c4463071b91a6e88a020bc3592cee949517fc98304f5d4a5b35ff265531
+  data.tar.gz: e047f4e17c7081890e7b6abe6e4707de26715b610bb11e722d7cbb695bfcce2a446ef524895cb3f4591132ec157ade16d7d2244c66661199c0ecf876405090e9

data/.travis.yml

@@ -7,13 +7,13 @@ rvm:
   - 2.1
 branches:
   only:
-    - master
+    - 3.1-stable
 before_script: 'bundle exec rake alchemy:spec:prepare'
 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/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['RAILS_VERSION']
-  gem 'rails', "~> #{ENV['RAILS_VERSION']}"
+  gem 'rails', ENV['RAILS_VERSION']
 end
 
 gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'

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

@@ -145,6 +145,7 @@ module Alchemy
           :destroy,
           :flush,
           :order,
+          :publish,
           :sort,
           :switch_language
         ], Alchemy::Page
@@ -197,7 +198,6 @@ module Alchemy
         :fold,
         :info,
         :link,
-        :publish,
         :read,
         :update,
         :unlock,

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 
   def self.version
     VERSION

data/lib/rails/templates/alchemy.rb

@@ -1,6 +1,7 @@
 # This rails template installs Alchemy and all depending gems.
-require File.expand_path('../../../alchemy/version', __FILE__)
+require File.expand_path("../../../alchemy/version", __FILE__)
 
-gem 'alchemy_cms', "#{Alchemy::VERSION}"
-gem 'alchemy-devise', '>= 2.1.0.beta3'
-gem 'capistrano', '~> 2.15.5', group: 'development'
+gem "alchemy_cms",    github: "AlchemyCMS/alchemy_cms",    branch: "3.1-stable"
+gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "2.1-stable"
+
+gem "capistrano", "~> 2.15.5", group: "development"

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

@@ -6,6 +6,6 @@ class DummyUser < ActiveRecord::Base
   end
 
   def alchemy_roles
-    %w(admin)
+    @alchemy_roles || %w(admin)
   end
 end

data/spec/features/admin/page_editing_feature_spec.rb

@@ -1,95 +1,135 @@
 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
-          allow(Alchemy::Config).to receive(:get) { |arg| arg == :sitemap ? {'show_flag' => true} : Alchemy::Config.show[arg.to_s] }
-        end
+  context 'as admin' do
+    let(:a_page) { 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
-          allow(Alchemy::Config).to receive(: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
+            allow(Alchemy::Config).to receive(:get) do |arg|
+              arg == :sitemap ? {'show_flag' => true} : Alchemy::Config.show[arg.to_s]
+            end
+          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
+            allow(Alchemy::Config).to receive(:get) do |arg|
+              arg == :sitemap ? {'show_flag' => false} : Alchemy::Config.show[arg.to_s]
+            end
+          end
+
+          it "should not 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) { 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 { expect_any_instance_of(Alchemy::Page).to receive(:taggable?).and_return(true) }
+      context "when page is taggable" do
+        before do
+          expect_any_instance_of(Alchemy::Page)
+            .to receive(:taggable?).and_return(true)
+        end
 
-      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')
+        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)
-      expect(page).not_to 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)
+        expect(page).not_to have_selector('#alchemy_menubar')
+      end
 
-    it "navigation links are not clickable" do
-      visit alchemy.admin_page_path(a_page)
-      within('#navigation') do
-        expect(page).to have_selector('a[href="javascript: void(0)"]')
+      it "navigation links are not clickable" do
+        visit alchemy.admin_page_path(a_page)
+        within('#navigation') do
+          expect(page).to have_selector('a[href="javascript: void(0)"]')
+        end
       end
     end
-  end
 
-  context 'in element panel' do
-    let!(:everything_page) { create(:page, page_layout: 'everything', do_not_autogenerate: false) }
-
-    it "renders essence editors for all elements" do
-      visit alchemy.admin_elements_path(page_id: everything_page.id)
-
-      expect(page).to have_selector('div.content_editor.essence_boolean')
-      expect(page).to have_selector('div.content_editor.essence_date')
-      expect(page).to have_selector('div.content_editor.essence_file')
-      expect(page).to have_selector('div.content_editor.essence_html_editor')
-      expect(page).to have_selector('div.content_editor.essence_link')
-      expect(page).to have_selector('div.content_editor.essence_picture_editor')
-      expect(page).to have_selector('div.content_editor.essence_richtext')
-      expect(page).to have_selector('div.content_editor.essence_select')
-      expect(page).to have_selector('div.content_editor.essence_text')
+    context 'in element panel' do
+      let!(:everything_page) do
+        create(:page, page_layout: 'everything', do_not_autogenerate: false)
+      end
+
+      it "renders essence editors for all elements" do
+        visit alchemy.admin_elements_path(page_id: everything_page.id)
+
+        expect(page).to have_selector('div.content_editor.essence_boolean')
+        expect(page).to have_selector('div.content_editor.essence_date')
+        expect(page).to have_selector('div.content_editor.essence_file')
+        expect(page).to have_selector('div.content_editor.essence_html_editor')
+        expect(page).to have_selector('div.content_editor.essence_link')
+        expect(page).to have_selector('div.content_editor.essence_picture_editor')
+        expect(page).to have_selector('div.content_editor.essence_richtext')
+        expect(page).to have_selector('div.content_editor.essence_select')
+        expect(page).to have_selector('div.content_editor.essence_text')
+      end
     end
   end
 end

data/spec/libraries/permissions_spec.rb

@@ -150,7 +150,10 @@ describe Alchemy::Permissions do
       is_expected.to be_able_to(:link, Alchemy::Page)
       is_expected.to be_able_to(:visit, Alchemy::Page)
       is_expected.to be_able_to(:unlock, Alchemy::Page)
-      is_expected.to be_able_to(:publish, Alchemy::Page)
+    end
+
+    it "can not publish pages" do
+      is_expected.to_not be_able_to(:publish, Alchemy::Page)
     end
 
     it "can manage elements" do
@@ -208,6 +211,10 @@ describe Alchemy::Permissions do
       is_expected.to be_able_to(:switch_language, Alchemy::Page)
     end
 
+    it "can publish pages" do
+      is_expected.to be_able_to(:publish, Alchemy::Page)
+    end
+
     it "can not see invisible pages" do
       is_expected.not_to be_able_to(:see, not_visible_page)
     end

data/spec/models/element_spec.rb

@@ -580,6 +580,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

@@ -734,12 +734,26 @@ module Alchemy
     end
 
     describe '#cache_key' do
-      let(:page) { stub_model(Page) }
-      subject { page }
+      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 }
 
-      describe '#cache_key' do
-        subject { super().cache_key }
-        it { is_expected.to match(page.id.to_s) }
+        it { is_expected.to eq("alchemy/pages/#{page.id}-#{page.published_at}") }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching