jekyll-seo-tag 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e6db909499c8ba306ee172c818f463f1409b3f31759bac7f7b344a2ea67fb6
-  data.tar.gz: cc3dbe920fae5441b04ed5a3452b16c4d55d13b0958fbf43a6bbe52c59ec1e28
+  metadata.gz: e9eb9dfd036a3ea2c3078d87759738e4606cbf37633996a68568a289fe0aec88
+  data.tar.gz: f351b73b95b687b9195df24044940e104ffebecc109b3f8120013594083583bd
 SHA512:
-  metadata.gz: ed7c5b987ec70f5c9bbabdff7fcc6b950514f1616f063e978dbd8dab63c62a5f95c43be4aece27c9cb612e7684fff2ed38d5d40d65a0d38a6ea182c1467bc0dd
-  data.tar.gz: 56bee779d96a1ef131d7c2606916ad6744ddb83f1a753173111becedbe8f282fa4b9b5182c40a407e0c8e9049f260f972c3432d96798ac57cb2ff40364a7e19b
+  metadata.gz: d4cf8a641a8446757ddb990bb9787a0a4a25f66debe44f3bc740052958fd3417df64efeb9c2a6fd1d8d0ff8e3296bc47eb65f8f97c10b22c89efb613aead4d1b
+  data.tar.gz: a18945dca650e7f6c0834badfd2f8f1c816654e39737666b2b17963017f7a97249b19bc99fb7f02661b66aca03c6ff44c260782030b43e2d7bf5ba6fecc8f040

data/.github/workflows/actions/memprof.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'jekyll'
+require 'memory_profiler'
+
+MemoryProfiler.report(allow_files: 'lib/jekyll-seo-tag') do
+  Jekyll::PluginManager.require_from_bundler
+  Jekyll::Commands::Build.process({
+    "source"             => File.expand_path(ARGV[0]),
+    "destination"        => File.expand_path("#{ARGV[0]}/_site"),
+    "disable_disk_cache" => true,
+  })
+  puts ''
+end.pretty_print(scale_bytes: true, normalize_paths: true)

data/.github/workflows/third-party.yml

@@ -0,0 +1,61 @@
+name: Third-Party Repository Profiling
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build_n_profile:
+    if: "!contains(github.event.commits[0].message, '[ci skip]')"
+    runs-on: 'ubuntu-latest'
+    steps:
+    - name: Checkout Jekyll SEO Tag
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 5
+        path: jekyll-seo-tag
+    - name: Checkout Third-Party Repository (WITHOUT SEO Tag)
+      uses: actions/checkout@v2
+      with:
+        repository: ashmaroli/tomjoht.github.io
+        ref: 'no-seo-tag'
+        path: alpha-sandbox
+    - name: Checkout Same Third-Party Repository (WITH SEO Tag)
+      uses: actions/checkout@v2
+      with:
+        repository: ashmaroli/tomjoht.github.io
+        ref: 'seo-tag'
+        path: sandbox
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Set up Dependencies Cache
+      uses: actions/cache@v1
+      with:
+        path: sandbox/vendor/bundle
+        key: ubuntu-latest-gems-
+        restore-keys: |
+          ubuntu-latest-gems-
+    - name: Set up Dependencies
+      run: |
+        gem update --system --no-document
+        gem update bundler --no-document
+        bundle config gemfile sandbox/Gemfile
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3
+    - name: Run Jekyll Build (WITHOUT SEO Tag) 3 times
+      run: |
+        bundle exec jekyll build -s alpha-sandbox -d alpha-sandbox/_site --trace
+        bundle exec jekyll build -s alpha-sandbox -d alpha-sandbox/_site --trace
+        bundle exec jekyll build -s alpha-sandbox -d alpha-sandbox/_site --trace
+    - name: Run Jekyll Build (WITH SEO Tag) 3 times
+      run: |
+        bundle exec jekyll build -s sandbox -d sandbox/_site --trace
+        bundle exec jekyll build -s sandbox -d sandbox/_site --trace
+        bundle exec jekyll build -s sandbox -d sandbox/_site --trace
+    - name: Memory Analysis of Jekyll Build (WITH SEO Tag)
+      run: bundle exec ruby jekyll-seo-tag/.github/workflows/actions/memprof.rb sandbox

data/.gitignore

@@ -1,12 +1,9 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/bin/
 *.gem
-_site
+.bundle
+.yardoc
+Gemfile.lock
+pkg
+spec/reports/
+spec/fixtures/.jekyll-cache
+tmp/
+vendor/bundle

data/.rubocop.yml

@@ -5,11 +5,11 @@ inherit_gem:
   rubocop-jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Exclude:
     - vendor/**/*
 
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
     - spec/**/*
     - jekyll-seo-tag.gemspec

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-03-25 11:42:06 +0100 using RuboCop version 0.66.0.
+# `rubocop --auto-gen-config --auto-gen-only-exclude`
+# on 2020-03-20 11:41:46 +0100 using RuboCop version 0.80.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.4
-  - 2.6
+  - 2.5
+  - 2.7
 
 before_install:
   - gem update --system
@@ -14,5 +14,5 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-    - JEKYLL_VERSION="~> 3.3"
-    - JEKYLL_VERSION=">= 4.0.0.pre.alpha1"
+    - JEKYLL_VERSION="~> 3.9"
+    - JEKYLL_VERSION="~> 4.0"

data/Gemfile

@@ -5,3 +5,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]
+gem "kramdown-parser-gfm" if ENV["JEKYLL_VERSION"] == "~> 3.9"

data/History.markdown

@@ -1,3 +1,42 @@
+## 2.7.0 / 2020-10-18
+
+### Minor Enhancements
+
+  * Change pagination message with `seo_paginator_message` option (#324)
+  * Make Twitter Summary Card without having Twitter account (#284)
+  * Prefer site.tagline to site.description for page title (#356)
+  * Render og:locale meta only when defined explicitly (#388)
+
+### Bug Fixes
+
+  * Ensure a single leading `@` for twitter usernames (#367)
+
+### Development Fixes
+
+  * chore(deps): require Ruby > 2.4.0 EOL
+  * test: fix locale specs that use the fallback locale (#360)
+  * refactor: Replace read-only empty hash with private constant (#418)
+  * refactor: Mutate hash literals instead of duplicating them (#417)
+  * refactor: Reduce allocations of instance-agnostic objects (#376)
+  * refactor: Memoize #author_hash in SeoTag::AuthorDrop (#342)
+  * refactor: simplify conditional in SeoTag::Drop#date_modified (#343)
+  * chore(ci): profile seo-tag plugin on a third-party repository (#414)
+  * chore(ci): Jekyll v4.0 (#372)
+  * chore(ci): test against current stable Ruby 2.5 and 2.7 (#385)
+  * style: align with latest jekyll-rubocop (#382)
+  * fix: Travis builds for Jekyll 3.x (#415)
+
+### Documentation
+
+  * Structured Data Testing Tool is deprecated (#409)
+  * Rename Google webmaster tools to Google Search Console  (#403)
+  * Improve documentation on plugin usage (#399)
+  * remove Google+ from example snippet (#358)
+  * HTTPS link to https://ogp.me/ (#359)
+  * HTTPS links to schema.org (#350)
+  * use example.com for example URL (#351)
+
+
 ## 2.6.1 / 2019-05-17
 
 ### Development Fixes

data/docs/README.md

@@ -12,8 +12,8 @@ Jekyll SEO Tag adds the following meta tags to your site:
 * Page description
 * Canonical URL
 * Next and previous URLs on paginated pages
-* [JSON-LD Site and post metadata](https://developers.google.com/structured-data/) for richer indexing
-* [Open Graph](http://ogp.me/) title, description, site title, and URL (for Facebook, LinkedIn, etc.)
+* [JSON-LD Site and post metadata](https://developers.google.com/search/docs/guides/intro-structured-data) for richer indexing
+* [Open Graph](https://ogp.me/) title, description, site title, and URL (for Facebook, LinkedIn, etc.)
 * [Twitter Summary Card](https://dev.twitter.com/cards/overview) metadata
 
 While you could theoretically add the necessary metadata tags yourself, Jekyll SEO Tag provides a battle-tested template of crowdsourced best-practices.

data/docs/advanced-usage.md

@@ -74,7 +74,7 @@ The following options can be set for any particular page. While the default opti
 
 * `seo`
   * `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.
+  * `type` - The type of things that the page represents. This must be a [Schema.org type](https://schema.org/docs/schemas.html), and will probably usually be something like [`BlogPosting`](https://schema.org/BlogPosting), [`NewsArticle`](https://schema.org/NewsArticle), [`Person`](https://schema.org/Person), [`Organization`](https://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.
@@ -98,7 +98,7 @@ image:
 
 ### Setting a default image
 
-You can define a default image using [Front Matter default](https://jekyllrb.com/docs/configuration/#front-matter-defaults), to provide a default Twitter Card or OGP image to all of your posts and pages.
+You can define a default image using [Front Matter defaults](https://jekyllrb.com/docs/configuration/front-matter-defaults/), to provide a default Twitter Card or OGP image to all of your posts and pages.
 
 Here is a very basic example, that you are encouraged to adapt to your needs:
 
@@ -112,11 +112,11 @@ defaults:
 
 ### SmartyPants Titles
 
-Titles will be processed using [Jekyll's `smartify` filter](https://jekyllrb.com/docs/templates/). This will use SmartyPants to translate plain ASCII punctuation into "smart" typographic punctuation. This will not render or strip any Markdown you may be using in a page title.
+Titles will be processed using [Jekyll's `smartify` filter](https://jekyllrb.com/docs/liquid/filters/). This will use SmartyPants to translate plain ASCII punctuation into "smart" typographic punctuation. This will not render or strip any Markdown you may be using in a page title.
 
 ### Setting customized Canonical URL
 
-You can set custom Canonical URL for a page by specifying canonical_url option in page front-matter.
+You can set custom Canonical URL for a page by specifying canonical_url option in page front matter.
 E.g., you have the following in the page's front matter:
 ```yml
 layout: post
@@ -130,7 +130,7 @@ Which will generate canonical_url with specified link in canonical_url.
 ```
 
 If no canonical_url option was specified, then uses page url for generating canonical_url.
-E.g., you have not specified canonical_url in front-matter:
+E.g., you have not specified canonical_url in front matter:
 ```yml
 layout: post
 title: Title of Your Post
@@ -138,5 +138,19 @@ title: Title of Your Post
 
 Which will generate following canonical_url:
 ```html
-<link rel="canonical" href="http://yoursite.com/title-of-your-post" />
+<link rel="canonical" href="https://example.com/title-of-your-post" />
 ```
+
+### Customizing title modifier for paginated pages
+
+You can override the default title modifier for paginated pages from `Page %{current} of %{total} for ` to a string of your
+choice by setting a `seo_paginator_message` key in your `_config.yml`.
+
+For example:  
+
+```yml
+seo_paginator_message: "%<current>s / %<total>s | "
+```
+
+While the value can be any string text, we recommend using a Ruby string-template containing the variables `current` and `total`
+similar to the example above, to incorporate the current page-number and total number of paginated pages in the title.

data/docs/usage.md

@@ -1,22 +1,29 @@
 ## Usage
 
-The SEO tag will respect any of the following if included in your site's `_config.yml` (and simply not include them if they're not defined):
+The SEO tag will respect any of the following if included in your site's `_config.yml` (and simply not include them if
+they're not defined):
 
-* `title` - Your site's title (e.g., Ben's awesome site, The GitHub Blog, etc.)
-* `description` - A short description (e.g., A blog dedicated to reviewing cat gifs)
+* `title` - Your site's title (e.g., *Ben's Awesome Site*, *The GitHub Blog*, etc.), used as part of the title tag like
+`Home | Ben's Awesome Site`.
+* `tagline` - A short description (e.g., *A blog dedicated to reviewing cat gifs*), used as part of the title tag like
+`Ben's Awesome Site | A blog dedicated to reviewing cat gifs` instead of `Ben's Awesome Site | Long description about a
+blog dedicated to reviewing cat gifs` that would be used when `page.title` is not defined.
+* `description` - A longer description used for the description meta tag. Also used as fallback for pages that don't
+provide their own `description`, and also as part of the page's title tag if neither `page.title` nor `site.tagline`
+has been defined.
 * `url` - The full URL to your site. Note: `site.github.url` will be used by default.
 * `author` - global author information (see [Advanced usage](advanced-usage.md#author-information))
-
 * `twitter` - The following properties are available:
   * `twitter:card` - The site's default card type
-  * `twitter:username` - The site's Twitter handle. You'll want to describe it like so:
+  * `twitter:username` - The site's Twitter handle.
+
+  You'll want to describe them like so:
 
   ```yml
   twitter:
     username: benbalter
     card: summary
   ```
-
 * `facebook` - The following properties are available:
   * `facebook:app_id` - a Facebook app ID for Facebook insights
   * `facebook:publisher` - a Facebook page URL or ID of the publishing entity
@@ -30,9 +37,12 @@ The SEO tag will respect any of the following if included in your site's `_confi
     publisher: 1234
     admins: 1234
   ```
-
-* `logo` - URL to a site-wide logo (e.g., `/assets/your-company-logo.png`) - If you would like the "publisher" property to be present, you must add this field to your site's configuration, during the validation of the structured data by Google web master tools, if the `logo` field is not validated, you will find errors inherent to the publisher in the [structured datas test](https://search.google.com/structured-data/testing-tool/u/0/)
-* `social` - For [specifying social profiles](https://developers.google.com/structured-data/customize/social-profiles). The following properties are available:
+* `logo` - URL to a site-wide logo (e.g., `/assets/your-company-logo.png`) - If you would like the "publisher" property
+to be present, you must add this field to your site's configuration, during the validation of the structured data by
+Google Search Console, if the `logo` field is not validated, you will find errors inherent to the publisher in the
+[Rich Results Testing Tool](https://search.google.com/test/rich-results)
+* `social` - For [specifying social profiles](https://developers.google.com/search/docs/guides/enhance-site#add-your-sites-name-logo-and-social-links).
+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.
 
@@ -43,24 +53,21 @@ The SEO tag will respect any of the following if included in your site's `_confi
       - https://twitter.com/BenBalter
       - https://www.facebook.com/ben.balter
       - https://www.linkedin.com/in/BenBalter
-      - https://plus.google.com/+BenBalter
       - https://github.com/benbalter
       - https://keybase.io/benbalter
   ```
-
-* `google_site_verification` for verifying ownership via Google webmaster tools
+* `google_site_verification` for verifying ownership via Google Search Console
 * Alternatively, verify ownership with several services at once using the following format:
-
-```yml
-webmaster_verifications:
-  google: 1234
-  bing: 1234
-  alexa: 1234
-  yandex: 1234
-  baidu: 1234
-```
-
-* `lang` - The locale these tags are marked up in. Of the format `language_TERRITORY`. Default is `en_US`.
+  ```yml
+  webmaster_verifications:
+    google: 1234
+    bing: 1234
+    alexa: 1234
+    yandex: 1234
+    baidu: 1234
+  ```
+* `locale` - The locale these tags are marked up in. Of the format `language_TERRITORY`. Default is `en_US`. Takes priority
+over existing config key `lang`.
 
 The SEO tag will respect the following YAML front matter if included in a post, page, or document:
 
@@ -68,6 +75,6 @@ The SEO tag will respect the following YAML front matter if included in a post,
 * `description` - A short description of the page's content
 * `image` - URL to an image associated with the post, page, or document (e.g., `/assets/page-pic.jpg`)
 * `author` - Page-, post-, or document-specific author information (see [Advanced usage](advanced-usage.md#author-information))
-* `lang` - Page-, post-, or document-specific language information
+* `locale` - Page-, post-, or document-specific locale information. Takes priority over existing front matter attribute `lang`.
 
 *Note:* Front matter defaults can be used for any of the above values as described in advanced usage with an image example.

data/jekyll-seo-tag.gemspec

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jekyll-seo-tag/version"
+require_relative "lib/jekyll-seo-tag/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-seo-tag"
@@ -10,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ben Balter"]
   spec.email         = ["ben.balter@github.com"]
   spec.summary       = "A Jekyll plugin to add metadata tags for search engines and social networks to better index and display your site's content."
-  spec.homepage      = "https://github.com/benbalter/jekyll-seo-tag"
+  spec.homepage      = "https://github.com/jekyll/jekyll-seo-tag"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
@@ -21,16 +19,16 @@ Gem::Specification.new do |spec|
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.4.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r!^exe/!) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jekyll", ">= 3.3", "< 5.0"
+  spec.add_dependency "jekyll", ">= 3.8", "< 5.0"
   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-jekyll", "~> 0.4"
+  spec.add_development_dependency "rubocop-jekyll", "~> 0.11"
 end

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

@@ -74,12 +74,14 @@ module Jekyll
       # including site-wide metadata if the author is provided as a string,
       # or an empty hash, if the author cannot be resolved
       def author_hash
-        if resolved_author.is_a? Hash
-          resolved_author
-        elsif resolved_author.is_a? String
-          { "name" => resolved_author }.merge(site_data_hash)
-        else
-          {}
+        @author_hash ||= begin
+          if resolved_author.is_a? Hash
+            resolved_author
+          elsif resolved_author.is_a? String
+            { "name" => resolved_author }.merge!(site_data_hash)
+          else
+            {}
+          end
         end
       end
 

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

@@ -11,10 +11,13 @@ module Jekyll
       ].freeze
       HOMEPAGE_OR_ABOUT_REGEX = %r!^/(about/)?(index.html?)?$!.freeze
 
+      EMPTY_READ_ONLY_HASH = {}.freeze
+      private_constant :EMPTY_READ_ONLY_HASH
+
       def initialize(text, context)
-        @obj = {}
+        @obj = EMPTY_READ_ONLY_HASH
         @mutations = {}
-        @text    = text
+        @text = text
         @context = context
       end
 
@@ -34,6 +37,10 @@ module Jekyll
         @site_title ||= format_string(site["title"] || site["name"])
       end
 
+      def site_tagline
+        @site_tagline ||= format_string site["tagline"]
+      end
+
       def site_description
         @site_description ||= format_string site["description"]
       end
@@ -43,6 +50,10 @@ module Jekyll
         @page_title ||= format_string(page["title"]) || site_title
       end
 
+      def site_tagline_or_description
+        site_tagline || site_description
+      end
+
       # Page title with site title or description appended
       # rubocop:disable Metrics/CyclomaticComplexity
       def title
@@ -50,7 +61,7 @@ module Jekyll
           if site_title && page_title != site_title
             page_title + TITLE_SEPARATOR + site_title
           elsif site_description && site_title
-            site_title + TITLE_SEPARATOR + site_description
+            site_title + TITLE_SEPARATOR + site_tagline_or_description
           else
             page_title || site_title
           end
@@ -101,13 +112,7 @@ module Jekyll
 
       def date_modified
         @date_modified ||= begin
-          date = if page_seo["date_modified"]
-                   page_seo["date_modified"]
-                 elsif page["last_modified_at"]
-                   page["last_modified_at"].to_liquid
-                 else
-                   page["date"]
-                 end
+          date = page_seo["date_modified"] || page["last_modified_at"].to_liquid || page["date"]
           filters.date_to_xmlschema(date) if date
         end
       end
@@ -156,6 +161,10 @@ module Jekyll
         @page_lang ||= page["lang"] || site["lang"] || "en_US"
       end
 
+      def page_locale
+        @page_locale ||= (page["locale"] || site["locale"] || page_lang).tr("-", "_")
+      end
+
       def canonical_url
         @canonical_url ||= begin
           if page["canonical_url"].to_s.empty?
@@ -189,8 +198,9 @@ module Jekyll
 
         current = @context["paginator"]["page"]
         total = @context["paginator"]["total_pages"]
+        paginator_message = site["seo_paginator_message"] || "Page %<current>s of %<total>s for "
 
-        return "Page #{current} of #{total} for " if current > 1
+        format(paginator_message, :current => current, :total => total) if current > 1
       end
 
       attr_reader :context
@@ -229,7 +239,7 @@ module Jekyll
         if hash[key].is_a?(Hash)
           hash[key]
         else
-          {}
+          EMPTY_READ_ONLY_HASH
         end
       end
     end

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

@@ -39,13 +39,17 @@ module Jekyll
 
       # The normalized image hash with a `path` key (which may be nil)
       def image_hash
-        @image_hash ||= if page["image"].is_a?(Hash)
-                          { "path" => nil }.merge(page["image"])
-                        elsif page["image"].is_a?(String)
-                          { "path" => page["image"] }
-                        else
-                          { "path" => nil }
-                        end
+        @image_hash ||= begin
+          image_meta = page["image"]
+
+          if image_meta.is_a?(Hash)
+            { "path" => nil }.merge!(image_meta)
+          elsif image_meta.is_a?(String)
+            { "path" => image_meta }
+          else
+            { "path" => nil }
+          end
+        end
       end
       alias_method :fallback_data, :image_hash
 

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

@@ -20,6 +20,9 @@ module Jekyll
       private :type
       private :logo
 
+      VALID_ENTITY_TYPES = %w(BlogPosting CreativeWork).freeze
+      private_constant :VALID_ENTITY_TYPES
+
       # page_drop should be an instance of Jekyll::SeoTag::Drop
       def initialize(page_drop)
         @mutations = {}
@@ -27,7 +30,7 @@ module Jekyll
       end
 
       def fallback_data
-        {
+        @fallback_data ||= {
           "@context" => "https://schema.org",
         }
       end
@@ -66,7 +69,7 @@ module Jekyll
       end
 
       def main_entity
-        return unless %w(BlogPosting CreativeWork).include?(type)
+        return unless VALID_ENTITY_TYPES.include?(type)
 
         {
           "@type" => "WebPage",

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.6.1"
+    VERSION = "2.7.0"
   end
 end

data/lib/template.html

@@ -13,7 +13,7 @@
   <meta name="author" content="{{ seo_tag.author.name }}" />
 {% endif %}
 
-<meta property="og:locale" content="{{ seo_tag.page_lang | replace:'-','_' }}" />
+<meta property="og:locale" content="{{ seo_tag.page_locale }}" />
 
 {% if seo_tag.description %}
   <meta name="description" content="{{ seo_tag.description }}" />
@@ -51,19 +51,23 @@
   <link rel="next" href="{{ paginator.next_page_path | absolute_url }}" />
 {% endif %}
 
-{% 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 %}
 
+{% 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 %}
+
+{% if seo_tag.page_title %}
   <meta property="twitter:title" content="{{ seo_tag.page_title }}" />
-  <meta name="twitter:site" content="@{{ site.twitter.username | replace:"@","" }}" />
+{% endif %}
+
+{% if site.twitter %}
+  <meta name="twitter:site" content="@{{ site.twitter.username | remove:'@' }}" />
 
   {% if seo_tag.author.twitter %}
-    <meta name="twitter:creator" content="@{{ seo_tag.author.twitter }}" />
+    <meta name="twitter:creator" content="@{{ seo_tag.author.twitter | remove:'@' }}" />
   {% endif %}
 {% endif %}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-seo-tag
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.11'
 description: 
 email:
 - ben.balter@github.com
@@ -93,6 +93,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/actions/memprof.rb"
+- ".github/workflows/third-party.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -122,7 +124,7 @@ files:
 - script/cibuild
 - script/release
 - script/site
-homepage: https://github.com/benbalter/jekyll-seo-tag
+homepage: https://github.com/jekyll/jekyll-seo-tag
 licenses:
 - MIT
 metadata:
@@ -135,14 +137,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to add metadata tags for search engines and social networks