jekyll-seo-tag 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb197372851982ae0bb4ab3b2bbb0c08e29dc70
-  data.tar.gz: f238e1379de659c6100b7bfc7f2b9362aff6061a
+  metadata.gz: c9c2e7b63d04d2bde4d1f47a71849d7b7efc5b99
+  data.tar.gz: 85705921fa8691e6588ffa10953f7cfc2ed31f3f
 SHA512:
-  metadata.gz: 990e391cc4f3ff9a354be4ea164746cea7bfce7eda85b0565ca6ed1ea84f11970ab7ef9b969e9de1adf645cd7e5e5dc4b4a59056cc76afcbfe717478fa412d58
-  data.tar.gz: ec56d87c8c74267c174dafbf012c7233657ef95a9e210ba5ef558a0eedbac23b3dddae7b2dca197fcc5178ea9aa9f088ab3385c09e060abbe707769fea752fa0
+  metadata.gz: fb94e6867b9fcc64aa895e7330a18a8c5f8e46242f8acf5c5cf2928516bc4ae131174f1ec9523838e89c8f7f092f4fb11f8d19573deb4d42cd6c9cc2946ce7c5
+  data.tar.gz: bf8b3125ab927e7d05abfadb4f00f43ae692504b4d9449adccc6df0eeda3ada48025d10cdd44e628cbc2b908f85d32dd634dc5841ac2cf87f4fb608f47a3b9ab

data/README.md

@@ -69,5 +69,5 @@ The SEO tag will respect the following YAML front matter if included in a post,
 
 * `title` - The title of the post, page, or document
 * `description` - A short description of the page's content
-* `image` - The absolute URL to an image that should be associated with the post, page, or document
+* `image` - Relative URL to an image associated with the post, page, or document (e.g., `assets/page-pic.jpg`)
 * `author` - The username of the post, page, or document author

data/lib/jekyll-seo-tag.rb

@@ -1,20 +1,13 @@
+require 'jekyll-seo-tag/filters'
+
 module Jekyll
   class SeoTag < Liquid::Tag
 
     attr_accessor :context
 
-    HTML_ESCAPE = {
-      "\u201c".freeze => '&ldquo;'.freeze,
-      "\u201d".freeze => '&rdquo;'.freeze
-    }
-    HTML_ESCAPE_REGEX = Regexp.union(HTML_ESCAPE.keys).freeze
-
     def render(context)
       @context = context
-      output = Liquid::Template.parse(template_contents).render!(payload, info)
-
-      # Encode smart quotes. See https://github.com/benbalter/jekyll-seo-tag/pull/6
-      output.gsub!(HTML_ESCAPE_REGEX, HTML_ESCAPE)
+      output = template.render!(payload, info)
 
       output
     end
@@ -31,10 +24,14 @@ module Jekyll
     def info
       {
         :registers => context.registers,
-        :filters   => [Jekyll::Filters]
+        :filters   => [Jekyll::Filters, JekyllSeoTag::Filters]
       }
     end
 
+    def template
+      @template ||= Liquid::Template.parse template_contents
+    end
+
     def template_contents
       @template_contents ||= File.read(template_path).gsub(/(>\n|[%}]})\s+(<|{[{%])/,'\1\2').chomp
     end

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

@@ -0,0 +1,14 @@
+module JekyllSeoTag
+  module Filters
+
+    # This is available in Liquid from version 3 which is required by Jekyll 3
+    # Provided here for compatibility with Jekyll 2.x
+    def default(input, default_value = ''.freeze)
+      if !input || input.respond_to?(:empty?) && input.empty?
+        default_value
+      else
+        input
+      end
+    end
+  end
+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 = "0.1.4"
+    VERSION = "1.0.0"
   end
 end

data/lib/template.html

@@ -2,39 +2,47 @@
 
 {% if site.url %}
   {% assign seo_url = site.url | append: site.baseurl %}
-{% elsif site.github.url %}
-  {% assign seo_url = site.github.url %}
 {% endif %}
+{% assign seo_url = seo_url | default: site.github.url %}
+
+{% assign seo_site_title = site.title | default: site.name %}
 
 {% if page.title %}
   {% assign seo_title = page.title %}
   {% assign seo_page_title = page.title %}
-  {% if site.title %}
-    {% assign seo_title = seo_title | append:" - " | append: site.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 %}
-{% elsif site.title %}
-  {% assign seo_title = site.title %}
-  {% assign seo_page_title = site.title %}
-	{% if site.description %}
-		{% assign seo_title = seo_title | append:" - " | append: site.description %}
-	{% endif %}
 {% endif %}
 {% if seo_title %}
   {% assign seo_title = seo_title | markdownify | strip_html | strip_newlines | escape_once %}
 {% endif %}
+{% if seo_site_title %}
+  {% assign seo_site_title = seo_site_title | markdownify | strip_html | strip_newlines | escape_once %}
+{% endif %}
 {% if seo_page_title %}
   {% assign seo_page_title = seo_page_title | markdownify | strip_html | strip_newlines | escape_once %}
 {% endif %}
 
-{% if page.description %}
-  {% assign seo_description = page.description %}
-{% elsif site.description %}
-  {% assign seo_description = site.description %}
-{% endif %}
+{% assign seo_description = page.description | default: page.excerpt | default: site.description %}
 {% if seo_description %}
   {% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %}
 {% endif %}
 
+{% if page.author %}
+  {% assign seo_author_name = page.author.name | default: page.author %}
+  {% assign seo_author_twitter = page.author.twitter | default: page.author %}
+{% endif %}
+{% if seo_author_twitter %}
+  {% assign seo_author_twitter = seo_author_twitter | replace:"@","" | prepend:"@" %}
+{% endif %}
+
 {% if seo_title %}
   <title>{{ seo_title }}</title>
 {% endif %}
@@ -49,24 +57,24 @@
 {% endif %}
 
 {% if seo_url %}
-  <link rel="canonical" href="{{ page.url | prepend: seo_url | replace:'/index.html','/' }}" itemprop="url" />
+  <link rel="canonical" href="{{ page.url | prepend: seo_url | replace:'/index.html','/' }}" />
   <meta property='og:url' content='{{ page.url | prepend: seo_url | replace:'/index.html','/' }}' />
 {% endif %}
 
-{% if site.title %}
-  <meta property="og:site_name" content="{{ site.title }}" />
+{% if seo_site_title %}
+  <meta property="og:site_name" content="{{ seo_site_title }}" />
   <script type="application/ld+json">
     {
       "@context" : "http://schema.org",
       "@type" : "WebSite",
-      "name" : {{ site.title | jsonify }},
+      "name" : {{ seo_site_title | jsonify }},
       "url" : {{ seo_url | jsonify }}
     }
   </script>
 {% endif %}
 
 {% if page.image %}
-  <meta property="og:image" content="{{ page.image }}" />
+  <meta property="og:image" content="{{ page.image | prepend: "/" | prepend: seo_url | escape }}" />
 {% endif %}
 
 {% if page.date %}
@@ -84,7 +92,7 @@
       "headline": {{ page.title | jsonify }},
       "image": {{ page.image | jsonify }},
       "datePublished": {{ page.date | date_to_xmlschema | jsonify }},
-      "description": {{ page.description | jsonify }}
+      "description": {{ seo_description | jsonify }}
     }
   </script>
 {% endif %}
@@ -97,8 +105,8 @@
   {% if page.image %}
     <meta name="twitter:image" content="{{ page.image | escape }}" />
   {% endif %}
-  {% if page.author %}
-    <meta name="twitter:creator" content="@{{ page.author | replace:"@","" }}" />
+  {% if seo_author_twitter %}
+    <meta name="twitter:creator" content="{{ seo_author_twitter }}" />
   {% endif %}
 {% endif %}
 
@@ -118,7 +126,7 @@
     {
       "@context" : "http://schema.org",
       "@type" : "{% if site.social.type %}{{ site.social.type }}{% else %}person{% endif %}",
-      "name" : "{% if site.social.name %}{{ site.social.name }}{% else %}{{ site.title }}{% endif %}",
+      "name" : "{% if site.social.name %}{{ site.social.name }}{% else %}{{ seo_site_title }}{% endif %}",
       "url" : {{ seo_url | jsonify }},
       "sameAs" : {{ site.social.links | jsonify }}
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-seo-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -96,6 +96,7 @@ files:
 - Rakefile
 - jekyll-seo-tag.gemspec
 - lib/jekyll-seo-tag.rb
+- lib/jekyll-seo-tag/filters.rb
 - lib/jekyll-seo-tag/version.rb
 - lib/template.html
 - script/bootstrap
@@ -128,3 +129,4 @@ specification_version: 4
 summary: A Jekyll plugin to add metadata tags for search engines and social networks
   to better index and display your site's content.
 test_files: []
+has_rdoc: