From 072635780d4f00ff526804156565aa8c2931e7d7 Mon Sep 17 00:00:00 2001
From: Danny Ben Shitrit <db@dannyben.com>
Date: Fri, 26 Jan 2024 06:36:57 +0000
Subject: [PATCH 1/2] - Update Sinatra, Octokit and Commonmarker

---
 .github/workflows/test.yml       | 2 +-
 Gemfile                          | 8 ++++----
 Runfile                          | 2 +-
 lib/madman.rb                    | 1 -
 lib/madman/refinements/array.rb  | 2 +-
 lib/madman/refinements/string.rb | 2 +-
 lib/madman/renderers/default.rb  | 5 ++++-
 madman.gemspec                   | 6 +++---
 spec/approvals/renderer/github   | 2 +-
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8426a5a..3ae7eab 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      matrix: { ruby: ['3.0', '3.1', '3.2', head] }
+      matrix: { ruby: ['3.0', '3.1', '3.2', '3.3'] }
 
     steps:
     - name: Checkout code
diff --git a/Gemfile b/Gemfile
index 1d32e5f..f52de19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,14 @@
 source 'https://rubygems.org'
 
-gem 'byebug'
 gem 'colsole'
+gem 'debug', require: ENV['DEBUGGER'] == '1'
 gem 'lp'
 gem 'rack-test'
 gem 'rspec'
-gem 'rspec_approvals'
 gem 'rspec-html-matchers'
-gem 'runfile', '>= 1.0.0.rc4', require: false
-gem 'runfile-tasks', '>= 1.0.0.rc2', require: false
+gem 'rspec_approvals'
+gem 'runfile', require: false
+gem 'runfile-tasks', require: false
 gem 'simplecov'
 
 gemspec
diff --git a/Runfile b/Runfile
index 890d5c1..46e43b8 100644
--- a/Runfile
+++ b/Runfile
@@ -1,4 +1,4 @@
-require "byebug"
+require "debug"
 require "lp"
 require 'madman/version'
 
diff --git a/lib/madman.rb b/lib/madman.rb
index 2bf5981..48cd7e1 100644
--- a/lib/madman.rb
+++ b/lib/madman.rb
@@ -2,7 +2,6 @@
 # ref: https://github.com/octokit/octokit.rb/blob/main/lib/octokit/warnable.rb
 ENV['OCTOKIT_SILENT'] = '1'
 
-require 'byebug' if ENV['BYEBUG']
 require 'commonmarker'
 require 'mister_bin'
 require 'octokit'
diff --git a/lib/madman/refinements/array.rb b/lib/madman/refinements/array.rb
index c2bff99..7821a19 100644
--- a/lib/madman/refinements/array.rb
+++ b/lib/madman/refinements/array.rb
@@ -5,7 +5,7 @@ def to_markdown
     end
 
     def to_html
-      CommonMarker.render_html to_markdown, :DEFAULT, [:table]
+      Commonmarker.to_html to_markdown, options: { extension: { table: true } }
     end
   end
 end
diff --git a/lib/madman/refinements/string.rb b/lib/madman/refinements/string.rb
index 0b14801..b1b008d 100644
--- a/lib/madman/refinements/string.rb
+++ b/lib/madman/refinements/string.rb
@@ -5,7 +5,7 @@ def slug
     end
 
     def to_html
-      CommonMarker.render_html self, :DEFAULT, [:table]
+      Commonmarker.to_html self, options: { extension: { table: true } }
     end
   end
 end
diff --git a/lib/madman/renderers/default.rb b/lib/madman/renderers/default.rb
index d05fb3f..f8053ca 100644
--- a/lib/madman/renderers/default.rb
+++ b/lib/madman/renderers/default.rb
@@ -2,7 +2,10 @@ module Madman
   module Renderers
     class Default
       def self.render(text, _opts = {})
-        CommonMarker.render_html text, %i[DEFAULT UNSAFE], [:table]
+        Commonmarker.to_html text, options: {
+          render: { unsafe: true, },
+          extension: { table: true }
+        }
       end
     end
   end
diff --git a/madman.gemspec b/madman.gemspec
index 20b4712..fd31ffb 100644
--- a/madman.gemspec
+++ b/madman.gemspec
@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable', '~> 2.7'
   s.add_runtime_dependency 'coffee-script', '~> 2.4'
   s.add_runtime_dependency 'colsole', '>= 0.8.1', '< 2'
-  s.add_runtime_dependency 'commonmarker', '~> 0.23', '>= 0.23.4'
+  s.add_runtime_dependency 'commonmarker', '~> 1.0'
   s.add_runtime_dependency 'mister_bin', '~> 0.7'
-  s.add_runtime_dependency 'octokit', '~> 6.0'
+  s.add_runtime_dependency 'octokit', '~> 8.0'
   s.add_runtime_dependency 'puma', '>= 5.1', '< 7'
   s.add_runtime_dependency 'requires', '~> 1.0'
   s.add_runtime_dependency 'sassc', '~> 2.4'
-  s.add_runtime_dependency 'sinatra', '~> 3.0'
+  s.add_runtime_dependency 'sinatra', '>= 3.0', '< 5'
   s.add_runtime_dependency 'slim', '>= 4.0', '< 6'
   s.add_runtime_dependency 'string-direction', '~> 1.2'
 
diff --git a/spec/approvals/renderer/github b/spec/approvals/renderer/github
index dfcb4b8..825400d 100644
--- a/spec/approvals/renderer/github
+++ b/spec/approvals/renderer/github
@@ -1 +1 @@
-<h1><a id="user-content-hello-world" class="anchor" aria-hidden="true" href="#hello-world"><span aria-hidden="true" class="octicon octicon-link"></span></a>hello world</h1>
+<h1><a id="user-content-hello-world" class="anchor" aria-hidden="true" tabindex="-1" href="#hello-world"><span aria-hidden="true" class="octicon octicon-link"></span></a>hello world</h1>

From 6b9079ceba7e97839c162d9d9cea19d9920b3f37 Mon Sep 17 00:00:00 2001
From: Danny Ben Shitrit <db@dannyben.com>
Date: Fri, 26 Jan 2024 06:40:15 +0000
Subject: [PATCH 2/2] - Drop support for Ruby 3.0

---
 .github/workflows/test.yml      |  2 +-
 .rubocop.yml                    |  2 +-
 Gemfile                         |  2 +-
 lib/madman/renderers/default.rb |  4 ++--
 madman.gemspec                  | 26 +++++++++++++-------------
 spec/rspec_mixin.rb             |  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3ae7eab..83459b9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      matrix: { ruby: ['3.0', '3.1', '3.2', '3.3'] }
+      matrix: { ruby: ['3.1', '3.2', '3.3'] }
 
     steps:
     - name: Checkout code
diff --git a/.rubocop.yml b/.rubocop.yml
index eeff002..80580ff 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,7 +8,7 @@ inherit_gem:
     - rspec.yml
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   Exclude:
     - debug.rb
     - dev/**/*
diff --git a/Gemfile b/Gemfile
index f52de19..db9177f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,8 @@ gem 'debug', require: ENV['DEBUGGER'] == '1'
 gem 'lp'
 gem 'rack-test'
 gem 'rspec'
-gem 'rspec-html-matchers'
 gem 'rspec_approvals'
+gem 'rspec-html-matchers'
 gem 'runfile', require: false
 gem 'runfile-tasks', require: false
 gem 'simplecov'
diff --git a/lib/madman/renderers/default.rb b/lib/madman/renderers/default.rb
index f8053ca..0c43ab8 100644
--- a/lib/madman/renderers/default.rb
+++ b/lib/madman/renderers/default.rb
@@ -3,8 +3,8 @@ module Renderers
     class Default
       def self.render(text, _opts = {})
         Commonmarker.to_html text, options: {
-          render: { unsafe: true, },
-          extension: { table: true }
+          render:    { unsafe: true },
+          extension: { table: true },
         }
       end
     end
diff --git a/madman.gemspec b/madman.gemspec
index fd31ffb..51d0b49 100644
--- a/madman.gemspec
+++ b/madman.gemspec
@@ -14,20 +14,20 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/dannyben/madman'
   s.license     = 'MIT'
 
-  s.required_ruby_version = '>= 3.0.0'
+  s.required_ruby_version = '>= 3.1.0'
 
-  s.add_runtime_dependency 'addressable', '~> 2.7'
-  s.add_runtime_dependency 'coffee-script', '~> 2.4'
-  s.add_runtime_dependency 'colsole', '>= 0.8.1', '< 2'
-  s.add_runtime_dependency 'commonmarker', '~> 1.0'
-  s.add_runtime_dependency 'mister_bin', '~> 0.7'
-  s.add_runtime_dependency 'octokit', '~> 8.0'
-  s.add_runtime_dependency 'puma', '>= 5.1', '< 7'
-  s.add_runtime_dependency 'requires', '~> 1.0'
-  s.add_runtime_dependency 'sassc', '~> 2.4'
-  s.add_runtime_dependency 'sinatra', '>= 3.0', '< 5'
-  s.add_runtime_dependency 'slim', '>= 4.0', '< 6'
-  s.add_runtime_dependency 'string-direction', '~> 1.2'
+  s.add_dependency 'addressable', '~> 2.7'
+  s.add_dependency 'coffee-script', '~> 2.4'
+  s.add_dependency 'colsole', '>= 0.8.1', '< 2'
+  s.add_dependency 'commonmarker', '~> 1.0'
+  s.add_dependency 'mister_bin', '~> 0.7'
+  s.add_dependency 'octokit', '~> 8.0'
+  s.add_dependency 'puma', '>= 5.1', '< 7'
+  s.add_dependency 'requires', '~> 1.0'
+  s.add_dependency 'sassc', '~> 2.4'
+  s.add_dependency 'sinatra', '>= 3.0', '< 5'
+  s.add_dependency 'slim', '>= 4.0', '< 6'
+  s.add_dependency 'string-direction', '~> 1.2'
 
   s.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/spec/rspec_mixin.rb b/spec/rspec_mixin.rb
index 47a0a72..a511309 100644
--- a/spec/rspec_mixin.rb
+++ b/spec/rspec_mixin.rb
@@ -6,7 +6,7 @@ def with_env(key, value)
     ENV[key] = old_value
   end
 
-  def without_env(key, &block)
-    with_env(key, nil, &block)
+  def without_env(key, &)
+    with_env(key, nil, &)
   end
 end