scrivito_seo_page_extender 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0485fe86a66891c0b92217114d06944382f32f27
-  data.tar.gz: 38d27823cf7f66f898b1688b3c28d06ec085dc7c
+  metadata.gz: 0105bcb9b2c5a5cd6b22daabc25c79d42fb0a33a
+  data.tar.gz: 581cde117affcdccd29d069166cdfb5f3a51a003
 SHA512:
-  metadata.gz: 7df5b6363893ea9abcef3d82d33a2aa97b97bc1c6328560f2dcba86a0a450a9dd3bc0721ea48854e5c7b0a7bf88745e2e4758d69757e2b8db2be0cdaa16380bb
-  data.tar.gz: e364531b187b1e9d857b3d8e4b863650ffcfe3f16a7b3f95a9f26a3adae50094d1def53e52ccf0cddea2cb8b4cd0daea00e71be6be12c7bd0a4ff09ea344ea88
+  metadata.gz: 3584bbcb4ed86ee94b656d30a478d9f77f95474d2325f87237e5263d90406b900d810ddb81ba7c99ec8524c955830e064eb9db6311f5610b83347818fc382df9
+  data.tar.gz: b804d98d32280e21becff068c4902df5e41c2541d28916867368fae140957e13b3e099287a3c3f3159d076cd693852e6a1eaa197606996a9b72a10bdc7ebf1d8

data/README.md

@@ -164,6 +164,7 @@ def self.seo_attribute_mapping(obj)
   {
     og_title: obj.my_app_title,
     og_description: obj.my_app_description
+    og_image: Obj.where(:title, :equals, 'Logo').first
     ...
   }
 end
@@ -269,5 +270,4 @@ en:
       three_words: 'Three word phrases'
       two_words: 'Two word phrases'
       word: 'Word'
-
 ```

data/app/concerns/open_graph_extender.rb

@@ -43,17 +43,5 @@ module OpenGraphExtender
     base.attribute :music_duration,          :string
     base.attribute :music_musician,          :stringlist
     base.attribute :music_song,              :stringlist
-
-    def image_width
-      self.og_image.meta_data[:width]
-    end
-
-    def image_height
-      self.og_image.meta_data[:height]
-    end
-
-    def image_type
-      self.og_image.meta_data[:content_type]
-    end
   end
 end

data/app/helper/seo_page_extender_helper.rb

@@ -19,6 +19,7 @@ module SeoPageExtenderHelper
   end
 
   def seo_attribute_fallback(obj, attribute)
+    return unless obj.respond_to?(attribute)
     if seo_attribute_fallback?(obj, attribute)
       seo_attribute_mapping(obj)[attribute]
     else
@@ -26,10 +27,24 @@ module SeoPageExtenderHelper
     end
   end
 
+  def image_width(obj)
+    obj.meta_data[:width]
+  end
+
+  def image_height(obj)
+    obj.meta_data[:height]
+  end
+
+  def image_type(obj)
+    obj.binary_content_type
+  end
+
   private
   def seo_attribute_fallback?(obj, attribute)
-    # config is true && attribute is not set && mapping exists
-    ScrivitoSeoPageExtender.configuration.attribute_mapping && !obj.send(attribute.to_sym).present? && (seo_attribute_mapping(obj)[attribute]).present?
+    # mapping is active && attribute is included to obj
+    if ScrivitoSeoPageExtender.configuration.attribute_mapping && obj.respond_to?(attribute)
+      !obj.send(attribute.to_sym).present? && (seo_attribute_mapping(obj)[attribute]).present?
+    end
   end
 
   def get_words_from_page(obj, attribute)

data/app/views/seo_page_extender/_meta_attribute.html.erb

@@ -1,9 +1,11 @@
-<% if @obj.respond_to?(attribute) && seo_attribute_fallback(@obj, attribute.to_sym).present? %>
+<% fallback = seo_attribute_fallback(@obj, attribute.to_sym) %>
+
+<% if @obj.respond_to?(attribute) && fallback.present? %>
   <% if name[/image\d?$/] %>
-    <meta content="<%= scrivito_path(@obj[attribute]) %>" name="<%= name %>"/>
+    <meta content="<%= scrivito_url(fallback) %>" name="<%= name %>"/>
   <% elsif name == 'audience' || name == 'robots' || name == 'keywords' %>
-    <meta content="<%= @obj.send(attribute).join(',') %>" name="<%= name %>"/>
+    <meta content="<%= seo_attribute_fallback(@obj, attribute).join(',') %>" name="<%= name %>"/>
   <% else %>
-    <meta content="<%= seo_attribute_fallback(@obj, attribute.to_sym) %>" name="<%= name %>"/>
+    <meta content="<%= fallback %>" name="<%= name %>"/>
   <% end %>
 <% end %>

data/app/views/seo_page_extender/_meta_attribute_open_graph.html.erb

@@ -1,10 +1,12 @@
-<% if @obj.respond_to?(attribute) && seo_attribute_fallback(@obj, attribute.to_sym).present? %>
+<% fallback = seo_attribute_fallback(@obj, attribute.to_sym) %>
+
+<% if @obj.respond_to?(attribute) && fallback.present? %>
   <% if attribute == 'og_image' %>
-    <meta content="<%= scrivito_path(@obj[attribute]) %>" property="<%= name %>"/>
-    <meta content="<%= @obj.image_type %>" property="og:image:type"/>
-    <meta content="<%= @obj.image_width %>" property="og:image:width"/>
-    <meta content="<%= @obj.image_height %>" property="og:image:height"/>
+    <meta content="<%= scrivito_url(fallback) %>" property="<%= name %>"/>
+    <meta content="<%= image_type(fallback) %>" property="og:image:type"/>
+    <meta content="<%= image_width(fallback) %>" property="og:image:width"/>
+    <meta content="<%= image_height(fallback) %>" property="og:image:height"/>
   <% else %>
-    <meta content="<%= seo_attribute_fallback(@obj, attribute.to_sym) %>" property="<%= name %>"/>
+    <meta content="<%= fallback %>" property="<%= name %>"/>
   <% end %>
 <% end %>

data/app/views/seo_page_extender/_meta_attribute_open_graph_array.html.erb

@@ -1,5 +1,5 @@
-<% if @obj.respond_to?(attribute) && !@obj.send(attribute).blank? %>
-  <% @obj[attribute].each do |obj| %>
+<% if @obj.respond_to?(attribute) && seo_attribute_fallback(@obj, attribute).present? %>
+  <% seo_attribute_fallback(@obj, attribute).each do |obj| %>
     <% if !obj.is_a? String %>
       <meta content="<%= scrivito_path(obj) %>" property="<%= name %>"/>
       <% if obj.is_a? Image %>

data/app/views/seo_page_extender/_meta_robots.html.erb

@@ -1,5 +1,5 @@
-<% if(@obj.respond_to?(attribute) && !@obj.send(attribute).blank?) %>
-  <meta content="<%= @obj.send(attribute).join(',') %>" name="robots" />
+<% if(@obj.respond_to?(attribute) && seo_attribute_fallback(@obj, attribute).present?) %>
+  <meta content="<%= seo_attribute_fallback(@obj, attribute).join(',') %>" name="robots" />
 <% else %>
   <meta content="all" name="robots" />
 <% end %>

data/app/views/seo_page_extender/_open_graph.html.erb

@@ -42,5 +42,5 @@
 <meta content="<%= canonical_link(@obj) %>" property="og:url"/>
 
 <% if Obj.respond_to? 'open_graph_site_name' %>
-  <meta content="<%= Obj.open_graph_site_name %>" property="og:sitename"/>
+  <meta content="<%= Obj.open_graph_site_name %>" property="og:site_name"/>
 <% end %>

data/app/views/seo_page_extender/_open_graph_attribute.html.erb

@@ -1,7 +1,7 @@
-<% if @obj.respond_to?(attribute) && !@obj.send(attribute).blank? %>
+<% if @obj.respond_to?(attribute) && seo_attribute_fallback(@obj, attribute).present? %>
   <% if name[/image\d?$/] %>
-    <meta content="<%= scrivito_path(@obj[attribute]) %>" name="<%= name %>"/>
+    <meta content="<%= scrivito_path(seo_attribute_fallback(@obj, attribute)) %>" name="<%= name %>"/>
   <% else %>
-    <meta content="<%= @obj.send(attribute).tr("\u00a0", ' ').strip %>" property="<%= name %>"/>
+    <meta content="<%= seo_attribute_fallback(@obj, attribute).tr("\u00a0", ' ').strip %>" property="<%= name %>"/>
   <% end %>
 <% end %>

data/lib/scrivito_seo_page_extender/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoSeoPageExtender
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_seo_page_extender
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk