ghostwriter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afedaad685b3c06c7baf6e7b1a7b00d8397f9ad1446ddfdcf835dfc99df19969
-  data.tar.gz: 786a612861e5d11e19672057371720c57dd7dc67e1f9b7333bf9269b819b0548
+  metadata.gz: 7851b6a60c2dc482938d9ea35844c9508384e508c6f20dc1bf73fcdeb91d4d15
+  data.tar.gz: e35c2c30d5a523b07e05c73764c24b9e60eb361f72b48ece4f10bb254f856d67
 SHA512:
-  metadata.gz: 610473e1214cd68edd7b1ce952fd43c44c22a29bc0895bebcc57b4e5e00385bccaec2008e23252eaf438a8b9a1ebd56af0a4c3956be53791ef1b5ee8b75dc1a3
-  data.tar.gz: 3f3bee72a1515077e7ccff0b1baae94607e33c84c83a84f8b51fdf3234aeaecaa48ddf0d6cfc2a38584ce6c0d0d7f52db5b4021638eb611089087ee638ba2d16
+  metadata.gz: fd0dc41dfb3f473eaa47ec5b6f148cf1984c358970382e508255342b320e67c83953c45e01a07a2dd4cf0feb286375608243f7c8550843b07f96a583c1fc415d
+  data.tar.gz: 01d7a3b8728f17a131d3dd5aab5d20799b271a9c84fcc04ee2cb29bf38506a856043bfce32ff69db68f6ccd5a727cab685b259c03d26e4fd5e68e9d6c45c5dd7

data/RELEASE_NOTES.md

@@ -1,5 +1,19 @@
 # Release Notes
 
+## 0.4.1 (2021-03-17)
+
+### Major
+
+* none
+
+### Minor
+
+* No longer provides link target in brackets after link text when they are the same
+
+### Bugfixes
+
+* Added explicit testing for HTML entity interpretation
+
 ## 0.4.0 (2021-03-16)
 
 ### Major

data/lib/ghostwriter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ghostwriter
-   VERSION = '0.4.0'
+   VERSION = '0.4.1'
 end

data/lib/ghostwriter/writer.rb

@@ -20,7 +20,7 @@ module Ghostwriter
 
          replace_anchors(doc, link_base)
          replace_headers(doc)
-         replace_table(doc)
+         replace_tables(doc)
 
          simple_replace(doc, 'hr', "\n----------\n")
          simple_replace(doc, 'br', "\n")
@@ -40,33 +40,40 @@ module Ghostwriter
       end
 
       def replace_anchors(doc, link_base)
-         # <base> node is unique by W3C spec
-         base     = doc.search('base').first
-         base_url = base ? base['href'] : link_base
+         base = get_link_base(doc, default: link_base)
 
          doc.search('a').each do |link_node|
             href = URI(link_node['href'])
-            href = base_url + href.to_s unless href.absolute?
+            href = base + href.to_s unless href.absolute?
 
-            link_node.inner_html = "#{ link_node.inner_html } (#{ href })"
+            link_node.inner_html = if link_matches(href, link_node.inner_html)
+                                      href.to_s
+                                   else
+                                      "#{ link_node.inner_html } (#{ href })"
+                                   end
          end
       end
 
+      def link_matches(first, second)
+         first.to_s.gsub(%r{^https?://}, '').chomp('/') == second.gsub(%r{^https?://}, '').chomp('/')
+      end
+
+      def get_link_base(doc, default:)
+         # <base> node is unique by W3C spec
+         base_node = doc.search('base').first
+
+         base_node ? base_node['href'] : default
+      end
+
       def replace_headers(doc)
          doc.search('header, h1, h2, h3, h4, h5, h6').each do |node|
             node.inner_html = "- #{ node.inner_html } -\n".squeeze(' ')
          end
       end
 
-      def replace_table(doc)
+      def replace_tables(doc)
          doc.css('table').each do |table|
-            column_sizes = table.search('tr').collect do |row|
-               row.search('th', 'td').collect do |node|
-                  node.inner_html.length
-               end
-            end
-
-            column_sizes = column_sizes.transpose.collect(&:max)
+            column_sizes = calculate_column_sizes(table)
 
             table.search('./thead/tr', './tbody/tr', './tr').each do |row|
                replace_table_nodes(row, column_sizes)
@@ -74,13 +81,27 @@ module Ghostwriter
                row.inner_html = "#{ row.inner_html }|\n"
             end
 
-            table.search('./thead').each do |row|
-               header_bottom = "|#{ column_sizes.collect { |len| ('-' * (len + 2)) }.join('|') }|"
+            add_table_header_underline(table, column_sizes)
 
-               row.inner_html = "#{ row.inner_html }#{ header_bottom }\n"
+            table.inner_html = "#{ table.inner_html }\n"
+         end
+      end
+
+      def calculate_column_sizes(table)
+         column_sizes = table.search('tr').collect do |row|
+            row.search('th', 'td').collect do |node|
+               node.inner_html.length
             end
+         end
 
-            table.inner_html = "#{ table.inner_html }\n"
+         column_sizes.transpose.collect(&:max)
+      end
+
+      def add_table_header_underline(table, column_sizes)
+         table.search('./thead').each do |row|
+            header_bottom = "|#{ column_sizes.collect { |len| ('-' * (len + 2)) }.join('|') }|"
+
+            row.inner_html = "#{ row.inner_html }#{ header_bottom }\n"
          end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghostwriter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Robin Miller