jekyll-seo-tag 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa7625108b352ef1b563698519ba698b591efdde
-  data.tar.gz: 1fd0e7b6a24d046e81ad0265738aa9687cdca1db
+  metadata.gz: 2228c5b86fbff03b257d705f372337ff4efc9484
+  data.tar.gz: 0aab240d866dba1da02d1be3f6c103131d0263a8
 SHA512:
-  metadata.gz: a0f5cc15eba20e905955a1095ece08f87b74150b928be795934e5a6a67aea09463ffdf2b66176ac39d7948cfb07f65676ddede3ccb86bcc6bfc2e1c1a758c28c
-  data.tar.gz: 79bd26c6530690c2b886d5ba66c0b97607bb979d0cd181061222ad1c120fddf9b53b2fa104a27740042e7bd49851620654db34c4db77e207d1e18fe2310b1134
+  metadata.gz: 3f24c19c1cf505c2697ab1e41a70c69fbd2a6a37a4a4348248955807f9f6e95a9db1b1c60ab91567fbd2a904ec1867652be529aa8816419b53387462fb3fc680
+  data.tar.gz: 6a69a9471ad6e287939308638a67e73657fd3d9445a6ad6a22be3a884edd9b0d3a7ae808185cfcf71df343a62e6e530d0edfaaf87123aef8b176abe9da0f2fd7

data/.rubocop.yml

@@ -10,16 +10,11 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*
 
-Style/Documentation:
-  Enabled: false
-
-Style/FileName:
-  Enabled: false
-
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Exclude:
     - spec/**/*
 
 AllCops:
+  TargetRubyVersion: 2.1
   Exclude:
     - vendor/**/*

data/.travis.yml

@@ -1,7 +1,14 @@
 rvm:
-  - 2.2.3
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
 before_install: gem install bundler
 language: ruby
 script: script/cibuild
 sudo: false
 cache: bundler
+
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/History.markdown

@@ -1,40 +1,57 @@
 ## HEAD
 
+## 2.4.0 / 2017-12-04
+
+### Minor
+
+  * Add meta generator (#236)
+  * Consistently use self-closing tags (#246)
+  * Strip null values from JSON-LD hash (#249)
+
+### Documentation
+
+  * Avoid deprecation warning when building docs (#243)
+
+### Development Fixes
+
+  * Test against latest Rubies (#242)
+  * Use Nokigiri on CI (#181)
+
 ## 2.3.0
 
 ### Minor Enhancements
 
-* Use canonical_url specified in page if present #211
-* Fix for image.path causing an invalid url error #228
-* Ensure `site.data.authors` is properly formatted before attempting to retrieve author meta #227
-* Convert author, image, and JSON-LD to dedicated drops #229
-* Cache parsed template #231
-* Define path with `__dir__` #232
+  * Use canonical_url specified in page if present #211
+  * Fix for image.path causing an invalid url error #228
+  * Ensure `site.data.authors` is properly formatted before attempting to retrieve author meta #227
+  * Convert author, image, and JSON-LD to dedicated drops #229
+  * Cache parsed template #231
+  * Define path with `__dir__` #232
 
 ### Documentation
 
-* gems: is deprecated in current Jekyll version of github-pages #230
+  * gems: is deprecated in current Jekyll version of github-pages #230
 
-## 2.2.3 
+## 2.2.3
 
-* Guard against the author's Twitter handle being Nil when stripping @'s #203
-* Guard against empty title or description strings #206
+  * Guard against the author's Twitter handle being Nil when stripping @'s #203
+  * Guard against empty title or description strings #206
 
 ## 2.2.2
 
 ### Minor Enhancements
 
-* Guard against arrays in subhashes #197
-* Guard against invalid or missing URLs #199
+  * Guard against arrays in subhashes #197
+  * Guard against invalid or missing URLs #199
 
 ### Development fixes
 
-* Remove dynamic GitHub Pages logic from Gemfile #194
+  * 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)
+  * Convert template logic to a Liquid Drop (significant performance improvement) (#184)
+  * Fix for JSON-LD validation warning for images missing required properties (#183)
 
 ## 2.2.0
 
@@ -44,7 +61,7 @@
   * Add og:locale support #166
   * Add support for Bing and Yandex webmaster tools. Closes #147 (#148)
   * Add SEO author and date modified to validate JSON-LD output (#151)
-  
+
 ### Minor Enhancements
 
   * Use `|` for title separator (#162)

data/docs/_config.yml

@@ -3,7 +3,7 @@ description: A Jekyll plugin to add metadata tags for search engines and social
 
 permalink: pretty
 
-gems:
+plugins:
   - jekyll-seo-tag
   - jekyll-sitemap
 

data/jekyll-seo-tag.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "jekyll", "~> 3.3"
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "html-proofer", "~> 3.7"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "html-proofer", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.48"
+  spec.add_development_dependency "rubocop", "~> 0.5"
 end

data/lib/jekyll-seo-tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "jekyll"
 require "jekyll-seo-tag/version"
 
@@ -44,12 +46,12 @@ module Jekyll
     end
 
     def payload
-      {
+      # site_payload is an instance of UnifiedPayloadDrop. See https://git.io/v5ajm
+      Jekyll::Utils.deep_merge_hashes(context.registers[:site].site_payload, {
         "page"      => context.registers[:page],
-        "site"      => context.registers[:site].site_payload["site"],
         "paginator" => context["paginator"],
         "seo_tag"   => drop,
-      }
+      })
     end
 
     def drop

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class SeoTag
     # A drop representing the current page's author

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class SeoTag
     class Drop < Jekyll::Drops::Drop

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class SeoTag
     class Filters

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class SeoTag
     # A drop representing the page image

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class SeoTag
     # This module is deprecated, but is included in the Gem to avoid a breaking

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class SeoTag
     class JSONLDDrop < Jekyll::Drops::Drop
@@ -71,6 +73,10 @@ module Jekyll
       alias_method :mainEntityOfPage, :main_entity
       private :main_entity
 
+      def to_json
+        to_h.reject { |_k, v| v.nil? }.to_json
+      end
+
       private
 
       attr_reader :page_drop

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class SeoTag
     # Mixin to share common URL-related methods between class

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # Prevent bundler errors
 module Liquid; class Tag; end; end
 
 module Jekyll
   class SeoTag < Liquid::Tag
-    VERSION = "2.3.0".freeze
+    VERSION = "2.4.0".freeze
   end
 end

data/lib/template.html

@@ -3,6 +3,8 @@
   <title>{{ seo_tag.title }}</title>
 {% endif %}
 
+<meta name="generator" content="Jekyll v{{ jekyll.version }}" />
+
 {% if seo_tag.page_title %}
   <meta property="og:title" content="{{ seo_tag.page_title }}" />
 {% endif %}
@@ -43,10 +45,10 @@
 {% endif %}
 
 {% if paginator.previous_page %}
-  <link rel="prev" href="{{ paginator.previous_page_path | absolute_url }}">
+  <link rel="prev" href="{{ paginator.previous_page_path | absolute_url }}" />
 {% endif %}
 {% if paginator.next_page %}
-  <link rel="next" href="{{ paginator.next_page_path | absolute_url }}">
+  <link rel="next" href="{{ paginator.next_page_path | absolute_url }}" />
 {% endif %}
 
 {% if site.twitter %}
@@ -79,19 +81,19 @@
 
 {% if site.webmaster_verifications %}
   {% if site.webmaster_verifications.google %}
-    <meta name="google-site-verification" content="{{ site.webmaster_verifications.google }}">
+    <meta name="google-site-verification" content="{{ site.webmaster_verifications.google }}" />
   {% endif %}
 
   {% if site.webmaster_verifications.bing %}
-    <meta name="msvalidate.01" content="{{ site.webmaster_verifications.bing }}">
+    <meta name="msvalidate.01" content="{{ site.webmaster_verifications.bing }}" />
   {% endif %}
 
   {% if site.webmaster_verifications.alexa %}
-    <meta name="alexaVerifyID" content="{{ site.webmaster_verifications.alexa }}">
+    <meta name="alexaVerifyID" content="{{ site.webmaster_verifications.alexa }}" />
   {% endif %}
 
   {% if site.webmaster_verifications.yandex %}
-    <meta name="yandex-verification" content="{{ site.webmaster_verifications.yandex }}">
+    <meta name="yandex-verification" content="{{ site.webmaster_verifications.yandex }}" />
   {% endif %}
 {% elsif site.google_site_verification %}
   <meta name="google-site-verification" content="{{ site.google_site_verification }}" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-seo-tag
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: html-proofer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: html-proofer
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.5'
 description: 
 email:
 - ben.balter@github.com