From 407ee8ee0ce33dec89dacb4fe39a995b515b2d0a Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 1 Mar 2016 09:18:13 +0200 Subject: [PATCH 1/9] Update README.md Fix indentation. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9a8feb0..b62dd43 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Jekyll SEO tag isn't designed to accommodate every possible use case. It should 3. Add the following right before `` in your site's template(s): ```liquid - {% seo %} + {% seo %} ``` ## Usage @@ -60,12 +60,12 @@ The SEO tag will respect any of the following if included in your site's `_confi username: benbalter ``` -* `facebook:app_id` (A Facebook app ID for Facebook insights), and/or `facebook:publisher` (A Facebook page URL or ID of the publishing entity). You'll want to describe one or both like so: +* `facebook:app_id` (a Facebook app ID for Facebook insights), and/or `facebook:publisher` (a Facebook page URL or ID of the publishing entity). You'll want to describe one or both like so: ```yml - facebook: - app_id: 1234 - publisher: 1234 + facebook: + app_id: 1234 + publisher: 1234 ``` * `logo` - Relative URL to a site-wide logo (e.g., `/assets/your-company-logo.png`) From dae68cb01e43973db27a8223166f9ce108139a35 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 1 Mar 2016 18:29:04 +0200 Subject: [PATCH 2/9] Remove spaces before `:`. --- lib/template.html | 10 +++++----- spec/jekyll_seo_tag_spec.rb | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/template.html b/lib/template.html index a6b3122..e457312 100644 --- a/lib/template.html +++ b/lib/template.html @@ -154,14 +154,14 @@ diff --git a/spec/jekyll_seo_tag_spec.rb b/spec/jekyll_seo_tag_spec.rb index 17c5f0e..c17f5c9 100644 --- a/spec/jekyll_seo_tag_spec.rb +++ b/spec/jekyll_seo_tag_spec.rb @@ -183,8 +183,8 @@ EOS it 'minifies JSON-LD' do expected = <<-EOS { - "@context" : "http://schema.org", - "@type" : "BlogPosting", + "@context": "http://schema.org", + "@type": "BlogPosting", "headline": "post", EOS expect(output).to match(expected) From 5fb86bfa7b7134e531a415d96da6787d4ed6fc4b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 1 Mar 2016 18:47:09 +0200 Subject: [PATCH 3/9] Be consistent with the quotes in output. --- lib/template.html | 4 ++-- spec/jekyll_seo_tag_spec.rb | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/template.html b/lib/template.html index e457312..4b87b8e 100644 --- a/lib/template.html +++ b/lib/template.html @@ -94,12 +94,12 @@ {% if seo_description %} - + {% endif %} {% if seo_url %} - + {% endif %} {% if seo_site_title %} diff --git a/spec/jekyll_seo_tag_spec.rb b/spec/jekyll_seo_tag_spec.rb index c17f5c9..4fa5a1d 100644 --- a/spec/jekyll_seo_tag_spec.rb +++ b/spec/jekyll_seo_tag_spec.rb @@ -55,7 +55,7 @@ describe Jekyll::SeoTag do it 'uses the page description' do expect(output).to match(%r{}) - expect(output).to match(%r{}) + expect(output).to match(%r{}) end end @@ -64,7 +64,7 @@ describe Jekyll::SeoTag do it 'uses the page excerpt when no page description exists' do expect(output).to match(%r{}) - expect(output).to match(%r{}) + expect(output).to match(%r{}) end end @@ -73,7 +73,7 @@ describe Jekyll::SeoTag do it 'uses the site description when no page description nor excerpt exist' do expect(output).to match(%r{}) - expect(output).to match(%r{}) + expect(output).to match(%r{}) end end @@ -83,7 +83,7 @@ describe Jekyll::SeoTag do it 'uses the site url to build the seo url' do expected = %r{} expect(output).to match(expected) - expected = %r{} + expected = %r{} expect(output).to match(expected) end @@ -94,7 +94,7 @@ describe Jekyll::SeoTag do expected = %r{} expect(output).to match(expected) - expected = %r{} + expected = %r{} expect(output).to match(expected) end end @@ -105,7 +105,7 @@ describe Jekyll::SeoTag do it 'uses baseurl to build the seo url' do expected = %r{} expect(output).to match(expected) - expected = %r{} + expected = %r{} expect(output).to match(expected) end end @@ -140,7 +140,7 @@ describe Jekyll::SeoTag do Foo - + EOS expect(output).to match(expected) @@ -155,7 +155,7 @@ EOS it 'uses site.github.url to build the seo url' do expected = %r{} expect(output).to match(expected) - expected = %r{} + expected = %r{} expect(output).to match(expected) end end From 38e688fcd9f51eb7bc0783cb9ab813ca28f7175d Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 1 Mar 2016 21:14:18 -0800 Subject: [PATCH 4/9] Check for existance of seo_page_title before outputting --- lib/template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/template.html b/lib/template.html index 4b87b8e..ab09fc9 100644 --- a/lib/template.html +++ b/lib/template.html @@ -88,7 +88,7 @@ {{ seo_title }} {% endif %} -{% if seo_title %} +{% if seo_page_title %} {% endif %} From 2c808aced6eaff3867c7a39514074a4ab38c4697 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 1 Mar 2016 21:14:32 -0800 Subject: [PATCH 5/9] Do not repeat Open Graph tags for Twitter --- lib/template.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/template.html b/lib/template.html index ab09fc9..ba29151 100644 --- a/lib/template.html +++ b/lib/template.html @@ -126,12 +126,6 @@ {% if site.twitter %} - - - - {% if page.image %} - - {% endif %} {% if seo_author_twitter %} From 55ead7fcb85eb30452ffe638d6dc3fb0944f1075 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 1 Mar 2016 21:20:31 -0800 Subject: [PATCH 6/9] Remove obsolete twitter:image test --- spec/jekyll_seo_tag_spec.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/spec/jekyll_seo_tag_spec.rb b/spec/jekyll_seo_tag_spec.rb index 4fa5a1d..ca664ff 100644 --- a/spec/jekyll_seo_tag_spec.rb +++ b/spec/jekyll_seo_tag_spec.rb @@ -266,16 +266,6 @@ EOS expect(output).to match(expected) end end - - context 'with page.image' do - let(:site) { make_site('twitter' => site_twitter, 'url' => 'http://example.invalid') } - let(:page) { make_page('image' => '/img/foo.png') } - - it 'outputs the image' do - expected = %r{} - expect(output).to match(expected) - end - end end end From f909777f3cd640051a96c0e05d385bc2901de3ea Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 2 Mar 2016 08:22:33 -0800 Subject: [PATCH 7/9] jsonify page.url instead of using quotes --- lib/template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/template.html b/lib/template.html index ba29151..93e3432 100644 --- a/lib/template.html +++ b/lib/template.html @@ -182,7 +182,7 @@ "sameAs": {{ seo_links | jsonify }}, {% endif %} - "url": "{{ page.url | prepend: seo_url | replace:'/index.html','/' }}" + "url": {{ page.url | prepend: seo_url | replace:'/index.html','/' | jsonify }} } From 62e82338be0796a67d4b1280fba396f72164909b Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Wed, 2 Mar 2016 12:02:37 -0500 Subject: [PATCH 8/9] Bump to 1.3.2 --- lib/jekyll-seo-tag/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll-seo-tag/version.rb b/lib/jekyll-seo-tag/version.rb index 7c37e62..f05fb2f 100644 --- a/lib/jekyll-seo-tag/version.rb +++ b/lib/jekyll-seo-tag/version.rb @@ -3,6 +3,6 @@ module Liquid; class Tag; end; end module Jekyll class SeoTag < Liquid::Tag - VERSION = '1.3.1'.freeze + VERSION = '1.3.2'.freeze end end From 556b8e45fa04af081d6f1eea7fe6947567cad94c Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 2 Mar 2016 09:13:12 -0800 Subject: [PATCH 9/9] Use current version in minify test --- spec/jekyll_seo_tag_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/jekyll_seo_tag_spec.rb b/spec/jekyll_seo_tag_spec.rb index ca664ff..3b9fb2a 100644 --- a/spec/jekyll_seo_tag_spec.rb +++ b/spec/jekyll_seo_tag_spec.rb @@ -135,8 +135,9 @@ describe Jekyll::SeoTag do end it 'minifies the output' do + version = Jekyll::SeoTag::VERSION expected = <<-EOS - + Foo