refinerycms-pages 2.0.3 → 2.0.4

data/app/controllers/refinery/page_sweeper.rb

@@ -18,11 +18,16 @@ module Refinery
     def expire_cache
       # TODO: Where does page_cache_directory come from??
       return unless page_cache_directory
-      page_cache_directory = Pathname.new(page_cache_directory.to_s)
+      page_cache_directory_path = Pathname.new(page_cache_directory.to_s)
 
       # Delete the full Cache
-      if (cache_root = page_cache_directory.join('refinery', 'cache', 'pages')).directory?
-        cache_root.rmdir
+      if (cache_root = page_cache_directory_path.join('refinery', 'cache', 'pages')).directory?
+        cache_root.rmtree
+      end
+
+      # Delete the pages index files (/refinery/cache/pages.html*)
+      Pathname.glob(page_cache_directory_path.join('refinery', 'cache', 'pages.html*')).each do |cache_index|
+        cache_index.delete
       end
     end
   end

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

@@ -1,6 +1,15 @@
 module Refinery
   module Admin
     module PagesHelper
+      def parent_id_nested_set_options(current_page)
+        pages = []
+        nested_set_options(::Refinery::Page, current_page) {|page| pages << page}
+        # page.title needs the :translations association, doing something like
+        # nested_set_options(::Refinery::Page.includes(:translations), page) doesn't work, yet.
+        # See https://github.com/collectiveidea/awesome_nested_set/pull/123
+        ActiveRecord::Associations::Preloader.new(pages, :translations).run
+        pages.map {|page| ["#{'-' * page.level} #{page.title}", page.id]}
+      end
     end
   end
 end

data/app/models/refinery/page.rb

@@ -72,8 +72,8 @@ module Refinery
       # For example with about/example we would need to find 'about' and then its child
       # called 'example' otherwise it may clash with another page called /example.
       def find_by_path(path)
-        split_path = path.to_s.split('/')
-        page = ::Refinery::Page.by_slug(split_path.shift).first
+        split_path = path.to_s.split('/').reject(&:blank?)
+        page = ::Refinery::Page.by_slug(split_path.shift, :parent_id => nil).first
         page = page.children.by_slug(split_path.shift).first until page.nil? || split_path.empty?
 
         page
@@ -103,12 +103,9 @@ module Refinery
       end
 
       # Finds a page using its slug.  See by_title
-      def by_slug(slug)
-        if defined?(::Refinery::I18n)
-          with_globalize(:locale => Refinery::I18n.frontend_locales, :slug => slug)
-        else
-          with_globalize(:locale => ::I18n.locale, :slug => slug)
-        end
+      def by_slug(slug, conditions={})
+        locales = Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : ::I18n.locale
+        with_globalize({ :locale => locales, :slug => slug }.merge(conditions))
       end
 
       # Shows all pages with :show_in_menu set to true, but it also
@@ -332,16 +329,16 @@ module Refinery
       Rails.cache.fetch(path_cache_key) { ['', nested_url].join('/') }
     end
 
-    def path_cache_key
-      [cache_key, 'nested_path'].join('#')
+    def path_cache_key(locale = Globalize.locale)
+      [cache_key(locale), 'nested_path'].join('#')
     end
 
-    def url_cache_key
-      [cache_key, 'nested_url'].join('#')
+    def url_cache_key(locale = Globalize.locale)
+      [cache_key(locale), 'nested_url'].join('#')
     end
 
-    def cache_key
-      [Refinery::Core.base_cache_key, 'page', ::I18n.locale, id].compact.join('/')
+    def cache_key(locale)
+      [Refinery::Core.base_cache_key, 'page', locale, id].compact.join('/')
     end
 
     # Returns true if this page is "published"
@@ -453,8 +450,10 @@ module Refinery
       return true unless Refinery::Pages.marketable_urls
 
       [self, children].flatten.each do |page|
-        Rails.cache.delete(page.url_cache_key)
-        Rails.cache.delete(page.path_cache_key)
+        ((Refinery.i18n_enabled? && Refinery::I18n.frontend_locales) || [::I18n.locale]).each do |locale|
+          Rails.cache.delete(page.url_cache_key(locale))
+          Rails.cache.delete(page.path_cache_key(locale))
+        end
       end
     end
     alias_method :invalidate_child_cached_url, :invalidate_cached_urls

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

@@ -18,8 +18,7 @@
         <%= f.label :parent_id, t('.parent_page') %>
         <%= refinery_help_tag t('.parent_page_help') %>
       </span>
-      <%= f.select :parent_id, nested_set_options(::Refinery::Page, @page) {|i| "#{'-' * i.level} #{i.title}" },
-                   :include_blank => true %>
+      <%= f.select :parent_id, parent_id_nested_set_options(@page), :include_blank => true %>
     </div>
     <% if Refinery::Pages.use_layout_templates %>
     <div class='field'>
@@ -27,7 +26,11 @@
         <%= f.label :layout_template, t('.layout_template') %>
         <%= refinery_help_tag t('.layout_template_help') %>
       </span>
-      <%= f.select(:layout_template, @valid_layout_templates) %>
+      <% 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 %>
     </div>
     <% end %>
     <% if Refinery::Pages.use_view_templates %>
@@ -36,7 +39,11 @@
         <%= f.label :view_template, t('.view_template') %>
         <%= refinery_help_tag t('.view_template_help') %>
       </span>
-      <%= f.select(:view_template, @valid_view_templates.map{|t| [t.titleize, t]}) %>
+      <% 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 %>
     </div>
     <% end %>
 

data/config/locales/en.yml

@@ -68,8 +68,10 @@ en:
           parent_page_help: You can put a page under another page by selecting it in the list. If you want this page to be a top-level page, just leave it blank.
           menu_title_help: If you want the menu to display a different title than the one that dipsplays on the page, enter it here.
           custom_slug_help: A slug is a human-readable ID used to create a page's full URL, for example 'about-us'. To override the slug that is automatically created by Refinery, enter your custom slug here.
+          layout_template: Layout template
+          layout_template_help: You can choose a different layout template for this page
           view_template: View template
-          view_template_help: You can chose different template for this page
+          view_template_help: You can choose a different view template for this page
         form_advanced_options_seo:
           seo: Search Engine Optimization
           seo_override_title: Browser title

data/config/locales/ru.yml

@@ -43,6 +43,9 @@ ru:
           view_live_html: Показать эту страницу вживую <br/><em>(откроется в новом окне)</em>
           hidden: скрытая
           draft: черновик
+        form:
+          preview: Посмотреть
+          preview_changes: Посмотреть свои изменения перед сохранением
         form_new_page_parts:
           title: Заголовок
         form_page_parts:

data/lib/refinery/pages/admin/instance_methods.rb

@@ -16,7 +16,7 @@ module Refinery
                                  ).gsub("home page", "Dashboard")
 =end
 
-            render :template => "/pages/show", :layout => layout?, :status => 404
+            render :template => "/refinery/pages/show", :layout => layout?, :status => 404
             return false
           else
             super

data/refinerycms-pages.gemspec

@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski', 'David Jones', 'Steven Heidel']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'awesome_nested_set',          '~> 2.1.0'
+  s.add_dependency 'awesome_nested_set',          '~> 2.1.3'
   s.add_dependency 'seo_meta',                    '~> 1.3.0'
   s.add_dependency 'refinerycms-core',            version
   s.add_dependency 'babosa',                      '!= 0.3.6'

data/spec/models/refinery/page_spec.rb

@@ -411,5 +411,24 @@ module Refinery
       end
     end
 
+    describe '.find_by_path' do
+      let(:page_title)  { 'team' }
+      let(:child_title) { 'about' }
+      let(:created_root_about) { subject.class.create!(:title => child_title, :deletable => true) }
+
+      before(:each) do
+        # Ensure pages are created.
+        created_child
+        created_root_about
+      end
+
+      it "should return (root) about page when looking for '/about'" do
+        Refinery::Page.find_by_path('/about').should == created_root_about
+      end
+
+      it "should return child about page when looking for '/team/about'" do
+        Refinery::Page.find_by_path('/team/about').should == created_child
+      end
+    end
   end
 end

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

@@ -506,6 +506,39 @@ module Refinery
           end
         end
       end
+
+      describe 'advanced options' do
+        describe 'view and layout templates' do
+          context 'when parent page has templates set' do
+            before(:each) do
+              Refinery::Pages.stub(:use_layout_templates).and_return(true)
+              Refinery::Pages.stub(:use_view_templates).and_return(true)
+              Refinery::Pages.stub(:layout_template_whitelist).and_return(['abc', 'refinery'])
+              Refinery::Pages.stub(:view_template_whitelist).and_return(['abc', 'refinery'])
+              Refinery::Pages.stub(:valid_templates).and_return(['abc', 'refinery'])
+              parent_page = FactoryGirl.create(:page, :view_template => 'refinery',
+                                                      :layout_template => 'refinery')
+              parent_page.children.create(FactoryGirl.attributes_for(:page))
+            end
+
+            specify 'sub page should inherit them' do
+              visit refinery.admin_pages_path
+
+              within '.nested' do
+                click_link 'Edit this page'
+              end
+
+              within '#page_layout_template' do
+                page.find('option[value=refinery]').selected?.should eq('selected')
+              end
+
+              within '#page_view_template' do
+                page.find('option[value=refinery]').selected?.should eq('selected')
+              end
+            end
+          end
+        end
+      end
     end
 
     describe "TranslatePages" do
@@ -571,6 +604,15 @@ module Refinery
           Globalize.locale = :en
         end
 
+        let(:about_page) do
+          page = Refinery::Page.last
+          # we need page parts so that there's wymeditor
+          Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
+            page.parts.create(:title => default_page_part, :body => nil, :position => index)
+          end
+          page
+        end
+
         describe "adding page link" do
           describe "with relative urls" do
             before(:each) { Refinery::Pages.absolute_page_links = false }
@@ -589,6 +631,7 @@ module Refinery
               page.should have_selector("a[href='/about']")
             end
           end
+
           describe "with absolute urls" do
             before(:each) { Refinery::Pages.absolute_page_links = true }
 
@@ -606,6 +649,37 @@ module Refinery
               page.should have_selector("a[href='http://www.example.com/about']")
             end
           end
+
+          # see https://github.com/resolve/refinerycms/pull/1583
+          context "when switching locales" do
+            specify "dialog has correct links", :js => true do
+              visit refinery.edit_admin_page_path(about_page)
+
+              click_link "Add Link"
+
+              page.should have_selector("iframe#dialog_frame")
+
+              page.within_frame("dialog_frame") do
+                page.should have_content("About")
+                page.should have_css("a[href$='/about']")
+
+                click_link "cancel_button"
+              end
+
+              within "#switch_locale_picker" do
+                click_link "Ru"
+              end
+
+              click_link "Add Link"
+
+              page.should have_selector("iframe#dialog_frame")
+
+              page.within_frame("dialog_frame") do
+                page.should have_content("About Ru")
+                page.should have_css("a[href$='/ru/about-ru']")
+              end
+            end
+          end
         end
       end
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
 - Philip Arndt
 - Uģis Ozols
+- Rob Yurkowski
 - David Jones
 - Steven Heidel
 autorequire: 
@@ -21,7 +22,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +30,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: seo_meta
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +54,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,7 +62,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 515173493532561148
+      hash: 1077792218542240122
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,10 +204,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 515173493532561148
+      hash: 1077792218542240122
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 1.8.19
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Pages extension for Refinery CMS