friendly_id 5.2.3 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ecc233dd377f5400a788a6a6fb7d37e2f4b200c
-  data.tar.gz: 9c848d7c0f238d70577cb0737b1f6411e779a6d5
+  metadata.gz: 19856ab4f2e02ba7eed649beef7728be7eae0a58
+  data.tar.gz: bcf94acb37ff90b70916a96a34a2035570490128
 SHA512:
-  metadata.gz: 4c0a2db2212245e2dcadd50a6f62e3970a10ca72d7230e92cebf31a03da6772c23d2203303e08ff51ed9c9985f234310e01db91f0baa79c663c9756b84181b7a
-  data.tar.gz: cc539ec2396d5736499c3852d0bd967c10d1d6d0ec3afd63b137634e9ac7f6365d7b073895c5297390a42ad74a9cb363064c81c317ad899f3e44f6f15a312f19
+  metadata.gz: 41b11ab959bcf15522a627431421bdb4542fd8768ee1695d6bf68d2351f479c4cd49e6f42e9b46a8f6aac0557bf199b8ad58582c02b049624204e12283740643
+  data.tar.gz: 221d38007de3e624191d6905bd0430dc90bce1a9b1212cc20e8bb9bfbd06aa60fc8e0e44c74ec52b9d424210806683ed39446bd623eae09cc07d0542f58db0e6

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 2.3.0
   - 2.2.0
   - 2.1.0
-  - jruby-9.0.4.0
+  - jruby-9.1.13.0
 
 env:
   - DB=postgres
@@ -17,12 +17,24 @@ gemfile:
   - 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
 
 before_install:
   - gem update bundler
 
 matrix:
   exclude:
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: jruby-9.1.13.0
+      gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-5.1.rb
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails-5.1.rb
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails-5.0.rb
     - rvm: 2.2.0
@@ -31,6 +43,11 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-4.0.rb
     - rvm: 2.4.0
       gemfile: gemfiles/Gemfile.rails-4.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
 
 sudo: false
 

data/Changelog.md

@@ -3,6 +3,18 @@
 We would like to think our many [contributors](https://github.com/norman/friendly_id/graphs/contributors) for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.2.4 (2018-04-24)
+
+* Fix compatibility with Rails versions 4.0 -> 5.2. ([#863](https://github.com/norman/friendly_id/pull/863)).
+* Refactor `History::FinderMethods` to use base implementation. ([#853](https://github.com/norman/friendly_id/pull/853)).
+* Defer loading of ActiveRecord to avoid config issues. ([#852](https://github.com/norman/friendly_id/pull/852)).
+* Ensure compatibility with paranoid deletion libraries. ([#838](https://github.com/norman/friendly_id/pull/838)).
+* Add treat_reserved_as_conflict option to initializer ([#847](https://github.com/norman/friendly_id/pull/847)).
+
+## 5.2.3 (2017-09-22)
+
+* Added option to treat reserved words as conflicts ([#831](https://github.com/norman/friendly_id/pull/831)).
+
 ## 5.2.2 (2017-09-13)
 
 * Prevent warning on db:migrate in Rails 5.1 ([#826](https://github.com/norman/friendly_id/pull/826)).
@@ -24,7 +36,7 @@ suggestions, ideas and improvements to FriendlyId.
 * Don't calculate all changes just to check if the param field has changed ([#667](https://github.com/norman/friendly_id/pull/667)).
 * Don't set or change slug when unrelated validation failures block the record from being saved ([#642](https://github.com/norman/friendly_id/issues/642)).
 * Fix order dependence bug between history and finders modules ([#718](https://github.com/norman/friendly_id/pull/718))
-* Added ability to conditionally turn off :dependent => :destory on FriendlyId::Slugs([#724](https://github.com/norman/friendly_id/pull/724))
+* Added ability to conditionally turn off `:dependent => :destroy` on FriendlyId::Slugs([#724](https://github.com/norman/friendly_id/pull/724))
 * Add support for Rails 5. ([#728](https://github.com/norman/friendly_id/pull/728))
 * Allow per-model conditional disabling of friendly path generation using a :routes option to friendly_id ([#735](https://github.com/norman/friendly_id/pull/735))
 

data/README.md

@@ -2,18 +2,6 @@
 [![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)
 
-**GETTING HELP**
-
-Please ask questions on [Stack
-Overflow](http://stackoverflow.com/questions/tagged/friendly-id) using the
-"friendly-id" tag. Prior to asking, search and see if your question has
-already been answered.
-
-Please only post issues in Github issues for actual bugs.
-
-I am asking people to do this because the same questions keep getting asked
-over and over and over again in the issues.
-
 # FriendlyId
 
 **For the most complete, user-friendly documentation, see the [FriendlyId Guide](http://norman.github.io/friendly_id/file.Guide.html).**
@@ -31,185 +19,84 @@ instead of:
     http://example.com/states/4323454
 
 
-## FriendlyId Features
-
-FriendlyId offers many advanced features, including: slug history and
-versioning, i18n, scoped slugs, reserved words, and custom slug generators.
-
-### What Changed in Version 5.1
-
-5.1 is a bugfix release, but bumps the minor version because some applications may be dependent
-on the previously buggy behavior. The changes include:
-
-* Blank strings can no longer be used as slugs.
-* When the first slug candidate is rejected because it is reserved, additional candidates will
-  now be considered before marking the record as invalid.
-* The `:finders` module is now compatible with Rails 4.2.
-
-### What Changed in Version 5.0
-
-As of version 5.0, FriendlyId uses [semantic versioning](http://semver.org/). Therefore, as you might
-infer from the version number, 5.0 introduces changes incompatible with 4.0.
-
-The most important changes are:
-
-* Finders are no longer overridden by default. If you want to do friendly finds,
-  you must do `Model.friendly.find` rather than `Model.find`. You can however
-  restore FriendlyId 4-style finders by using the `:finders` addon:
-
-  ```ruby
-  friendly_id :foo, use: :slugged # you must do MyClass.friendly.find('bar')
-  # or...
-  friendly_id :foo, use: [:slugged, :finders] # you can now do MyClass.find('bar')
-  ```
-* A new "candidates" functionality which makes it easy to set up a list of
-  alternate slugs that can be used to uniquely distinguish records, rather than
-  appending a sequence. For example:
-
-  ```ruby
-  class Restaurant < ActiveRecord::Base
-    extend FriendlyId
-    friendly_id :slug_candidates, use: :slugged
-
-    # Try building a slug based on the following fields in
-    # increasing order of specificity.
-    def slug_candidates
-      [
-        :name,
-        [:name, :city],
-        [:name, :street, :city],
-        [:name, :street_number, :street, :city]
-      ]
-    end
-  end
-  ```
-* Now that candidates have been added, FriendlyId no longer uses a numeric
-  sequence to differentiate conflicting slug, but rather a UUID (e.g. something
-  like `2bc08962-b3dd-4f29-b2e6-244710c86106`). This makes the
-  codebase simpler and more reliable when running concurrently, at the expense
-  of uglier ids being generated when there are conflicts.
-* The default sequence separator has been changed from two dashes to one dash.
-* Slugs are no longer regenerated when a record is saved. If you want to regenerate
-  a slug, you must explicitly set the slug column to nil:
-
-  ```ruby
-  restaurant.friendly_id # joes-diner
-  restaurant.name = "The Plaza Diner"
-  restaurant.save!
-  restaurant.friendly_id # joes-diner
-  restaurant.slug = nil
-  restaurant.save!
-  restaurant.friendly_id # the-plaza-diner
-  ```
-
-  You can restore some of the old behavior by overriding the
-  `should_generate_new_friendly_id?` method.
-* The `friendly_id` Rails generator now generates an initializer showing you
-  how to do some common global configuration.
-* The Globalize plugin has moved to a [separate gem](https://github.com/norman/friendly_id-globalize) (currently in alpha).
-* The `:reserved` module no longer includes any default reserved words.
-  Previously it blocked "edit" and "new" everywhere. The default word list has
-  been moved to `config/initializers/friendly_id.rb` and now includes many more
-  words.
-* The `:history` and `:scoped` addons can now be used together.
-* Since it now requires Rails 4, FriendlyId also now requires Ruby 1.9.3 or
-  higher.
-
-#### Upgrading from FriendlyId 4.0
-
-Run `rails generate friendly_id --skip-migration` and edit the initializer
-generated in `config/initializers/friendly_id.rb`. This file contains notes
-describing how to restore (or not) some of the defaults from FriendlyId 4.0.
-
-If you want to use the `:history` and `:scoped` addons together, you must add a
-`:scope` column to your friendly_id_slugs table and replace the unique index on
-`:slug` and `:sluggable_type` with a unique index on those two columns, plus
-the new `:scope` column.
-
-A migration like this should be sufficient:
-
-```ruby
-add_column   :friendly_id_slugs, :scope, :string
-remove_index :friendly_id_slugs, [:slug, :sluggable_type]
-add_index    :friendly_id_slugs, [:slug, :sluggable_type]
-add_index    :friendly_id_slugs, [:slug, :sluggable_type, :scope], unique: true
-```
-
-## Articles
+## Getting Help
 
-[Migrating an ad-hoc URL slug system to FriendlyId](http://olivierlacan.com/posts/migrating-an-ad-hoc-url-slug-system-to-friendly-id/)  
-[Pretty URLs with FriendlyId](http://railscasts.com/episodes/314-pretty-urls-with-friendlyid)
+Ask questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/friendly-id)
+using the "friendly-id" tag, and for bugs have a look at [the bug section](https://github.com/norman/friendly_id#bugs)
 
-## Docs
-
-The most current docs from the master branch can always be found
-[here](http://norman.github.io/friendly_id).
-
-Docs for older versions are also available:
+## FriendlyId Features
 
-* [5.0](http://norman.github.io/friendly_id/5.0/)
-* [4.0](http://norman.github.io/friendly_id/4.0/)
-* [3.3](http://norman.github.io/friendly_id/3.3/)
-* [2.3](http://norman.github.io/friendly_id/2.3/)
+FriendlyId offers many advanced features, including:
 
-The best place to start is with the
-[Guide](http://norman.github.io/friendly_id/file.Guide.html),
-which compiles the top-level RDocs into one outlined document.
+ * slug history and versioning
+ * i18n
+ * scoped slugs
+ * reserved words
+ * custom slug generators
 
-For a getting started video, you may want to watch [GoRails #9](https://gorails.com/episodes/pretty-urls-with-friendly-id)
+## Usage
 
-You might also want to watch Ryan Bates's [Railscast on FriendlyId](http://railscasts.com/episodes/314-pretty-urls-with-friendlyid),
-which is now somewhat outdated but still relevant.
+Add this line to your application's Gemfile:
 
+```ruby
+gem 'friendly_id', '~> 5.1.0' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
+```
 
-## Rails Quickstart
+And then execute:
 
 ```shell
-rails new my_app
-cd my_app
-```
-```ruby
-# Gemfile
-gem 'friendly_id', '~> 5.1.0' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
+bundle install
 ```
+
+Generate the friendly configuration file
+
 ```shell
 rails generate friendly_id
 ```
+
 >Temp solution for Rails 5.1+ : Before running the migration, go into the generated migration file and specify the Rails version:  
 `class CreateFriendlyIdSlugs < ActiveRecord::Migration[5.1]`  
+
+Run the migration scripts
+
 ```shell
-rails generate scaffold user name:string slug:string:uniq
-rake db:migrate
+rails db:migrate
 ```
+
+Edit the `app/models/user.rb` file as the following:
+
 ```ruby
-# edit app/models/user.rb
 class User < ApplicationRecord
   extend FriendlyId
   friendly_id :name, use: :slugged
 end
+```
 
-User.create! name: "Joe Schmoe"
+Edit the `app/controllers/users_controller.rb` file and replace `User.find` by `User.friendly.find`
 
-# Change User.find to User.friendly.find in your controller
-User.friendly.find(params[:id])
+```ruby
+class UserController < ApplicationController
+  def show
+    @user = User.friendly.find(params[:id])
+  end
+end
 ```
-```shell
-rails server
 
-GET http://localhost:3000/users/joe-schmoe
-```
+Now when you create a new user like the following:
+
 ```ruby
-# 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:
-User.find_each(&:save)
+User.create! name: "Joe Schmoe"
 ```
 
-## Benchmarks
+You can then access the user show page using the URL http://localhost:3000/users/joe-schmoe.
+
 
-The latest benchmarks for FriendlyId are maintained
-[here](http://bit.ly/friendly-id-benchmarks).
+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
+User.find_each(&:save)
+```
 
 ## Bugs
 

data/UPGRADING.md

@@ -0,0 +1,115 @@
+## Articles
+
+* [Migrating an ad-hoc URL slug system to FriendlyId](http://olivierlacan.com/posts/migrating-an-ad-hoc-url-slug-system-to-friendly-id/)
+* [Pretty URLs with FriendlyId](http://railscasts.com/episodes/314-pretty-urls-with-friendlyid)
+
+## Docs
+
+The most current docs from the master branch can always be found
+[here](http://norman.github.io/friendly_id).
+
+Docs for older versions are also available:
+
+* [5.0](http://norman.github.io/friendly_id/5.0/)
+* [4.0](http://norman.github.io/friendly_id/4.0/)
+* [3.3](http://norman.github.io/friendly_id/3.3/)
+* [2.3](http://norman.github.io/friendly_id/2.3/)
+
+## What Changed in Version 5.1
+
+5.1 is a bugfix release, but bumps the minor version because some applications may be dependent
+on the previously buggy behavior. The changes include:
+
+* Blank strings can no longer be used as slugs.
+* When the first slug candidate is rejected because it is reserved, additional candidates will
+  now be considered before marking the record as invalid.
+* The `:finders` module is now compatible with Rails 4.2.
+
+## What Changed in Version 5.0
+
+As of version 5.0, FriendlyId uses [semantic versioning](http://semver.org/). Therefore, as you might
+infer from the version number, 5.0 introduces changes incompatible with 4.0.
+
+The most important changes are:
+
+* Finders are no longer overridden by default. If you want to do friendly finds,
+  you must do `Model.friendly.find` rather than `Model.find`. You can however
+  restore FriendlyId 4-style finders by using the `:finders` addon:
+
+  ```ruby
+  friendly_id :foo, use: :slugged # you must do MyClass.friendly.find('bar')
+  # or...
+  friendly_id :foo, use: [:slugged, :finders] # you can now do MyClass.find('bar')
+  ```
+* A new "candidates" functionality which makes it easy to set up a list of
+  alternate slugs that can be used to uniquely distinguish records, rather than
+  appending a sequence. For example:
+
+  ```ruby
+  class Restaurant < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :slug_candidates, use: :slugged
+
+    # Try building a slug based on the following fields in
+    # increasing order of specificity.
+    def slug_candidates
+      [
+        :name,
+        [:name, :city],
+        [:name, :street, :city],
+        [:name, :street_number, :street, :city]
+      ]
+    end
+  end
+  ```
+* Now that candidates have been added, FriendlyId no longer uses a numeric
+  sequence to differentiate conflicting slug, but rather a UUID (e.g. something
+  like `2bc08962-b3dd-4f29-b2e6-244710c86106`). This makes the
+  codebase simpler and more reliable when running concurrently, at the expense
+  of uglier ids being generated when there are conflicts.
+* The default sequence separator has been changed from two dashes to one dash.
+* Slugs are no longer regenerated when a record is saved. If you want to regenerate
+  a slug, you must explicitly set the slug column to nil:
+
+  ```ruby
+  restaurant.friendly_id # joes-diner
+  restaurant.name = "The Plaza Diner"
+  restaurant.save!
+  restaurant.friendly_id # joes-diner
+  restaurant.slug = nil
+  restaurant.save!
+  restaurant.friendly_id # the-plaza-diner
+  ```
+
+  You can restore some of the old behavior by overriding the
+  `should_generate_new_friendly_id?` method.
+* The `friendly_id` Rails generator now generates an initializer showing you
+  how to do some common global configuration.
+* The Globalize plugin has moved to a [separate gem](https://github.com/norman/friendly_id-globalize) (currently in alpha).
+* The `:reserved` module no longer includes any default reserved words.
+  Previously it blocked "edit" and "new" everywhere. The default word list has
+  been moved to `config/initializers/friendly_id.rb` and now includes many more
+  words.
+* The `:history` and `:scoped` addons can now be used together.
+* Since it now requires Rails 4, FriendlyId also now requires Ruby 1.9.3 or
+  higher.
+
+## Upgrading from FriendlyId 4.0
+
+Run `rails generate friendly_id --skip-migration` and edit the initializer
+generated in `config/initializers/friendly_id.rb`. This file contains notes
+describing how to restore (or not) some of the defaults from FriendlyId 4.0.
+
+If you want to use the `:history` and `:scoped` addons together, you must add a
+`:scope` column to your friendly_id_slugs table and replace the unique index on
+`:slug` and `:sluggable_type` with a unique index on those two columns, plus
+the new `:scope` column.
+
+A migration like this should be sufficient:
+
+```ruby
+add_column   :friendly_id_slugs, :scope, :string
+remove_index :friendly_id_slugs, [:slug, :sluggable_type]
+add_index    :friendly_id_slugs, [:slug, :sluggable_type]
+add_index    :friendly_id_slugs, [:slug, :sluggable_type, :scope], unique: true
+```

data/friendly_id.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 4.0.0'
 
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'railties', '~> 4.0'
+  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'

data/gemfiles/Gemfile.rails-4.0.rb

@@ -18,7 +18,7 @@ group :development, :test do
   platforms :ruby, :rbx do
     gem 'sqlite3'
     gem 'mysql2', '~> 0.3.10'
-    gem 'pg'
+    gem 'pg', '~> 0.15'
     gem 'redcarpet'
   end
 

data/gemfiles/Gemfile.rails-4.1.rb

@@ -17,7 +17,7 @@ group :development, :test do
   platforms :ruby, :rbx do
     gem 'sqlite3'
     gem 'mysql2', '~> 0.3.13'
-    gem 'pg'
+    gem 'pg', '~> 0.15'
     gem 'redcarpet'
   end
 

data/gemfiles/Gemfile.rails-4.2.rb

@@ -16,8 +16,8 @@ group :development, :test do
 
   platforms :ruby, :rbx do
     gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
+    gem 'mysql2', '~> 0.4.10'
+    gem 'pg', '~> 0.15'
     gem 'redcarpet'
   end
 

data/gemfiles/Gemfile.rails-5.0.rb

@@ -9,8 +9,8 @@ gem 'i18n', '~> 0.7.0'
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter.git', branch: 'rails-5'
-    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter.git', branch: 'rails-5'
+    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: '50-stable'
+    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: '50-stable'
     gem 'kramdown'
   end
 

data/gemfiles/Gemfile.rails-5.1.rb

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.1.0'
+gem 'railties', '~> 5.1.0'
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    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'
+  end
+end

data/gemfiles/Gemfile.rails-5.2.rb

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.2.0'
+gem 'railties', '~> 5.2.0'
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+    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'
+  end
+end

data/lib/friendly_id/candidates.rb

@@ -63,8 +63,6 @@ module FriendlyId
       slug.present?
     end
 
-    private
-
     def reserved?(slug)
       config = @object.friendly_id_config
       return false unless config.uses? ::FriendlyId::Reserved

data/lib/friendly_id/finder_methods.rb

@@ -9,7 +9,7 @@ module FriendlyId
     # id matching '123' and then fall back to looking for a record with the
     # numeric id '123'.
     #
-    # Since FriendlyId 5.0, if the id is a numeric string like '123-foo' it
+    # Since FriendlyId 5.0, if the id is a nonnumeric string like '123-foo' it
     # will *only* search by friendly id and not fall back to the regular find
     # method.
     #
@@ -50,7 +50,7 @@ module FriendlyId
       when :integer
         Integer(id, 10) rescue false
       when :uuid
-        id.match /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/
+        id.match(/\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/)
       else
         true
       end

data/lib/friendly_id/history.rb

@@ -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("#{Slug.quoted_table_name}.id DESC")}, {
+        has_many :slugs, -> {order(id: :desc)}, {
           :as         => :sluggable,
           :dependent  => @friendly_id_config.dependent_value,
           :class_name => Slug.to_s
@@ -86,14 +86,13 @@ method.
       include ::FriendlyId::FinderMethods
 
       def exists_by_friendly_id?(id)
-        where(arel_table[friendly_id_config.query_field].eq(id)).exists? || joins(:slugs).where(slug_history_clause(id)).exists?
+        super || joins(:slugs).where(slug_history_clause(id)).exists?
       end
 
       private
 
       def first_by_friendly_id(id)
-        matching_record = where(friendly_id_config.query_field => id).first
-        matching_record || slug_table_record(id)
+        super || slug_table_record(id)
       end
 
       def slug_table_record(id)

data/lib/friendly_id/initializer.rb

@@ -18,6 +18,12 @@ FriendlyId.defaults do |config|
 
   config.reserved_words = %w(new edit index session login logout users admin
     stylesheets assets javascripts images)
+    
+  # This adds an option to to treat reserved words as conflicts rather than exceptions.
+  # When there is no good candidate, a UUID will be appended, matching the existing
+  # conflict behavior.
+
+  # config.treat_reserved_as_conflict = true
 
   #  ## Friendly Finders
   #
@@ -76,7 +82,12 @@ FriendlyId.defaults do |config|
   # behavior by overriding the `should_generate_new_friendly_id?` method that
   # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
   # more like 4.0.
+  # Note: Use(include) Slugged module in the config if using the anonymous module.
+  # If you have `friendly_id :name, use: slugged` in the model, Slugged module
+  # is included after the anonymous module defined in the initializer, so it
+  # overrides the `should_generate_new_friendly_id?` method from the anonymous module.
   #
+  # config.use :slugged
   # config.use Module.new {
   #   def should_generate_new_friendly_id?
   #     slug.blank? || <your_column_name_here>_changed?

data/lib/friendly_id/migration.rb

@@ -1,4 +1,11 @@
-class CreateFriendlyIdSlugs < ActiveRecord::Migration
+migration_class =
+  if ActiveRecord::VERSION::MAJOR >= 5
+    ActiveRecord::Migration[4.2]
+  else
+    ActiveRecord::Migration
+  end
+
+class CreateFriendlyIdSlugs < migration_class
   def change
     create_table :friendly_id_slugs do |t|
       t.string   :slug,           :null => false

data/lib/friendly_id/object_utils.rb

@@ -2,7 +2,6 @@ module FriendlyId
   # Instances of these classes will never be considered a friendly id.
   # @see FriendlyId::ObjectUtils#friendly_id
   UNFRIENDLY_CLASSES = [
-    ActiveRecord::Base,
     Array,
     FalseClass,
     Hash,
@@ -59,6 +58,10 @@ module FriendlyId
       true
     end
   end
+
+  def self.mark_as_unfriendly(klass)
+    klass.send(:include, FriendlyId::UnfriendlyUtils)
+  end
 end
 
 Object.send :include, FriendlyId::ObjectUtils
@@ -66,4 +69,8 @@ Object.send :include, FriendlyId::ObjectUtils
 # Considered unfriendly if object is an instance of an unfriendly class or
 # one of its descendants.
 
-FriendlyId::UNFRIENDLY_CLASSES.each { |klass| klass.send(:include, FriendlyId::UnfriendlyUtils) }
+FriendlyId::UNFRIENDLY_CLASSES.each { |klass| FriendlyId.mark_as_unfriendly(klass) }
+
+ActiveSupport.on_load(:active_record) do
+  FriendlyId.mark_as_unfriendly(ActiveRecord::Base)
+end

data/lib/friendly_id/sequentially_slugged.rb

@@ -47,7 +47,7 @@ module FriendlyId
       def slug_conflicts
         scope.
           where(conflict_query, slug, sequential_slug_matcher).
-          order(ordering_query).pluck(slug_column)
+          order(Arel.sql(ordering_query)).pluck(Arel.sql(slug_column))
       end
 
       def conflict_query

data/lib/friendly_id/slug.rb

@@ -5,6 +5,10 @@ module FriendlyId
   class Slug < ActiveRecord::Base
     belongs_to :sluggable, :polymorphic => true
 
+    def sluggable
+      sluggable_type.constantize.unscoped { super }
+    end
+
     def to_param
       slug
     end

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = '5.2.3'.freeze
+  VERSION = '5.2.4'.freeze
 end

data/test/helper.rb

@@ -38,6 +38,10 @@ if ENV["LOG"]
   ActiveRecord::Base.logger = Logger.new($stdout)
 end
 
+if ActiveSupport::VERSION::STRING >= '4.2'
+  ActiveSupport.test_order = :random
+end
+
 module FriendlyId
   module Test
 

data/test/history_test.rb

@@ -172,7 +172,7 @@ class HistoryTestWithAutomaticSlugRegeneration < HistoryTest
   end
 end
 
-class DependentDestroyTest < HistoryTest
+class DependentDestroyTest < TestCaseClass
 
   include FriendlyId::Test
 
@@ -211,6 +211,37 @@ class DependentDestroyTest < HistoryTest
   end
 end
 
+if ActiveRecord::VERSION::STRING >= '5.0'
+  class HistoryTestWithParanoidDeletes < HistoryTest
+    class ParanoidRecord < ActiveRecord::Base
+      extend FriendlyId
+      friendly_id :name, :use => :history, :dependent => false
+
+      default_scope { where(deleted_at: nil) }
+    end
+
+    def model_class
+      ParanoidRecord
+    end
+
+    test 'slug should have a sluggable even when soft deleted by a library' do
+      transaction do
+        assert FriendlyId::Slug.find_by_slug('paranoid').nil?
+        record = model_class.create(name: 'paranoid')
+        assert FriendlyId::Slug.find_by_slug('paranoid').present?
+
+        record.update_attribute(:deleted_at, Time.now)
+
+        orphan_slug = FriendlyId::Slug.find_by_slug('paranoid')
+        assert orphan_slug.present?, 'Orphaned slug should exist'
+
+        assert orphan_slug.valid?, "Errors: #{orphan_slug.errors.full_messages}"
+        assert orphan_slug.sluggable.present?, 'Orphaned slug should still find corresponding paranoid sluggable'
+      end
+    end
+  end
+end
+
 class HistoryTestWithSti < HistoryTest
   class Journalist < ActiveRecord::Base
     extend FriendlyId
@@ -248,7 +279,7 @@ class HistoryTestWithFriendlyFinders < HistoryTest
         begin
           assert model_class.find(old_friendly_id)
           assert model_class.exists?(old_friendly_id), "should exist? by old id for #{model_class.name}"
-        rescue ActiveRecord::RecordNotFound => e
+        rescue ActiveRecord::RecordNotFound
           flunk "Could not find record by old id for #{model_class.name}"
         end
       end
@@ -356,4 +387,4 @@ class ScopedHistoryTest < TestCaseClass
       assert_equal record.slug, second_record.slug
     end
   end
-end
+end

data/test/object_utils_test.rb

@@ -19,6 +19,8 @@ class ObjectUtilsTest < TestCaseClass
   end
 
   test "ActiveRecord::Base instances should be unfriendly_ids" do
+    FriendlyId.mark_as_unfriendly(ActiveRecord::Base)
+
     model_class = Class.new(ActiveRecord::Base) do
       self.table_name = "authors"
     end

data/test/schema.rb

@@ -2,7 +2,14 @@ require "friendly_id/migration"
 
 module FriendlyId
   module Test
-    class Schema < ActiveRecord::Migration
+    migration_class =
+      if ActiveRecord::VERSION::MAJOR >= 5
+        ActiveRecord::Migration[4.2]
+      else
+        ActiveRecord::Migration
+      end
+
+    class Schema < migration_class
       class << self
         def down
           CreateFriendlyIdSlugs.down
@@ -41,6 +48,12 @@ module FriendlyId
             add_column table_name, :slug, :string
           end
 
+          paranoid_tables.each do |table_name|
+            add_column table_name, :slug, :string
+            add_column table_name, :deleted_at, :datetime
+            add_index table_name, :deleted_at
+          end
+
           # This will be used to test scopes
           add_column :novels, :novelist_id, :integer
           add_column :novels, :publisher_id, :integer
@@ -78,6 +91,10 @@ module FriendlyId
           %w[journalists articles novelists novels manuals cities]
         end
 
+        def paranoid_tables
+          ["paranoid_records"]
+        end
+
         def tables_with_uuid_primary_key
           ["menu_items"]
         end
@@ -91,7 +108,7 @@ module FriendlyId
         end
 
         def tables
-          simple_tables + slugged_tables + scoped_tables
+          simple_tables + slugged_tables + scoped_tables + paranoid_tables
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.4
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -43,14 +43,14 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -158,12 +158,15 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- UPGRADING.md
 - bench.rb
 - 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
 - guide.rb
 - lib/friendly_id.rb
 - lib/friendly_id/.gitattributes