jekyll-webmention_io 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d86bfdab4d69fd069fa99d6fea826e339ec4d8f
-  data.tar.gz: cea42253a16bda0f67f61906f6c287e68a1ecc69
+  metadata.gz: 34469c6b4a37c2117e85ee46589880aeddab27e3
+  data.tar.gz: 5188a0aad200b94ce371cf45abe972cd3eb4f41f
 SHA512:
-  metadata.gz: 03f80512f3cba8a20568f96711056d0656cdef74cd4571e74353c35e2b6b8950725b18a7451f985273bdc6f721a1a2b1ecaa700ad6f755d677faa3da3cf3cda6
-  data.tar.gz: '08592dfefc41d220c6d15ed293d3fbaa3131e8eb8654a3608eb070f3b1effe2e2af69ebcee9ddff61a2076bdd99fdcc218fdd582fd7eec7b064b0697f29bf419'
+  metadata.gz: 2a55f6a92d741ee73c2c0b14222aafc70383f05c856f4c5755328bdc39a75ae132bb5d0a74788e4e82391401feb33ed8f35e0158ea36a775a6affc6ad48c5893
+  data.tar.gz: a2c23a460f6e897449d4b6bfac555a646a6d5342278d8d865d89082b3c1f35da5fc4b02873515a29aa31cba549d29bc88dd14bcac8c7266e034f931ec9ff1007

data/lib/jekyll/generators/compile_js.rb

@@ -27,7 +27,7 @@ module Jekyll
       priority :low
       
       def generate(site)
-        if site.config['webmentions']['js'] == false
+        if site.config.dig( 'webmentions', 'js' ) == false
           Jekyll::WebmentionIO::log 'info', 'Skipping JavaScript inclusion.'
           return
         end
@@ -36,7 +36,7 @@ module Jekyll
           'destination' => 'js',
           'uglify'      => true
         }
-        site_config = site.config['webmentions']['js'] || {}
+        site_config = site.config.dig( 'webmentions', 'js' ) || {}
         
         config = config.merge(site_config)
         

data/lib/jekyll/generators/gather_webmentions.rb

@@ -12,7 +12,7 @@ module Jekyll
     priority :high
     
     def generate(site)
-      if site.config['webmentions']['pause_lookups'] == true
+      if site.config.dig( 'webmentions', 'pause_lookups' ) == true
         Jekyll::WebmentionIO::log 'info', 'Webmention lookups are currently paused.'
         return
       end
@@ -49,7 +49,7 @@ module Jekyll
         since_id = false
         if @cached_webmentions.has_key? post.url
           past_webmentions = @cached_webmentions[post.url]
-          if past_webmentions && past_webmentions.keys && past_webmentions[past_webmentions.keys.last]
+          if past_webmentions.dig( past_webmentions&.keys&.last )
             since_id = past_webmentions[past_webmentions.keys.last]['raw']['id']
           end
         end
@@ -233,9 +233,9 @@ module Jekyll
             webmention['title'] = markdownify( title ) if title
 
             # Everything else
-            content = link['data']['content']
-            if type != 'post' && type != 'reply' && type != 'link'
-              content = link['activity']['sentence_html']
+            content = link['activity']['sentence_html']
+            if ['post', 'reply', 'link'].include? type
+              content = link['data']['content'] unless link['data']['content'].empty?
             end
             webmention['content'] = markdownify( content )
 

data/lib/jekyll/generators/queue_webmentions.rb

@@ -12,7 +12,7 @@ module Jekyll
     priority :low
     
     def generate(site)
-      if site.config['webmentions']['pause_lookups'] == true
+      if site.config.dig( 'webmentions', 'pause_lookups' ) == true
         Jekyll::WebmentionIO::log 'info', 'Webmention lookups are currently paused.'
         return
       end
@@ -62,7 +62,7 @@ module Jekyll
       outgoing_webmentions.each do |source_url, webmentions|
         collection = {}
         webmentions.each do |target_url|
-          if sent_webmentions.has_key? source_url and sent_webmentions[source_url].include? target_url
+          if sent_webmentions.dig( source_url, target_url )
             collection[target_url] = ""
           else
             collection[target_url] = false

data/lib/jekyll/tags/_.rb

@@ -31,21 +31,9 @@ module Jekyll
       end
       
       def set_template( template )
-        supported_templates = Jekyll::WebmentionIO::types + ['count', 'webmentions']
-        
+        supported_templates = Jekyll::WebmentionIO::types + ['count', 'webmentions']        
         Jekyll::WebmentionIO::log 'error', "#{template} is not supported" if ! supported_templates.include? template
-
-        if Jekyll::WebmentionIO::config.has_key? 'templates' and Jekyll::WebmentionIO::config['templates'].has_key? template
-          # Jekyll::WebmentionIO::log 'info', "Using custom #{template} template"
-          template_file = Jekyll::WebmentionIO::config['templates'][template]
-        else
-          # Jekyll::WebmentionIO::log 'info', "Using default #{template} template"
-          template_file = File.join(File.dirname(File.expand_path(__FILE__)), "../templates/#{template}.html")
-        end
-
-        # Jekyll::WebmentionIO::log 'info', "Template file: #{template_file}"
-        handler = File.open(template_file, 'rb')
-        @template = handler.read
+        @template = Jekyll::WebmentionIO::get_template_contents( template )
         # Jekyll::WebmentionIO::log 'info', "template: #{@template}"
       end
 

data/lib/jekyll/tags/count.rb

@@ -25,4 +25,5 @@ module Jekyll
   end
 end
 
-Liquid::Template.register_tag('webmention_count', Jekyll::WebmentionIO::WebmentionCountTag)
+Liquid::Template.register_tag('webmention_count', Jekyll::WebmentionIO::WebmentionCountTag)
+Liquid::Template.register_tag('webmentions_count', Jekyll::WebmentionIO::WebmentionCountTag)

data/lib/jekyll/tags/webmentions_head.rb

@@ -25,10 +25,10 @@ module Jekyll
           head << "<meta property=\"webmention:redirected_from\" content=\"#{redirect}\">"
         end
 
-        config = site.config['webmentions']
-        if config.has_key? 'username'
-          head << "<link rel=\"pingback\" href=\"https://webmention.io/#{config['username']}/xmlrpc\">"
-          head << "<link rel=\"webmention\" href=\"https://webmention.io/#{config['username']}/webmention\">"
+        username = site.config.dig( 'webmentions', 'username' )
+        if username
+          head << "<link rel=\"pingback\" href=\"https://webmention.io/#{username}/xmlrpc\">"
+          head << "<link rel=\"webmention\" href=\"https://webmention.io/#{username}/webmention\">"
         end
 
         head

data/lib/jekyll/tags/webmentions_js.rb

@@ -12,15 +12,16 @@ module Jekyll
         site = context.registers[:site]
 
         # JS can be turned off too
-        if site.config['webmentions']['js'] == false
-          return
+        if site.config.dig( 'webmentions', 'js' ) == false
+          Jekyll::WebmentionIO::log 'info', 'JavaScript output is disabled, so the {% webmentions_js %} tag is being skipped'
+          return ''
         end
 
         config = {
-          'destination' => "js",
+          'destination' => 'js',
           'uglify'      => true
         }
-        site_config = site.config['webmentions']['js'] || {}        
+        site_config = site.config.dig( 'webmentions', 'js' ) || {}        
         config = config.merge(site_config)
 
         # JS file
@@ -33,18 +34,9 @@ module Jekyll
         templates = ''
         template_files = Jekyll::WebmentionIO::types + ['count', 'webmentions']
         template_files.each do |template|
-          if Jekyll::WebmentionIO::config.has_key? 'templates' and Jekyll::WebmentionIO::config['templates'].has_key? template
-            # Jekyll::WebmentionIO::log 'info', "Using custom #{template} template"
-            template_file = Jekyll::WebmentionIO::config['templates'][template]
-          else
-            # Jekyll::WebmentionIO::log 'info', "Using default #{template} template"
-            template_file = File.join(File.dirname(File.expand_path(__FILE__)), "../templates/#{template}.html")
-          end
-          # Jekyll::WebmentionIO::log 'info', "Template file: #{template_file}"
-          handler = File.open(template_file, 'rb')
-          template_contents = handler.read
-
-          templates << "<template style=\"display:none\" id=\"webmention-#{template}\">#{template_contents}</template>"
+          templates << "<template style=\"display:none\" id=\"webmention-#{template}\">"
+          templates << Jekyll::WebmentionIO::get_template_contents( template )
+          templates << '</template>'
         end
         
         "#{js}\n#{templates}"

data/lib/jekyll/webmention_io.rb

@@ -123,6 +123,19 @@ module Jekyll
       response
     end
 
+    def self.get_template_contents( template )
+      if Jekyll::WebmentionIO::config.dig( 'templates', template )
+          # Jekyll::WebmentionIO::log 'info', "Using custom #{template} template"
+          template_file = Jekyll::WebmentionIO::config['templates'][template]
+        else
+          # Jekyll::WebmentionIO::log 'info', "Using default #{template} template"
+          template_file = File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{template}.html")
+        end
+        # Jekyll::WebmentionIO::log 'info', "Template file: #{template_file}"
+        handler = File.open(template_file, 'rb')
+        handler.read
+    end
+
     # Utilities
     # def key_exists(hash, test_key)
     #   if hash.is_a? Hash 

data/lib/jekyll/webmention_io/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module WebmentionIO
-    VERSION = "2.6.2"
+    VERSION = "2.6.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -201,12 +201,16 @@ dependencies:
 description: |
   This Gem includes a suite of tools for managing webmentions in Jekyll:
 
-  * Tags - render webmention info into your templates:
-  ** All webmentions
-  ** Count of webmentions
-  ** Likes
-  ** Replies
-  ** Reposts
+  * Tags
+    * Count of webmentions (filterable)
+    * All webmentions (filterable)
+    * Likes
+    * Links
+    * Posts
+    * Replies
+    * Reposts
+    * Contents for the `head` of your pages
+    * JavaScript enhancements
   * Commands - Send webmentions you’ve made
   * Generators - Collect webmentions from Webmention.io and gather sites you’ve mentioned
 email: