From 47cffc068e70075db1dfdbc1e3017367a56b2092 Mon Sep 17 00:00:00 2001 From: Danny Ben Shitrit Date: Thu, 8 Jan 2026 08:32:28 +0000 Subject: [PATCH] - Update dependencies --- .github/workflows/test.yml | 4 ++-- .gitignore | 2 +- .rubocop.yml | 4 ++-- Runfile | 9 ++------- lib/madman/refinements/array.rb | 2 +- lib/madman/refinements/string.rb | 2 +- lib/madman/renderers/default.rb | 14 +++++++++----- lib/madman/server_base.rb | 2 ++ lib/madman/yamldoc.rb | 5 ++--- madman.gemspec | 13 +++++++------ spec/approvals/bin/render/basic | 2 +- spec/approvals/document/render | 2 +- spec/approvals/renderer/default | 2 +- spec/approvals/renderer/default-htmlcode | 2 +- spec/approvals/renderer/github | 2 +- 15 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83459b9..393f4e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,11 +10,11 @@ jobs: runs-on: ubuntu-latest strategy: - matrix: { ruby: ['3.1', '3.2', '3.3'] } + matrix: { ruby: ['3.2', '3.3', '3.4', '4.0'] } steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install OS dependencies run: sudo apt-get -y install libyaml-dev diff --git a/.gitignore b/.gitignore index be9a3bc..bb39256 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.gem /.yardoc /coverage -/debug.rb +/debug.runfile /dev /doc /Gemfile.lock diff --git a/.rubocop.yml b/.rubocop.yml index 80580ff..7b1a5d5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,4 @@ -require: +plugins: - rubocop-performance - rubocop-rspec @@ -9,8 +9,8 @@ inherit_gem: AllCops: TargetRubyVersion: 3.1 + SuggestExtensions: false Exclude: - - debug.rb - dev/**/* RSpec/AnyInstance: diff --git a/Runfile b/Runfile index e11a2b6..08b5b50 100644 --- a/Runfile +++ b/Runfile @@ -1,5 +1,4 @@ -require "debug" -require "lp" +require 'lp' require 'madman/version' title "Madman Developer Toolbelt" @@ -7,6 +6,7 @@ summary "Runfile tasks for building the Madman gem" version Madman::VERSION import_gem 'runfile-tasks/gem', gemname: 'madman' +import 'debug' help "Inject usage to README" action :usage do @@ -19,11 +19,6 @@ action :usage do doc.save end -help "Count lines of code" -action :cloc do - system "cloc . --exclude-dir coverage,spec,templates,tmp,dev --exclude-ext yml" -end - helpers do def usage_commands { diff --git a/lib/madman/refinements/array.rb b/lib/madman/refinements/array.rb index 7821a19..e7be2de 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.to_html to_markdown, options: { extension: { table: true } } + Renderers::Default.render to_markdown end end end diff --git a/lib/madman/refinements/string.rb b/lib/madman/refinements/string.rb index b1b008d..d6670a3 100644 --- a/lib/madman/refinements/string.rb +++ b/lib/madman/refinements/string.rb @@ -5,7 +5,7 @@ def slug end def to_html - Commonmarker.to_html self, options: { extension: { table: true } } + Renderers::Default.render self end end end diff --git a/lib/madman/renderers/default.rb b/lib/madman/renderers/default.rb index 0c43ab8..8865e13 100644 --- a/lib/madman/renderers/default.rb +++ b/lib/madman/renderers/default.rb @@ -1,11 +1,15 @@ module Madman module Renderers class Default - def self.render(text, _opts = {}) - Commonmarker.to_html text, options: { - render: { unsafe: true }, - extension: { table: true }, - } + def self.render(text, *) + Commonmarker.to_html text, + options: { + render: { unsafe: true }, + extension: { table: true }, + }, + plugins: { + syntax_highlighter: { theme: 'InspiredGitHub' }, + } end end end diff --git a/lib/madman/server_base.rb b/lib/madman/server_base.rb index a38dbfe..a90ddef 100644 --- a/lib/madman/server_base.rb +++ b/lib/madman/server_base.rb @@ -1,6 +1,8 @@ module Madman class ServerBase < Sinatra::Base set :views, File.expand_path('../views', __dir__) + set :protection, except: :host_authorization + set :host_authorization, permitted_hosts: [] Slim::Engine.set_options pretty: true diff --git a/lib/madman/yamldoc.rb b/lib/madman/yamldoc.rb index cbee3a3..deadf4a 100644 --- a/lib/madman/yamldoc.rb +++ b/lib/madman/yamldoc.rb @@ -42,11 +42,10 @@ def counter def tree!(data = nil, indent = 0, caption = 2) data ||= yaml - result = [] caption = 6 if caption > 6 - data.each do |key, value| - result.push render_pair key, value, indent, caption + result = data.map do |key, value| + render_pair key, value, indent, caption end result.join "\n" diff --git a/madman.gemspec b/madman.gemspec index 51d0b49..e29b661 100644 --- a/madman.gemspec +++ b/madman.gemspec @@ -18,15 +18,16 @@ Gem::Specification.new do |s| 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 'colsole', '~> 1.0' + s.add_dependency 'commonmarker', '~> 2.6' s.add_dependency 'mister_bin', '~> 0.7' - s.add_dependency 'octokit', '~> 8.0' - s.add_dependency 'puma', '>= 5.1', '< 7' + s.add_dependency 'octokit', '~> 10.0' + s.add_dependency 'puma', '~> 7.1' + s.add_dependency 'rackup', '~> 2.3' 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 'sinatra', '~> 4.2' + s.add_dependency 'slim', '~> 5.2' s.add_dependency 'string-direction', '~> 1.2' s.metadata['rubygems_mfa_required'] = 'true' diff --git a/spec/approvals/bin/render/basic b/spec/approvals/bin/render/basic index a491452..6b0da73 100644 --- a/spec/approvals/bin/render/basic +++ b/spec/approvals/bin/render/basic @@ -1,4 +1,4 @@ -

Hello Ace

+

Hello Ace