From 4fbe171f1aca83d2a6e9f589989ddcf1057d8d7c Mon Sep 17 00:00:00 2001 From: bwatson78 Date: Tue, 11 Feb 2025 07:32:23 -0600 Subject: [PATCH 1/2] Updates ruby and actionview. --- Gemfile | 2 +- Gemfile.lock | 56 +++++++++++++++++++--------------- lib/helpers/schoolie_helper.rb | 2 +- schoolie.gemspec | 4 +-- test/schoolie_test.rb | 1 + 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Gemfile b/Gemfile index 00fcd7a..f707238 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" # Specify your gem's dependencies in schoolie.gemspec gemspec -gem "actionview", "~>5" +gem "actionview", "~> 6.1" group :development, :test do gem "byebug" gem "coveralls-ruby", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 29c6bfa..be573e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,26 +2,27 @@ PATH remote: . specs: schoolie (0.1.3) - actionview (~> 5) + actionview (~> 6.1) GEM remote: https://rubygems.org/ specs: - actionview (5.2.6.2) - activesupport (= 5.2.6.2) + actionview (6.1.7.10) + activesupport (= 6.1.7.10) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.2.6.2) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) ast (2.4.2) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.3.5) coveralls-ruby (0.2.0) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -30,25 +31,31 @@ GEM tins (~> 1.6) crass (1.0.6) docile (1.4.0) - erubi (1.10.0) - i18n (1.10.0) + erubi (1.13.1) + i18n (1.14.7) concurrent-ruby (~> 1.0) json (2.6.1) - loofah (2.14.0) + loofah (2.24.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) + mini_portile2 (2.8.8) minitest (5.15.0) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.18.2) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-gnu) racc (~> 1.4) parallel (1.21.0) parser (3.1.0.0) ast (~> 2.4.1) - racc (1.6.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + racc (1.8.1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rainbow (3.1.1) rake (13.0.6) regexp_parser (2.2.1) @@ -76,18 +83,19 @@ GEM term-ansicolor (1.7.1) tins (~> 1.0) thor (1.2.1) - thread_safe (0.3.6) tins (1.31.0) sync - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unicode-display_width (2.1.0) + zeitwerk (2.7.1) PLATFORMS + ruby x86_64-linux DEPENDENCIES - actionview (~> 5) + actionview (~> 6.1) byebug coveralls-ruby minitest (~> 5.0) diff --git a/lib/helpers/schoolie_helper.rb b/lib/helpers/schoolie_helper.rb index 75b8c12..0136c36 100644 --- a/lib/helpers/schoolie_helper.rb +++ b/lib/helpers/schoolie_helper.rb @@ -27,6 +27,6 @@ def load_statics(map) end def load_map(config) - @load_map ||= YAML.safe_load(File.open(config, "r"), [Symbol]) + @load_map ||= YAML.safe_load(File.open(config, "r")) end end diff --git a/schoolie.gemspec b/schoolie.gemspec index 0ed32b3..c8001fa 100644 --- a/schoolie.gemspec +++ b/schoolie.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.summary = "A gem to generate sitemaps & meta tags for Samvera repositories" spec.homepage = "https://github.com/curationexperts/schoolie" spec.license = "Apache-2.0" - spec.required_ruby_version = ">= 2.6.0" + spec.required_ruby_version = "~> 3.2.2" spec.metadata["allowed_push_host"] = "https://rubygems.org" @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] # Uncomment to register a new dependency of your gem - spec.add_dependency "actionview", "~> 5" + spec.add_dependency "actionview", "~> 6.1" # For more information and examples about making a new gem, checkout our # guide at: https://bundler.io/guides/creating_gem.html diff --git a/test/schoolie_test.rb b/test/schoolie_test.rb index 53c48e0..0ce4ae6 100644 --- a/test/schoolie_test.rb +++ b/test/schoolie_test.rb @@ -2,6 +2,7 @@ require "test_helper" +# A suite of minitests for the gem. class SchoolieTest < Minitest::Test def test_that_it_has_a_version_number refute_nil ::Schoolie::VERSION From ba88df64b425f846afe5989de33794346a23d4cd Mon Sep 17 00:00:00 2001 From: bwatson78 Date: Tue, 11 Feb 2025 07:34:26 -0600 Subject: [PATCH 2/2] ignores git ignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6d46011..a28ec71 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /spec/reports/ /tmp/ /vendor +/.ruby-version +/test/.ruby-version