friendly_id 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb8d2b37002508059b4480fe303a2ff277e4ee1264cd4dd3de6261a127aaa8d
-  data.tar.gz: 8cc571f9b42192a2ff254ed5f134817b6b3d0d7c37bb5cd82df1493055e21830
+  metadata.gz: 6fa83b80901ae7c4930b4a0dea61544152f2cc4a7d94b828c2f52e807fb5d686
+  data.tar.gz: b5db403619e2d9bc275d567dc9f567fb943316e1222bc9c6052e43a285b92116
 SHA512:
-  metadata.gz: 7549da1a767fefcf3cd05913fc59801d4ffe9fe1bac77429d39ad42e544dcd1a03942c74515c5eee47207269c0a7e34a48a728e1d66b2e8d4a86cb7dabe9a84b
-  data.tar.gz: 181750c6dc3a12cb6e0948504aa2888fbd95823ee3282d2c18938eb3805cc3c86b9ddaabefd18e1d2bcaec3ea8d3e8546260caed38cf9504af768e8fa905c02d
+  metadata.gz: f8c8bef9ec1e0a42103fa813d40b087bcb84c1f3148f73d53d21fde568865b9a6dc0a2c83508431a2ffa2c2b09bf7f3d26e49b30ac09a758e39dd02323aff328
+  data.tar.gz: 0f78de10e8d9597728e554dc53949318f23a5771adb8014b23172c204f550c48b5f2222f8df144a4368d5f34560f01051a5f42183fcac415f85ad9e1bfb262e4

data.tar.gz.sig

@@ -0,0 +1,2 @@
+�Hi�/��P:L�񔢣$�v���ҿ�Z��c�����B�C�݁�n��^���KӤ��&%�s[��oϗ*�(0&��g��⸡�3<
p�X��]����Z�'�&.3f�Ȫ�,�#-�S�YF�Ԛ�_�L�N�6�W	�E�dl��N�biS��f�+�� �[
+eY~��˔��	O�	�y~B��K8v$"O'�:�

data/.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 42
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

data/.github/workflows/test.yml

@@ -0,0 +1,60 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+jobs:
+  test:
+    strategy:
+      matrix:
+        architecture: [ x64 ]
+        database: [ mysql, postgresql ]
+        gemfile: [ '6.0', '5.2', '5.1', '5.0' ]
+        ruby: [ '2.6.x', '2.5.x' ]
+      fail-fast: false
+    runs-on: ubuntu-latest
+    name: ${{ matrix.ruby }} ${{ matrix.database }} rails-${{ matrix.gemfile }}
+    steps:
+    - uses: actions/setup-ruby@v1.0.0
+      with:
+        architecture: ${{ matrix.architecture }}
+        ruby-version: ${{ matrix.ruby }}
+        version: ${{ matrix.ruby }}
+    - uses: actions/checkout@v1
+    - run: sudo apt-get update && sudo apt-get install libpq-dev postgresql-client libmysqlclient-dev mysql-client libsqlite3-dev -y
+    - id: cache-bundler
+      uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ matrix.ruby }}-gem-${{ hashFiles(format('gemfiles/Gemfile.rails-{0}.rb', matrix.gemfile)) }}
+    - run: gem install bundler
+    - run: bundle install --path vendor/bundle
+    - run: bundle exec rake db:create db:up
+    - run: bundle exec rake test
+
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_GEMFILE: gemfiles/Gemfile.rails-${{ matrix.gemfile }}.rb
+      BUNDLE_PATH: vendor/bundle
+      CI: true
+      COVERALLS: true
+      DB: ${{ matrix.database }}
+      MYSQL_PASSWORD: root
+      PGHOST: localhost
+      PGPORT: 5432
+      PGUSER: postgres
+      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

data/Changelog.md

@@ -3,6 +3,17 @@
 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.4.0 (2020-08-14)
+
+* Fix Ruby 2.7 keyword params deprecation warning ([#939](https://github.com/norman/friendly_id/pull/939))
+* Fix Slug Validation in `unset_slug_if_invalid` ([#938](https://github.com/norman/friendly_id/pull/938))
+* Make `first_by_friendly_id` case insensitive using `downcase` ([#787](https://github.com/norman/friendly_id/pull/787))
+* Use `destroy_all` rather than `delete_all` when creating historical slugs ([#924](https://github.com/norman/friendly_id/pull/924))
+* Set required ruby version to `>= 2.1.0` ([#923](https://github.com/norman/friendly_id/pull/923))
+* Avoid using deprecated `update_attributes` ([#922](https://github.com/norman/friendly_id/pull/922))
+
 ## 5.3.0 (2019-09-25)
 
 * Record history when scope changes but slug does not ([#916](https://github.com/norman/friendly_id/pull/916))

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rake'
+
 group :development, :test do
   platforms :ruby do
     gem 'byebug'

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/norman/friendly_id.svg)](https://travis-ci.org/norman/friendly_id)
+[![Build Status](https://github.com/norman/friendly_id/workflows/CI/badge.svg)](https://github.com/norman/friendly_id/actions)
 [![Code Climate](https://codeclimate.com/github/norman/friendly_id.svg)](https://codeclimate.com/github/norman/friendly_id)
 [![Inline docs](http://inch-ci.org/github/norman/friendly_id.svg?branch=master)](http://inch-ci.org/github/norman/friendly_id)
 
@@ -95,7 +95,7 @@ User.create! name: "Joe Schmoe"
 You can then access the user show page using the URL http://localhost:3000/users/joe-schmoe.
 
 
-If you're adding FriendlyId to an existing app and need to generate slugs for 
+If you're adding FriendlyId to an existing app and need to generate slugs for
 existing users, do this from the console, runner, or add a Rake task:
 
 ```ruby

data/Rakefile

@@ -71,7 +71,7 @@ namespace :db do
     driver = FriendlyId::Test::Database.driver
     config = FriendlyId::Test::Database.config[driver]
     commands = {
-      "mysql"    => "mysql -u #{config['username']} -e 'create database #{config["database"]};' >/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}}
@@ -83,7 +83,7 @@ namespace :db do
     driver = FriendlyId::Test::Database.driver
     config = FriendlyId::Test::Database.config[driver]
     commands = {
-      "mysql"    => "mysql -u #{config['username']} -e 'drop database #{config["database"]};' >/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}}

data/certs/parndt.pem

@@ -0,0 +1,25 @@
+-----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==
+-----END CERTIFICATE-----

data/friendly_id.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.require_paths     = ["lib"]
   s.license           = 'MIT'
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.1.0'
 
   s.add_dependency 'activerecord', '>= 4.0.0'
 
@@ -31,4 +31,9 @@ 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.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')
+  end
 end

data/lib/friendly_id/base.rb

@@ -159,8 +159,9 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     #
     # @option options [Symbol,Module] :use The addon or name of an addon to use.
     #   By default, FriendlyId provides {FriendlyId::Slugged :slugged},
-    #   {FriendlyId::History :history}, {FriendlyId::Reserved :reserved}, and
-    #   {FriendlyId::Scoped :scoped}, and {FriendlyId::SimpleI18n :simple_i18n}.
+    #   {FriendlyId::Reserved :finders}, {FriendlyId::History :history},
+    #   {FriendlyId::Reserved :reserved}, {FriendlyId::Scoped :scoped}, and
+    #   {FriendlyId::SimpleI18n :simple_i18n}.
     #
     # @option options [Array] :reserved_words Available when using `:reserved`,
     #   which is loaded by default. Sets an array of words banned for use as

data/lib/friendly_id/configuration.rb

@@ -25,6 +25,7 @@ module FriendlyId
     attr_accessor :routes
 
     def initialize(model_class, values = nil)
+      @base           = nil
       @model_class    = model_class
       @defaults       = {}
       @modules        = []
@@ -47,8 +48,8 @@ module FriendlyId
     #
     # @param [#to_s,Module] modules Arguments should be Modules, or symbols or
     #   strings that correspond with the name of an addon to use with FriendlyId.
-    #   By default FriendlyId provides `:slugged`, `:history`, `:simple_i18n`,
-    #   and `:scoped`.
+    #   By default FriendlyId provides `:slugged`, `:finders`, `:history`,
+    #   `:reserved`, `:simple_i18n`, and `:scoped`.
     def use(*modules)
       modules.to_a.flatten.compact.map do |object|
         mod = get_module(object)

data/lib/friendly_id/finder_methods.rb

@@ -59,7 +59,7 @@ module FriendlyId
     end
 
     def first_by_friendly_id(id)
-      find_by(friendly_id_config.query_field => id)
+      find_by(friendly_id_config.query_field => id.downcase)
     end
 
     def raise_not_found_exception(id)

data/lib/friendly_id/history.rb

@@ -44,9 +44,9 @@ method.
         @post = Post.friendly.find params[:id]
 
         # If an old id or a numeric id was used to find the record, then
-        # the request path will not match the post_path, and we should do
-        # a 301 redirect that uses the current friendly id.
-        if request.path != post_path(@post)
+        # the request slug will not match the current slug, and we should do
+        # a 301 redirect to the new path
+        if params[:id] != @post.slug
           return redirect_to @post, :status => :moved_permanently
         end
       end
@@ -72,7 +72,7 @@ method.
     # Configures the model instance to use the History add-on.
     def self.included(model_class)
       model_class.class_eval do
-        has_many :slugs, -> {order(id: :desc)}, {
+        has_many :slugs, -> {order(id: :desc)}, **{
           :as         => :sluggable,
           :dependent  => @friendly_id_config.dependent_value,
           :class_name => Slug.to_s
@@ -128,7 +128,7 @@ method.
       if friendly_id_config.uses?(:scoped)
         relation = relation.where(:scope => serialized_scope)
       end
-      relation.delete_all
+      relation.destroy_all unless relation.empty?
       slugs.create! do |record|
         record.slug = friendly_id
         record.scope = serialized_scope if friendly_id_config.uses?(:scoped)

data/lib/friendly_id/slugged.rb

@@ -67,7 +67,7 @@ app's behavior and requirements.
 #### Formatting
 
 By default, FriendlyId uses Active Support's
-[paramaterize](http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize)
+[parameterize](http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize)
 method to create slugs. This method will intelligently replace spaces with
 dashes, and Unicode Latin characters with ASCII approximations:
 
@@ -375,7 +375,7 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     private :slug_generator
 
     def unset_slug_if_invalid
-      if errors.present? && attribute_changed?(friendly_id_config.query_field.to_s)
+      if errors[friendly_id_config.query_field].present? && attribute_changed?(friendly_id_config.query_field.to_s)
         diff = changes[friendly_id_config.query_field]
         send "#{friendly_id_config.slug_column}=", diff.first
       end

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = '5.3.0'.freeze
+  VERSION = '5.4.0'.freeze
 end

data/test/databases.yml

@@ -2,14 +2,16 @@ mysql:
   adapter: mysql2
   database: friendly_id_test
   username: root
-  hostname: localhost
+  password: <%= ENV['MYSQL_PASSWORD'] %>
+  host: 127.0.0.1
+  port: 3306
   encoding: utf8
 
 postgres:
   adapter: postgresql
-  host: localhost
-  port: 5432
-  username: postgres
+  host: <%= ENV.fetch('PGHOST') { 'localhost' } %>
+  port: <%= ENV.fetch('PGPORT') { '5432' } %>
+  username: <%= ENV.fetch('PGUSER') { 'postgres' } %>
   database: friendly_id_test
   encoding: utf8
 

data/test/finders_test.rb

@@ -26,4 +26,28 @@ class Finders < TestCaseClass
       assert model_class.existing.find(record.friendly_id)
     end
   end
+
+  test 'should find capitalized records with finders as class methods' do
+    with_instance_of(model_class) do |record|
+      assert model_class.find(record.friendly_id.capitalize)
+    end
+  end
+
+  test 'should find capitalized records with finders on relations' do
+    with_instance_of(model_class) do |record|
+      assert model_class.existing.find(record.friendly_id.capitalize)
+    end
+  end
+
+  test 'should find upcased records with finders as class methods' do
+    with_instance_of(model_class) do |record|
+      assert model_class.find(record.friendly_id.upcase)
+    end
+  end
+
+  test 'should find upcased records with finders on relations' do
+    with_instance_of(model_class) do |record|
+      assert model_class.existing.find(record.friendly_id.upcase)
+    end
+  end
 end

data/test/helper.rb

@@ -27,6 +27,7 @@ end
 require "mocha/setup"
 require "active_record"
 require 'active_support/core_ext/time/conversions'
+require 'erb'
 
 I18n.enforce_available_locales = false
 
@@ -85,7 +86,11 @@ module FriendlyId
       end
 
       def config
-        @config ||= YAML::load(File.open(File.expand_path("../databases.yml", __FILE__)))
+        @config ||= YAML::load(
+          ERB.new(
+            File.read(File.expand_path("../databases.yml", __FILE__))
+          ).result
+        )
       end
 
       def driver

data/test/history_test.rb

@@ -65,8 +65,7 @@ class HistoryTest < TestCaseClass
   test "should not be read only when found by slug" do
     with_instance_of(model_class) do |record|
       refute model_class.friendly.find(record.friendly_id).readonly?
-      assert record.update_attribute :name, 'foo'
-      assert record.update_attributes name: 'foo'
+      assert record.update name: 'foo'
     end
   end
 
@@ -93,6 +92,28 @@ class HistoryTest < TestCaseClass
     end
   end
 
+  test 'should maintain history even if current slug is not the most recent one' do
+    with_instance_of(model_class) do |record|
+      record.name = 'current'
+      assert record.save
+
+      # this feels like a hack. only thing i can get to work with the HistoryTestWithSti
+      # test cases. (Editorialist vs Journalist.)
+      sluggable_type = FriendlyId::Slug.first.sluggable_type
+      # create several slugs for record
+      # current slug does not have max id
+      FriendlyId::Slug.delete_all
+      FriendlyId::Slug.create(sluggable_type: sluggable_type, sluggable_id: record.id, slug: 'current')
+      FriendlyId::Slug.create(sluggable_type: sluggable_type, sluggable_id: record.id, slug: 'outdated')
+
+      record.reload
+      record.slug = nil
+      assert record.save
+
+      assert_equal 2, FriendlyId::Slug.count
+    end
+  end
+
   test "should not create new slugs that match old slugs" do
     transaction do
       first_record = model_class.create! :name => "foo"
@@ -109,10 +130,10 @@ class HistoryTest < TestCaseClass
       first_record = model_class.create! :name => "foo"
       second_record = model_class.create! :name => 'another'
 
-      second_record.update_attributes :name => 'foo', :slug => nil
+      second_record.update :name => 'foo', :slug => nil
       assert_match(/foo-.*/, second_record.slug)
 
-      first_record.update_attributes :name => 'another', :slug => nil
+      first_record.update :name => 'another', :slug => nil
       assert_match(/another-.*/, first_record.slug)
     end
   end
@@ -230,7 +251,7 @@ if ActiveRecord::VERSION::STRING >= '5.0'
         record = model_class.create(name: 'paranoid')
         assert FriendlyId::Slug.find_by_slug('paranoid').present?
 
-        record.update_attribute(:deleted_at, Time.now)
+        record.update deleted_at: Time.now
 
         orphan_slug = FriendlyId::Slug.find_by_slug('paranoid')
         assert orphan_slug.present?, 'Orphaned slug should exist'

data/test/shared.rb

@@ -62,7 +62,7 @@ module FriendlyId
           my_model_class = Class.new(model_class)
           self.class.const_set("Foo", my_model_class)
           with_instance_of my_model_class do |record|
-            record.update_attributes my_model_class.friendly_id_config.slug_column => nil
+            record.update my_model_class.friendly_id_config.slug_column => nil
             record = my_model_class.friendly.find(record.id)
             record.class.validate Proc.new {errors.add(:name, "FAIL")}
             record.save
@@ -132,7 +132,7 @@ module FriendlyId
         test "updating record's other values should not change the friendly_id" do
           with_instance_of model_class do |record|
             old = record.friendly_id
-            record.update_attributes! :active => false
+            record.update! active: false
             assert model_class.friendly.find old
           end
         end

data/test/simple_i18n_test.rb

@@ -91,14 +91,14 @@ class SimpleI18nTest < TestCaseClass
   class RegressionTest < TestCaseClass
     include FriendlyId::Test
 
-    test "should not overwrite other locale's slugs on update_attributes" do
+    test "should not overwrite other locale's slugs on update" do
       transaction do
         journalist = Journalist.create!(:name => "John Smith")
         journalist.set_friendly_id("Juan Fulano", :es)
         journalist.save!
         assert_equal "john-smith", journalist.to_param
         journalist.slug = nil
-        journalist.update_attributes :name => "Johnny Smith"
+        journalist.update :name => "Johnny Smith"
         assert_equal "johnny-smith", journalist.to_param
         I18n.with_locale(:es) do
           assert_equal "juan-fulano", journalist.to_param

data/test/slugged_test.rb

@@ -92,7 +92,7 @@ class SluggedTest < TestCaseClass
     end
   end
 
-  test "should not set slug on create if unrelated validations fail" do
+  test "should set slug on create if unrelated validations fail" do
     klass = Class.new model_class do
       validates_presence_of :active
       friendly_id :name, :use => :slugged
@@ -106,11 +106,30 @@ class SluggedTest < TestCaseClass
       instance = klass.new :name => 'foo'
       refute instance.save
       refute instance.valid?
+      assert_equal 'foo', instance.slug
+    end
+  end
+
+  test "should not set slug on create if slug validation fails" do
+    klass = Class.new model_class do
+      validates_presence_of :active
+      validates_length_of :slug, :minimum => 2
+      friendly_id :name, :use => :slugged
+
+      def self.name
+        "Journalist"
+      end
+    end
+
+    transaction do
+      instance = klass.new :name => 'x'
+      refute instance.save
+      refute instance.valid?
       assert_nil instance.slug
     end
   end
 
-  test "should not set slug on create if unrelated validations fail with custom slug_column" do
+  test "should set slug on create if unrelated validations fail with custom slug_column" do
     klass = Class.new(ActiveRecord::Base) do
       self.table_name = 'authors'
       extend FriendlyId
@@ -126,11 +145,31 @@ class SluggedTest < TestCaseClass
       instance = klass.new :name => 'foo'
       refute instance.save
       refute instance.valid?
+      assert_equal 'foo', instance.subdomain
+    end
+  end
+
+  test "should not set slug on create if custom slug column validations fail" do
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = 'authors'
+      extend FriendlyId
+      validates_length_of :subdomain, :minimum => 2
+      friendly_id :name, :use => :slugged, :slug_column => :subdomain
+
+      def self.name
+        "Author"
+      end
+    end
+
+    transaction do
+      instance = klass.new :name => 'x'
+      refute instance.save
+      refute instance.valid?
       assert_nil instance.subdomain
     end
   end
 
-  test "should not update slug on save if unrelated validations fail" do
+  test "should keep new slug on save if unrelated validations fail" do
     klass = Class.new model_class do
       validates_presence_of :active
       friendly_id :name, :use => :slugged
@@ -149,6 +188,28 @@ class SluggedTest < TestCaseClass
       instance.active = nil
       refute instance.save
       refute instance.valid?
+      assert_equal 'foobar', instance.slug
+    end
+  end
+
+  test "should not update slug on save if slug validations fail" do
+    klass = Class.new model_class do
+      validates_length_of :slug, :minimum => 2
+      friendly_id :name, :use => :slugged
+
+      def self.name
+        "Journalist"
+      end
+    end
+
+    transaction do
+      instance = klass.new :name => 'foo', :active => true
+      assert instance.save
+      assert instance.valid?
+      instance.name = 'x'
+      instance.slug = nil
+      instance.active = nil
+      refute instance.save
       assert_equal 'foo', instance.slug
     end
   end
@@ -425,6 +486,7 @@ class ToParamTest < TestCaseClass
   class Journalist < ActiveRecord::Base
     extend FriendlyId
     validates_presence_of :active
+    validates_length_of :slug, :minimum => 2
     friendly_id :name, :use => :slugged
 
     attr_accessor :to_param_in_callback
@@ -438,9 +500,21 @@ class ToParamTest < TestCaseClass
     assert_nil Journalist.new.to_param
   end
 
-  test "to_param should return nil if record failed validation" do
+  test "to_param should return original slug if record failed validation" do
     journalist = Journalist.new :name => 'Clark Kent', :active => nil
     refute journalist.save
+    assert_equal 'clark-kent', journalist.to_param
+  end
+
+  test "to_param should clear slug attributes if slug attribute fails validation" do
+    journalist = Journalist.new :name => 'x', :active => true
+    refute journalist.save
+    assert_nil journalist.to_param
+  end
+
+  test "to_param should clear slug attribute if slug attribute fails validation and unrelated validation fails" do
+    journalist = Journalist.new :name => 'x', :active => nil
+    refute journalist.save
     assert_nil journalist.to_param
   end
 
@@ -452,7 +526,7 @@ class ToParamTest < TestCaseClass
     end
   end
 
-  test "to_param should use original slug if existing record changes but fails to save" do
+  test "to_param should use new slug if existing record changes but fails to save" do
     transaction do
       journalist = Journalist.new :name => 'Clark Kent', :active => true
       assert journalist.save
@@ -460,6 +534,18 @@ class ToParamTest < TestCaseClass
       journalist.slug = nil
       journalist.active = nil
       refute journalist.save
+      assert_equal 'superman', journalist.to_param
+    end
+  end
+
+  test "to_param should use original slug if new slug attribute is not valid" do
+    transaction do
+      journalist = Journalist.new :name => 'Clark Kent', :active => true
+      assert journalist.save
+      journalist.name = 'x'
+      journalist.slug = nil
+      journalist.active = nil
+      refute journalist.save
       assert_equal 'clark-kent', journalist.to_param
     end
   end

metadata

@@ -1,15 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Norman Clarke
 - Philip Arndt
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----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==
+  -----END CERTIFICATE-----
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -149,8 +175,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gemtest"
+- ".github/stale.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
 - Changelog.md
@@ -160,10 +187,8 @@ files:
 - Rakefile
 - UPGRADING.md
 - bench.rb
+- certs/parndt.pem
 - friendly_id.gemspec
-- gemfiles/Gemfile.rails-4.0.rb
-- gemfiles/Gemfile.rails-4.1.rb
-- gemfiles/Gemfile.rails-4.2.rb
 - gemfiles/Gemfile.rails-5.0.rb
 - gemfiles/Gemfile.rails-5.1.rb
 - gemfiles/Gemfile.rails-5.2.rb
@@ -214,7 +239,7 @@ homepage: https://github.com/norman/friendly_id
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,15 +247,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: []

data/.travis.yml

@@ -1,96 +0,0 @@
-language: ruby
-cache: bundler
-services:
-  - postgresql
-  - mysql
-dist: trusty
-addons:
-  postgresql: "9.6"
-rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-  - 2.3.8
-  - 2.2.0
-  - 2.1.0
-  - jruby-9.1.13.0
-
-env:
-  global:
-    - COVERALLS=true 
-  matrix:
-    - DB=postgres
-    - DB=mysql
-
-gemfile:
-  - gemfiles/Gemfile.rails-4.0.rb
-  - gemfiles/Gemfile.rails-4.1.rb
-  - gemfiles/Gemfile.rails-4.2.rb
-  - gemfiles/Gemfile.rails-5.0.rb
-  - gemfiles/Gemfile.rails-5.1.rb
-  - gemfiles/Gemfile.rails-5.2.rb
-  - gemfiles/Gemfile.rails-6.0.rb
-
-before_install:
-  - gem update bundler
-
-matrix:
-  exclude:
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails-5.2.rb
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails-6.0.rb
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails-5.2.rb
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails-6.0.rb
-    - rvm: jruby-9.1.13.0
-      gemfile: gemfiles/Gemfile.rails-5.2.rb
-    - rvm: jruby-9.1.13.0
-      gemfile: gemfiles/Gemfile.rails-6.0.rb
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails-5.0.rb
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails-5.1.rb
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails-6.0.rb
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails-5.1.rb
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails-5.0.rb
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails-6.0.rb
-    - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile.rails-6.0.rb
-    - rvm: 2.4.6
-      gemfile: gemfiles/Gemfile.rails-4.0.rb
-    - rvm: 2.4.6
-      gemfile: gemfiles/Gemfile.rails-4.1.rb
-    - rvm: 2.4.6
-      gemfile: gemfiles/Gemfile.rails-6.0.rb
-    - rvm: 2.5.5
-      gemfile: gemfiles/Gemfile.rails-4.0.rb
-    - rvm: 2.5.5
-      gemfile: gemfiles/Gemfile.rails-4.1.rb
-    - rvm: 2.5.5
-      gemfile: gemfiles/Gemfile.rails-5.0.rb
-    - rvm: 2.5.5
-      gemfile: gemfiles/Gemfile.rails-5.1.rb
-    - rvm: 2.6.3
-      gemfile: gemfiles/Gemfile.rails-4.0.rb
-    - rvm: 2.6.3
-      gemfile: gemfiles/Gemfile.rails-4.1.rb
-    - rvm: 2.6.3
-      gemfile: gemfiles/Gemfile.rails-5.0.rb
-    - rvm: 2.6.3
-      gemfile: gemfiles/Gemfile.rails-5.1.rb
-  allow_failures:
-    - rvm: jruby-9.1.13.0
-      gemfile: gemfiles/Gemfile.rails-5.1.rb
-    - rvm: jruby-9.1.13.0
-      gemfile: gemfiles/Gemfile.rails-5.0.rb
-
-before_script:
-  - bundle exec rake db:create db:up
-
-script: 'bundle exec rake test'

data/gemfiles/Gemfile.rails-4.0.rb

@@ -1,30 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activerecord', '~> 4.0.13'
-gem 'railties', '~> 4.0.13'
-gem 'minitest', '~> 4.5.0'
-
-# Database Configuration
-group :development, :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.14'
-    gem 'activerecord-jdbcmysql-adapter', '~> 1.3.14'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.14'
-    gem 'kramdown'
-  end
-
-  platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'mysql2', '~> 0.3.10'
-    gem 'pg', '~> 0.15'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
-    gem 'json'
-  end
-end

data/gemfiles/Gemfile.rails-4.1.rb

@@ -1,29 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activerecord', '~> 4.1.9'
-gem 'railties', '~> 4.1.9'
-
-# Database Configuration
-group :development, :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.14'
-    gem 'activerecord-jdbcmysql-adapter', '~> 1.3.14'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.14'
-    gem 'kramdown'
-  end
-
-  platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'mysql2', '~> 0.3.13'
-    gem 'pg', '~> 0.15'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
-    gem 'json'
-  end
-end

data/gemfiles/Gemfile.rails-4.2.rb

@@ -1,28 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activerecord', '~> 4.2.1'
-gem 'railties', '~> 4.2.1'
-gem 'i18n', '~> 0.7.0'
-
-# Database Configuration
-group :development, :test do
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '~> 1.3.14'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.14'
-    gem 'kramdown'
-  end
-
-  platforms :ruby, :rbx do
-    gem 'sqlite3'
-    gem 'mysql2', '~> 0.4.10'
-    gem 'pg', '~> 0.15'
-    gem 'redcarpet'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubinius-developer_tools'
-  end
-end