refinerycms-pages 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66573e24ded851715eb030ec7e56c42c7d5fcba
-  data.tar.gz: a5e7e009811a415a95e5911fcf739d32d3d77151
+  metadata.gz: 6f503f368f89b0578401ea340bd135e5aac4a4ef
+  data.tar.gz: f6ea7967a335cf7107ad792f37f87b60f3116968
 SHA512:
-  metadata.gz: 11f6602c5142b8d36d9663d81d4af8cb99e85c57964b76315dd1c0d49a64ac4d3ff0b2273377ae042e29f77cc31cb54ecd9c5dd5449dada00b332c38fd90d24f
-  data.tar.gz: 9583d10fff14df271d377f178e3d5763ef4177ec7218888c86227a43fad848f2dec191380c93b423ae04496d20bc9678e1b05d05db8145996997fb0fe494b988
+  metadata.gz: 805867400c5c99ff7402ca86e747509a179fceadd081a31518b43706e995b4bfe44a08b2c0c5f9ae4742f4ef1c8dfcb53959d38677f96078ca6ae22c675b79f6
+  data.tar.gz: ef16b436cbc796b1a697c0fdf5e18ce92a26d8869b519ed0de0be351c430ff60a703fee797f209104ddda6a1b061860bd98563eab08921bcb9671a707c9304d9

data/app/controllers/refinery/pages_controller.rb

@@ -25,11 +25,11 @@ module Refinery
     #
     def show
       if should_skip_to_first_child?
-        redirect_to refinery.url_for(first_live_child.url) and return
+        redirect_to refinery.url_for(first_live_child.url), status: 301 and return
       elsif page.link_url.present?
-        redirect_to page.link_url and return
+        redirect_to page.link_url, status: 301 and return
       elsif should_redirect_to_friendly_url?
-        redirect_to refinery.url_for(page.url), :status => 301 and return
+        redirect_to refinery.url_for(page.url), status: 301 and return
       end
 
       render_with_templates?
@@ -66,7 +66,7 @@ module Refinery
     def current_refinery_user_can_access?(plugin)
       admin? && authorisation_manager.allow?(:plugin, plugin)
     end
-    
+
     def first_live_child
       page.children.order('lft ASC').live.first
     end

data/app/models/refinery/page.rb

@@ -163,15 +163,15 @@ module Refinery
 
     # The canonical page for this particular page.
     # Consists of:
-    #   * The default locale's translated slug
+    #   * The current locale's translated slug
     def canonical
-      Globalize.with_locale(::Refinery::I18n.default_frontend_locale) { url }
+      Globalize.with_locale(::Refinery::I18n.current_frontend_locale) { url }
     end
 
     # The canonical slug for this particular page.
-    # This is the slug for the default frontend locale.
+    # This is the slug for the current frontend locale.
     def canonical_slug
-      Globalize.with_locale(::Refinery::I18n.default_frontend_locale) { slug }
+      Globalize.with_locale(::Refinery::I18n.current_frontend_locale) { slug }
     end
 
     # Returns in cascading order: custom_slug or menu_title or title depending on

data/app/models/refinery/page_part.rb

@@ -1,7 +1,7 @@
 module Refinery
   class PagePart < Refinery::Core::BaseModel
 
-    belongs_to :page, :foreign_key => :refinery_page_id
+    belongs_to :page, :foreign_key => :refinery_page_id, :touch => true
 
     before_validation :set_default_slug
 

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

@@ -16,7 +16,7 @@ module Refinery
       include ActionView::Helpers::SanitizeHelper
 
       def initialize(initial_hash = {})
-        initial_hash.map do |key, value|
+        { logger: Rails.logger }.merge(initial_hash).map do |key, value|
           send("#{key}=", value)
         end
       end
@@ -62,6 +62,7 @@ module Refinery
 
       private
 
+      attr_accessor :logger
       attr_writer :id, :fallback_html, :hidden
 
       def wrap_content_in_tag(content)
@@ -77,7 +78,7 @@ module Refinery
           warning << "Refinery::Pages::SectionPresenter#wrap_content_in_tag\n"
           warning << "HTML attributes and/or elements content has been sanitized\n"
           warning << "#{::Diffy::Diff.new(input, output).to_s(:color)}\n"
-          warn warning
+          logger.warn warning
         end
 
         return output

data/spec/models/refinery/page_part_spec.rb

@@ -31,6 +31,12 @@ module Refinery
       expect(part_two.errors[:slug]).to be_empty
     end
 
+    it 'updates the page updated_at field when changed' do
+      page.save
+      expect(page).to receive(:touch)
+      page.parts.first.update_attribute(:content, 'Modified')
+    end
+
     context 'when using content_for?' do
 
       it 'return true when page part has content' do

data/spec/models/refinery/page_url_spec.rb

@@ -118,12 +118,15 @@ module Refinery
           expect(default_canonical).to eq(page.canonical)
         end
 
-        specify 'translated page returns master page' do
+        specify "translated page returns its pages's canonical"  do
+          allow(Refinery::I18n).to receive(:current_frontend_locale).and_return(:ru)
+
           Globalize.with_locale(:ru) do
             page.title = ru_page_title
             page.save
 
-            expect(page.canonical).to eq(default_canonical)
+            expect(page.canonical).to_not eq(default_canonical)
+            expect(page.canonical).to eq(page.url)
           end
         end
       end
@@ -142,12 +145,15 @@ module Refinery
           expect(default_canonical_slug).to eq(page.canonical_slug)
         end
 
-        specify "translated page returns master page's slug'" do
+        specify "translated page returns its page's canonical slug'" do
+          allow(Refinery::I18n).to receive(:current_frontend_locale).and_return(:ru)
+
           Globalize.with_locale(:ru) do
             page.title = ru_page_title
             page.save
 
-            expect(page.canonical_slug).to eq(default_canonical_slug)
+            expect(page.canonical_slug).to_not eq(default_canonical_slug)
+            expect(page.canonical_slug).to eq(page.canonical_slug)
           end
         end
       end

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

@@ -113,14 +113,24 @@ module Refinery
         end
 
         describe "#sanitize_content" do
+          let(:warning) do
+            %Q{\n-- SANITIZED CONTENT WARNING --\nRefinery::Pages::SectionPresenter#wrap_content_in_tag\nHTML attributes and/or elements content has been sanitized\n\e[31m-<dummy></dummy>\e[0m\n\\n\n}
+          end
+
           it "shows a sanitized content warning" do
+            expect(Rails.logger).to receive(:warn).with(warning)
             section = SectionPresenter.new
             section.override_html = %Q{<dummy></dummy>}
             section.wrapped_html(true)
-            @errors.rewind
-            expect(@errors.read).to eq(
-              %Q{\n-- SANITIZED CONTENT WARNING --\nRefinery::Pages::SectionPresenter#wrap_content_in_tag\nHTML attributes and/or elements content has been sanitized\n\e[31m-<dummy></dummy>\e[0m\n\\n\n}
-            )
+          end
+
+          it "accepts a custom logger" do
+            logger = spy(:logger, warn: true)
+            SectionPresenter.new(logger: logger).tap do |presenter|
+              presenter.override_html = %Q{<dummy></dummy>}
+              presenter.wrapped_html(true)
+            end
+            expect(logger).to have_received(:warn).with(warning)
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Philip Arndt
@@ -14,25 +14,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   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
-  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
+  CZImiZPyLGQBGRYCaW8wHhcNMTcwNzI1MTMxMjIwWhcNMTgwNzI1MTMxMjIwWjBN
   MQ0wCwYDVQQDDARnZW1zMREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixk
   ARkWBWFybmR0MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
-  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
+  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
-  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
+  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
   -----END CERTIFICATE-----
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
@@ -108,14 +108,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Pages extension for Refinery CMS

metadata.gz.sig

@@ -1 +1,2 @@
-"��|-h�/��p�A3�.N�|��[��=�|�����=�8�C�,���;W�âDf�up��?�ܜ�*�����_��l�\zmrܮBe��MnY���MQL1��@[�k�&��?g�ޖ���04�pءC�d������9��/DG��0�.����!�8���Knj� ����zn�r��S�:l�v�b
�i��RK_%iU�Ṣk�����a��80�����K�q�i���v�A�%N��5�:���
+1�*��)!w�b�CH*~L'�{`zn�D^�j��9���.Ȗٛ��n�
+;{�ll俻�g�