friendly_id 5.4.2 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ddfb374efbecb41ddb5164a5f0fbb4df5838edfcb13a8e7d8d6caa1b378f34
-  data.tar.gz: 363955e55e33b9b15d59099f1b6ac00d88f32e0b3835f1dfd6fcf718aad7ac7f
+  metadata.gz: 0b1293d744a87c9988c0ff2dfba773f351cdf62bc24e3b3c73e386310b44d4bb
+  data.tar.gz: 1e02363f0abe107ce5165942024ff4cdabfc8b8c18083e0615846c58f5e41252
 SHA512:
-  metadata.gz: d966763a10e683b815681576ef71c720caeafee88c49f866f912cae1a2aae12a33fd00bfc93f2d0eb7204ae2b91c514613edf34996119519613452b0ce0cdfb1
-  data.tar.gz: f8e8522f7f4b1c8a32bc8fd58c719d8376beb3325f2adfbca0554f7ec63a2742d5ab5b7128bbf2fa3f106075f5f89af590843c36bf3924d975674bada3673ca9
+  metadata.gz: f7f27736b4ae2218c95c42cde457472a919c81f89d0b899453c351e4b16c2e557c6f44a9dc32ef947123e2228e5588f8bcd1157c60d3ecb4f4195cc4687609b9
+  data.tar.gz: bf6b4a73627faa1363a78d70d6a82e3e1ebf2fa1b7979504d0914646325fffc980f9b78508a3a9ad8ab17c93034bc45c2b50cf3d058f33857b4e83a064c605fc

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/test.yml

@@ -10,20 +10,13 @@ jobs:
     strategy:
       matrix:
         database: [ mysql, postgresql ]
-        gemfile: [ '6.0', '5.2' ]
-        ruby: [ '2.7', '2.6', '2.5' ]
+        gemfile: [ '7.0', '6.1', '6.0' ]
+        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
+        exclude:
+          - ruby: '2.6'
+            gemfile: '7.0'
       fail-fast: false
     runs-on: ubuntu-latest
-    name: ${{ matrix.ruby }} ${{ matrix.database }} rails-${{ matrix.gemfile }}
-    steps:
-    - uses: actions/checkout@v2
-    - run: sudo apt-get update && sudo apt-get install libpq-dev postgresql-client libmysqlclient-dev mysql-client libsqlite3-dev -y
-    - uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-        ruby-version: ${{ matrix.ruby }}
-    - run: bundle exec rake db:create db:up
-    - run: bundle exec rake test
 
     env:
       BUNDLE_GEMFILE: gemfiles/Gemfile.rails-${{ matrix.gemfile }}.rb
@@ -32,18 +25,34 @@ jobs:
       DB: ${{ matrix.database }}
       MYSQL_PASSWORD: root
       PGHOST: localhost
-      PGPORT: 5432
-      PGUSER: postgres
+      PGPASSWORD: runner
+      PGUSER: runner
       RAILS_ENV: test
 
-    services:
-      postgres:
-        image: postgres:11.5
-        ports: ["5432:5432"]
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-      mysql:
-        image: mysql:5.7
-        ports: ["3306:3306"]
-        options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 5
-        env:
-          MYSQL_ROOT_PASSWORD: root
+    name: ${{ matrix.ruby }} ${{ matrix.database }} rails-${{ matrix.gemfile }}
+    steps:
+    - uses: actions/checkout@v3
+
+    - run: sudo apt-get update && sudo apt-get install libsqlite3-dev -y
+
+    - name: "Set up MySQL using VM's server"
+      if: ${{ env.DB == 'mysql' }}
+      run: |
+        sudo apt-get install libmysqlclient-dev -y
+        sudo systemctl start mysql.service
+
+    - name: "Set up PostgreSQL using VM's server"
+      if: ${{ env.DB == 'postgresql' }}
+      run: |
+        sudo apt-get install libpq-dev -y
+        sudo systemctl start postgresql.service
+        sudo -u postgres psql -c "CREATE USER runner WITH SUPERUSER PASSWORD 'runner'"
+        sudo -u postgres createdb runner
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+
+    - run: bundle exec rake db:{create,up}
+    - run: bundle exec rake test

data/Changelog.md

@@ -5,6 +5,12 @@ suggestions, ideas and improvements to FriendlyId.
 
 ## Unreleased
 
+## 5.5.0 (2022-11-16)
+
+* SimpleI18n: Handle regional locales ([#965](https://github.com/norman/friendly_id/pull/965))
+* Fix: "unknown column" exception ([#943](https://github.com/norman/friendly_id/pull/943))
+* Add: `allow_nil: true` to the Finder ([#995](https://github.com/norman/friendly_id/pull/995) and [#997](https://github.com/norman/friendly_id/pull/997))
+
 ## 5.4.2 (2021-01-07)
 
 * Fix: Set slug before save if needed ([#948](https://github.com/norman/friendly_id/pull/948))

data/Gemfile

@@ -1,27 +1,23 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
+gem "standard"
+gem "rake"
 
 group :development, :test do
   platforms :ruby do
-    gem 'byebug'
-    gem 'pry'
+    gem "byebug"
+    gem "pry"
   end
 
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta2'
-    gem 'kramdown'
+    gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.beta2"
+    gem "kramdown"
   end
 
   platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
+    gem "sqlite3"
+    gem "redcarpet"
   end
 end

data/README.md

@@ -104,6 +104,27 @@ existing users, do this from the console, runner, or add a Rake task:
 User.find_each(&:save)
 ```
 
+## Options
+
+### `: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`.
+
+#### Example
+
+```ruby
+MyModel.friendly.find("bad-slug") # where bad-slug is not a valid slug
+MyModel.friendly.find(123)        # where 123 is not a valid primary key ID
+MyModel.friendly.find(nil)        # maybe you have a variable/param that's potentially nil
+#=> raise ActiveRecord::RecordNotFound
+
+MyModel.friendly.find("bad-slug", allow_nil: true)
+MyModel.friendly.find(123, allow_nil: true)
+MyModel.friendly.find(nil, allow_nil: true)
+#=> nil
+```
+
 ## Bugs
 
 Please report them on the [Github issue

data/Rakefile

@@ -1,107 +1,104 @@
 require "rubygems"
 require "rake/testtask"
 
-task :default => :test
+task default: :test
 
 task :load_path do
-  %w(lib test).each do |path|
+  %w[lib test].each do |path|
     $LOAD_PATH.unshift(File.expand_path("../#{path}", __FILE__))
   end
 end
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList["test/*_test.rb"]
   t.verbose = true
 end
 
 desc "Remove temporary files"
 task :clean do
-  %x{rm -rf *.gem doc pkg coverage}
-  %x{rm -f `find . -name '*.rbc'`}
+  `rm -rf *.gem doc pkg coverage`
+  %x(rm -f `find . -name '*.rbc'`)
 end
 
 desc "Build the gem"
 task :gem do
-  %x{gem build friendly_id.gemspec}
+  `gem build friendly_id.gemspec`
 end
 
 desc "Build YARD documentation"
 task :yard do
-  puts %x{bundle exec yard}
+  puts `bundle exec yard`
 end
 
 desc "Run benchmarks"
-task :bench => :load_path do
+task bench: :load_path do
   require File.expand_path("../bench", __FILE__)
 end
 
 desc "Run benchmarks on finders"
-task :bench_finders => :load_path do
+task bench_finders: :load_path do
   require File.expand_path("../test/benchmarks/finders", __FILE__)
 end
 
 desc "Run benchmarks on ObjectUtils"
-task :bench_object_utils => :load_path do
+task bench_object_utils: :load_path do
   require File.expand_path("../test/benchmarks/object_utils", __FILE__)
 end
 
 desc "Generate Guide.md"
 task :guide do
-  load File.expand_path('../guide.rb', __FILE__)
+  load File.expand_path("../guide.rb", __FILE__)
 end
 
 namespace :test do
-
   desc "Run each test class in a separate process"
   task :isolated do
     dir = File.expand_path("../test", __FILE__)
     Dir["#{dir}/*_test.rb"].each do |test|
       puts "Running #{test}:"
-      puts %x{ruby -Ilib -Itest #{test}}
+      puts `ruby -Ilib -Itest #{test}`
     end
   end
 end
 
 namespace :db do
-
   desc "Create the database"
-  task :create => :load_path do
+  task create: :load_path do
     require "helper"
     driver = FriendlyId::Test::Database.driver
     config = FriendlyId::Test::Database.config[driver]
     commands = {
-      "mysql"    => "mysql -h #{config['host']} -P #{config['port']} -u #{config['username']} --password=#{config['password']} -e 'create database #{config["database"]};' >/dev/null",
-      "postgres" => "psql -c 'create database #{config['database']};' -U #{config['username']} >/dev/null"
+      "mysql" => "mysql -h #{config["host"]} -P #{config["port"]} -u #{config["username"]} --password=#{config["password"]} -e 'create database #{config["database"]};' >/dev/null",
+      "postgres" => "psql -c 'create database #{config["database"]};' -U #{config["username"]} >/dev/null"
     }
-    %x{#{commands[driver] || true}}
+    `#{commands[driver] || true}`
   end
 
   desc "Drop the database"
-  task :drop => :load_path do
+  task drop: :load_path do
     require "helper"
     driver = FriendlyId::Test::Database.driver
     config = FriendlyId::Test::Database.config[driver]
     commands = {
-      "mysql"    => "mysql -h #{config['host']} -P #{config['port']} -u #{config['username']} --password=#{config['password']} -e 'drop database #{config["database"]};' >/dev/null",
-      "postgres" => "psql -c 'drop database #{config['database']};' -U #{config['username']} >/dev/null"
+      "mysql" => "mysql -h #{config["host"]} -P #{config["port"]} -u #{config["username"]} --password=#{config["password"]} -e 'drop database #{config["database"]};' >/dev/null",
+      "postgres" => "psql -c 'drop database #{config["database"]};' -U #{config["username"]} >/dev/null"
     }
-    %x{#{commands[driver] || true}}
+    `#{commands[driver] || true}`
   end
 
   desc "Set up the database schema"
-  task :up => :load_path do
+  task up: :load_path do
     require "helper"
     FriendlyId::Test::Schema.up
   end
 
   desc "Drop and recreate the database schema"
-  task :reset => [:drop, :create]
-
+  task reset: [:drop, :create]
 end
 
-task :doc => :yard
+task doc: :yard
 
 task :docs do
-  sh %{git checkout gh-pages && rake doc && git checkout @{-1}}
+  sh %(git checkout gh-pages && rake doc && git checkout @{-1})
 end

data/bench.rb

@@ -4,7 +4,11 @@ require "ffaker"
 N = 10000
 
 def transaction
-  ActiveRecord::Base.transaction { yield ; raise ActiveRecord::Rollback }
+  ActiveRecord::Base.transaction do
+    yield
+
+    raise ActiveRecord::Rollback
+  end
 end
 
 class Array
@@ -17,65 +21,64 @@ Book = Class.new ActiveRecord::Base
 
 class Journalist < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => :slugged
+  friendly_id :name, use: :slugged
 end
 
 class Manual < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => :history
+  friendly_id :name, use: :history
 end
 
 class Restaurant < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => :finders
+  friendly_id :name, use: :finders
 end
 
-
-BOOKS       = []
+BOOKS = []
 JOURNALISTS = []
-MANUALS     = []
+MANUALS = []
 RESTAURANTS = []
 
 100.times do
   name = FFaker::Name.name
-  BOOKS       << (Book.create! :name => name).id
-  JOURNALISTS << (Journalist.create! :name => name).friendly_id
-  MANUALS     << (Manual.create! :name => name).friendly_id
-  RESTAURANTS << (Restaurant.create! :name => name).friendly_id
+  BOOKS << (Book.create! name: name).id
+  JOURNALISTS << (Journalist.create! name: name).friendly_id
+  MANUALS << (Manual.create! name: name).friendly_id
+  RESTAURANTS << (Restaurant.create! name: name).friendly_id
 end
 
 ActiveRecord::Base.connection.execute "UPDATE manuals SET slug = NULL"
 
 Benchmark.bmbm do |x|
-  x.report 'find (without FriendlyId)' do
-    N.times {Book.find BOOKS.rand}
+  x.report "find (without FriendlyId)" do
+    N.times { Book.find BOOKS.rand }
   end
 
-  x.report 'find (in-table slug)' do
-    N.times {Journalist.friendly.find JOURNALISTS.rand}
+  x.report "find (in-table slug)" do
+    N.times { Journalist.friendly.find JOURNALISTS.rand }
   end
 
-  x.report 'find (in-table slug; using finders module)' do
-    N.times {Restaurant.find RESTAURANTS.rand}
+  x.report "find (in-table slug; using finders module)" do
+    N.times { Restaurant.find RESTAURANTS.rand }
   end
 
-  x.report 'find (external slug)' do
-    N.times {Manual.friendly.find MANUALS.rand}
+  x.report "find (external slug)" do
+    N.times { Manual.friendly.find MANUALS.rand }
   end
 
-  x.report 'insert (without FriendlyId)' do
-    N.times {transaction {Book.create :name => FFaker::Name.name}}
+  x.report "insert (without FriendlyId)" do
+    N.times { transaction { Book.create name: FFaker::Name.name } }
   end
 
-  x.report 'insert (in-table-slug)' do
-    N.times {transaction {Journalist.create :name => FFaker::Name.name}}
+  x.report "insert (in-table-slug)" do
+    N.times { transaction { Journalist.create name: FFaker::Name.name } }
   end
 
-  x.report 'insert (in-table-slug; using finders module)' do
-    N.times {transaction {Restaurant.create :name => FFaker::Name.name}}
+  x.report "insert (in-table-slug; using finders module)" do
+    N.times { transaction { Restaurant.create name: FFaker::Name.name } }
   end
 
-  x.report 'insert (external slug)' do
-    N.times {transaction {Manual.create :name => FFaker::Name.name}}
+  x.report "insert (external slug)" do
+    N.times { transaction { Manual.create name: FFaker::Name.name } }
   end
 end

data/certs/parndt.pem

@@ -1,25 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
-L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMjAwNTEwMjIxOTQ2WhcNMjEwNTEwMjIx
-OTQ2WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDT+JzHYPGMYJt9ct2DCsbIymn1uJJp
-HnDkQESfsGe40jTC90oF2iVbVOkaacNc1N3CSWUZvZjuygUuS86P6/kpBILGdO2+
-bkXXKtfGC2YGGx9TdNLpCb4925vQHvdFeKXGpQDZdDw1SNC6zraZou47CvOE1cl2
-Bp+1QMZuGRZ4+5CzOEWDWurjqce3O1jUEbyBB7z5H0h/YEaxfXipxhL1Dhi0sgkH
-qP/e6SxzifdifdZCksJFQ06a1ji9hJY6eM23qbv/aaluVHAZSVBAQBS7rYniLo+N
-G4vpFhoubQO5u8UluUtCaPUpI/qOvVcSaZn3ZkzlMwC8b1RwAeXBQmtFE2wnrv2i
-ovTwoN7rHchwhgaHbkuFh4Wr92wGbrWL7J+X8rWKk1f8RF4kvtNE/NA6YrkxTpVh
-QMyDmekt7rTxvcq2NneLGroWIUVCx/JID+Jw492LKQ6Sl1/P2TRzdEDtqZAZL0gt
-xlWeMUfGG2D/gLnhs5qnaFaWQwGTmBnTgHcCAwEAAaNxMG8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEqtAyQVxPgKsrgoTQ1YmaIu/fmvMBoGA1Ud
-EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
-aW8wDQYJKoZIhvcNAQELBQADggGBALu2HM50B8xqlAXkCwavJDvWWtV9pG1igFUg
-friZRWprUQ5nTaNmAd8p8qbJQwaIK2gt+DfYWfB9LtKnQTfbhLRBbmJ7zYw8LjKY
-PwCs4RWjDAiuyCO3ppfsz+1bsMUXPLgWlaUkXsUy3nr2NruEFTO9zu3wGYQQ93Tt
-vYSHOnP35UB4QjsjNrOO7FBaQfy6O909PP+GnVcJ62s9c26voJz63RSolwY7Jydw
-XUlG68jjJKSoDHRzVTmNB7sX8rs8P2kvYkpIUXPHyls3mWBWjBWbdEYWESZrxI2x
-dS7jY3AnfqhvsWra2pSREb2IDqPnJrHVOejnEI/zuuufUxLwDx3AC6SMdsyWkZ7V
-9OmLt2rg75Sct6h2220lO5ySqYtqAXuOMBDGv5L0zLalx1g8LACA7uILTKVWh8B8
-Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
-/HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
+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-----

data/friendly_id.gemspec

@@ -1,39 +1,36 @@
-# encoding: utf-8
 require File.expand_path("../lib/friendly_id/version", __FILE__)
 
 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.homepage          = "https://github.com/norman/friendly_id"
-  s.summary           = "A comprehensive slugging and pretty-URL plugin."
-  s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files -- {test}/*`.split("\n")
-  s.require_paths     = ["lib"]
-  s.license           = 'MIT'
+  s.name = "friendly_id"
+  s.version = FriendlyId::VERSION
+  s.authors = ["Norman Clarke", "Philip Arndt"]
+  s.email = ["norman@njclarke.com", "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")
+  s.test_files = `git ls-files -- {test}/*`.split("\n")
+  s.require_paths = ["lib"]
+  s.license = "MIT"
 
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = ">= 2.1.0"
 
-  s.add_dependency 'activerecord', '>= 4.0.0'
+  s.add_dependency "activerecord", ">= 4.0.0"
 
-  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 'yard'
-  s.add_development_dependency 'i18n'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'simplecov'
+  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 "yard"
+  s.add_development_dependency "i18n"
+  s.add_development_dependency "ffaker"
+  s.add_development_dependency "simplecov"
 
-  s.description = <<-EOM
-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.
-EOM
+  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 =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__)
-    s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  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

@@ -1,27 +1,22 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gemspec path: '../'
+gemspec path: "../"
 
-gem 'activerecord', '~> 5.2.0'
-gem 'railties', '~> 5.2.0'
+gem "activerecord", "~> 5.2.0"
+gem "railties", "~> 5.2.0"
 
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '~> 51.1'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.1'
-    gem 'kramdown'
+    gem "activerecord-jdbcmysql-adapter", "~> 51.1"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 51.1"
+    gem "kramdown"
   end
 
   platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
+    gem "sqlite3"
+    gem "mysql2"
+    gem "pg"
+    gem "redcarpet"
   end
 end

data/gemfiles/Gemfile.rails-6.0.rb

@@ -1,27 +1,22 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gemspec path: '../'
+gemspec path: "../"
 
-gem 'activerecord', '~> 6.0.0'
-gem 'railties', '~> 6.0.0'
+gem "activerecord", "~> 6.0.0"
+gem "railties", "~> 6.0.0"
 
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '~> 51.1'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.1'
-    gem 'kramdown'
+    gem "activerecord-jdbcmysql-adapter", "~> 51.1"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 51.1"
+    gem "kramdown"
   end
 
   platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
+    gem "sqlite3"
+    gem "mysql2"
+    gem "pg"
+    gem "redcarpet"
   end
 end

data/gemfiles/Gemfile.rails-6.1.rb

@@ -0,0 +1,22 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem "activerecord", "~> 6.1.4"
+gem "railties", "~> 6.1.4"
+
+# 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