tanshuku 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ef893ce52de6a2a3e9c76b217ec13fc11faa6aac8ddac739205dcf9336fdde
-  data.tar.gz: e764fe77479fb67ebd3a592525a442654c1ffe0e57e01f46a28710989c7a4fd7
+  metadata.gz: 076e5ce40463d17a9fa6361a0e8a317fb15d1428300921e8527b6765a2f62ee8
+  data.tar.gz: bd412ced4ce541d9b4896ea8382caeaf6ec9a4ea7cd8c33e3f4364c643b93538
 SHA512:
-  metadata.gz: c4e7d22a8d8572a6ed2473f94eb1e659cb853b1b204c6aa6f199710228bafe190ff20761b60c2d27547dfae291ffe55c7f4e38ecd56678d3984e2f82a1590f4f
-  data.tar.gz: b373b1c24e1f6746de4003f394d583c9ed4a91256f90e34237a1db8ea1a590a63041c639e34f90b155cc36568e755dd1c3be773999283af2c52ae15a48940722
+  metadata.gz: 1e1f3ad12c2f5d59c9536ea37a11018502391e455693cf75ea54b94cacee202a0247483978e4192be13886c28ccf67db380d528f6467894204db952858d2fbb5
+  data.tar.gz: '07801692da343d445145619b9ac9c87895a1c0644c60864ac24bd2721a948558c644ea8354fa4e8ea254fe1b95d4ec8eef0d0fdbc3ab8617c697bebe3e6475d9'

data/app/models/tanshuku/url.rb

@@ -167,6 +167,10 @@ module Tanshuku
     # @param url_options [Hash] An option for Rails’ +url_for+.
     #
     # @return [String] A shortened URL.
+    #
+    # @note
+    #   In Rails 8.0 or later, this method loads the routes before calling +url_for+ as Tanshuku depends on them.
+    #   cf. https://github.com/rails/rails/pull/52353
     def shortened_url(url_options = {})
       url_options = url_options.symbolize_keys
       url_options[:controller] = "tanshuku/urls"
@@ -175,6 +179,25 @@ module Tanshuku
 
       Tanshuku::Engine.routes.url_for(url_options)
     end
+
+    case Gem::Version.new(Rails.version)
+    when "7.0"..."8.0"
+      # Don’t define `#shortened_url` in this branch because YARD doesn’t recognize the method.
+    else
+      # Overwrite the `#shortened_url` in Rails 8.0 or later.
+      # rubocop:disable Lint/DuplicateMethods
+      def shortened_url(url_options = {})
+        Rails.application.reload_routes_unless_loaded
+
+        url_options = url_options.symbolize_keys
+        url_options[:controller] = "tanshuku/urls"
+        url_options[:action] = :show
+        url_options[:key] = key
+
+        Tanshuku::Engine.routes.url_for(url_options)
+      end
+      # rubocop:enable Lint/DuplicateMethods
+    end
   end
   # rubocop:enable Rails/ApplicationRecord
 end

data/db/migrate/20230220123456_create_tanshuku_urls.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateTanshukuUrls < ActiveRecord::Migration[7.0]
+class CreateTanshukuUrls < ActiveRecord::Migration[Rails::VERSION::STRING.to_f]
   def change
     create_table :tanshuku_urls do |t|
       t.text :url, null: false
@@ -11,7 +11,7 @@ class CreateTanshukuUrls < ActiveRecord::Migration[7.0]
       # You might adjust the `limit: 20` depending on `.key_length` and `.key_generator` of `Tanshuku.config`.
       t.string :key, null: false, limit: 20, index: { unique: true }, comment: "cf. Tanshuku::Url.generate_key"
 
-      t.datetime :created_at, null: false, precision: nil
+      t.datetime :created_at, null: false
     end
   end
 end

data/lib/generators/tanshuku/install_generator.rb

@@ -24,8 +24,16 @@ module Tanshuku
       # rubocop:disable Rails/TimeZone
       old_filename = "20230220123456_create_tanshuku_urls.rb"
       new_filename = old_filename.sub("20230220123456", Time.now.strftime("%Y%m%d%H%M%S"))
-      copy_file "../../../db/migrate/#{old_filename}", "db/migrate/#{new_filename}"
       # rubocop:enable Rails/TimeZone
+
+      old_filepath = "../../../db/migrate/#{old_filename}"
+      new_filepath = "db/migrate/#{new_filename}"
+
+      copy_file old_filepath, new_filepath
+
+      # rubocop:disable Lint/NumberConversion
+      gsub_file new_filepath, "Rails::VERSION::STRING.to_f", Rails::VERSION::STRING.to_f.to_s
+      # rubocop:enable Lint/NumberConversion
     end
   end
 end

data/lib/tanshuku/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tanshuku
-  VERSION = "4.0.0"
+  VERSION = "4.0.2"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tanshuku
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - kg8m
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-16 00:00:00.000000000 Z
+date: 2024-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7.0'
 description: Tanshuku is a simple and performance aware Rails engine for shortening
   URLs. Tanshuku generates a shortened URL per a normalized original URL. Tanshuku
   redirects from a shortened URL to its corresponding original URL.
@@ -61,7 +60,6 @@ files:
 - lib/tanshuku/configuration.rb
 - lib/tanshuku/engine.rb
 - lib/tanshuku/version.rb
-- lib/tasks/check_all.rb
 - sig/app/controllers/tanshuku/urls_controller.rbs
 - sig/app/models/tanshuku/url.rbs
 - sig/db/migrate/create_tanshuku_urls.rbs
@@ -70,7 +68,6 @@ files:
 - sig/lib/tanshuku/configuration.rbs
 - sig/lib/tanshuku/engine.rbs
 - sig/lib/tanshuku/version.rbs
-- sig/lib/tasks/check_all.rbs
 homepage: https://github.com/kg8m/tanshuku
 licenses:
 - MIT
@@ -80,7 +77,6 @@ metadata:
   changelog_uri: https://github.com/kg8m/tanshuku/releases
   documentation_uri: https://kg8m.github.io/tanshuku/
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Tanshuku is a simple and performance aware Rails engine for shortening URLs.
 test_files: []

data/lib/tasks/check_all.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require "English"
-require "io/console"
-require "paint"
-require "pty"
-
-class CheckAll
-  TASKNAMES = %i[rubocop spec steep:check yard:check].freeze
-  LINE = Paint["-" * (IO.console or raise).winsize[1], :bold]
-  TITLE_TEMPLATE = Paint["\n#{LINE}\nExecute: %<command>s\n#{LINE}\n\n", :bold]
-
-  attr_reader :failed_commands
-
-  def self.call
-    new.call
-  end
-
-  def initialize
-    @failed_commands = []
-  end
-
-  def call
-    # rubocop:disable ThreadSafety/NewThread
-    TASKNAMES.map { |taskname| Thread.new(taskname, &executor) }.each(&:join)
-    # rubocop:enable ThreadSafety/NewThread
-    output_result
-  end
-
-  private
-
-  def executor
-    lambda do |taskname|
-      command = "bundle exec rake #{taskname}"
-
-      outputs = []
-      outputs << format(TITLE_TEMPLATE, command:)
-
-      # Use `PTY.spawn` to get colorized outputs of each command.
-      PTY.spawn(command) do |reader, writer, pid|
-        writer.close
-
-        while (output = reader.gets)
-          outputs << output
-        end
-
-        Process.wait(pid)
-      end
-      failed_commands << command unless $CHILD_STATUS&.success?
-
-      puts outputs.join
-    end
-  end
-
-  def output_result
-    puts ""
-    puts LINE
-    puts Paint["Result", :bold]
-    puts LINE
-
-    if failed_commands.empty?
-      puts Paint["\nAll checks are OK.", :green, :bold]
-    else
-      puts Paint["\nChecks failed!!\n", :red, :bold]
-      puts failed_commands.map { |command| "  - #{command}" }.join("\n")
-      abort ""
-    end
-  end
-end

data/sig/lib/tasks/check_all.rbs

@@ -1,18 +0,0 @@
-class CheckAll
-  TASKNAMES: Array[Symbol]
-  LINE: String
-  TITLE_TEMPLATE: String
-
-  attr_reader failed_commands: Array[String]
-
-  def initialize: () -> void
-
-  def self.call: () -> void
-
-  def call: () -> void
-
-  private
-
-  def executor: () -> ^(*String) -> void
-  def output_result: () -> void
-end