jekyll-seo-tag 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d007bd49496c661cf441f17dc25d6756ae9daf31
-  data.tar.gz: c1a2dc3f79edacd4d68fedc1c8f518249a5a59a3
+  metadata.gz: '026698a5195b405a9a4c48b49e002f648d19c7bd'
+  data.tar.gz: d7a9f7ed597cd9d708f0354f2334a5fc424ba9b1
 SHA512:
-  metadata.gz: 0eec356674ff4054de62b1d022cbf206496fc4eb17dc2933137764851310b5350d1b0b6bd8403ff80a2faf9e8184f8a85d4eeeecf572752d2ea8d5cfe0c68e36
-  data.tar.gz: 12088f4299da9829ab61d2c04ce1994cbcd3999f32cd3489aab59053bcf1b3584342e9c4e6bddf1cd082e95032094d2179c0713977f4eea5e4ab338e8e52e3f5
+  metadata.gz: 5eb1720decf7faf0eaff8d1550637ac54a1321303fd08ca0dda2685d6f70ef8a44a1707992b9e8f63061efa6cc563f1b09d7db2db9ca16d3091f74716846def6
+  data.tar.gz: ecfa02bf252edf0ab07c23d8995bb8f4478879bb6426619e1091fdb1d400349b044375cb8d9af844b0ce382120a825e907466e27f031cf5817a00ca169d429d7

data/Gemfile

@@ -3,14 +3,3 @@ require "json"
 require "open-uri"
 
 gemspec
-
-group :development, :test do
-  versions = JSON.parse(open("https://pages.github.com/versions.json").read)
-  versions.delete("ruby")
-  versions.delete("jekyll-seo-tag")
-  versions.delete("github-pages")
-
-  versions.each do |dep, version|
-    gem dep, version
-  end
-end

data/History.markdown

@@ -1,5 +1,18 @@
 ## HEAD
 
+## 2.2.2
+
+### Minor Enhancements
+
+* Guard against arrays in subhashes #197
+* Guard against invalid or missing URLs #199
+
+### Development fixes
+
+* Remove dynamic GitHub Pages logic from Gemfile #194
+
+## 2.2.1
+
 * Convert template logic to a Liquid Drop (significant performance improvement) (#184)
 * Fix for JSON-LD validation warning for images missing required properties (#183)
 

data/lib/jekyll-seo-tag/drop.rb

@@ -55,8 +55,8 @@ module Jekyll
                   seo_name
                 elsif !homepage_or_about?
                   nil
-                elsif site["social"] && site["social"]["name"]
-                  format_string site["social"]["name"]
+                elsif site_social["name"]
+                  format_string site_social["name"]
                 elsif site_title
                   format_string site_title
                 end
@@ -95,8 +95,8 @@ module Jekyll
 
       def date_modified
         @date_modified ||= begin
-          date = if page["seo"] && page["seo"]["date_modified"]
-                   page["seo"]["date_modified"]
+          date = if page_seo["date_modified"]
+                   page_seo["date_modified"]
                  elsif page["last_modified_at"]
                    page["last_modified_at"].to_liquid
                  else
@@ -112,8 +112,8 @@ module Jekyll
 
       def type
         @type ||= begin
-          if page["seo"] && page["seo"]["type"]
-            page["seo"]["type"]
+          if page_seo["type"]
+            page_seo["type"]
           elsif homepage_or_about?
             "WebSite"
           elsif page["date"]
@@ -126,10 +126,10 @@ module Jekyll
 
       def links
         @links ||= begin
-          if page["seo"] && page["seo"]["links"]
-            page["seo"]["links"]
-          elsif homepage_or_about? && site["social"] && site["social"]["links"]
-            site["social"]["links"]
+          if page_seo["links"]
+            page_seo["links"]
+          elsif homepage_or_about? && site_social["links"]
+            site_social["links"]
           end
         end
       end
@@ -162,6 +162,7 @@ module Jekyll
 
         image = { "path" => image } if image.is_a?(String)
         image["path"] ||= image["facebook"] || image["twitter"]
+        return @image = nil unless image["path"]
 
         unless absolute_url? image["path"]
           image["path"] = filters.absolute_url image["path"]
@@ -177,7 +178,9 @@ module Jekyll
       end
 
       def canonical_url
-        @canonical_url ||= filters.absolute_url(page["url"]).gsub(%r!/index\.html$!, "/")
+        @canonical_url ||= begin
+          filters.absolute_url(page["url"]).to_s.gsub(%r!/index\.html$!, "/")
+        end
       end
 
       private
@@ -205,7 +208,10 @@ module Jekyll
       end
 
       def absolute_url?(string)
+        return unless string
         Addressable::URI.parse(string).absolute?
+      rescue Addressable::URI::InvalidURIError
+        nil
       end
 
       def format_string(string)
@@ -237,7 +243,29 @@ module Jekyll
       end
 
       def seo_name
-        @seo_name ||= format_string(page["seo"]["name"]) if page["seo"]
+        @seo_name ||= format_string(page_seo["name"]) if page_seo["name"]
+      end
+
+      def page_seo
+        @page_seo ||= sub_hash(page, "seo")
+      end
+
+      def site_social
+        @site_social ||= sub_hash(site, "social")
+      end
+
+      # Safely returns a sub hash
+      #
+      # hash - the parent hash
+      # key  - the key in the parent hash
+      #
+      # Returns the sub hash or an empty hash, if it does not exist
+      def sub_hash(hash, key)
+        if hash[key].is_a?(Hash)
+          hash[key]
+        else
+          {}
+        end
       end
     end
   end

data/lib/jekyll-seo-tag/version.rb

@@ -3,6 +3,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class SeoTag < Liquid::Tag
-    VERSION = "2.2.1".freeze
+    VERSION = "2.2.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-seo-tag
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll