ghostwriter 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d172e04147a0336191fbdff8bcf50df22ca418127dc3fadd79c45b2137ad65
-  data.tar.gz: d2ad779f40767c1c40088fd9d50593ec9ba2b811168fd13f94f191c721522546
+  metadata.gz: c2bacc9e2d98409f7220a3b21d0cc57f18ff9c6768fb3175c0f06fdbef767e95
+  data.tar.gz: 5dba28996b1589fb94c0edbf7b3897a7610267438389ed57dbb009377544be93
 SHA512:
-  metadata.gz: 24a4919b7fff1b061c9bcd2dbee0144ac42a05b3383a3cc3769bfd2afab3373a48785f86e1e002e43597d06c7cd348d471057358597c461e53e6f8b129028f89
-  data.tar.gz: 2267a86a05ee535949434a443efffe62d4d88879dbae58ff53b6d4eb03b21445d896815639c204f8e9a325f2283d1ee82ea85917a0e6b5940e9cdc97a0241266
+  metadata.gz: 101966376b10eec407d0a5b98bdb11ddfa3830c4532bc77b5e4ad4aeba41e05925c72dd78d25b6fc34f507f7ea9a32809757f735f8d6b6aa15d079a436c0db9b
+  data.tar.gz: dc870788a2971023a8276369d2953aa68f801edf31eeefd7bd6513400d453cf6e02fa728856f67a892e91fd8535c5607cca1cb244302d18e76bdc1c089b208e3

data/.ruby-version

@@ -1 +1 @@
-ruby-3.1.4
+ruby-3.3.0

data/Gemfile

@@ -7,12 +7,12 @@ gemspec
 
 group :development do
    gem 'bundler', '~> 2.4'
-   gem 'rake', '~> 13.0'
-   gem 'rubocop', '~> 1.55'
-   gem 'rubocop-performance', '~> 1.19'
+   gem 'rake', '~> 13.2'
+   gem 'rubocop', '~> 1.69'
+   gem 'rubocop-performance', '~> 1.23'
 end
 
 group :test do
-   gem 'rspec', '~> 3.12'
+   gem 'rspec', '~> 3.13'
    gem 'simplecov', '~> 0.22'
 end

data/RELEASE_NOTES.md

@@ -1,5 +1,20 @@
 # Release Notes
 
+## 1.4.0 (2023-09-13)
+
+### Major
+
+* none
+
+### Minor
+
+* Support for graceful handling of nested tables
+* Increased minimum ruby to 3.3
+
+### Bugfixes
+
+* none
+
 ## 1.3.0 (2023-09-13)
 
 ### Major

data/Rakefile

@@ -1,5 +1,9 @@
+#!/usr/bin/env rake
 # frozen_string_literal: true
 
+# No longer require bundle exec
+Gem.use_gemdeps 'Gemfile'
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/ghostwriter.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
    spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
    spec.require_paths = ['lib']
 
-   spec.required_ruby_version = '>= 3.1'
+   spec.required_ruby_version = '>= 3.3'
 
    spec.add_dependency 'nokogiri', '>= 1.12'
 end

data/lib/ghostwriter/version.rb

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

data/lib/ghostwriter/writer.rb

@@ -149,21 +149,43 @@ module Ghostwriter
       module TableWriter
          def replace_tables(doc)
             doc.css('table').each do |table|
+               # TODO: nokogiri chokes on table:not(table table), but support may come later https://github.com/sparklemotion/nokogiri/issues/3207
+               next if complex? table
+
                # remove whitespace between nodes
                table.search('//text()[normalize-space()=""]').remove
 
                column_sizes = calculate_column_sizes(table)
 
-               table.search('./thead/tr', './tbody/tr', './tr').each do |row|
-                  replace_table_nodes(row, column_sizes)
-
-                  row.replace("#{ row.inner_html }#{ @table_column }\n")
-               end
+               fancy_rows! table, column_sizes
 
                add_table_header_underline(table, column_sizes)
 
                table.replace("\n#{ table.inner_html }\n")
             end
+
+            doc.css('table table').each do |table|
+               simple_rows! table
+            end
+         end
+
+         # complex just means it contains a table or is itself nested
+         def complex?(table)
+            !table.css('table').empty? || !table.ancestors('table').empty?
+         end
+
+         def fancy_rows!(table, column_sizes)
+            table.search('./thead/tr', './tbody/tr', './tr').each do |row|
+               replace_table_nodes(row, column_sizes)
+
+               row.replace("#{ row.inner_html }#{ @table_column }\n")
+            end
+         end
+
+         def simple_rows!(table)
+            table.search('./thead/tr', './tbody/tr', './tr').each do |row|
+               row.replace("\n#{ row.inner_html }\n")
+            end
          end
 
          def calculate_column_sizes(table)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghostwriter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Robin Miller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -65,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Converts HTML to plain text