Merge branch 'main' into main

Author: amatsuda

.github/workflows/main.yml

@@ -10,6 +10,9 @@ jobs:
 
       matrix:
         ruby-version:
+          - '2.4'
+          - '2.5'
+          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
@@ -20,7 +23,9 @@ jobs:
           - jruby-head
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - run: rm Gemfile.lock
 
       - uses: ruby/setup-ruby@v1
         with:

.rubocop.yml

@@ -6,7 +6,7 @@ require:
 AllCops:
   DisplayCopNames: true
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 2.5
 
 Bundler/DuplicatedGem:
   Enabled: false

Gemfile

@@ -4,12 +4,15 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "bundler", "~> 2.4.0"
 gem "rake", ">= 11"
 
 # Use local copy of simplecov in development if you want to
 # gem "simplecov", :path => File.dirname(__FILE__) + "/../simplecov"
-gem "simplecov", git: "https://github.com/simplecov-ruby/simplecov"
+if RUBY_VERSION < "2.5"
+  gem "simplecov", "< 0.19"
+else
+  gem "simplecov", git: "https://github.com/simplecov-ruby/simplecov"
+end
 
 group :test do
   gem "minitest"
@@ -20,7 +23,10 @@ group :development do
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"
+  gem "sass"
   gem "sprockets"
   gem "uglifier"
-  gem "yui-compressor"
 end
+
+gem "base64" if RUBY_VERSION >= "3.3"
+gem "logger" if RUBY_VERSION >= "3.4"

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/simplecov-ruby/simplecov
-  revision: 1d8f692d772c101c56f3f4e94945e898ad7b3769
+  revision: b6c2d4208a5fa395ce09d7e1d3b074f680ee29b0
   specs:
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -16,76 +16,78 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    concurrent-ruby (1.2.2)
-    docile (1.4.0)
+    base64 (0.2.0)
+    concurrent-ruby (1.3.4)
+    docile (1.4.1)
     execjs (2.9.1)
-    json (2.7.1)
-    json (2.7.1-java)
-    language_server-protocol (3.17.0.3)
-    minitest (5.20.0)
+    ffi (1.17.0)
+    logger (1.6.1)
+    minitest (5.15.0)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
-    racc (1.7.3-java)
-    rack (3.0.9.1)
+    racc (1.8.1)
+    racc (1.8.1-java)
+    rack (3.1.7)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.8.3)
-    rexml (3.3.3)
-      strscan
-    rubocop (1.59.0)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    regexp_parser (2.9.2)
+    rexml (3.3.6)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rexml
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-minitest (0.34.2)
-      rubocop (>= 1.39, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-performance (1.20.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-minitest (0.19.1)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-performance (1.13.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     simplecov_json_formatter (0.1.4)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    strscan (3.1.0)
-    strscan (3.1.0-java)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
-    yui-compressor (0.12.0)
 
 PLATFORMS
   arm64-darwin-22
   ruby
   universal-java-1.8
 
 DEPENDENCIES
-  bundler (~> 2.4.0)
+  base64
+  logger
   minitest
   rake (>= 11)
   rubocop
   rubocop-minitest
   rubocop-performance
   rubocop-rake
+  sass
   simplecov!
   simplecov-html!
   sprockets
   uglifier
-  yui-compressor
 
 BUNDLED WITH
-   2.4.22
+   2.3.15

Rakefile

@@ -34,11 +34,20 @@ namespace :assets do
   task :compile do
     puts "Compiling assets"
     require "sprockets"
+    require "sprockets/sass_processor"
+
+    Sprockets.register_processor("text/css") do |input|
+      {data: input[:data].gsub(/(?<!-|_)url\(['"]?(.+?)['"]?\)/) { "asset-data-url(\"#{Regexp.last_match(1)}\")" }}
+    end
+
+    Sprockets.register_processor "text/css", Sprockets::ScssProcessor
+
     assets = Sprockets::Environment.new do |env|
       env.append_path "assets/javascripts"
       env.append_path "assets/stylesheets"
+      env.append_path "public"
       env.js_compressor = :uglify
-      env.css_compressor = :yui
+      env.css_compressor = :scss
     end
     assets["application.js"].write_to("public/application.js")
     assets["application.css"].write_to("public/application.css")

assets/javascripts/application.js

@@ -103,7 +103,7 @@ $(document).ready(function () {
   // Make sure tabs don't get ugly focus borders when active
   $('.group_tabs').on('focus', 'a', function () { $(this).blur(); });
 
-  var favicon_path = $('link[rel="shortcut icon"]').attr('href');
+  var favicon_path = $('link[rel="icon"]').attr('href');
   $('.group_tabs').on('click', 'a', function () {
     if (!$(this).parent().hasClass('active')) {
       $('.group_tabs a').parent().removeClass('active');
@@ -114,8 +114,8 @@ $(document).ready(function () {
 
       // Force favicon reload - otherwise the location change containing anchor would drop the favicon...
       // Works only on firefox, but still... - Anyone know a better solution to force favicon on local file?
-      $('link[rel="shortcut icon"]').remove();
-      $('head').append('<link rel="shortcut icon" type="image/png" href="' + favicon_path + '" />');
+      $('link[rel="icon"]').remove();
+      $('head').append('<link rel="icon" type="image/png" href="' + favicon_path + '" />');
     };
     return false;
   });