refinerycms-pages 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e83dbfdfba885ff0dd0f31a0b23f226c01483b0
-  data.tar.gz: 1eb13220474770daf946ab20955393fab25e7388
+  metadata.gz: 4933d54bda49d54b6458ba369411b14d07c4296d
+  data.tar.gz: 7d9b0ffdaa544522cd7e58c2aa262795ba722ae2
 SHA512:
-  metadata.gz: 94f97db5e16189f54615a2fdc27000554583c2704ef9cf8a3261ae87e6e08034892bff197c36f2758aabf53f807abf8645db29ad7e74ad4bb80d460f17f5073f
-  data.tar.gz: 6ea014c7893bf92120a23aece4e6b8d005f75c2cc37a2bdb644dcdbf60d719f2e0773c13195ca24159c840e32ed2a098457db8bf319b8c4b840f1ceea01bed2d
+  metadata.gz: 7930a05fc308a3d86bfb85e606bcdd8e672c6c44aed78ba99ca47aff029421cde7031fa766a3d0f23c8941944f20c49adc5eada1dd797b37f57bc566e1890104
+  data.tar.gz: 3e26bcbe3eb57580e81276f6e1750081b1c72f07fde92387692094d8aefe59cd212eb1768c0ffd5476cb427a104efbb0319e8208fe5b222363826bde76bbccbd

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

@@ -64,8 +64,8 @@ module Refinery
 
       def wrap_content_in_tag(content)
         content = sanitize(content,
-          tags: Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS,
-          attributes: Loofah::HTML5::WhiteList::ALLOWED_ATTRIBUTES
+          tags: Refinery::Pages::whitelist_elements,
+          attributes: Refinery::Pages::whitelist_attributes
         )
         content_tag(:section, content_tag(:div, content, :class => 'inner'), :id => id)
       end

data/lib/generators/refinery/pages/templates/config/initializers/refinery/pages.rb.erb

@@ -40,10 +40,9 @@ Refinery::Pages.configure do |config|
   # and will no longer be nested as children.
   # config.scope_slug_by_parent = <%= Refinery::Pages.scope_slug_by_parent.inspect %>
 
-  # Set this to true if you want backend pages to be cached
-  # config.cache_pages_backend = <%= Refinery::Pages.cache_pages_backend.inspect %>
-
-  # Set this to true to activate full-page-cache
+  # Set this to true to activate full-page-cache.
+  # If you use Rails 4.0+ and set config.cache_pages_full to true, you have to add this gem in your Gemfile:
+  # gem 'actionpack-page_caching'
   # config.cache_pages_full = <%= Refinery::Pages.cache_pages_full.inspect %>
 
   # Set this to true to fully expand the page hierarchy in the admin
@@ -66,4 +65,8 @@ Refinery::Pages.configure do |config|
   # config.absolute_page_links = <%= Refinery::Pages.absolute_page_links.inspect %>
 
   # config.show_title_in_body = <%= Refinery::Pages.show_title_in_body.inspect %>
+
+  # config.add_whitelist_elements = <%= Refinery::Pages.add_whitelist_elements.inspect %>
+
+  # config.add_whitelist_attributes = <%= Refinery::Pages.add_whitelist_attributes.inspect %>
 end

data/lib/refinery/pages/configuration.rb

@@ -5,10 +5,11 @@ module Refinery
     config_accessor :pages_per_dialog, :pages_per_admin_index, :new_page_parts,
                     :marketable_urls, :approximate_ascii, :strip_non_ascii,
                     :default_parts, :use_custom_slugs, :scope_slug_by_parent,
-                    :cache_pages_backend, :cache_pages_full, :layout_template_whitelist,
+                    :cache_pages_full, :layout_template_whitelist,
                     :use_layout_templates, :page_title, :absolute_page_links, :types,
                     :auto_expand_admin_tree, :show_title_in_body,
-                    :friendly_id_reserved_words, :layout_templates_pattern, :view_templates_pattern
+                    :friendly_id_reserved_words, :layout_templates_pattern, :view_templates_pattern,
+                    :add_whitelist_elements, :add_whitelist_attributes, :whitelist_elements, :whitelist_attributes
 
     self.pages_per_dialog = 14
     self.pages_per_admin_index = 20
@@ -19,10 +20,21 @@ module Refinery
     self.default_parts = [{ title: "Body", slug: "body" }, { title: "Side Body", slug: "side_body" }]
     self.use_custom_slugs = false
     self.scope_slug_by_parent = true
-    self.cache_pages_backend = false
     self.cache_pages_full = false
     self.layout_template_whitelist = ["application"]
+    self.add_whitelist_elements = %w[ source track ]
+    self.add_whitelist_attributes = %w[ kind srclang placeholder controls ]
+
+
     class << self
+      def whitelist_elements
+        Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS.merge(config.add_whitelist_elements)
+      end
+
+      def whitelist_attributes
+        Loofah::HTML5::WhiteList::ALLOWED_ATTRIBUTES.merge(config.add_whitelist_attributes)
+      end
+
       def layout_template_whitelist
         Array(config.layout_template_whitelist).map(&:to_s)
       end

data/spec/factories/page_parts.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :page_part, class: Refinery::PagePart do
+    title 'Body'
+    slug 'side_body'
+  end
+end

data/spec/factories/pages.rb

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

data/spec/presenters/refinery/pages/section_presenter_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 module Refinery
   module Pages
+
+
     describe SectionPresenter do
       it "can build a css class for when it is not present based on id" do
         section = SectionPresenter.new(:fallback_html => 'foobar', :id => 'mynode')
@@ -45,6 +47,56 @@ module Refinery
           expect(section.wrapped_html(true)).to xml_eq('<section id="mynode"><div class="inner">foobar</div></section>')
         end
 
+
+        # Regression tests for https://github.com/refinery/refinerycms-inquiries/issues/168
+        describe "#whitelist_elements" do
+          context "when an element is not in a whitelist" do
+            it "will not return those elements" do
+              allow(Refinery::Pages).to receive(:whitelist_elements) {%w()}
+              section = SectionPresenter.new
+              section.override_html = %Q{<dummy></dummy>}
+              expect(section.wrapped_html(true)).to xml_eq(
+                %Q{<section><div class="inner"></div></section>}
+              )
+            end
+          end
+
+          context "when an extra element is included in the whitelist" do
+            it "will contain the whitelisted element" do
+              allow(Refinery::Pages).to receive(:whitelist_elements) {%w(dummy)}
+              section = SectionPresenter.new
+              section.override_html = %Q{<dummy></dummy>}
+              expect(section.wrapped_html(true)).to xml_eq(
+                %Q{<section><div class="inner"><dummy></dummy></div></section>}
+              )
+            end
+          end
+        end
+
+        describe "#whitelist_attributes" do
+          context "when an attribute is not in a whitelist" do
+            it "will not return those attributes" do
+              allow(Refinery::Pages).to receive(:whitelist_attributes) {%w()}
+              section = SectionPresenter.new
+              section.override_html = %Q{<a attribute="value"></a>}
+              expect(section.wrapped_html(true)).to xml_eq(
+                %Q{<section><div class="inner"><a></a></div></section>}
+              )
+            end
+          end
+
+          context "when extra attributes are included in the whitelist" do
+            it "will contain the whitelisted attributes" do
+              allow(Refinery::Pages).to receive(:whitelist_attributes) {%w(attribute)}
+              section = SectionPresenter.new
+              section.override_html = %Q{<a attribute="value"></a>}
+              expect(section.wrapped_html(true)).to xml_eq(
+                %Q{<section><div class="inner"><a attribute="value"></a></div></section>}
+              )
+            end
+          end
+        end
+
         describe "if allowed to use fallback html" do
           it "wont show a section with no fallback or override" do
             section = SectionPresenter.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +223,7 @@ files:
 - refinerycms-pages.gemspec
 - spec/controllers/refinery/admin/pages_controller_spec.rb
 - spec/controllers/refinery/pages_controller_spec.rb
+- spec/factories/page_parts.rb
 - spec/factories/pages.rb
 - spec/features/refinery/admin/pages_spec.rb
 - spec/features/refinery/pages_spec.rb
@@ -265,13 +266,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Pages extension for Refinery CMS
 test_files:
 - spec/controllers/refinery/admin/pages_controller_spec.rb
 - spec/controllers/refinery/pages_controller_spec.rb
+- spec/factories/page_parts.rb
 - spec/factories/pages.rb
 - spec/features/refinery/admin/pages_spec.rb
 - spec/features/refinery/pages_spec.rb