refinerycms-pages 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fdd8c12a2b4c050e7c4997d2b1c44e80ada1219
-  data.tar.gz: 3cc0a3205db48009b2594ec278280dbaf3434162
+  metadata.gz: 2e83dbfdfba885ff0dd0f31a0b23f226c01483b0
+  data.tar.gz: 1eb13220474770daf946ab20955393fab25e7388
 SHA512:
-  metadata.gz: 521eb0e2ede33925f53d4f4e4094b1531a42ba8a56155d0906f7841ad9ba9134aca6d8c4a7610240f550cf52e39e056c4fae7d1de54a18c9558f60e511f762b8
-  data.tar.gz: 6d08af242e7024af03de977cbd50cbcc3a6757384a9ba7dcb63208b19ef96868f6069cb1aa92b4fa167fff27477d87fd62237960169959f313a391584284f188
+  metadata.gz: 94f97db5e16189f54615a2fdc27000554583c2704ef9cf8a3261ae87e6e08034892bff197c36f2758aabf53f807abf8645db29ad7e74ad4bb80d460f17f5073f
+  data.tar.gz: 6ea014c7893bf92120a23aece4e6b8d005f75c2cc37a2bdb644dcdbf60d719f2e0773c13195ca24159c840e32ed2a098457db8bf319b8c4b840f1ceea01bed2d

data/app/controllers/refinery/admin/page_parts_controller.rb

@@ -23,7 +23,7 @@ module Refinery
 
       protected
         def new_page_part_params
-          params.permit(:title, :slug, :body)
+          params.except(:part_index).permit(:title, :slug, :body, :locale)
         end
 
     end

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

@@ -50,6 +50,7 @@ module Refinery
       # We show the title from the next available locale
       # if there is no title for the current locale
       def page_title_with_translations(page)
+        Refinery.deprecate('page_title_with_translations', when: '3.1', replacement: 'translated_field')
         page.title.presence || page.translations.detect { |t| t.title.present?}.title
       end
 

data/app/presenters/refinery/pages/section_presenter.rb

@@ -11,6 +11,7 @@ module Refinery
     # Sections may be hidden, in which case they wont display at all.
     class SectionPresenter
       include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::SanitizeHelper
 
       def initialize(initial_hash = {})
         initial_hash.map do |key, value|
@@ -62,6 +63,10 @@ module Refinery
       attr_writer :id, :fallback_html, :hidden
 
       def wrap_content_in_tag(content)
+        content = sanitize(content,
+          tags: Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS,
+          attributes: Loofah::HTML5::WhiteList::ALLOWED_ATTRIBUTES
+        )
         content_tag(:section, content_tag(:div, content, :class => 'inner'), :id => id)
       end
     end

data/app/presenters/refinery/pages/title_section_presenter.rb

@@ -4,10 +4,12 @@ module Refinery
     # a title. These are much like normal sections except they are wrapped in
     # a h1 tag rather than a div.
     class TitleSectionPresenter < SectionPresenter
+      include ActionView::Helpers::SanitizeHelper
+
     private
 
       def wrap_content_in_tag(content)
-        content_tag(:h1, content, :id => id)
+        content_tag(:h1, sanitize(content), :id => id)
       end
     end
   end

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

@@ -19,7 +19,7 @@
     <% end %>
 
     <span class='title <%= 'toggle' if page.children.present? %>'>
-      <%= page_title_with_translations page %>
+      <%= translated_field(page, :title) %>
       <%= page_meta_information page %>
     </span>
 

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005 [Resolve Digital](http://resolve.digital)
+Copyright (c) 2005 [Resolve Digital](https://resolve.digital)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/refinerycms-pages.gemspec

@@ -19,7 +19,7 @@ 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',                 '~> 5.1.0'
+  s.add_dependency 'friendly_id',                 ['>= 5.1.0', '< 5.3']
   s.add_dependency 'globalize',                   ['>= 4.0.0', '< 5.2']
   s.add_dependency 'awesome_nested_set',          '~> 3.0.0'
   s.add_dependency 'seo_meta',                    '~> 2.0.0.rc.1'

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

@@ -13,6 +13,15 @@ def expect_window_without_content(content, window: windows.last)
   end
 end
 
+def switch_page_form_locale(locale)
+  within "#switch_locale_picker" do
+    find("a", text: locale.upcase).click
+  end
+
+  # make sure that the locale change has taken effect
+  expect(page).to have_selector("#switch_locale_picker li.selected a##{locale.downcase}")
+end
+
 module Refinery
   module Admin
     describe "Pages", :type => :feature do
@@ -99,14 +108,14 @@ module Refinery
               expect(page).not_to have_content(locations.title)
             end
 
-            it "expands children", :js do
+            it "expands children", js: true do
               find("#page_#{company.id} .title.toggle").click
 
               expect(page).to have_content(team.title)
               expect(page).to have_content(locations.title)
             end
 
-            it "expands children when nested multiple levels deep", :js do
+            it "expands children when nested multiple levels deep", js: true do
               find("#page_#{company.id} .title.toggle").click
               find("#page_#{locations.id} .title.toggle").click
 
@@ -149,7 +158,7 @@ module Refinery
           expect(page.body).to match(%r{href="/my-first-page"})
         end
 
-        it "includes menu title field", :js => true do
+        it "includes menu title field", js: true do
           visit refinery.new_admin_page_path
 
           fill_in "Title", :with => "My first page"
@@ -204,7 +213,7 @@ module Refinery
 
         context 'when saving and continuing to edit' do
           before :each do
-            find('a[tooltip^=Edit]').visible?
+            expect(page).to have_selector('a[tooltip^=Edit]', visible: true)
             find('a[tooltip^=Edit]').click
 
             fill_in "Title", :with => "Updated"
@@ -212,13 +221,13 @@ module Refinery
             find('#flash').visible?
           end
 
-          it "updates page", :js do
+          it "updates page", js: true do
             expect(page).to have_content("'Updated' was successfully updated.")
           end
 
           # Regression test for https://github.com/refinery/refinerycms/issues/1892
           context 'when saving to exit (a second time)' do
-            it 'updates page', :js do
+            it 'updates page', js: true do
               find("#submit_button").click
               expect(page).to have_content("'Updated' was successfully updated.")
             end
@@ -226,7 +235,7 @@ module Refinery
         end
       end
 
-      describe 'Previewing', :js do
+      describe 'Previewing', js: true do
         let(:preview_content) { "Some changes I'm unsure what they will look like".freeze }
         context "an existing page" do
           before { Page.create :title => 'Preview me' }
@@ -466,7 +475,7 @@ module Refinery
           end
         end
 
-        describe "a page with two locales", js:true do
+        describe "a page with two locales" do
           let(:en_page_title) { 'News' }
           let(:en_page_slug) { 'news' }
           let(:ru_page_title) { 'Новости' }
@@ -489,19 +498,18 @@ module Refinery
             news_page.destroy!
             visit refinery.admin_pages_path
 
-            find('a', text:"Add new page").trigger(:click)
-            within "#switch_locale_picker" do
-              find('a', text: "RU").trigger(:click)
-            end
+            click_link "Add new page"
+            switch_page_form_locale "RU"
+
             fill_in "Title", :with => ru_page_title
             click_button "Save"
+            expect(page).to have_selector("#page_#{Page.last.id} .actions")
 
             within "#page_#{Page.last.id} .actions" do
               find("a[href^='/#{Refinery::Core.backend_route}/pages/#{ru_page_slug_encoded}/edit']").click
             end
-            within "#switch_locale_picker" do
-              find('a', text: "EN").trigger(:click)
-            end
+
+            switch_page_form_locale "EN"
             fill_in "Title", :with => en_page_title
             find("#submit_button").click
 
@@ -527,7 +535,7 @@ module Refinery
             end
           end
 
-          it "uses the slug from the default locale in admin" do
+          it "uses the slug from the default locale in admin", js: true do
             visit refinery.admin_pages_path
 
             within "#page_#{news_page.id}" do
@@ -570,9 +578,8 @@ module Refinery
           it "lets you add a Russian title without an English title" do
             ru_page.destroy!
             find('a', text: 'Add new page').trigger(:click)
-            within "#switch_locale_picker" do
-              find('a', text: "RU").trigger(:click)
-            end
+            switch_page_form_locale "RU"
+
             fill_in "Title", :with => ru_page_title
             click_button "Save"
 
@@ -622,7 +629,7 @@ module Refinery
             end
           end
 
-          context "when page is a child page", js: true do
+          context "when page is a child page" do
             it 'succeeds' do
               ru_page.destroy!
               parent_page = Page.create(:title => "Parent page")
@@ -642,12 +649,12 @@ module Refinery
         end
       end
 
-      describe "new page part", :js do
+      describe "new page part" do
         before do
           allow(Refinery::Pages).to receive(:new_page_parts).and_return(true)
         end
 
-        it "adds new page part" do
+        it "adds new page part", js: true do
           visit refinery.new_admin_page_path
           find("#add_page_part").trigger(:click)
 
@@ -662,7 +669,7 @@ module Refinery
         end
       end
 
-      describe "delete existing page part", :js do
+      describe "delete existing page part" do
         let!(:some_page) { Page.create! :title => "Some Page" }
 
         before do
@@ -673,7 +680,7 @@ module Refinery
           allow(Refinery::Pages).to receive(:new_page_parts).and_return(true)
         end
 
-        it "deletes page parts" do
+        it "deletes page parts", js: true do
           visit refinery.edit_admin_page_path(some_page.id)
 
           within "#page_parts" do
@@ -721,7 +728,7 @@ module Refinery
               @page = parent_page.children.create :title => 'Child Page'
             end
 
-            specify 'sub page should inherit them', :js => true do
+            specify 'sub page should inherit them', js: true do
               visit refinery.edit_admin_page_path(@page.id)
 
               find('#toggle_advanced_options').trigger(:click)
@@ -739,7 +746,7 @@ module Refinery
       end
 
       # regression spec for https://github.com/refinery/refinerycms/issues/1891
-      describe "a page part with HTML", js:true do
+      describe "a page part with HTML" do
         before do
           page = Refinery::Page.create! :title => "test"
           Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
@@ -752,7 +759,7 @@ module Refinery
           end
         end
 
-        specify "should retain the html" do
+        specify "should retain the html", js:true do
           visit refinery.admin_pages_path
           find('a[tooltip="Edit this page"]').trigger(:click)
           Capybara.ignore_hidden_elements = false
@@ -766,7 +773,7 @@ module Refinery
       before { Globalize.locale = :en }
       refinery_login
 
-      describe "a page with a single locale", js: true do
+      describe "a page with a single locale" do
         before do
           allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :lv])
           Page.create :title => 'First Page'
@@ -775,11 +782,9 @@ module Refinery
         it "can have a second locale added to it" do
           visit refinery.admin_pages_path
 
-          find('a', text: 'Add new page').trigger(:click)
+          click_link "Add new page"
+          switch_page_form_locale "LV"
 
-          within "#switch_locale_picker" do
-            find('a', text: "LV").trigger(:click)
-          end
           fill_in "Title", :with => "Brīva vieta reklāmai"
           click_button "Save"
 

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

@@ -73,35 +73,6 @@ module Refinery
           end
         end
       end
-
-      describe "#page_title_with_translations" do
-        let(:page) { FactoryGirl.build(:page) }
-
-        before do
-          Globalize.with_locale(:en) do
-            page.title = "draft"
-            page.save!
-          end
-
-          Globalize.with_locale(:lv) do
-            page.title = "melnraksts"
-            page.save!
-          end
-        end
-
-        context "when title is present" do
-          it "returns it" do
-            expect(helper.page_title_with_translations(page)).to eq("draft")
-          end
-        end
-
-        context "when title for current locale isn't available" do
-          it "returns existing title from translations" do
-            Page.translation_class.where(:locale => :en).first.destroy
-            expect(helper.page_title_with_translations(page)).to eq("melnraksts")
-          end
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
@@ -80,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement