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`) 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 diff --git a/lib/template.html b/lib/template.html index 464926b..d5e9686 100644 --- a/lib/template.html +++ b/lib/template.html @@ -88,18 +88,18 @@ {{ seo_title }} {% endif %} -{% if seo_title %} +{% if seo_page_title %} {% endif %} {% if seo_description %} - + {% endif %} {% if seo_url %} - + {% endif %} {% if seo_site_title %} @@ -126,12 +126,6 @@ {% if site.twitter %} - - - - {% if page.image %} - - {% endif %} {% if seo_author_twitter %} @@ -154,14 +148,14 @@ diff --git a/spec/jekyll_seo_tag_spec.rb b/spec/jekyll_seo_tag_spec.rb index 62bfed0..0f1bf5f 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 @@ -135,12 +135,13 @@ describe Jekyll::SeoTag do end it 'minifies the output' do + version = Jekyll::SeoTag::VERSION expected = <<-EOS - + Foo - + EOS expect(output).to match(expected) @@ -155,7 +156,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 @@ -184,8 +185,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) @@ -267,16 +268,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