jekyll-seo-tag 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dfc0385fb69c3aa6632916ea056d33c415170fb0d38fa16acf9310d68d24c01
-  data.tar.gz: 1b0e657d2a3f8da3a9f7f55eba87fec578b59c3979d0930896adc12783fed157
+  metadata.gz: 8297d8859bf6e52c0a77bfbda660ff832f1cdb6eb0a5112c98b2e3fd9fdf4647
+  data.tar.gz: 867eb20b76f4437622cd881f0a21a39f4ffabf51268c81a1e228c7e0461e753c
 SHA512:
-  metadata.gz: c106de99699b188a26903bfea3f9916394f8d0c448c487115b3bcaaf46216bfff9bbeffae3b36fd970be4cec3d03feb40989a39fa6a90647fb9a1ee5ef5baf8a
-  data.tar.gz: cb86303b5bf7a62cfb39716fb9957e2bdbc5d118958baea7bf164b8479678629db175961e2f698d436686b9a80662756b6a632c99e39f468d1f70d3ce2e5361b
+  metadata.gz: ce913e55583ea6354413717fa3945a20f6a8c4fa7dd763918b141ca1e32a2eec011b78e40613dc7297126a4623efbd5cc450f69da841acd4e1d4aece62360acb
+  data.tar.gz: 7773d8759ff186edd5b6ba906edfc7ea992dd39f814582aeef2d94ed3606dae034e49318c16d53896ce1a663f56462b7ad51248d959ee12d1370e53047249185

data/.rubocop.yml

@@ -1,5 +1,6 @@
+require: rubocop-jekyll
 inherit_gem:
-  jekyll: .rubocop.yml
+  rubocop-jekyll: .rubocop.yml
 
 AllCops:
   TargetRubyVersion: 2.3
@@ -14,7 +15,3 @@ Metrics/LineLength:
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
-
-Layout/IndentHeredoc:
-  Exclude:
-    - spec/**/*

data/.travis.yml

@@ -1,12 +1,11 @@
+language: ruby
+cache: bundler
 rvm:
-  - 2.3
   - 2.4
-  - 2.5
+  - 2.6
+
 before_install: gem install bundler
-language: ruby
 script: script/cibuild
-sudo: false
-cache: bundler
 
 env:
   global:

data/History.markdown

@@ -1,3 +1,34 @@
+## HEAD
+
+### Minor Enhancements
+
+  * Release: v2.6.0 (#334)
+
+## 2.6.0 / 2019-03-16
+
+### Minor Enhancements
+
+  * Twitter Image and Title (#330)
+
+### Bug Fixes
+
+  * Do not cache the drop payload for SeoTag (#306)
+  * Update url of schema website (#296)
+
+### Development Fixes
+
+  * Relax version constraint on Bundler (#325)
+  * chore(ci): Add Ruby 2.6, drop Ruby 2.3 (#326)
+  * chore (ci): remove deprecated `sudo: false` in .travis.yml (#333)
+  * Lint Ruby code with rubocop-jekyll gem (#302)
+  * chore(deps): bump rubocop-jekyll to v0.4 (#320)
+  * chore(deps): bump rubocop-jekyll to v0.3 (#316)
+  * Correct RuboCop offenses in spec files (#319)
+
+### Documentation
+
+  * Rectify error in Usage documentation (#328)
+
 ## 2.5.0 / 2018-05-18
 
   * Docs: Prevent GitHub Pages from processing Liquid raw tag (#276)

data/docs/advanced-usage.md

@@ -76,6 +76,8 @@ The following options can be set for any particular page. While the default opti
   * `name` - If the name of the thing that the page represents is different from the page title. (i.e.: "Frank's Café" vs "Welcome to Frank's Café")
   * `type` - The type of things that the page represents. This must be a [Schema.org type](http://schema.org/docs/schemas.html), and will probably usually be something like [`BlogPosting`](http://schema.org/BlogPosting), [`NewsArticle`](http://schema.org/NewsArticle), [`Person`](http://schema.org/Person), [`Organization`](http://schema.org/Organization), etc.
   * `links` - An array of other URLs that represent the same thing that this page represents. For instance, Jane's bio page might include links to Jane's GitHub and Twitter profiles.
+  * `date_modified` - Manually specify the `dateModified` field in the JSON-LD output to override Jekyll's own `dateModified`.
+  This field will take **first priority** for the `dateModified` JSON-LD output. This is useful when the file timestamp does not match the true time that the content was modified. A user may also install [Last Modified At](https://github.com/gjtorikian/jekyll-last-modified-at) which will offer an alternative way of providing for the `dateModified` field.
 
 ### Customizing image output
 

data/docs/usage.md

@@ -35,7 +35,6 @@ The SEO tag will respect any of the following if included in your site's `_confi
 * `social` - For [specifying social profiles](https://developers.google.com/structured-data/customize/social-profiles). The following properties are available:
   * `name` - If the user or organization name differs from the site's name
   * `links` - An array of links to social media profiles.
-  * `date_modified` - Manually specify the `dateModified` field in the JSON-LD output to override Jekyll's own `dateModified`. This field will take **first priority** for the `dateModified` JSON-LD output. This is useful when the file timestamp does not match the true time that the content was modified. A user may also install [Last Modified At](https://github.com/gjtorikian/jekyll-last-modified-at) which will offer an alternative way of providing for the `dateModified` field.
 
   ```yml
   social:

data/jekyll-seo-tag.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "jekyll", "~> 3.3"
-  spec.add_development_dependency "bundler", "~> 1.15"
+  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 "rubocop", "~> 0.56.0"
+  spec.add_development_dependency "rubocop-jekyll", "~> 0.4"
 end

data/lib/jekyll-seo-tag.rb

@@ -24,7 +24,7 @@ module Jekyll
     # We will not strip any whitespace if the next character is a '-'
     #   so that we do not interfere with the HTML comment at the
     #   very begining
-    MINIFY_REGEX = %r!(?<=[{}]|[>,]\n)\s+(?\!-)!
+    MINIFY_REGEX = %r!(?<=[{}]|[>,]\n)\s+(?\!-)!.freeze
 
     def initialize(_tag_name, text, _tokens)
       super
@@ -47,15 +47,20 @@ module Jekyll
 
     def payload
       # site_payload is an instance of UnifiedPayloadDrop. See https://git.io/v5ajm
-      Jekyll::Utils.deep_merge_hashes(context.registers[:site].site_payload, {
+      Jekyll::Utils.deep_merge_hashes(
+        context.registers[:site].site_payload,
         "page"      => context.registers[:page],
         "paginator" => context["paginator"],
-        "seo_tag"   => drop,
-      })
+        "seo_tag"   => drop
+      )
     end
 
     def drop
-      @drop ||= Jekyll::SeoTag::Drop.new(@text, @context)
+      if context.registers[:site].liquid_renderer.respond_to?(:cache)
+        Jekyll::SeoTag::Drop.new(@text, @context)
+      else
+        @drop ||= Jekyll::SeoTag::Drop.new(@text, @context)
+      end
     end
 
     def info

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

@@ -19,6 +19,7 @@ module Jekyll
       # site - The Jekyll::Drops::SiteDrop
       def initialize(page: nil, site: nil)
         raise ArgumentError unless page && site
+
         @mutations = {}
         @page = page
         @site = site
@@ -33,6 +34,7 @@ module Jekyll
 
       def twitter
         return @twitter if defined? @twitter
+
         twitter = author_hash["twitter"] || author_hash["name"]
         @twitter = twitter.is_a?(String) ? twitter.sub(%r!^@!, "") : nil
       end
@@ -47,6 +49,7 @@ module Jekyll
       # Returns a string or hash representing the author
       def resolved_author
         return @resolved_author if defined? @resolved_author
+
         sources = [page["author"]]
         sources << page["authors"].first if page["authors"].is_a?(Array)
         sources << site["author"]
@@ -61,6 +64,7 @@ module Jekyll
         @site_data_hash ||= begin
           return {} unless resolved_author.is_a?(String)
           return {} unless site.data["authors"].is_a?(Hash)
+
           author_hash = site.data["authors"][resolved_author]
           author_hash.is_a?(Hash) ? author_hash : {}
         end

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

@@ -6,10 +6,10 @@ module Jekyll
       include Jekyll::SeoTag::UrlHelper
 
       TITLE_SEPARATOR = " | "
-      FORMAT_STRING_METHODS = %i[
-        markdownify strip_html normalize_whitespace escape_once
+      FORMAT_STRING_METHODS = [
+        :markdownify, :strip_html, :normalize_whitespace, :escape_once,
       ].freeze
-      HOMEPAGE_OR_ABOUT_REGEX = %r!^/(about/)?(index.html?)?$!
+      HOMEPAGE_OR_ABOUT_REGEX = %r!^/(about/)?(index.html?)?$!.freeze
 
       def initialize(text, context)
         @obj = {}
@@ -26,6 +26,7 @@ module Jekyll
       def title?
         return false unless title
         return @display_title if defined?(@display_title)
+
         @display_title = (@text !~ %r!title=false!i)
       end
 
@@ -43,6 +44,7 @@ module Jekyll
       end
 
       # Page title with site title or description appended
+      # rubocop:disable Metrics/CyclomaticComplexity
       def title
         @title ||= begin
           if site_title && page_title != site_title
@@ -54,15 +56,15 @@ module Jekyll
           end
         end
 
-        if page_number
-          return page_number + @title
-        end
+        return page_number + @title if page_number
 
         @title
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def name
         return @name if defined?(@name)
+
         @name = if seo_name
                   seo_name
                 elsif !homepage_or_about?
@@ -141,6 +143,7 @@ module Jekyll
       def logo
         @logo ||= begin
           return unless site["logo"]
+
           if absolute_url? site["logo"]
             filters.uri_escape site["logo"]
           else
@@ -187,9 +190,7 @@ module Jekyll
         current = @context["paginator"]["page"]
         total = @context["paginator"]["total_pages"]
 
-        if current > 1
-          return "Page #{current} of #{total} for "
-        end
+        return "Page #{current} of #{total} for " if current > 1
       end
 
       attr_reader :context

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

@@ -18,6 +18,7 @@ module Jekyll
       # context - the Liquid::Context
       def initialize(page: nil, context: nil)
         raise ArgumentError unless page && context
+
         @mutations = {}
         @page = page
         @context = context
@@ -57,6 +58,7 @@ module Jekyll
       def absolute_url
         return unless raw_path
         return @absolute_url if defined? @absolute_url
+
         @absolute_url = if raw_path.is_a?(String) && absolute_url?(raw_path) == false
                           filters.absolute_url raw_path
                         else

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

@@ -28,12 +28,13 @@ module Jekyll
 
       def fallback_data
         {
-          "@context" => "http://schema.org",
+          "@context" => "https://schema.org",
         }
       end
 
       def author
         return unless page_drop.author["name"]
+
         {
           "@type" => "Person",
           "name"  => page_drop.author["name"],
@@ -52,6 +53,7 @@ module Jekyll
 
       def publisher
         return unless logo
+
         output = {
           "@type" => "Organization",
           "logo"  => {
@@ -65,6 +67,7 @@ module Jekyll
 
       def main_entity
         return unless %w(BlogPosting CreativeWork).include?(type)
+
         {
           "@type" => "WebPage",
           "@id"   => page_drop.canonical_url,

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

@@ -13,6 +13,7 @@ module Jekyll
       # Returns nil if it is not a string or can't be parsed as a URL
       def absolute_url?(string)
         return unless string
+
         Addressable::URI.parse(string).absolute?
       rescue Addressable::URI::InvalidURIError
         nil

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

@@ -5,6 +5,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class SeoTag < Liquid::Tag
-    VERSION = "2.5.0"
+    VERSION = "2.6.0"
   end
 end

data/lib/template.html

@@ -54,10 +54,12 @@
 {% if site.twitter %}
   {% if seo_tag.image %}
     <meta name="twitter:card" content="{{ page.twitter.card | default: site.twitter.card | default: "summary_large_image" }}" />
+    <meta property="twitter:image" content="{{ seo_tag.image.path }}" />
   {% else %}
     <meta name="twitter:card" content="summary" />
   {% endif %}
 
+  <meta property="twitter:title" content="{{ seo_tag.page_title }}" />
   <meta name="twitter:site" content="@{{ site.twitter.username | replace:"@","" }}" />
 
   {% if seo_tag.author.twitter %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-seo-tag
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -28,14 +28,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: '0.4'
 description: 
 email:
 - ben.balter@github.com
@@ -135,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to add metadata tags for search engines and social networks