jekyll-seo-tag 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d7b830b127017c667a9e58bd5c214e594558bc
-  data.tar.gz: a69f4f9cee9f45644add22a57245366cdbc1ddc1
+  metadata.gz: 3aadbfac78b25f51bdf3988226662b0bec27d938
+  data.tar.gz: 31daa9c7be9db36224a7f7e4ea73bd65759e434c
 SHA512:
-  metadata.gz: 52c022b593902ef22131b0e96ef497d188e73469a07a6c2ffa33c0619de08393eeeaae729556a8d368a1d45b0d9ce7907f64e1eb40a177abcbce1213989e82b6
-  data.tar.gz: 0a7309abed4b88e3c9b95a8f349cfae6ad0305b304a4901d3fcf7e1c4d637a16d6381a3b2fd6fe64eba7f9d2817d8d410a23a3700b7fb36fb20f0cb655be3677
+  metadata.gz: 86935801e5cfa7a9615a3d43724883963cd4797cd77cd23c0acf269d673d812b54c046377b0c9cbefb60aba7de645d6a8e261014db70e1bfebe7d9a9e17b49b3
+  data.tar.gz: 22c5d2544893c1568669e1655ee242ee56207ce20c04f898b951089220357dbab5451a2a1bf29e6cfcf1dfef624e17faf78d77a7507cf7b20de05a5e6a1f901a

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/bin/
 *.gem

data/.rubocop.yml

@@ -6,12 +6,20 @@ Metrics/LineLength:
     - spec/**/*
     - jekyll-seo-tag.gemspec
 
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+
 Style/Documentation:
   Enabled: false
 
 Style/FileName:
   Enabled: false
 
+Style/IndentHeredoc:
+  Exclude:
+    - spec/**/*
+
 AllCops:
   Exclude:
     - vendor/**/*

data/Gemfile

@@ -1,15 +1,14 @@
-source 'https://rubygems.org'
-require 'json'
-require 'open-uri'
+source "https://rubygems.org"
+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.delete('jekyll') # Remove this line when GitHub Pages supports 3.3.0
+  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

data/History.markdown

@@ -1,5 +1,26 @@
 ## HEAD
 
+### Major Enhancements
+
+  * Add author meta (#103)
+  * 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)
+  * Use `og:image` for twitter image (#174)
+
+### Development Fixes
+
+  * Style fixes (#170, #157, #149)
+  * Test against latest version of Jekyll (#171)
+  * Bump dev dependencies (#172)
+  * Remove Rake dependency (#180)
+
+## 2.1.0
+
 ### Major Enhancement
 
   * Use new URL filters (#123)

data/README.md

@@ -8,13 +8,13 @@ A Jekyll plugin to add metadata tags for search engines and social networks to b
 
 Jekyll SEO Tag adds the following meta tags to your site:
 
-* Pages title (with site title appended when available)
+* Page title, with site title or description appended
 * 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.)
-* [Twitter summary card](https://dev.twitter.com/cards/overview) metadata
+* [Open Graph](http://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.
 
@@ -78,6 +78,7 @@ 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:
@@ -92,6 +93,17 @@ The SEO tag will respect any of the following if included in your site's `_confi
     ```
 
 * `google_site_verification` for verifying ownership via Google webmaster tools
+* Alternatively, verify ownership with several services at once using the following format:
+
+```yml
+webmaster_verifications:
+  google: 1234
+  bing: 1234
+  alexa: 1234
+  yandex: 1234
+```
+
+* `lang` - The locale these tags are marked up in. Of the format `language_TERRITORY`. Default is `en_US`.
 
 The SEO tag will respect the following YAML front matter if included in a post, page, or document:
 
@@ -99,6 +111,7 @@ 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 below)
+* `lang` - Page-, post-, or document-specific language information
 
 ## Advanced usage
 
@@ -182,17 +195,14 @@ The following options can be set for any particular page. While the default opti
 For most users, setting `image: [path-to-image]` on a per-page basis should be enough. If you need more control over how images are represented, the `image` property can also be an object, with the following options:
 
 * `path` - The relative path to the image. Same as `image: [path-to-image]`
-* `twitter` - The relative path to a Twitter-specific image.
-* `facebook` - The relative path to a Facebook-specific image.
-* `height` - The height of the Facebook (`og:image`) image
-* `width` - The width of the Facebook (`og:image`) image
+* `height` - The height of the Open Graph (`og:image`) image
+* `width` - The width of the Open Graph (`og:image`) image
 
 You can use any of the above, optional properties, like so:
 
 ```yml
 image:
-  twitter: /img/twitter.png
-  facebook: /img/facebook.png
+  path: /img/twitter.png
   height: 100
   width: 100
 ```

data/jekyll-seo-tag.gemspec

@@ -1,34 +1,34 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll-seo-tag/version'
+require "jekyll-seo-tag/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'jekyll-seo-tag'
+  spec.name          = "jekyll-seo-tag"
   spec.version       = Jekyll::SeoTag::VERSION
-  spec.authors       = ['Ben Balter']
-  spec.email         = ['ben.balter@github.com']
+  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.license       = 'MIT'
+  spec.homepage      = "https://github.com/benbalter/jekyll-seo-tag"
+  spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
-    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  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.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'
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'html-proofer', '~> 2.5'
-  spec.add_development_dependency 'rubocop', '~> 0.37'
+  spec.add_dependency "jekyll", "~> 3.3"
+  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "html-proofer", "~> 3.6"
+  spec.add_development_dependency "rubocop", "~> 0.48"
 end

data/lib/jekyll-seo-tag.rb

@@ -30,7 +30,7 @@ module Jekyll
     def options
       {
         "version" => Jekyll::SeoTag::VERSION,
-        "title"   => title?
+        "title"   => title?,
       }
     end
 
@@ -39,18 +39,18 @@ module Jekyll
         "page"      => context.registers[:page],
         "site"      => context.registers[:site].site_payload["site"],
         "paginator" => context["paginator"],
-        "seo_tag"   => options
+        "seo_tag"   => options,
       }
     end
 
     def title?
-      !(@text =~ %r!title=false!i)
+      @text !~ %r!title=false!i
     end
 
     def info
       {
         :registers => context.registers,
-        :filters   => [Jekyll::Filters]
+        :filters   => [Jekyll::Filters],
       }
     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.1.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/lib/template.html

@@ -5,21 +5,13 @@
 {% endif %}
 
 {% assign seo_site_title = site.title | default: site.name %}
+{% assign seo_page_title = page.title | default: seo_site_title %}
+{% assign seo_title = page.title | default: seo_site_title %}
 
-{% if page.title %}
-  {% assign seo_title = page.title %}
-  {% assign seo_page_title = page.title %}
-
-  {% if seo_site_title %}
-    {% assign seo_title = seo_title | append:" - " | append: seo_site_title %}
-  {% endif %}
-{% elsif seo_site_title %}
-  {% assign seo_title = seo_site_title %}
-  {% assign seo_page_title = seo_site_title %}
-
-  {% if site.description %}
-    {% assign seo_title = seo_title | append:" - " | append: site.description %}
-  {% endif %}
+{% if page.title and seo_site_title %}
+  {% assign seo_title = page.title | append:" | " | append: seo_site_title %}
+{% elsif site.description and seo_site_title %}
+  {% assign seo_title = seo_site_title | append:" | " | append: site.description %}
 {% endif %}
 
 {% if page.seo and page.seo.name %}
@@ -52,6 +44,15 @@
 
 {% assign seo_author = page.author | default: page.authors[0] | default: site.author %}
 {% if seo_author %}
+  {% if seo_author.name %}
+    {% assign seo_author_name = seo_author.name %}
+  {% else %}
+    {% if site.data.authors and site.data.authors[seo_author] %}
+      {% assign seo_author_name = site.data.authors[seo_author].name %}
+    {% else %}
+      {% assign seo_author_name = seo_author  %}
+    {% endif %}
+  {% endif %}
   {% if seo_author.twitter %}
     {% assign seo_author_twitter = seo_author.twitter %}
   {% else %}
@@ -64,6 +65,10 @@
   {% assign seo_author_twitter = seo_author_twitter | replace:"@","" %}
 {% endif %}
 
+{% if page.date_modified or page.last_modified_at or page.date %}
+  {% assign seo_date_modified = page.seo.date_modified | default: page.last_modified_at %}
+{% endif %}
+
 {% if page.seo and page.seo.type %}
     {% assign seo_type = page.seo.type %}
 {% elsif seo_homepage_or_about %}
@@ -89,13 +94,15 @@
 {% endif %}
 
 {% if page.image %}
-  {% assign seo_page_image = page.image.path | default: page.image.facebook | default: page.image %}
+  {% assign seo_page_image = page.image.path | default: page.image.facebook | default: page.image.twitter | default: page.image %}
   {% unless seo_page_image contains "://" %}
     {% assign seo_page_image = seo_page_image | absolute_url %}
   {% endunless %}
   {% assign seo_page_image = seo_page_image | escape %}
 {% endif %}
 
+{% assign seo_page_lang = page.lang | default: site.lang | default: "en_US" %}
+
 {% if seo_tag.title and seo_title %}
   <title>{{ seo_title }}</title>
 {% endif %}
@@ -104,6 +111,12 @@
   <meta property="og:title" content="{{ seo_page_title }}" />
 {% endif %}
 
+{% if seo_author_name %}
+  <meta name="author" content="{{ seo_author_name }}" />
+{% endif %}
+
+<meta property="og:locale" content="{{ seo_page_lang | replace:'-','_' }}" />
+
 {% if seo_description %}
   <meta name="description" content="{{ seo_description }}" />
   <meta property="og:description" content="{{ seo_description }}" />
@@ -119,7 +132,7 @@
 {% endif %}
 
 {% if seo_page_image %}
-<meta property="og:image" content="{{ seo_page_image }}" />
+  <meta property="og:image" content="{{ seo_page_image }}" />
   {% if page.image.height %}
     <meta property="og:image:height" content="{{ page.image.height }}" />
   {% endif %}
@@ -128,10 +141,6 @@
   {% endif %}
 {% endif %}
 
-{% if page.image.twitter %}
-  <meta name="twitter:image" content="{{ page.image.twitter | absolute_url }}" />
-{% endif %}
-
 {% if page.date %}
   <meta property="og:type" content="article" />
   <meta property="article:published_time" content="{{ page.date | date_to_xmlschema }}" />
@@ -172,10 +181,24 @@
   {% endif %}
 {% endif %}
 
-{% if site.google_site_verification %}
+{% if site.webmaster_verifications %}
+  {% if 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 }}">
+  {% endif %}
+  {% if 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 }}">
+  {% endif %}
+{% elsif site.google_site_verification %}
   <meta name="google-site-verification" content="{{ site.google_site_verification }}" />
 {% endif %}
 
+
 <script type="application/ld+json">
   {
     "@context": "http://schema.org",
@@ -192,6 +215,13 @@
     "headline": {{ seo_page_title | jsonify }},
 {% endif %}
 
+{% if seo_author %}
+    "author": {
+       "@type": "Person",
+       "name": {{ seo_author | jsonify }}
+    },
+{% endif %}
+
 {% if seo_page_image %}
     "image": {{ seo_page_image | jsonify }},
 {% endif %}
@@ -200,6 +230,10 @@
     "datePublished": {{ page.date | date_to_xmlschema | jsonify }},
 {% endif %}
 
+{% if seo_date_modified %}
+    "dateModified": {{ seo_date_modified | date_to_xmlschema | jsonify }},
+{% endif %}
+
 {% if seo_description %}
     "description": {{ seo_description | jsonify }},
 {% endif %}
@@ -207,6 +241,9 @@
 {% if seo_site_logo %}
     "publisher": {
         "@type": "Organization",
+        {% if seo_author %}
+            "name": {{ seo_author | jsonify }},
+        {% endif %}
         "logo": {
             "@type": "ImageObject",
             "url": {{ seo_site_logo | jsonify }}
@@ -214,6 +251,13 @@
     },
 {% endif %}
 
+{% if seo_type == "BlogPosting" or seo_type == "CreativeWork"%}
+    "mainEntityOfPage": {
+        "@type": "WebPage",
+        "@id": {{ page.url | replace:'/index.html','/' | absolute_url | jsonify }}
+    },
+{% endif %}
+
 {% if seo_links %}
     "sameAs": {{ seo_links | jsonify }},
 {% endif %}

data/script/cibuild

@@ -2,6 +2,6 @@
 
 set -ex
 
-bundle exec rake spec
+bundle exec rspec
 bundle exec rubocop -S -D
 bundle exec gem build jekyll-seo-tag.gemspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-seo-tag
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,70 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: html-proofer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.48'
 description: 
 email:
 - ben.balter@github.com
@@ -109,7 +95,6 @@ files:
 - History.markdown
 - LICENSE.txt
 - README.md
-- Rakefile
 - jekyll-seo-tag.gemspec
 - lib/jekyll-seo-tag.rb
 - lib/jekyll-seo-tag/version.rb
@@ -138,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to add metadata tags for search engines and social networks

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec