jekyll-webmention_io 3.3.2 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33b8089dd07065db73ad59fbf4da05f5e6a6a65d
-  data.tar.gz: 4dcd8591cc9ff96aff981440d1042538c595e7f1
+SHA256:
+  metadata.gz: 020334fc76fba2718d1567fc7938e4b09d3f9612023f32be752f41b88ded0fd9
+  data.tar.gz: bf9f07dd3cb7bc2fe266e92fab05f5122125fdf4012272e576d1095cf8a9cfde
 SHA512:
-  metadata.gz: d04a8b7e3f54e1d13235f5d68d3a781f8c2185e1662fdabc4a202f54750683ef215f00dd0b02bf3b0a8af2cb99d019128cf49ab78f3da54dddcecc6f4d7ec411
-  data.tar.gz: 7692c870f2e8cc5068a132de7176906c3280bdfe96ff6d6db6dbeb351bb03a98f2a4ee3a075cfc245e24cec528818ca061a96859b11ec6ace2235858838e655c
+  metadata.gz: 1876c839ad26beae83a09d2a41d066fcd2187d3914c2c5b3086a3582a878f0b90dd2f46a2929efb0cf51d71ef106cf3459a7016668d5b163a03d4e8e7c8be97e
+  data.tar.gz: e33a2f9291ea21f7c83b8e558b8f0c3e7b2a179442b4675b7d46c00b3df8300e553b039451e5731455f2662f1875a85b34cd62ac63f8441f0c97072d497fd984

data/lib/jekyll/commands/webmention.rb

@@ -3,65 +3,70 @@
 require "json"
 
 module Jekyll
-  module Commands
-    class WebmentionCommand < Command
-      def self.init_with_program(prog)
-        prog.command(:webmention) do |c|
-          c.syntax "webmention"
-          c.description "Sends queued webmentions"
+  module WebmentionIO
+    module Commands
+      class WebmentionCommand < Command
+        def self.init_with_program(prog)
+          prog.command(:webmention) do |c|
+            c.syntax "webmention"
+            c.description "Sends queued webmentions"
 
-          c.action { |args, options| process args, options }
+            c.action { |args, options| process args, options }
+          end
         end
-      end
 
-      def self.process(_args = [], options = {})
-        options = configuration_from_options(options)
-        WebmentionIO.bootstrap(Jekyll::Site.new(options))
+        def self.process(_args = [], options = {})
+          options = configuration_from_options(options)
+          WebmentionIO.bootstrap(Jekyll::Site.new(options))
 
-        if File.exist? WebmentionIO.cache_file("sent.yml")
-          WebmentionIO.log "error", "Your outgoing webmentions queue needs to be upgraded. Please re-build your project."
-        end
-        count = 0
-        cached_outgoing = WebmentionIO.get_cache_file_path "outgoing"
-        if File.exist?(cached_outgoing)
-          outgoing = WebmentionIO.load_yaml(cached_outgoing)
-          outgoing.each do |source, targets|
-            targets.each do |target, response|
-              # skip ones we’ve handled
-              next unless response == false
+          if File.exist? WebmentionIO.cache_file("sent.yml")
+            WebmentionIO.log "error", "Your outgoing webmentions queue needs to be upgraded. Please re-build your project."
+          end
 
-              # convert protocol-less links
-              if target.index("//").zero?
-                target = "http:#{target}"
-              end
+          WebmentionIO.log "msg", "Getting ready to send webmentions (this may take a while)."
+
+          count = 0
+          cached_outgoing = WebmentionIO.get_cache_file_path "outgoing"
+          if File.exist?(cached_outgoing)
+            outgoing = WebmentionIO.load_yaml(cached_outgoing)
+            outgoing.each do |source, targets|
+              targets.each do |target, response|
+                # skip ones we’ve handled
+                next unless response == false
 
-              # skip bad URLs
-              next unless WebmentionIO.uri_ok?(target)
+                # convert protocol-less links
+                if target.index("//").zero?
+                  target = "http:#{target}"
+                end
 
-              # get the endpoint
-              endpoint = WebmentionIO.get_webmention_endpoint(target)
-              next unless endpoint
+                # skip bad URLs
+                next unless WebmentionIO.uri_ok?(target)
 
-              # get the response
-              response = WebmentionIO.webmention(source, target, endpoint)
-              next unless response
+                # get the endpoint
+                endpoint = WebmentionIO.get_webmention_endpoint(target)
+                next unless endpoint
 
-              # capture JSON responses in case site wants to do anything with them
-              begin
-                response = JSON.parse response
-              rescue JSON::ParserError
-                response = ""
+                # get the response
+                response = WebmentionIO.webmention(source, target, endpoint)
+                next unless response
+
+                # capture JSON responses in case site wants to do anything with them
+                begin
+                  response = JSON.parse response
+                rescue JSON::ParserError
+                  response = ""
+                end
+                outgoing[source][target] = response
+                count += 1
               end
-              outgoing[source][target] = response
-              count += 1
             end
-          end
-          if count.positive?
-            WebmentionIO.dump_yaml(cached_outgoing, outgoing)
-          end
-          WebmentionIO.log "msg", "#{count} webmentions sent."
-        end # file exists (outgoing)
-      end # def process
-    end # WebmentionCommand
-  end # Commands
+            if count.positive?
+              WebmentionIO.dump_yaml(cached_outgoing, outgoing)
+            end
+            WebmentionIO.log "msg", "#{count} webmentions sent."
+          end # file exists (outgoing)
+        end # def process
+      end # WebmentionCommand
+    end # Commands
+  end # WebmentionIO
 end # Jekyll

data/lib/jekyll/generators/compile_js.rb

@@ -8,6 +8,7 @@
 #
 
 require "uglifier"
+require "fileutils"
 
 module Jekyll
   module WebmentionIO
@@ -32,11 +33,18 @@ module Jekyll
           return
         end
 
-        @source_file_destination = if handler.source?
-                                     @site.in_source_dir(handler.destination)
-                                   else
-                                     Dir.mktmpdir
-                                   end
+        if @site.config['serving']
+          Jekyll::WebmentionIO.log "msg", "A WebmentionIO.js source file will not be generated during `jekyll serve`."
+        end
+
+        @source_file_base_dir = if handler.source? && !@site.config['serving']
+                                  @site.in_source_dir()
+                                else
+                                  Dir.mktmpdir
+                                end
+
+        @destination = handler.destination
+        @source_file_destination = File.join(@source_file_base_dir, @destination)
 
         @javascript = +"" # unfrozen String
 
@@ -77,12 +85,12 @@ module Jekyll
       end
 
       def create_js_file
-        Dir.mkdir(@source_file_destination) unless File.exist?(@source_file_destination)
+        FileUtils.mkdir_p(@source_file_destination) unless File.exist?(@source_file_destination)
         File.open(File.join(@source_file_destination, @file_name), "wb") { |f| f.write(@javascript) }
       end
 
       def deploy_js_file
-        js_file = WebmentionIO::JavaScriptFile.new(@site, @source_file_destination, "", @file_name)
+        js_file = WebmentionIO::JavaScriptFile.new(@site, @source_file_base_dir, @destination, @file_name)
         @site.static_files << js_file
       end
     end

data/lib/jekyll/generators/gather_webmentions.rb

@@ -19,6 +19,14 @@ module Jekyll
         @site = site
         @site_url = site.config["url"].to_s
 
+        if @site.config['serving']
+          Jekyll::WebmentionIO.log "msg", "Webmentions won’t be gathered when running `jekyll serve`."
+
+          @site.config['webmentions'] ||= {}
+          @site.config['webmentions']['pause_lookups'] = true
+          return
+        end
+
         if @site_url.include? "localhost"
           Jekyll::WebmentionIO.log "msg", "Webmentions won’t be gathered on localhost."
           return

data/lib/jekyll/generators/queue_webmentions.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 #  (c) Aaron Gustafson
@@ -17,6 +18,14 @@ module Jekyll
         @site = site
         @site_url = site.config["url"].to_s
 
+        if @site.config['serving']
+          Jekyll::WebmentionIO.log "msg", "Webmentions lookups are not run when running `jekyll serve`."
+
+          @site.config['webmentions'] ||= {}
+          @site.config['webmentions']['pause_lookups'] = true
+          return
+        end
+
         if @site_url.include? "localhost"
           WebmentionIO.log "msg", "Webmentions lookups are not run on localhost."
           return
@@ -63,7 +72,7 @@ module Jekyll
         if post.data["in_reply_to"]
           uris[post.data["in_reply_to"]] = false
         end
-        post.content.scan(/(?:https?:)?\/\/[^\s)#"]+/) do |match|
+        post.content.scan(/(?:https?:)?\/\/[^\s)#\[\]{}<>%|\^"]+/) do |match|
           unless uris.key? match
             uris[match] = false
           end

data/lib/jekyll/webmention_io/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module WebmentionIO
-    VERSION = "3.3.2"
+    VERSION = "3.3.6"
   end
 end

data/lib/jekyll/webmention_io.rb

@@ -126,7 +126,7 @@ module Jekyll
 
     def self.get_response(api_params)
       api_params << @api_suffix
-      url = "#{@api_endpoint}?#{api_params}"
+      url = URI::Parser.new.escape("#{@api_endpoint}?#{api_params}")
       log "info", "Sending request to #{url}."
       source = get_uri_source(url)
       if source
@@ -171,6 +171,7 @@ module Jekyll
 
     def self.get_timeframe_from_date(time)
       date = time.to_date
+      timeframe = nil
       TIMEFRAMES.each do |key, value|
         if date.to_date > get_date_from_string(value)
           timeframe = key
@@ -284,8 +285,8 @@ module Jekyll
         when Net::HTTPSuccess then
           return response.body.force_encoding("UTF-8")
         when Net::HTTPRedirection then
-          redirect_to = URI.parse(URI.encode(response["location"]))
-          redirect_to = redirect_to.relative? ? "#{uri.scheme}://#{uri.host}" + redirect_to.to_s : redirect_to.to_s
+          redirect_to = URI::Parser.new.parse(response["location"])
+          redirect_to = redirect_to.relative? ? "#{original_uri.scheme}://#{original_uri.host}" + redirect_to.to_s : redirect_to.to_s
           return get_uri_source(redirect_to, redirect_limit - 1, original_uri)
         else
           uri_is_not_ok(uri)
@@ -328,7 +329,7 @@ module Jekyll
     # Private Methods
 
     def self.get_http_response(uri)
-      uri  = URI.parse(URI.encode(uri))
+      uri = URI::Parser.new.parse(uri)
       http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = 10
 
@@ -351,7 +352,7 @@ module Jekyll
 
     # Cache bad URLs for a bit
     def self.uri_is_not_ok(uri)
-      uri = URI.parse(URI.encode(uri))
+      uri = URI::Parser.new.parse(uri.to_s)
       # Never cache webmention.io in here
       return if uri.host == "webmention.io"
 
@@ -362,7 +363,7 @@ module Jekyll
     end
 
     def self.uri_ok?(uri)
-      uri = URI.parse(URI.encode(uri))
+      uri = URI::Parser.new.parse(uri.to_s)
       now = Time.now.to_s
       bad_uris = load_yaml(@cache_files["bad_uris"])
       if bad_uris.key? uri.host

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webmention_io
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.6
 platform: ruby
 authors:
 - Aaron Gustafson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.48'
+- !ruby/object:Gem::Dependency
+  name: kramdown-parser-gfm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: |
   This Gem includes a suite of tools for managing webmentions in Jekyll:
 
@@ -270,15 +284,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin for sending & receiving webmentions via Webmention.io.