friendly_id 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1293d744a87c9988c0ff2dfba773f351cdf62bc24e3b3c73e386310b44d4bb
-  data.tar.gz: 1e02363f0abe107ce5165942024ff4cdabfc8b8c18083e0615846c58f5e41252
+  metadata.gz: 41f8cc1c8668551a87b0537b5a30b812ec635755c7b1d0bfda678bc4be23b84c
+  data.tar.gz: 7cc6753a1f56537561558134ceae5c796b2e1296fa5230b0b734ddebd17be789
 SHA512:
-  metadata.gz: f7f27736b4ae2218c95c42cde457472a919c81f89d0b899453c351e4b16c2e557c6f44a9dc32ef947123e2228e5588f8bcd1157c60d3ecb4f4195cc4687609b9
-  data.tar.gz: bf6b4a73627faa1363a78d70d6a82e3e1ebf2fa1b7979504d0914646325fffc980f9b78508a3a9ad8ab17c93034bc45c2b50cf3d058f33857b4e83a064c605fc
+  metadata.gz: cbfde34d6b2cd2347ab9837101824e65504fa226d51e4820e87b5cc7f2546c3e55decb2c7d0df4f8d1d899ef517f8177a5f63543a5577194071b7388f10cb5cf
+  data.tar.gz: f13c197800451a77c86092fa15fcd730ae669dca4486856ddf1dce21be7ad6ee8bbed41590f0a3afb1d72d804c343e4b5050f6c906090a7c951fb54b46c1d936

data/.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Release to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    environment: release
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - uses: rubygems/release-gem@v1

data/.github/workflows/test.yml

@@ -10,11 +10,39 @@ jobs:
     strategy:
       matrix:
         database: [ mysql, postgresql ]
-        gemfile: [ '7.0', '6.1', '6.0' ]
-        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
+        gemfile: [ '8.0', '7.2', '7.1', '7.0', '6.1', '6.0' ]
+        ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3', '3.4' ]
         exclude:
-          - ruby: '2.6'
-            gemfile: '7.0'
+          - gemfile: '6.0'
+            ruby: '3.2'
+          - gemfile: '6.0'
+            ruby: '3.3'
+          - gemfile: '6.0'
+            ruby: '3.4'
+          - gemfile: '6.1'
+            ruby: '3.2'
+          - gemfile: '6.1'
+            ruby: '3.3'
+          - gemfile: '6.1'
+            ruby: '3.4'
+          - gemfile: '7.0'
+            ruby: '3.3'
+          - gemfile: '7.0'
+            ruby: '3.4'
+          - gemfile: '7.1'
+            ruby: '3.3'
+          - gemfile: '7.1'
+            ruby: '3.4'
+          - gemfile: '7.2'
+            ruby: '2.7'
+          - gemfile: '7.2'
+            ruby: '3.0'
+          - gemfile: '8.0'
+            ruby: '2.7'
+          - gemfile: '8.0'
+            ruby: '3.0'
+          - gemfile: '8.0'
+            ruby: '3.1'
       fail-fast: false
     runs-on: ubuntu-latest
 
@@ -31,7 +59,7 @@ jobs:
 
     name: ${{ matrix.ruby }} ${{ matrix.database }} rails-${{ matrix.gemfile }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
     - run: sudo apt-get update && sudo apt-get install libsqlite3-dev -y
 

data/.yardopts

@@ -1,5 +1,7 @@
 -e guide.rb
 --files=Changelog.md,Guide.md
+--tag guide
+--hide-tag guide
 --private
 --protected
 --exclude lib/friendly_id/migration

data/Changelog.md

@@ -3,7 +3,14 @@
 We would like to think our many [contributors](https://github.com/norman/friendly_id/graphs/contributors) for
 suggestions, ideas and improvements to FriendlyId.
 
-## Unreleased
+## 5.6.0 (2025-12-07)
+
+* Add: `treat_numeric_as_conflict` option to prevent ambiguous numeric slugs. ([#1037](https://github.com/norman/friendly_id/pull/1037))
+* Fix: history not using `parse_friendly_id`. ([#1020](https://github.com/norman/friendly_id/pull/1020))
+
+## 5.5.1 (2023-11-13)
+
+* Fix YARD doc generation. ([#1006](https://github.com/norman/friendly_id/pull/1006))
 
 ## 5.5.0 (2022-11-16)
 

data/README.md

@@ -39,7 +39,7 @@ FriendlyId offers many advanced features, including:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'friendly_id', '~> 5.4.0'
+gem 'friendly_id', '~> 5.5.0'
 ```
 
 Note: You MUST use 5.0.0 or greater for Rails 4.0+.
@@ -108,8 +108,8 @@ User.find_each(&:save)
 
 ### `:allow_nil`
 
-You can pass `allow_nil: true` to the `friendly.find()` method if you're want to
-avoid raising `ActiveRecord::RecordNotFound` and accept a `nil`.
+You can pass `allow_nil: true` to the `friendly.find()` method if you want to
+avoid raising `ActiveRecord::RecordNotFound` and accept `nil`.
 
 #### Example
 

data/Rakefile

@@ -1,4 +1,5 @@
 require "rubygems"
+require "bundler/gem_tasks"
 require "rake/testtask"
 
 task default: :test
@@ -21,11 +22,6 @@ task :clean do
   %x(rm -f `find . -name '*.rbc'`)
 end
 
-desc "Build the gem"
-task :gem do
-  `gem build friendly_id.gemspec`
-end
-
 desc "Build YARD documentation"
 task :yard do
   puts `bundle exec yard`

data/friendly_id.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = "friendly_id"
   s.version = FriendlyId::VERSION
   s.authors = ["Norman Clarke", "Philip Arndt"]
-  s.email = ["norman@njclarke.com", "p@arndt.io"]
+  s.email = ["norman@njclarke.com", "gems@p.arndt.io"]
   s.homepage = "https://github.com/norman/friendly_id"
   s.summary = "A comprehensive slugging and pretty-URL plugin."
   s.files = `git ls-files`.split("\n")
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coveralls"
   s.add_development_dependency "railties", ">= 4.0"
   s.add_development_dependency "minitest", "~> 5.3"
-  s.add_development_dependency "mocha", "~> 1.1"
+  s.add_development_dependency "mocha", "~> 2.1"
   s.add_development_dependency "yard"
   s.add_development_dependency "i18n"
   s.add_development_dependency "ffaker"
@@ -28,9 +28,4 @@ Gem::Specification.new do |s|
   s.description = "FriendlyId is the \"Swiss Army bulldozer\" of slugging " \
     "and permalink plugins for Active Record. It lets you create pretty URLs " \
     "and work with human-friendly strings as if they were numeric ids."
-
-  s.cert_chain = [File.expand_path("certs/parndt.pem", __dir__)]
-  if $PROGRAM_NAME.end_with?("gem") && ARGV.include?("build") && ARGV.include?(__FILE__)
-    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
-  end
 end

data/gemfiles/{Gemfile.rails-5.2.rb → Gemfile.rails-7.1.rb}

@@ -2,14 +2,14 @@ source "https://rubygems.org"
 
 gemspec path: "../"
 
-gem "activerecord", "~> 5.2.0"
-gem "railties", "~> 5.2.0"
+gem "activerecord", "~> 7.1.0"
+gem "railties", "~> 7.1.0"
 
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter", "~> 51.1"
-    gem "activerecord-jdbcpostgresql-adapter", "~> 51.1"
+    gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
     gem "kramdown"
   end
 

data/gemfiles/Gemfile.rails-7.2.rb

@@ -0,0 +1,22 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 7.2.0"
+gem "railties", "~> 7.2.0"
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
+    gem "kramdown"
+  end
+
+  platforms :ruby, :rbx do
+    gem "sqlite3"
+    gem "mysql2"
+    gem "pg"
+    gem "redcarpet"
+  end
+end

data/gemfiles/Gemfile.rails-8.0.rb

@@ -0,0 +1,22 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 8.0.0"
+gem "railties", "~> 8.0.0"
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
+    gem "kramdown"
+  end
+
+  platforms :ruby, :rbx do
+    gem "sqlite3"
+    gem "mysql2"
+    gem "pg"
+    gem "redcarpet"
+  end
+end

data/guide.rb

@@ -4,8 +4,15 @@
 
 def comments_from path
   path = File.expand_path("../lib/friendly_id/#{path}", __FILE__)
-  match = File.read(path).match(/\n=begin(.*)\n=end/m)[1].to_s
-  match.split("\n").reject { |x| x =~ /^@/ }.join("\n").strip
+  matches = File.read(path).match(/\n\s*# @guide begin\n(.*)\s*# @guide end/m)
+
+  return if matches.nil?
+
+  match = matches[1].to_s
+  match.split("\n")
+    .map { |x| x.sub(/^\s*#\s?/, "") } # Strip off the comment, leading whitespace, and the space after the comment
+    .reject { |x| x =~ /^@/ }         # Ignore yarddoc tags for the guide
+    .join("\n").strip
 end
 
 File.open(File.expand_path("../Guide.md", __FILE__), "w:utf-8") do |guide|

data/lib/friendly_id/base.rb

@@ -1,6 +1,7 @@
 module FriendlyId
+  # @guide begin
   #
-  ## Setting Up FriendlyId in Your Model
+  # ## Setting Up FriendlyId in Your Model
   #
   # To use FriendlyId in your ActiveRecord models, you must first either extend or
   # include the FriendlyId module (it makes no difference), then invoke the
@@ -21,7 +22,7 @@ module FriendlyId
   # all classes that participate in STI, both your parent classes and their
   # children.*
   #
-  ### The Default Setup: Simple Models
+  # ### The Default Setup: Simple Models
   #
   # The simplest way to use FriendlyId is with a model that has a uniquely indexed
   # column with no spaces or special characters, and that is seldom or never
@@ -53,6 +54,7 @@ module FriendlyId
   # in a URL can be repetitive and surprisingly tricky, so for this reason it's
   # often better and easier to use {FriendlyId::Slugged slugs}.
   #
+  # @guide end
   module Base
     # Configure FriendlyId's behavior in a model.
     #

data/lib/friendly_id/finders.rb

@@ -1,4 +1,6 @@
 module FriendlyId
+  # @guide begin
+  #
   # ## Performing Finds with FriendlyId
   #
   # FriendlyId offers enhanced finders which will search for your record by
@@ -12,7 +14,7 @@ module FriendlyId
   #     Restaurant.find(23)                     #=> still works
   #     Restaurant.find('plaza-diner')          #=> will not work
   #
-  ### Restoring FriendlyId 4.0-style finders
+  # ### Restoring FriendlyId 4.0-style finders
   #
   # Prior to version 5.0, FriendlyId overrode the default finder methods to perform
   # friendly finds all the time. This required modifying parts of Rails that did
@@ -34,7 +36,7 @@ module FriendlyId
   #     Restaurant.find('plaza-diner')          #=> now also works
   #     Restaurant.active.find('plaza-diner')   #=> now also works
   #
-  ### Updating your application to use FriendlyId's finders
+  # ### Updating your application to use FriendlyId's finders
   #
   # Unless you've chosen to use the `:finders` addon, be sure to modify the finders
   # in your controllers to use the `friendly` scope. For example:
@@ -49,7 +51,7 @@ module FriendlyId
   #       @restaurant = Restaurant.friendly.find(params[:id])
   #     end
   #
-  #### Active Admin
+  # #### Active Admin
   #
   # Unless you use the `:finders` addon, you should modify your admin controllers
   # for models that use FriendlyId with something similar to the following:
@@ -60,6 +62,7 @@ module FriendlyId
   #       end
   #     end
   #
+  # @guide end
   module Finders
     module ClassMethods
       if (ActiveRecord::VERSION::MAJOR == 4) && (ActiveRecord::VERSION::MINOR == 0)

data/lib/friendly_id/history.rb

@@ -1,6 +1,7 @@
 module FriendlyId
+  # @guide begin
   #
-  ## History: Avoiding 404's When Slugs Change
+  # ## History: Avoiding 404's When Slugs Change
   #
   # FriendlyId's {FriendlyId::History History} module adds the ability to store a
   # log of a model's slugs, so that when its friendly id changes, it's still
@@ -8,7 +9,7 @@ module FriendlyId
   #
   # The primary use case for this is avoiding broken URLs.
   #
-  ### Setup
+  # ### Setup
   #
   # In order to use this module, you must add a table to your database schema to
   # store the slug records. FriendlyId provides a generator for this purpose:
@@ -19,13 +20,13 @@ module FriendlyId
   # This will add a table named `friendly_id_slugs`, used by the {FriendlyId::Slug}
   # model.
   #
-  ### Considerations
+  # ### Considerations
   #
   # Because recording slug history requires creating additional database records,
   # this module has an impact on the performance of the associated model's `create`
   # method.
   #
-  ### Example
+  # ### Example
   #
   #     class Post < ActiveRecord::Base
   #       extend FriendlyId
@@ -49,6 +50,8 @@ module FriendlyId
   #         end
   #       end
   #     end
+  #
+  # @guide end
   module History
     module Configuration
       def dependent_value
@@ -82,13 +85,13 @@ module FriendlyId
       include ::FriendlyId::FinderMethods
 
       def exists_by_friendly_id?(id)
-        super || joins(:slugs).where(slug_history_clause(id)).exists?
+        super || joins(:slugs).where(slug_history_clause(parse_friendly_id(id))).exists?
       end
 
       private
 
       def first_by_friendly_id(id)
-        super || slug_table_record(id)
+        super || slug_table_record(parse_friendly_id(id))
       end
 
       def slug_table_record(id)

data/lib/friendly_id/reserved.rb

@@ -1,6 +1,7 @@
 module FriendlyId
+  # @guide begin
   #
-  ## Reserved Words
+  # ## Reserved Words
   #
   # The {FriendlyId::Reserved Reserved} module adds the ability to exclude a list of
   # words from use as FriendlyId slugs.
@@ -26,6 +27,7 @@ module FriendlyId
   #       end
   #     end
   #
+  # @guide end
   module Reserved
     # When included, this module adds configuration options to the model class's
     # friendly_id_config.

data/lib/friendly_id/scoped.rb

@@ -1,8 +1,9 @@
 require "friendly_id/slugged"
 
 module FriendlyId
+  # @guide begin
   #
-  ## Unique Slugs by Scope
+  # ## Unique Slugs by Scope
   #
   # The {FriendlyId::Scoped} module allows FriendlyId to generate unique slugs
   # within a scope.
@@ -53,7 +54,7 @@ module FriendlyId
   #
   # All supplied values will be used to determine scope.
   #
-  ### Finding Records by Friendly ID
+  # ### Finding Records by Friendly ID
   #
   # If you are using scopes your friendly ids may not be unique, so a simple find
   # like:
@@ -70,13 +71,13 @@ module FriendlyId
   #     Restaurant.where(:city_id => @city.id).friendly.find("joes-diner")
   #
   #
-  ### Finding All Records That Match a Scoped ID
+  # ### Finding All Records That Match a Scoped ID
   #
   # Query the slug column directly:
   #
   #     Restaurant.where(:slug => "joes-diner")
   #
-  ### Routes for Scoped Models
+  # ### Routes for Scoped Models
   #
   # Recall that FriendlyId is a database-centric library, and does not set up any
   # routes for scoped models. You must do this yourself in your application. Here's
@@ -98,6 +99,7 @@ module FriendlyId
   #     http://example.org/cities/seattle/restaurants/joes-diner
   #     http://example.org/cities/chicago/restaurants/joes-diner
   #
+  # @guide end
   module Scoped
     # FriendlyId::Config.use will invoke this method when present, to allow
     # loading dependent modules prior to overriding them when necessary.

data/lib/friendly_id/simple_i18n.rb

@@ -1,8 +1,9 @@
 require "i18n"
 
 module FriendlyId
+  # @guide begin
   #
-  ## Translating Slugs Using Simple I18n
+  # ## Translating Slugs Using Simple I18n
   #
   # The {FriendlyId::SimpleI18n SimpleI18n} module adds very basic i18n support to
   # FriendlyId.
@@ -17,7 +18,7 @@ module FriendlyId
   # If you need to support two or more locales, you may wish to use the
   # friendly_id_globalize gem instead.
   #
-  ### Example migration
+  # ### Example migration
   #
   #     def self.up
   #       create_table :posts do |t|
@@ -32,7 +33,7 @@ module FriendlyId
   #       add_index :posts, :slug_pt_br
   #     end
   #
-  ### Finds
+  # ### Finds
   #
   # Finds will take into consideration the current locale:
   #
@@ -50,11 +51,11 @@ module FriendlyId
   #       Post.friendly.find("la-guerra-de-las-galaxias")
   #     end
   #
-  ### Creating Records
+  # ### Creating Records
   #
   # When new records are created, the slug is generated for the current locale only.
   #
-  ### Translating Slugs
+  # ### Translating Slugs
   #
   # To translate an existing record's friendly_id, use
   # {FriendlyId::SimpleI18n::Model#set_friendly_id}. This will ensure that the slug
@@ -69,6 +70,8 @@ module FriendlyId
   #     I18n.with_locale(:es) do
   #       post.set_friendly_id("La guerra de las galaxias")
   #     end
+  #
+  # @guide end
   module SimpleI18n
     # FriendlyId::Config.use will invoke this method when present, to allow
     # loading dependent modules prior to overriding them when necessary.

data/lib/friendly_id/slug_generator.rb

@@ -12,6 +12,10 @@ module FriendlyId
         return false if @config.reserved_words.include?(slug)
       end
 
+      if @config.treat_numeric_as_conflict && purely_numeric_slug?(slug)
+        return false
+      end
+
       !@scope.exists_by_friendly_id?(slug)
     end
 
@@ -19,5 +23,16 @@ module FriendlyId
       candidates.each { |c| return c if available?(c) }
       nil
     end
+
+    private
+
+    def purely_numeric_slug?(slug)
+      return false unless slug
+      begin
+        Integer(slug, 10).to_s == slug.to_s
+      rescue ArgumentError, TypeError
+        false
+      end
+    end
   end
 end

data/lib/friendly_id/slugged.rb

@@ -2,8 +2,9 @@ require "friendly_id/slug_generator"
 require "friendly_id/candidates"
 
 module FriendlyId
+  # @guide begin
   #
-  ## Slugged Models
+  # ## Slugged Models
   #
   # FriendlyId can use a separate column to store slugs for models which require
   # some text processing.
@@ -34,7 +35,7 @@ module FriendlyId
   # unique. You may also wish to constrain it to NOT NULL, but this depends on your
   # app's behavior and requirements.
   #
-  ### Example Setup
+  # ### Example Setup
   #
   #     # your model
   #     class Post < ActiveRecord::Base
@@ -60,9 +61,9 @@ module FriendlyId
   #       end
   #     end
   #
-  ### Working With Slugs
+  # ### Working With Slugs
   #
-  #### Formatting
+  # #### Formatting
   #
   # By default, FriendlyId uses Active Support's
   # [parameterize](http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize)
@@ -72,7 +73,7 @@ module FriendlyId
   #     movie = Movie.create! :title => "Der Preis fürs Überleben"
   #     movie.slug #=> "der-preis-furs-uberleben"
   #
-  #### Column or Method?
+  # #### Column or Method?
   #
   # FriendlyId always uses a method as the basis of the slug text - not a column. At
   # first glance, this may sound confusing, but remember that Active Record provides
@@ -95,7 +96,7 @@ module FriendlyId
   #
   # FriendlyId refers to this internally as the "base" method.
   #
-  #### Uniqueness
+  # #### Uniqueness
   #
   # When you try to insert a record that would generate a duplicate friendly id,
   # FriendlyId will append a UUID to the generated slug to ensure uniqueness:
@@ -109,7 +110,7 @@ module FriendlyId
   # Previous versions of FriendlyId appended a numeric sequence to make slugs
   # unique, but this was removed to simplify using FriendlyId in concurrent code.
   #
-  #### Candidates
+  # #### Candidates
   #
   # Since UUIDs are ugly, FriendlyId provides a "slug candidates" functionality to
   # let you specify alternate slugs to use in the event the one you want to use is
@@ -147,20 +148,38 @@ module FriendlyId
   # unique slug, then FriendlyId will append a UUID to the first candidate as a
   # last resort.
   #
-  #### Sequence Separator
+  # #### Sequence Separator
   #
   # By default, FriendlyId uses a dash to separate the slug from a sequence.
   #
   # You can change this with the {FriendlyId::Slugged::Configuration#sequence_separator
   # sequence_separator} configuration option.
   #
-  #### Providing Your Own Slug Processing Method
+  # #### Avoiding Numeric Slugs
+  #
+  # Purely numeric slugs like "123" can create ambiguity in Rails routing - they could
+  # be interpreted as either a friendly slug or a database ID. To prevent this, you can
+  # configure FriendlyId to treat numeric slugs as conflicts and add a UUID suffix:
+  #
+  #     class Product < ActiveRecord::Base
+  #       extend FriendlyId
+  #       friendly_id :sku, use: :slugged
+  #       friendly_id_config.treat_numeric_as_conflict = true
+  #     end
+  #
+  #     product = Product.create! sku: "123"
+  #     product.slug #=> "123-f9f3789a-daec-4156-af1d-fab81aa16ee5"
+  #
+  # This only affects purely numeric slugs. Alphanumeric slugs like "product-123"
+  # or "abc123" will work normally.
+  #
+  # #### Providing Your Own Slug Processing Method
   #
   # You can override {FriendlyId::Slugged#normalize_friendly_id} in your model for
   # total control over the slug format. It will be invoked for any generated slug,
   # whether for a single slug or for slug candidates.
   #
-  #### Deciding When to Generate New Slugs
+  # #### Deciding When to Generate New Slugs
   #
   # As of FriendlyId 5.0, slugs are only generated when the `slug` field is nil. If
   # you want a slug to be regenerated,set the slug field to nil:
@@ -198,7 +217,7 @@ module FriendlyId
   #       end
   #     end
   #
-  #### Locale-specific Transliterations
+  # #### Locale-specific Transliterations
   #
   # Active Support's `parameterize` uses
   # [transliterate](http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-transliterate),
@@ -219,7 +238,7 @@ module FriendlyId
   #
   # This functionality was in fact taken from earlier versions of FriendlyId.
   #
-  #### Gotchas: Common Problems
+  # #### Gotchas: Common Problems
   #
   # FriendlyId uses a before_validation callback to generate and set the slug. This
   # means that if you create two model instances before saving them, it's possible
@@ -233,6 +252,7 @@ module FriendlyId
   # creating more than one nested record for a model that uses FriendlyId. See [this
   # Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
   #
+  # @guide end
   module Slugged
     # Sets up behavior and configuration options for FriendlyId's slugging
     # feature.
@@ -384,7 +404,7 @@ module FriendlyId
     # {FriendlyId::Configuration FriendlyId::Configuration}.
     module Configuration
       attr_writer :slug_column, :slug_limit, :sequence_separator
-      attr_accessor :slug_generator_class
+      attr_accessor :slug_generator_class, :treat_numeric_as_conflict
 
       # Makes FriendlyId use the slug column for querying.
       # @return String The slug column.

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.5.0".freeze
+  VERSION = "5.6.0".freeze
 end

data/lib/friendly_id.rb

@@ -4,8 +4,9 @@ require "friendly_id/object_utils"
 require "friendly_id/configuration"
 require "friendly_id/finder_methods"
 
+# @guide begin
 #
-## About FriendlyId
+# ## About FriendlyId
 #
 # FriendlyId is an add-on to Ruby's Active Record that allows you to replace ids
 # in your URLs with strings:
@@ -19,9 +20,9 @@ require "friendly_id/finder_methods"
 # It requires few changes to your application code and offers flexibility,
 # performance and a well-documented codebase.
 #
-### Core Concepts
+# ### Core Concepts
 #
-#### Slugs
+# #### Slugs
 #
 # The concept of *slugs* is at the heart of FriendlyId.
 #
@@ -29,7 +30,7 @@ require "friendly_id/finder_methods"
 # keywords, rather than an opaque identifier such as a numeric id. This can make
 # your application more friendly both for users and search engines.
 #
-#### Finders: Slugs Act Like Numeric IDs
+# #### Finders: Slugs Act Like Numeric IDs
 #
 # To the extent possible, FriendlyId lets you treat text-based identifiers like
 # normal IDs. This means that you can perform finds with slugs just like you do
@@ -38,6 +39,7 @@ require "friendly_id/finder_methods"
 #     Person.find(82542335)
 #     Person.friendly.find("joe")
 #
+# @guide end
 module FriendlyId
   autoload :History, "friendly_id/history"
   autoload :Slug, "friendly_id/slug"

data/test/helper.rb

@@ -19,9 +19,9 @@ rescue LoadError
 end
 
 begin
-  TestCaseClass = MiniTest::Test
+  TestCaseClass = Minitest::Test
 rescue NameError
-  TestCaseClass = MiniTest::Unit::TestCase
+  TestCaseClass = Minitest::Unit::TestCase
 end
 
 require "mocha/minitest"

data/test/numeric_slug_test.rb

@@ -1,5 +1,17 @@
 require "helper"
 
+class Article < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, use: :slugged
+end
+
+class ArticleWithNumericPrevention < ActiveRecord::Base
+  self.table_name = "articles"
+  extend FriendlyId
+  friendly_id :name, use: :slugged
+  friendly_id_config.treat_numeric_as_conflict = true
+end
+
 class NumericSlugTest < TestCaseClass
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -28,4 +40,61 @@ class NumericSlugTest < TestCaseClass
       assert model_class.friendly.exists?("123")
     end
   end
+
+  test "should prevent purely numeric slugs when treat_numeric_as_conflict is enabled" do
+    transaction do
+      record = ArticleWithNumericPrevention.create! name: "123"
+      refute_equal "123", record.slug
+      assert_match(/\A123-[0-9a-f-]{36}\z/, record.slug)
+    end
+  end
+
+  test "should allow non-numeric slugs when treat_numeric_as_conflict is enabled" do
+    transaction do
+      record = ArticleWithNumericPrevention.create! name: "abc123"
+      assert_equal "abc123", record.slug
+    end
+  end
+
+  test "should allow alphanumeric slugs when treat_numeric_as_conflict is enabled" do
+    transaction do
+      record = ArticleWithNumericPrevention.create! name: "product-123"
+      assert_equal "product-123", record.slug
+    end
+  end
+
+  test "should handle zero as numeric when treat_numeric_as_conflict is enabled" do
+    transaction do
+      record = ArticleWithNumericPrevention.create! name: "0"
+      refute_equal "0", record.slug
+      assert_match(/\A0-[0-9a-f-]{36}\z/, record.slug)
+    end
+  end
+
+  test "should handle large numbers as numeric when treat_numeric_as_conflict is enabled" do
+    transaction do
+      record = ArticleWithNumericPrevention.create! name: "999999999"
+      refute_equal "999999999", record.slug
+      assert_match(/\A999999999-[0-9a-f-]{36}\z/, record.slug)
+    end
+  end
+
+  test "should find records with UUID-suffixed numeric slugs when treat_numeric_as_conflict is enabled" do
+    transaction do
+      record = ArticleWithNumericPrevention.create! name: "123"
+      found = ArticleWithNumericPrevention.friendly.find(record.slug)
+      assert_equal record.id, found.id
+    end
+  end
+
+  test "should resolve conflicts between multiple numeric slugs when treat_numeric_as_conflict is enabled" do
+    transaction do
+      record1 = ArticleWithNumericPrevention.create! name: "456"
+      record2 = ArticleWithNumericPrevention.create! name: "456"
+
+      refute_equal record1.slug, record2.slug
+      assert_match(/\A456-[0-9a-f-]{36}\z/, record1.slug)
+      assert_match(/\A456-[0-9a-f-]{36}\z/, record2.slug)
+    end
+  end
 end

metadata

@@ -1,43 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Norman Clarke
 - Philip Arndt
-autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBRMREwDwYDVQQDDAhydWJ5
-  Z2VtczERMA8GCgmSJomT8ixkARkWAXAxFTATBgoJkiaJk/IsZAEZFgVhcm5kdDES
-  MBAGCgmSJomT8ixkARkWAmlvMB4XDTIyMTExNTIyMjQzMFoXDTIzMTExNTIyMjQz
-  MFowUTERMA8GA1UEAwwIcnVieWdlbXMxETAPBgoJkiaJk/IsZAEZFgFwMRUwEwYK
-  CZImiZPyLGQBGRYFYXJuZHQxEjAQBgoJkiaJk/IsZAEZFgJpbzCCAaIwDQYJKoZI
-  hvcNAQEBBQADggGPADCCAYoCggGBAMPq2bIEO+BmmBeuidSySK7xlL/LWBHzyDxw
-  EMgWsHqJMDZYCZI4WoWbSTSSLrp5zPXLWN0hB23u3dxFp4RVygTTZkc8k05mteab
-  fdREGgdcP+mY8/ASQSvb1VW6IM51Srgjy1SK0S5Qf3HAiQafFvRsxRkY0SWyth24
-  ne/7HG667vHQ1+t0VFl8twupJE9S8p2zgX3eZBl2yRNm/kE5reUsOLvmS58Iri/X
-  9tnz0SGkzrKkim9OIByq7XkFLL3oaIyfbBVgOWilM5pvxj/xNuRH7EIM6aE3q0UZ
-  xo7o9u9Iz2zApDEjejByPjxWAhLuP3v3bJyinRFE1rO47lEM/s6KM/6YooxvgYIN
-  miYYFRtTj9nmKEMv6+h1mZ1/ZwqStTTRh/T90T65dcgsoqRd0JNvpNRjFrYH5cuj
-  QZWMl/FE6AADm0GXa34ZiTQx3Wx2ctqJLFak8+imPwes90nCpiYmgaZpwBI+shjU
-  AddbPDNq+EoxPMWTh0Er3w76fywOWQIDAQABo3kwdzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUxRJaTQZmtkN8FKUWVHKc2riND18wHgYDVR0RBBcw
-  FYETcnVieWdlbXNAcC5hcm5kdC5pbzAeBgNVHRIEFzAVgRNydWJ5Z2Vtc0BwLmFy
-  bmR0LmlvMA0GCSqGSIb3DQEBCwUAA4IBgQBSRGMkZ2dvJ0LSjFz+rIt3G3AZMbKD
-  tjaaQRuC9rOkrl3Rml6h9j7cHYiM0wkTjXneFNySc8jWmM/jKnxiiUfUK9r1XL4n
-  71tz39+MD2lIpLVVEQ69MIoUseppNUTCg0mNghSDYNwISMD/hoWwbJudBi56DbhE
-  xkulLbw8qtcEE+iilIKibe+eJF4platKScsOA7d1AuilR1/S245UzeqwwyI52/xK
-  dfoP928X9Tb/48+83lWUgAgCQOd6WdfCpgQ5H6R90lc8L7OfuDR/vgcmSOTsNVgG
-  1TC3b2FISS0p0qfZsiS7BXh+ARoBKLXsV1a7WR36X0dUpajvk+zzBGrFCdbW43Gx
-  wmJzIksYnf9Ktg8Ux+FLcRBGw4qEIyWvqmS0obB1Hke68rTg0uNTFcKXsNw33XF5
-  fw1cbj95g7OPe0feGK8+afXh/L38vx/hIIOGlUEZ+HaWL2Dki/7vRGvda8dfOpG5
-  bJfaoyKbVsrK+gGKFJv860zsO8lg6BGLsUw=
-  -----END CERTIFICATE-----
-date: 2022-11-15 00:00:00.000000000 Z
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +141,7 @@ description: FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   as if they were numeric ids.
 email:
 - norman@njclarke.com
-- p@arndt.io
+- gems@p.arndt.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -179,6 +150,7 @@ files:
 - ".github/FUNDING.yml"
 - ".github/dependabot.yml"
 - ".github/stale.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".yardopts"
@@ -190,12 +162,13 @@ files:
 - Rakefile
 - UPGRADING.md
 - bench.rb
-- certs/parndt.pem
 - friendly_id.gemspec
-- gemfiles/Gemfile.rails-5.2.rb
 - gemfiles/Gemfile.rails-6.0.rb
 - gemfiles/Gemfile.rails-6.1.rb
 - gemfiles/Gemfile.rails-7.0.rb
+- gemfiles/Gemfile.rails-7.1.rb
+- gemfiles/Gemfile.rails-7.2.rb
+- gemfiles/Gemfile.rails-8.0.rb
 - guide.rb
 - lib/friendly_id.rb
 - lib/friendly_id/.gitattributes
@@ -243,7 +216,6 @@ homepage: https://github.com/norman/friendly_id
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,8 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: []

data/certs/parndt.pem

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBRMREwDwYDVQQDDAhydWJ5
-Z2VtczERMA8GCgmSJomT8ixkARkWAXAxFTATBgoJkiaJk/IsZAEZFgVhcm5kdDES
-MBAGCgmSJomT8ixkARkWAmlvMB4XDTIyMTExNTIyMjQzMFoXDTIzMTExNTIyMjQz
-MFowUTERMA8GA1UEAwwIcnVieWdlbXMxETAPBgoJkiaJk/IsZAEZFgFwMRUwEwYK
-CZImiZPyLGQBGRYFYXJuZHQxEjAQBgoJkiaJk/IsZAEZFgJpbzCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAMPq2bIEO+BmmBeuidSySK7xlL/LWBHzyDxw
-EMgWsHqJMDZYCZI4WoWbSTSSLrp5zPXLWN0hB23u3dxFp4RVygTTZkc8k05mteab
-fdREGgdcP+mY8/ASQSvb1VW6IM51Srgjy1SK0S5Qf3HAiQafFvRsxRkY0SWyth24
-ne/7HG667vHQ1+t0VFl8twupJE9S8p2zgX3eZBl2yRNm/kE5reUsOLvmS58Iri/X
-9tnz0SGkzrKkim9OIByq7XkFLL3oaIyfbBVgOWilM5pvxj/xNuRH7EIM6aE3q0UZ
-xo7o9u9Iz2zApDEjejByPjxWAhLuP3v3bJyinRFE1rO47lEM/s6KM/6YooxvgYIN
-miYYFRtTj9nmKEMv6+h1mZ1/ZwqStTTRh/T90T65dcgsoqRd0JNvpNRjFrYH5cuj
-QZWMl/FE6AADm0GXa34ZiTQx3Wx2ctqJLFak8+imPwes90nCpiYmgaZpwBI+shjU
-AddbPDNq+EoxPMWTh0Er3w76fywOWQIDAQABo3kwdzAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIEsDAdBgNVHQ4EFgQUxRJaTQZmtkN8FKUWVHKc2riND18wHgYDVR0RBBcw
-FYETcnVieWdlbXNAcC5hcm5kdC5pbzAeBgNVHRIEFzAVgRNydWJ5Z2Vtc0BwLmFy
-bmR0LmlvMA0GCSqGSIb3DQEBCwUAA4IBgQBSRGMkZ2dvJ0LSjFz+rIt3G3AZMbKD
-tjaaQRuC9rOkrl3Rml6h9j7cHYiM0wkTjXneFNySc8jWmM/jKnxiiUfUK9r1XL4n
-71tz39+MD2lIpLVVEQ69MIoUseppNUTCg0mNghSDYNwISMD/hoWwbJudBi56DbhE
-xkulLbw8qtcEE+iilIKibe+eJF4platKScsOA7d1AuilR1/S245UzeqwwyI52/xK
-dfoP928X9Tb/48+83lWUgAgCQOd6WdfCpgQ5H6R90lc8L7OfuDR/vgcmSOTsNVgG
-1TC3b2FISS0p0qfZsiS7BXh+ARoBKLXsV1a7WR36X0dUpajvk+zzBGrFCdbW43Gx
-wmJzIksYnf9Ktg8Ux+FLcRBGw4qEIyWvqmS0obB1Hke68rTg0uNTFcKXsNw33XF5
-fw1cbj95g7OPe0feGK8+afXh/L38vx/hIIOGlUEZ+HaWL2Dki/7vRGvda8dfOpG5
-bJfaoyKbVsrK+gGKFJv860zsO8lg6BGLsUw=
------END CERTIFICATE-----

metadata.gz.sig

@@ -1 +0,0 @@
-j搉g6hDŽ���aQ�,��[�H�+P~M@ɈLO�z�!�TV�ٿ��>q|0T����ع|cDs1�`���
��5�ϝd+��������\�:Ƶ���T��5��;�P��j]��h'�D�+�H-��@z}�,��WR) w���%�t�I�?L�4ɚ4K��뜂HI`4X