refinerycms-pages 2.0.4 → 2.0.5

data/app/controllers/refinery/pages_controller.rb

@@ -1,6 +1,6 @@
 module Refinery
   class PagesController < ::ApplicationController
-    before_filter :find_page, :except => [:preview]
+    before_filter :find_page, :set_canonical, :except => [:preview]
 
     # Save whole Page after delivery
     after_filter { |c| c.write_cache? }
@@ -94,6 +94,10 @@ module Refinery
       render render_options if render_options.any?
     end
 
+    def set_canonical
+      @canonical = refinery.url_for @page.canonical if @page.present?
+    end
+
     def write_cache?
       if Refinery::Pages.cache_pages_full
         cache_page(response.body, File.join('', 'refinery', 'cache', 'pages', request.path.sub("//", "/")).to_s)

data/app/helpers/refinery/admin/pages_helper.rb

@@ -10,6 +10,18 @@ module Refinery
         ActiveRecord::Associations::Preloader.new(pages, :translations).run
         pages.map {|page| ["#{'-' * page.level} #{page.title}", page.id]}
       end
+
+      def template_options(template_type, current_page)
+        return {} if current_page.send(template_type)
+
+        if current_page.parent_id?
+          # Use Parent Template by default.
+          { :selected => current_page.parent.send(template_type) }
+        else
+          # Use Default Template (First in whitelist)
+          { :selected => Refinery::Pages.send("#{template_type}_whitelist").first }
+        end
+      end
     end
   end
 end

data/app/models/refinery/page.rb

@@ -26,7 +26,8 @@ module Refinery
                     :skip_to_first_child, :position, :show_in_menu, :draft,
                     :parts_attributes, :browser_title, :meta_description,
                     :parent_id, :menu_title, :created_at, :updated_at,
-                    :page_id, :layout_template, :view_template, :custom_slug
+                    :page_id, :layout_template, :view_template, :custom_slug,
+                    :slug
 
     attr_accessor :locale, :page_title, :page_menu_title # to hold temporarily
     validates :title, :presence => true
@@ -173,7 +174,7 @@ module Refinery
 
       # Returns how many pages per page should there be when paginating pages
       def per_page(dialog = false)
-        dialog ? Pages.pages_per_dialog : Pages.config.pages_per_admin_index
+        dialog ? Pages.pages_per_dialog : Pages.pages_per_admin_index
       end
 
       def expire_page_caching
@@ -186,18 +187,25 @@ module Refinery
           return true # so that other callbacks process.
         end
       end
+
+      def rebuild_with_invalidate_cached_urls!
+        rebuild_without_invalidate_cached_urls!
+        find_each { |page| page.send :invalidate_cached_urls }
+      end
+      alias_method_chain :rebuild!, :invalidate_cached_urls
+    end
+
+    # The canonical page for this particular page.
+    # Consists of:
+    #   * The default locale's translated slug
+    def canonical
+      Globalize.with_locale(::Refinery::I18n.default_frontend_locale){ url }
     end
 
     # Returns in cascading order: custom_slug or menu_title or title depending on
     # which attribute is first found to be present for this page.
     def custom_slug_or_title
-      if custom_slug.present?
-        custom_slug
-      elsif menu_title.present?
-        menu_title
-      else
-        title
-      end
+      custom_slug.presence || menu_title.presence || title
     end
 
     # Am I allowed to delete this page?
@@ -291,7 +299,7 @@ module Refinery
     # For example, this might evaluate to /about for the "About" page.
     def url_marketable
       # :id => nil is important to prevent any other params[:id] from interfering with this route.
-      url_normal.merge(:path => nested_url, :id => nil)
+      url_normal.merge :path => nested_url, :id => nil
     end
 
     # Returns a url suitable to be used in url_for in Rails (such as link_to).
@@ -302,26 +310,23 @@ module Refinery
 
     # If the current locale is set to something other than the default locale
     # then the :locale attribute will be set on the url hash, otherwise it won't be.
-    def with_locale_param(url_hash)
-      if self.class.different_frontend_locale?
-        url_hash.update(:locale => ::Refinery::I18n.current_frontend_locale)
-      end
+    def with_locale_param(url_hash, locale = nil)
+      locale ||= ::Refinery::I18n.current_frontend_locale if self.class.different_frontend_locale?
+      url_hash.update :locale => locale if locale
       url_hash
     end
 
+    def uncached_nested_url
+      [parent.try(:uncached_nested_url), to_param.to_s].compact.flatten
+    end
+
     # Returns an array with all ancestors to_param, allow with its own
     # Ex: with an About page and a Mission underneath,
     # ::Refinery::Page.find('mission').nested_url would return:
     #
     #   ['about', 'mission']
     #
-    def nested_url
-      Rails.cache.fetch(url_cache_key) { uncached_nested_url }
-    end
-
-    def uncached_nested_url
-      [parent.try(:nested_url), to_param.to_s].compact.flatten
-    end
+    alias_method :nested_url, :uncached_nested_url
 
     # Returns the string version of nested_url, i.e., the path that should be generated
     # by the router
@@ -444,8 +449,7 @@ module Refinery
     end
     alias_method_chain :normalize_friendly_id, :marketable_urls
 
-  private
-
+    private
     def invalidate_cached_urls
       return true unless Refinery::Pages.marketable_urls
 

data/app/views/refinery/admin/pages/_form_advanced_options.html.erb

@@ -26,11 +26,8 @@
         <%= f.label :layout_template, t('.layout_template') %>
         <%= refinery_help_tag t('.layout_template_help') %>
       </span>
-      <% if @page.parent_id? %>
-        <%= f.select(:layout_template, @valid_layout_templates, {:selected => @page.parent.layout_template}) %>
-      <% else %>
-        <%= f.select(:layout_template, @valid_layout_templates) %>
-      <% end %>
+      <%= f.select :layout_template, @valid_layout_templates,
+                   template_options(:layout_template, @page) %>
     </div>
     <% end %>
     <% if Refinery::Pages.use_view_templates %>
@@ -39,11 +36,8 @@
         <%= f.label :view_template, t('.view_template') %>
         <%= refinery_help_tag t('.view_template_help') %>
       </span>
-      <% if @page.parent_id? %>
-        <%= f.select(:view_template, @valid_view_templates.map{|t| [t.titleize, t]}, {:selected => @page.parent.view_template }) %>
-      <% else %>
-        <%= f.select(:view_template, @valid_view_templates.map{|t| [t.titleize, t]}) %>
-      <% end %>
+      <%= f.select :view_template, @valid_view_templates.map { |t| [t.titleize, t] },
+                   template_options(:view_template, @page) %>
     </div>
     <% end %>
 

data/app/views/refinery/admin/pages/_page.html.erb

@@ -8,22 +8,20 @@
 
     <span class='title <%= 'toggle' if page.children.present? %>'>
       <%= page.title_with_meta.html_safe %>
-      <% if Refinery.i18n_enabled? and Refinery::I18n.frontend_locales.many? %>
-        <span class='preview'>
-          <% page.translations.each do |translation| %>
-            <% if translation.title.present? %>
-              <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
-                          refinery.edit_admin_page_path(page, :switch_locale => translation.locale),
-                          :class => 'locale' %>
-            <% end %>
-          <% end %>
-        </span>
-      <% end %>
     </span>
+    <% if Refinery.i18n_enabled? and Refinery::I18n.frontend_locales.many? %>
+      <span class='locales'>
+        <% page.translations.each do |translation| %>
+          <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
+                      refinery.edit_admin_page_path(page.nested_url, :switch_locale => translation.locale),
+                      :class => 'locale' if translation.title.present? %>
+        <% end %>
+      </span>
+    <% end %>
 
     <span class='actions'>
       <%= link_to refinery_icon_tag('application_go.png'),
-                  refinery.page_path(page),
+                  page.url,
                   :target => "_blank",
                   :title => t('.view_live_html') %>
       <%= link_to refinery_icon_tag('page_add.png'),

data/db/seeds.rb

@@ -39,3 +39,10 @@ if Refinery::Page.by_title("About").empty?
                 :position => 1
               })
 end
+
+(Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : [:en]).each do |lang|
+  I18n.locale = lang
+  Refinery::Page.find_by_title("Home").update_attributes(:slug => "home")
+  Refinery::Page.find_by_title("Page not found").update_attributes(:slug => "page-not-found")
+  Refinery::Page.find_by_title("About").update_attributes(:slug => "about")
+end

data/lib/refinery/pages/engine.rb

@@ -24,7 +24,11 @@ module Refinery
           plugin.name = 'refinery_pages'
           plugin.version = %q{2.0.0}
           plugin.menu_match = %r{refinery/page(_part|s_dialog)?s$}
-          plugin.activity = { :class_name => :'refinery/page' }
+          plugin.activity = {
+            :class_name => :'refinery/page',
+            :nested_with => [:uncached_nested_url],
+            :use_record_in_nesting => false
+          }
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_pages_path }
         end
       end

data/spec/controllers/refinery/admin/pages_controller_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+module Refinery
+  module Admin
+    describe PagesController do
+      login_refinery_superuser
+
+      describe "#update_positions" do
+        it "calls .rebuild! on Refinery::Page" do
+          Refinery::Page.should_receive(:rebuild!).once
+
+          post :update_positions, :ul => []
+        end
+      end
+    end
+  end
+end

data/spec/helpers/refinery/pages/admin/pages_helper_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+module Refinery
+  module Admin
+    describe PagesHelper do
+      describe "#template_options" do
+        context "when page layout/view templte is set" do
+          it "returns empty hash" do
+            page = FactoryGirl.create(:page)
+
+            page.view_template = "rspec_template"
+            helper.template_options(:view_template, page).should eq({})
+
+            page.layout_template = "rspec_layout"
+            helper.template_options(:layout_template, page).should eq({})
+          end
+        end
+
+        context "when page layout/view template isn't set" do
+          context "when page has parent" do
+            it "returns option hash based on parent page" do
+              parent = FactoryGirl.create(:page, :view_template => "rspec_view",
+                                                 :layout_template => "rspec_layout")
+              page = FactoryGirl.create(:page, :parent_id => parent.id)
+
+              expected_view = { :selected => parent.view_template }
+              helper.template_options(:view_template, page).should eq(expected_view)
+
+              expected_layout = { :selected => parent.layout_template }
+              helper.template_options(:layout_template, page).should eq(expected_layout)
+            end
+          end
+
+          context "when page doesn't have parent page" do
+            before do
+              Refinery::Pages.stub(:view_template_whitelist).and_return(%w(one two))
+              Refinery::Pages.stub(:layout_template_whitelist).and_return(%w(two one))
+            end
+
+            it "returns option hash with first item from configured whitelist" do
+              page = FactoryGirl.create(:page)
+
+              expected_view = { :selected => "one" }
+              helper.template_options(:view_template, page).should eq(expected_view)
+
+              expected_layout = { :selected => "two" }
+              helper.template_options(:layout_template, page).should eq(expected_layout)
+            end
+          end
+        end
+      end
+    end
+  end
+end 

data/spec/models/refinery/page_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module Refinery
@@ -103,6 +104,41 @@ module Refinery
       end
     end
 
+    describe '#canonical' do
+      before do
+        ::Refinery::I18n.stub(:default_frontend_locale).and_return(:en)
+        ::Refinery::I18n.stub(:frontend_locales).and_return([Refinery::I18n.default_frontend_locale, :ru])
+        ::Refinery::I18n.stub(:current_frontend_locale).and_return(Refinery::I18n.default_frontend_locale)
+
+        page.save
+      end
+      let(:page_title)  { 'team' }
+      let(:child_title) { 'about' }
+      let(:ru_page_title) { 'Новости' }
+      let!(:default_canonical) {
+        Globalize.with_locale(::Refinery::I18n.default_frontend_locale) {
+          page.canonical
+        }
+      }
+
+      specify 'page returns itself' do
+        page.canonical.should == page.url
+      end
+
+      specify 'default canonical matches page#canonical' do
+        default_canonical.should == page.canonical
+      end
+
+      specify 'translated page returns master page' do
+        Globalize.with_locale(:ru) do
+          page.title = ru_page_title
+          page.save
+
+          page.canonical.should == default_canonical
+        end
+      end
+    end
+
     context 'custom slugs' do
       let(:custom_page_slug) { 'custom-page-slug' }
       let(:custom_child_slug) { 'custom-child-slug' }

data/spec/requests/refinery/admin/pages_spec.rb

@@ -132,7 +132,7 @@ module Refinery
           page.body.should =~ /Add a new child page/
           page.body.should =~ %r{/refinery/pages/new\?parent_id=}
           page.body.should =~ /View this page live/
-          page.body.should =~ %r{/pages/my-first-page}
+          page.body.should =~ %r{href="/my-first-page"}
 
           Refinery::Page.count.should == 1
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,9 @@ files:
 - lib/refinerycms-pages.rb
 - license.md
 - refinerycms-pages.gemspec
+- spec/controllers/refinery/admin/pages_controller_spec.rb
 - spec/factories/pages.rb
+- spec/helpers/refinery/pages/admin/pages_helper_spec.rb
 - spec/helpers/refinery/pages/content_pages_helper_spec.rb
 - spec/lib/generators/refinery/pages/pages_generator_spec.rb
 - spec/lib/pages/content_page_presenter_spec.rb
@@ -195,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1077792218542240122
+      hash: -121281082121598221
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1077792218542240122
+      hash: -121281082121598221
 requirements: []
 rubyforge_project: refinerycms
 rubygems_version: 1.8.22
@@ -212,7 +214,9 @@ signing_key:
 specification_version: 3
 summary: Pages extension for Refinery CMS
 test_files:
+- spec/controllers/refinery/admin/pages_controller_spec.rb
 - spec/factories/pages.rb
+- spec/helpers/refinery/pages/admin/pages_helper_spec.rb
 - spec/helpers/refinery/pages/content_pages_helper_spec.rb
 - spec/lib/generators/refinery/pages/pages_generator_spec.rb
 - spec/lib/pages/content_page_presenter_spec.rb