alchemy_cms 2.6.0 → 2.6.1

data/app/assets/stylesheets/alchemy/archive.scss

@@ -435,3 +435,7 @@ div#pictures_page_list {
     line-height: 6px;
   }
 }
+
+table.list#tag_list .tag {
+  padding: 0;
+}

data/app/helpers/alchemy/pages_helper.rb

@@ -122,7 +122,8 @@ module Alchemy
         :reverse_children => false
       }.merge(options)
       page = page_or_find(options[:from_page])
-      pages = page.children.visible.with_permissions_to(:show, :context => :alchemy_pages)
+      return nil if page.blank?
+      pages = page.children.with_permissions_to(:see, :context => :alchemy_pages)
       pages = pages.restricted if options.delete(:restricted_only)
       if depth = options[:deepness]
         pages = pages.where("#{Page.table_name}.depth <= #{depth}")
@@ -197,7 +198,7 @@ module Alchemy
         :reverse => false,
         :link_active_page => false
       }.merge(options)
-      pages = breadcrumb(options[:page]).published.visible.with_permissions_to(:show, :context => :alchemy_pages)
+      pages = breadcrumb(options[:page]).with_permissions_to(:see, :context => :alchemy_pages)
       pages = pages.restricted if options.delete(:restricted_only)
       pages.to_a.reverse! if options[:reverse]
       if options[:without].present?

data/config/authorization_rules.rb

@@ -1,6 +1,9 @@
 authorization do
 
   role :guest do
+    has_permission_on :alchemy_pages, :to => [:see] do
+      if_attribute :visible => true, :restricted => false
+    end
     has_permission_on :alchemy_pages, :to => [:show] do
       if_attribute :public => true, :restricted => false
     end
@@ -17,6 +20,9 @@ authorization do
 
   role :registered do
     includes :guest
+    has_permission_on :alchemy_pages, :to => [:see] do
+      if_attribute :visible => true, :restricted => true
+    end
     has_permission_on :alchemy_pages, :to => [:show] do
       if_attribute :public => true, :restricted => true
       if_attribute :public => true, :restricted => false

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 
   def self.version
     VERSION

data/spec/helpers/base_helper_spec.rb

@@ -60,5 +60,31 @@ module Alchemy
       end
     end
 
+    describe '#page_or_find' do
+      let(:page) { FactoryGirl.create(:public_page) }
+
+      context "passing a page_layout string" do
+        context "of a not existing page" do
+          it "should return nil" do
+            expect(helper.page_or_find('contact')).to be_nil
+          end
+        end
+
+        context 'of an existing page' do
+          it "should return the page object" do
+            session[:language_id] = page.language_id
+            expect(helper.page_or_find(page.page_layout)).to eq(page)
+          end
+        end
+      end
+
+      context "passing a page object" do
+        it "should return the given page object" do
+          expect(helper.page_or_find(page)).to eq(page)
+        end
+      end
+
+    end
+
   end
 end

data/spec/helpers/pages_helper_spec.rb

@@ -25,14 +25,26 @@ module Alchemy
       @root_page = language_root # We need this instance variable in the helpers
     end
 
-    it "should render the current page layout" do
-      @page = public_page
-      helper.render_page_layout.should have_selector('div#content')
+    describe "#render_page_layout" do
+      it "should render the current page layout" do
+        @page = public_page
+        helper.render_page_layout.should have_selector('div#content')
+      end
     end
 
     describe "#render_navigation" do
       before { visible_page }
 
+      it "should render only visible pages" do
+        not_visible_page = FactoryGirl.create(:page, visible: false)
+        helper.render_navigation.should_not match(/#{not_visible_page.name}/)
+      end
+
+      it "should render visible unpublished pages" do
+        unpublished_visible_page = FactoryGirl.create(:page, visible: true, public: false)
+        helper.render_navigation.should match(/#{unpublished_visible_page.name}/)
+      end
+
       context "not in multi_language mode" do
         before { helper.stub(:multi_language?).and_return(false) }
 
@@ -54,8 +66,10 @@ module Alchemy
             Authorization.stub!(:current_user).and_return(FactoryGirl.build(:registered_user))
           end
 
-          it "should render restricted pages" do
-            helper.render_navigation.should have_selector("ul.navigation.level_1 li a[href=\"/#{restricted_page.urlname}\"]")
+          it "should render also restricted pages" do
+            not_restricted_page = FactoryGirl.create(:public_page, restricted: false, visible: true)
+            helper.render_navigation.should match(/#{restricted_page.name}/)
+            helper.render_navigation.should match(/#{not_restricted_page.name}/)
           end
         end
 
@@ -114,6 +128,34 @@ module Alchemy
         end
       end
 
+      context "with options[:from_page] set" do
+        before { level_2_page }
+
+        context "passing a page object" do
+          it "should render the pages underneath the given one" do
+            output = helper.render_navigation(from_page: visible_page)
+            output.should_not have_selector("ul li a[href=\"/#{visible_page.urlname}\"]")
+            output.should have_selector("ul li a[href=\"/#{level_2_page.urlname}\"]")
+          end
+        end
+
+        context "passing a page_layout" do
+          it "should render the pages underneath the page with the given page_layout" do
+            helper.stub(:page_or_find).with('contact').and_return(visible_page)
+            output = helper.render_navigation(from_page: 'contact')
+            output.should_not have_selector("ul li a[href=\"/#{visible_page.urlname}\"]")
+            output.should have_selector("ul li a[href=\"/#{level_2_page.urlname}\"]")
+          end
+        end
+
+        context "passing a page_layout of a not existing page" do
+          it "should render nothing" do
+            expect(helper.render_navigation(from_page: 'news')).to be_nil
+          end
+        end
+
+      end
+
     end
 
     describe '#render_subnavigation' do
@@ -211,14 +253,14 @@ module Alchemy
         end
       end
 
-      it "should render a breadcrumb of visible pages only." do
-        page.update_attributes!(visible: false, urlname: 'a-invisible-public-page', name: 'A invisible Public Page', title: 'A invisible Public Page')
-        helper.render_breadcrumb(page: page, visible_only: true).should_not match(/A invisible Public Page/)
+      it "should render a breadcrumb of visible pages only" do
+        page.update_attributes!(visible: false, urlname: 'a-invisible-page', name: 'A Invisible Page', title: 'A Invisible Page')
+        helper.render_breadcrumb(page: page).should_not match(/A Invisible Page/)
       end
 
-      it "should render a breadcrumb of published pages only" do
+      it "should render a breadcrumb of visible and unpublished pages" do
         page.update_attributes!(public: false, urlname: 'a-unpublic-page', name: 'A Unpublic Page', title: 'A Unpublic Page')
-        helper.render_breadcrumb(page: page, public_only: true).should_not match(/A Unpublic Page/)
+        helper.render_breadcrumb(page: page).should match(/A Unpublic Page/)
       end
 
       context "with options[:without]" do
@@ -266,7 +308,7 @@ module Alchemy
     describe "#language_links" do
 
       context "with two public languages" do
-        
+
         # Always create second language
         before { klingonian }
 
@@ -324,7 +366,7 @@ module Alchemy
               end
             end
           end
-          
+
           context "with options[:show_title]" do
             context "set to true" do
               it "should render the language links with titles" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1151,7 +1151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1448087068870740088
+      hash: 2987207668504208741
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: