effective_pages 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d6ac4c034e7b55034c50c15f907f937110daa117af3bb2579547fd1da3a4c3
-  data.tar.gz: 61b61f6a912e821e77c07298723f8864c4fc6669e4f5719f8a6c98190bd4164b
+  metadata.gz: 398c1e27018e91e6b525023eb4436e1996e5d6bf27a709b6ffcfb28f2a1244aa
+  data.tar.gz: ba5550d8d643d97c3bc28b16150332d5a6a82b030e021044dc69b5e4639992ed
 SHA512:
-  metadata.gz: 4b5eb44075781cf1a5790e7e5cf7b24af4ed58fb849e4270c5be20c3a51069ccea30ff0327c29aa0f6464f0282cd53b79d2568499627511cdb19b0fefe737e54
-  data.tar.gz: 0ad912da27c0cb8b7b3c625fd9e1d90025290fa987b3db6a4f1385d843972d1fa8a59287d4061ddd21ef441a94ca81634764d9125084520d9d351f18ec8f6d13
+  metadata.gz: c071da921b8873e0160aacc25344307f0e592900216b43f2aa523fb5debd6b200c6c14f1a753351bfed8d772aa7f808aeed66ad58d68e83ab72a1c7a82747c78
+  data.tar.gz: 7824e33d15accde33a03b86d8066ae965925f12222d9f6076a55e147929fc7c718314ddd80179d1ae4c130bacc57cac9e954be441a82a82710d7348e2a866948

data/app/controllers/effective/pages_controller.rb

@@ -13,6 +13,7 @@ module Effective
 
       @page_title = @page.title
       @meta_description = @page.meta_description
+      @canonical_url = effective_pages.page_url(@page)
 
       if EffectivePages.authorized?(self, :admin, :effective_pages)
         flash.now[:warning] = [

data/app/helpers/effective_pages_helper.rb

@@ -39,14 +39,18 @@ module EffectivePagesHelper
       ]
 
       if EffectivePages.site_og_image_width.present?
-        tags << tag(:meta, property: 'og:image:width', content: EffectivePages.site_og_image_width) 
+        tags << tag(:meta, property: 'og:image:width', content: EffectivePages.site_og_image_width)
       end
 
       if EffectivePages.site_og_image_height.present?
-        tags << tag(:meta, property: 'og:image:height', content: EffectivePages.site_og_image_height) 
+        tags << tag(:meta, property: 'og:image:height', content: EffectivePages.site_og_image_height)
       end
     end
 
+    if effective_pages_canonical_url.present?
+      tags << tag(:link, rel: 'canonical', href: effective_pages_canonical_url)
+    end
+
     tags.compact.join("\n").html_safe
   end
 
@@ -70,6 +74,14 @@ module EffectivePagesHelper
     truncate((@meta_description || EffectivePages.fallback_meta_description).to_s, length: 150)
   end
 
+  def effective_pages_canonical_url
+    unless @canonical_url.present? || EffectivePages.silence_missing_canonical_url_warnings
+      Rails.logger.error("WARNING: (effective_pages) Expected @canonical_url to be present. Please assign a @canonical_url variable in your controller action.")
+    end
+
+    @canonical_url
+  end
+
   def effective_pages_og_type
     @effective_pages_og_type || 'website'
   end

data/config/effective_pages.rb

@@ -37,6 +37,8 @@ EffectivePages.setup do |config|
   # Turn off missing meta page title and meta description warnings
   config.silence_missing_page_title_warnings = false
   config.silence_missing_meta_description_warnings = false
+  config.silence_missing_canonical_url_warnings = false
+
 
   # Display the effective roles 'choose roles' input when an admin creates a new post
   config.use_effective_roles = false

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '2.0.5'.freeze
+  VERSION = '2.0.6'.freeze
 end

data/lib/effective_pages.rb

@@ -23,7 +23,8 @@ module EffectivePages
 
   mattr_accessor :silence_missing_page_title_warnings
   mattr_accessor :silence_missing_meta_description_warnings
-  
+  mattr_accessor :silence_missing_canonical_url_warnings
+
   mattr_accessor :use_effective_roles
 
   mattr_accessor :menu

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails