jekyll-seo-tag 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cdff06231b75a2ecb150cdfb81cdb801313ddb8
-  data.tar.gz: 03934ef692a5c3ab070ca620f3e5ad564b4ba334
+  metadata.gz: ddb197372851982ae0bb4ab3b2bbb0c08e29dc70
+  data.tar.gz: f238e1379de659c6100b7bfc7f2b9362aff6061a
 SHA512:
-  metadata.gz: 103731eadffe841e6955ea3669413d48f9445cfd2e90e94f9218ea6ab3b9dc8071215b37f080891dabd0f888978e2cf7f1abd90bd5d26c09f05035868bddb4c6
-  data.tar.gz: 28f7a0d315788fc49df2132e56e471b9bcd4e4c5089c21bef1e40ce7c648b55fb50843655c438b09ef2ccc053f597327d5a99ad1d94dc1adbbdb1119601b3830
+  metadata.gz: 990e391cc4f3ff9a354be4ea164746cea7bfce7eda85b0565ca6ed1ea84f11970ab7ef9b969e9de1adf645cd7e5e5dc4b4a59056cc76afcbfe717478fa412d58
+  data.tar.gz: ec56d87c8c74267c174dafbf012c7233657ef95a9e210ba5ef558a0eedbac23b3dddae7b2dca197fcc5178ea9aa9f088ab3385c09e060abbe707769fea752fa0

data/jekyll-seo-tag.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'jekyll-seo-tag/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-seo-tag"
-  spec.version       = "0.1.3"
+  spec.version       = Jekyll::SeoTag::VERSION
   spec.authors       = ["Ben Balter"]
   spec.email         = ["ben.balter@github.com"]
   spec.summary       = %q{A Jekyll plugin to add metadata tags for search engines and social networks to better index and display your site's content.}

data/lib/jekyll-seo-tag.rb

@@ -3,16 +3,18 @@ module Jekyll
 
     attr_accessor :context
 
+    HTML_ESCAPE = {
+      "\u201c".freeze => '“'.freeze,
+      "\u201d".freeze => '”'.freeze
+    }
+    HTML_ESCAPE_REGEX = Regexp.union(HTML_ESCAPE.keys).freeze
+
     def render(context)
       @context = context
       output = Liquid::Template.parse(template_contents).render!(payload, info)
 
-      # Minify
-      output.gsub!(/[\s]{2,}/, "\n")
-
       # Encode smart quotes. See https://github.com/benbalter/jekyll-seo-tag/pull/6
-      output.gsub!("\u201c", "“")
-      output.gsub!("\u201d", "”")
+      output.gsub!(HTML_ESCAPE_REGEX, HTML_ESCAPE)
 
       output
     end
@@ -34,7 +36,7 @@ module Jekyll
     end
 
     def template_contents
-      @template_contents ||= File.read(template_path)
+      @template_contents ||= File.read(template_path).gsub(/(>\n|[%}]})\s+(<|{[{%])/,'\1\2').chomp
     end
 
     def template_path

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

@@ -0,0 +1,8 @@
+# Prevent bundler errors
+module Liquid; class Tag; end; end
+
+module Jekyll
+  class SeoTag < Liquid::Tag
+    VERSION = "0.1.4"
+  end
+end

data/lib/template.html

@@ -1,18 +1,20 @@
 <!-- Begin Jekyll SEO tag -->
 
 {% if site.url %}
-  {% assign seo_url = site.url %}
+  {% assign seo_url = site.url | append: site.baseurl %}
 {% elsif site.github.url %}
   {% assign seo_url = site.github.url %}
 {% endif %}
 
 {% 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 %}
   {% 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 %}
@@ -20,6 +22,9 @@
 {% if seo_title %}
   {% assign seo_title = seo_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 %}
@@ -32,7 +37,10 @@
 
 {% if seo_title %}
   <title>{{ seo_title }}</title>
-  <meta property="og:title" content="{{ seo_title }}" />
+{% endif %}
+
+{% if seo_title %}
+  <meta property="og:title" content="{{ seo_page_title }}" />
 {% endif %}
 
 {% if seo_description %}
@@ -41,8 +49,8 @@
 {% endif %}
 
 {% if seo_url %}
-  <link rel="canonical" href="{{ seo_url }}{{ page.url }}" itemprop="url" />
-  <meta property='og:url' content='{{ seo_url }}{{ page.url }}' />
+  <link rel="canonical" href="{{ page.url | prepend: seo_url | replace:'/index.html','/' }}" itemprop="url" />
+  <meta property='og:url' content='{{ page.url | prepend: seo_url | replace:'/index.html','/' }}' />
 {% endif %}
 
 {% if site.title %}
@@ -64,10 +72,10 @@
 {% if page.date %}
   <meta property="og:type" content="article" />
   {% if page.next.url %}
-    <link rel="next" href="{{ seo_url }}{{ page.next.url }}" title="{{ page.next.title | escape }}" />
+    <link rel="next" href="{{ page.next.url | prepend: seo_url | replace:'/index.html','/' }}" title="{{ page.next.title | escape }}" />
   {% endif %}
   {% if page.previous.url %}
-    <link rel="prev" href="{{ seo_url }}{{ page.previous.url }}" title="{{ page.previous.title | escape }}" />
+    <link rel="prev" href="{{ page.previous.url | prepend: seo_url | replace:'/index.html','/' }}" title="{{ page.previous.title | escape }}" />
   {% endif %}
   <script type="application/ld+json">
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-seo-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-01-07 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/version.rb
 - lib/template.html
 - script/bootstrap
 - script/cibuild
@@ -121,10 +122,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 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: