refinerycms-pages 2.0.10 → 2.1.0

data/lib/refinery/pages/url.rb

@@ -0,0 +1,74 @@
+module Refinery
+  module Pages
+    class Url
+
+      class Localised < Url
+        def self.handle?(page)
+          page.link_url.present?
+        end
+
+        def url
+          current_url = page.link_url
+
+          if current_url =~ %r{^/} &&
+            Refinery::I18n.current_frontend_locale != Refinery::I18n.default_frontend_locale
+            current_url = "/#{Refinery::I18n.current_frontend_locale}#{current_url}"
+          end
+
+          current_url
+        end
+      end
+
+      class Marketable < Url
+        def self.handle?(page)
+          Refinery::Pages.marketable_urls
+        end
+
+        def url
+          url_hash = base_url_hash.merge(:path => page.nested_url, :id => nil)
+          with_locale_param(url_hash)
+        end
+      end
+
+      class Normal < Url
+        def self.handle?(page)
+          page.to_param.present?
+        end
+
+        def url
+          url_hash = base_url_hash.merge(:path => nil, :id => page.to_param)
+          with_locale_param(url_hash)
+        end
+      end
+
+      def self.build(page)
+        klass = [ Localised, Marketable, Normal ].detect { |d| d.handle?(page) } || self
+        klass.new(page).url
+      end
+
+      def initialize(page)
+        @page = page
+      end
+
+      def url
+        raise NotImplementedError
+      end
+
+      private
+
+      attr_reader :page
+
+      def with_locale_param(url_hash)
+        if (locale = Refinery::I18n.current_frontend_locale) != ::I18n.locale
+          url_hash.update :locale => locale if locale
+        end
+        url_hash
+      end
+
+      def base_url_hash
+        { :controller => '/refinery/pages', :action => 'show', :only_path => true }
+      end
+
+    end
+  end
+end

data/refinerycms-pages.gemspec

@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -20,8 +19,10 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
+  s.add_dependency 'friendly_id',                 '~> 4.0.9'
+  s.add_dependency 'globalize3',                  '~> 0.3.0'
   s.add_dependency 'awesome_nested_set',          '~> 2.1.3'
-  s.add_dependency 'seo_meta',                    '~> 1.3.0'
+  s.add_dependency 'seo_meta',                    '~> 1.4.0'
   s.add_dependency 'refinerycms-core',            version
   s.add_dependency 'babosa',                      '!= 0.3.6'
 end

data/spec/controllers/refinery/pages_controller_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+module Refinery
+  describe PagesController do
+    before do
+      FactoryGirl.create(:page, :link_url => "/")
+      FactoryGirl.create(:page, :title => "test")
+    end
+
+    describe "#home" do
+      it "renders home template" do
+        get :home
+        expect(response).to render_template("home")
+      end
+    end
+
+    describe "#show" do
+      it "renders show template" do
+        get :show, :path => "test"
+        expect(response).to render_template("show")
+      end
+    end
+  end
+end

data/spec/factories/pages.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
   factory :page, :class => Refinery::Page do
-    title "Test title"
+    sequence(:title, "a") {|n| "Test title #{n}" }
   end
 end

data/spec/{requests → features}/refinery/admin/pages_spec.rb

@@ -18,7 +18,7 @@ end
 module Refinery
   module Admin
     describe "Pages" do
-      login_refinery_user
+      refinery_login_with :refinery_user
 
       context "when no pages" do
         it "invites to create one" do
@@ -85,15 +85,15 @@ module Refinery
             end
 
             it "expands children", :js do
-              find("#page_#{company.id} .toggle").click
+              find("#page_#{company.id} .title.toggle").click
 
               page.should have_content(team.title)
               page.should have_content(locations.title)
             end
 
             it "expands children when nested mutliple levels deep", :js do
-              find("#page_#{company.id} .toggle").click
-              find("#page_#{locations.id} .toggle").click
+              find("#page_#{company.id} .title.toggle").click
+              find("#page_#{locations.id} .title.toggle").click
 
               page.should have_content("New York")
             end
@@ -136,10 +136,13 @@ module Refinery
           Refinery::Page.count.should == 1
         end
 
-        it "includes menu title field" do
+        it "includes menu title field", :js => true do
           visit refinery.new_admin_page_path
 
           fill_in "Title", :with => "My first page"
+
+          click_link "toggle_advanced_options"
+
           fill_in "Menu title", :with => "The first page"
 
           click_button "Save"
@@ -162,7 +165,7 @@ module Refinery
             click_link "Edit this page"
 
             fill_in "Title", :with => "Updated"
-            click_button "Save"
+            find("#submit_button").click
 
             page.should have_content("'Updated' was successfully updated.")
           end
@@ -174,7 +177,7 @@ module Refinery
             find('a[tooltip^=Edit]').click
 
             fill_in "Title", :with => "Updated"
-            click_button "Save & continue editing"
+            find("#submit_continue_button").click
             find('#flash').visible?
           end
 
@@ -185,7 +188,7 @@ module Refinery
           # Regression test for https://github.com/refinery/refinerycms/issues/1892
           context 'when saving to exit (a second time)' do
             it 'updates page', :js do
-              click_button "Save"
+              find("#submit_button").click
               page.should have_content("'Updated' was successfully updated.")
             end
           end
@@ -206,6 +209,21 @@ module Refinery
             new_window_should_have_content("Some changes I'm unsure what they will look like")
           end
 
+          it 'will not show the site bar', :js do
+            visit refinery.admin_pages_path
+
+            find('a[tooltip^=Edit]').click
+            fill_in "Title", :with => "Some changes I'm unsure what they will look like"
+            click_button "Preview"
+
+            new_window_should_not_have_content(
+              ::I18n.t('switch_to_website', :scope => 'refinery.site_bar')
+            )
+            new_window_should_not_have_content(
+              ::I18n.t('switch_to_website_editor', :scope => 'refinery.site_bar')
+            )
+          end
+
           it 'will not save the preview changes', :js do
             visit refinery.admin_pages_path
 
@@ -314,13 +332,16 @@ module Refinery
           Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
 
           # Create a home page in both locales (needed to test menus)
-          home_page = FactoryGirl.create(:page, :title => 'Home',
-                                                :link_url => '/',
-                                                :menu_match => "^/$")
-          Globalize.locale = :ru
-          home_page.title = 'Домашняя страница'
-          home_page.save
-          Globalize.locale = :en
+          home_page = Globalize.with_locale(:en) do
+            Page.create :title => 'Home',
+                        :link_url => '/',
+                        :menu_match => "^/$"
+          end
+
+          Globalize.with_locale(:ru) do
+            home_page.title = 'Домашняя страница'
+            home_page.save
+          end
         end
 
         describe "add a page with title for default locale" do
@@ -356,7 +377,7 @@ module Refinery
 
             within "#menu" do
               page.should have_content('News')
-              page.should have_css('a', :href => 'news')
+              page.should have_selector("a[href='/news']")
             end
           end
 
@@ -374,7 +395,6 @@ module Refinery
           let(:en_page_title) { 'News' }
           let(:en_page_slug) { 'news' }
           let(:ru_page_title) { 'Новости' }
-          let(:ru_page_slug) { 'новости' }
           let(:ru_page_slug_encoded) { '%D0%BD%D0%BE%D0%B2%D0%BE%D1%81%D1%82%D0%B8' }
           let!(:news_page) do
             Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
@@ -408,7 +428,7 @@ module Refinery
               click_link "En"
             end
             fill_in "Title", :with => en_page_title
-            click_button "Save"
+            find("#submit_button").click
 
             page.should have_content("'#{en_page_title}' was successfully updated.")
             Refinery::Page.count.should == 2
@@ -464,7 +484,7 @@ module Refinery
           }
           let(:ru_page_id) { ru_page.id }
           let(:ru_page_title) { 'Новости' }
-          let(:ru_page_slug) { 'новости' }
+          let(:ru_page_slug_encoded) { '%D0%BD%D0%BE%D0%B2%D0%BE%D1%81%D1%82%D0%B8' }
 
           before do
             ru_page
@@ -513,7 +533,7 @@ module Refinery
 
             within "#menu" do
               page.should have_content(ru_page_title)
-              page.should have_css('a', :href => ru_page_slug)
+              page.should have_selector("a[href*='/#{ru_page_slug_encoded}']")
             end
           end
 
@@ -548,34 +568,73 @@ module Refinery
         end
       end
 
+      describe "delete existing page part", :js do
+        let!(:some_page) { Page.create! :title => "Some Page" }
+
+        before do
+          some_page.parts.create! :title => "First Part", :position => 1
+          some_page.parts.create! :title => "Second Part", :position => 2
+          some_page.parts.create! :title => "Third Part", :position => 3
+
+          Refinery::Pages.stub(:new_page_parts).and_return(true)
+        end
+
+        it "deletes page parts" do
+          visit refinery.edit_admin_page_path(some_page.id)
+
+          within "#page_parts" do
+            page.should have_content("First Part")
+            page.should have_content("Second Part")
+            page.should have_content("Third Part")
+          end
+
+          2.times do
+            click_link "delete_page_part"
+            page.driver.browser.switch_to.alert.accept
+          end
+
+          within "#page_parts" do
+            page.should have_no_content("First Part")
+            page.should have_no_content("Second Part")
+            page.should have_content("Third Part")
+          end
+
+          click_button "submit_button"
+
+          visit refinery.edit_admin_page_path(some_page.id)
+
+          within "#page_parts" do
+            page.should have_no_content("First Part")
+            page.should have_no_content("Second Part")
+            page.should have_content("Third Part")
+          end
+        end
+      end
+
       describe 'advanced options' do
         describe 'view and layout templates' do
           context 'when parent page has templates set' do
             before 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 = Page.create :title => 'Parent Page',
                                         :view_template => 'refinery',
                                         :layout_template => 'refinery'
-              parent_page.children.create :title => 'Child Page'
+              @page = parent_page.children.create :title => 'Child Page'
             end
 
-            specify 'sub page should inherit them' do
-              visit refinery.admin_pages_path
+            specify 'sub page should inherit them', :js => true do
+              visit refinery.edit_admin_page_path(@page.id)
 
-              within '.nested' do
-                click_link 'Edit this page'
-              end
+              click_link 'toggle_advanced_options'
 
               within '#page_layout_template' do
-                page.find('option[value=refinery]').selected?.should eq('selected')
+                page.find('option[value=refinery]').should be_selected
               end
 
               within '#page_view_template' do
-                page.find('option[value=refinery]').selected?.should eq('selected')
+                page.find('option[value=refinery]').should be_selected
               end
             end
           end
@@ -599,10 +658,30 @@ module Refinery
           page.should have_content("header class='regression'")
         end
       end
+
+      describe "with full page caching", :caching do
+        include CachingHelpers
+        let(:cached_page) { Page.create :title => 'Cached page' }
+
+        before do
+          cache_page(cached_page)
+        end
+
+        describe "creating updating or destroying a page" do
+          it "should clear the page cache" do
+            cached_page.should be_cached
+
+            visit refinery.admin_pages_path
+            click_link "Remove this page forever"
+
+            cached_page.should_not be_cached
+          end
+        end
+      end
     end
 
     describe "TranslatePages" do
-      login_refinery_translator
+      refinery_login_with :refinery_translator
 
       describe "add page to main locale" do
         it "doesn't succeed" do
@@ -657,11 +736,14 @@ module Refinery
           Refinery::I18n.frontend_locales = [:en, :ru]
 
           # Create a page in both locales
-          about_page = FactoryGirl.create(:page, :title => 'About')
-          Globalize.locale = :ru
-          about_page.title = 'About Ru'
-          about_page.save
-          Globalize.locale = :en
+          about_page = Globalize.with_locale(:en) do
+            Page.create :title => 'About'
+          end
+
+          Globalize.with_locale(:ru) do
+            about_page.title = 'About Ru'
+            about_page.save
+          end
         end
 
         let(:about_page) do
@@ -678,14 +760,14 @@ module Refinery
             before { Refinery::Pages.absolute_page_links = false }
 
             it "shows Russian pages if we're editing the Russian locale" do
-              visit 'refinery/pages_dialogs/link_to?wymeditor=true&switch_locale=ru'
+              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true, :switch_locale => :ru)
 
               page.should have_content("About Ru")
               page.should have_selector("a[href='/ru/about-ru']")
             end
 
             it "shows default to the default locale if no query string is added" do
-              visit 'refinery/pages_dialogs/link_to?wymeditor=true'
+              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true)
 
               page.should have_content("About")
               page.should have_selector("a[href='/about']")
@@ -696,14 +778,14 @@ module Refinery
             before { Refinery::Pages.absolute_page_links = true }
 
             it "shows Russian pages if we're editing the Russian locale" do
-              visit 'refinery/pages_dialogs/link_to?wymeditor=true&switch_locale=ru'
+              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true, :switch_locale => :ru)
 
               page.should have_content("About Ru")
               page.should have_selector("a[href='http://www.example.com/ru/about-ru']")
             end
 
             it "shows default to the default locale if no query string is added" do
-              visit 'refinery/pages_dialogs/link_to?wymeditor=true'
+              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true)
 
               page.should have_content("About")
               page.should have_selector("a[href='http://www.example.com/about']")
@@ -715,7 +797,8 @@ module Refinery
             specify "dialog has correct links", :js do
               visit refinery.edit_admin_page_path(about_page)
 
-              click_link "Add Link"
+
+              find("#page_part_body .wym_tools_link a").click
 
               page.should have_selector("iframe#dialog_frame")
 
@@ -730,7 +813,7 @@ module Refinery
                 click_link "Ru"
               end
 
-              click_link "Add Link"
+              find("#page_part_body .wym_tools_link a").click
 
               page.should have_selector("iframe#dialog_frame")