jekyll-relative-links 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba6b38e69cda482b2142b9e88772c64963323a21
-  data.tar.gz: 34303fa94a455987bee54fdac2f78a785a968c86
+  metadata.gz: 5ca1f80629950904c828211cc5c032e590eb02e7
+  data.tar.gz: 0f699f5d6a7dbc1ad7227a03e327155bf58d51e5
 SHA512:
-  metadata.gz: 2e8ed38db685fc82e2aafe3a8e32f6c296c38681548873efaa07487b2d480afcbbf46e33b95580c4bb50854050fb28faf9313452ffafe077a1a53f2cdc345861
-  data.tar.gz: 50630b46713f52d82ef9ee4c4cd17f4a7e1b87d85b2bcab7747e93c94164427709935cb2ff3d29d1fcc4ccd3da0b4e50bca4a634694d13e1fd23bd41ed4b002a
+  metadata.gz: 9167289dc30d083a23ff0a33d62f78a49e6406858fd82dc7b4e4bad9fadcd876e98ad6a7279b58a272d0833bae4f3c2d67b2ed075899a4f1f839adf377e387ad
+  data.tar.gz: b154836fd6304a5696017183b024978e7e598a203b66d63cbd5f135d13a8d0e56a30149a27a43243d518a3d7afbc4945e1d64c7f90868cefb1534046b88a40fa

data/lib/jekyll-relative-links/generator.rb

@@ -26,29 +26,38 @@ module JekyllRelativeLinks
 
       site.pages.each do |page|
         next unless markdown_extension?(page.extname)
-        url_base = File.dirname(page.path)
-
-        page.content.gsub!(LINK_REGEX) do |original|
-          link_type     = Regexp.last_match(2) ? :inline : :reference
-          link_text     = Regexp.last_match(link_type == :inline ? 2 : 5)
-          relative_path = Regexp.last_match(link_type == :inline ? 3 : 6)
-          fragment      = Regexp.last_match(link_type == :inline ? 4 : 7)
-
-          relative_path.sub!(%r!\A/!, "")
-          url = url_for_path(path_from_root(relative_path, url_base))
-
-          if url
-            url << fragment if fragment
-            replacement_text(link_type, link_text, url)
-          else
-            original
-          end
+        replace_relative_links!(page)
+      end
+    end
+
+    def replace_relative_links!(page)
+      url_base = File.dirname(page.path)
+
+      page.content.gsub!(LINK_REGEX) do |original|
+        link_type, link_text, relative_path, fragment = link_parts(Regexp.last_match)
+        path = path_from_root(relative_path, url_base)
+        url  = url_for_path(path)
+
+        if url
+          replacement_text(link_type, link_text, url, fragment)
+        else
+          original
         end
       end
+    rescue ArgumentError => e
+      raise e unless e.to_s.start_with?("invalid byte sequence in UTF-8")
     end
 
     private
 
+    def link_parts(matches)
+      link_type     = matches[2] ? :inline : :reference
+      link_text     = matches[link_type == :inline ? 2 : 5]
+      relative_path = matches[link_type == :inline ? 3 : 6]
+      fragment      = matches[link_type == :inline ? 4 : 7]
+      [link_type, link_text, relative_path, fragment]
+    end
+
     def context
       JekyllRelativeLinks::Context.new(site)
     end
@@ -62,19 +71,23 @@ module JekyllRelativeLinks
     end
 
     def url_for_path(path)
-      extension = File.extname(path)
-      return unless markdown_extension?(extension)
+      target = potential_targets.find { |p| p.relative_path.sub(%r!\A/!, "") == path }
+      relative_url(target.url) if target
+    end
 
-      page = site.pages.find { |p| p.path == path }
-      relative_url(page.url) if page
+    def potential_targets
+      @potential_targets ||= (site.pages + site.static_files)
     end
 
     def path_from_root(relative_path, url_base)
+      relative_path.sub!(%r!\A/!, "")
       absolute_path = File.expand_path(relative_path, url_base)
       absolute_path.sub(%r!\A#{Dir.pwd}/!, "")
     end
 
-    def replacement_text(type, text, url)
+    def replacement_text(type, text, url, fragment = nil)
+      url << fragment if fragment
+
       if type == :inline
         "[#{text}](#{url})"
       else

data/lib/jekyll-relative-links/version.rb

@@ -1,3 +1,3 @@
 module JekyllRelativeLinks
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-relative-links
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to convert relative links to markdown files to their rendered