friendly_id 5.2.0.beta.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d11cd5a5fc78a05718add4cf44e44f4425700f02
-  data.tar.gz: 581623a3a24eff70d1e0ee307bdcaf814631a80c
+  metadata.gz: 606af0800382602b2f88d11be3a839a3e8c23255
+  data.tar.gz: a501dd78829d595fe897475bdf4a6c6d98caee9c
 SHA512:
-  metadata.gz: 9068ff6f4efaab2c47673eb31b5f700898d5fad4f3d6f3fa754e7b9f9264ee1b02689637af319995c83a2b0771a40d7c70ce422b112e8337b0281ba42a5e41bb
-  data.tar.gz: 5726a377bc4573bfb59cbfdc0d0d4abe224516bd691017299809da5304abd51477da9c8c7bb0f48916afd44b4de9b77ddc81716e0e9be69e24427018eb7abe51
+  metadata.gz: cb2afe89084b532541152c46056649ec6bfca0a2fe51493706f7f996ee233bae010a248a735fb55451e89b1918b29e60b5471e78c0272f29a5c5c410220eacc8
+  data.tar.gz: 8a527f735585ce88c1627bc54f206745f69a826d27574f6d306ee4a29dff23421e82225b0b9e9751cdd5a3a9911f3dba755d10d7a9951758052a3bd869b26441

data/.travis.yml

@@ -2,11 +2,11 @@ language: ruby
 cache: bundler
 
 rvm:
+  - 2.3.0
   - 2.2.0
-  - 2.0.0
   - 2.1.0
-  - jruby-19mode
-  - rbx-2
+  - 2.0.0
+  - jruby-9.0.4.0
 
 env:
   - DB=postgres
@@ -16,15 +16,26 @@ 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
 
 matrix:
   allow_failures:
     - rvm: jruby-19mode
       gemfile: gemfiles/Gemfile.rails-4.2.rb
       env: DB=postgres
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/Gemfile.rails-5.0.rb
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails-5.0.rb
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-5.0.rb
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails-5.0.rb
 
 sudo: false
 
-before_script: 'bundle exec rake db:create db:up'
+before_script:
+  - bundle exec rake db:create db:up
 
 script: 'COVERALLS=true bundle exec rake test'

data/CONTRIBUTING.md

@@ -3,7 +3,7 @@
 Please ask questions on [Stack
 Overflow](http://stackoverflow.com/questions/tagged/friendly-id) using the
 "friendly_id" or "friendly-id" tag. Prior to asking, search and see if your
-question has already been anwered.
+question has already been answered.
 
 Please only post issues in Github issues for actual bugs.
 

data/Changelog.md

@@ -1,15 +1,19 @@
 # FriendlyId Changelog
 
-We would like to think our many {file:Contributors contributors} for
+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.0 (NOT RELEASED YET)
+## 5.2.0 (2016-12-01)
 
 * Add sequential slug module for FriendlyId 4.x-style sequential slugs. ([#644](https://github.com/norman/friendly_id/pull/644)).
 * Make Candidates#each iterable without block ([#651](https://github.com/norman/friendly_id/pull/651)).
 * Ensure slug history prefers the record that most recently used the slug ([#663](https://github.com/norman/friendly_id/pull/663)).
 * 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))
+* 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))
 
 ## 5.1.0 (2015-01-15)
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Norman Clarke, Adrian Mugnolo and Emilio Tagua.
+Copyright (c) 2008-2016 Norman Clarke, Adrian Mugnolo and Emilio Tagua.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -16,7 +16,7 @@ over and over and over again in the issues.
 
 # FriendlyId
 
-<em>For the most complete, user-friendly documentation, see the [FriendlyId Guide](http://norman.github.io/friendly_id/file.Guide.html).</em>
+**For the most complete, user-friendly documentation, see the [FriendlyId Guide](http://norman.github.io/friendly_id/file.Guide.html).**
 
 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
@@ -236,7 +236,7 @@ volunteers](https://github.com/norman/friendly_id/contributors).
 
 ## License
 
-Copyright (c) 2008-2014 Norman Clarke and contributors, released under the MIT
+Copyright (c) 2008-2016 Norman Clarke and contributors, released under the MIT
 license.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

data/Rakefile

@@ -36,6 +36,16 @@ task :bench => :load_path do
   require File.expand_path("../bench", __FILE__)
 end
 
+desc "Run benchmarks on finders"
+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
+  require File.expand_path("../test/benchmarks/object_utils", __FILE__)
+end
+
 desc "Generate Guide.md"
 task :guide do
   load File.expand_path('../guide.rb', __FILE__)

data/bench.rb

@@ -1,7 +1,7 @@
 require File.expand_path("../test/helper", __FILE__)
 require "ffaker"
 
-N = 1000
+N = 10000
 
 def transaction
   ActiveRecord::Base.transaction { yield ; raise ActiveRecord::Rollback }
@@ -37,7 +37,7 @@ MANUALS     = []
 RESTAURANTS = []
 
 100.times do
-  name = Faker::Name.name
+  name = FFaker::Name.name
   BOOKS       << (Book.create! :name => name).id
   JOURNALISTS << (Journalist.create! :name => name).friendly_id
   MANUALS     << (Manual.create! :name => name).friendly_id
@@ -64,18 +64,18 @@ Benchmark.bmbm do |x|
   end
 
   x.report 'insert (without FriendlyId)' do
-    N.times {transaction {Book.create :name => Faker::Name.name}}
+    N.times {transaction {Book.create :name => FFaker::Name.name}}
   end
 
   x.report 'insert (in-table-slug)' do
-    N.times {transaction {Journalist.create :name => Faker::Name.name}}
+    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 => Faker::Name.name}}
+    N.times {transaction {Restaurant.create :name => FFaker::Name.name}}
   end
 
   x.report 'insert (external slug)' do
-    N.times {transaction {Manual.create :name => Faker::Name.name}}
+    N.times {transaction {Manual.create :name => FFaker::Name.name}}
   end
 end

data/friendly_id.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = FriendlyId::VERSION
   s.authors           = ["Norman Clarke", "Philip Arndt"]
   s.email             = ["norman@njclarke.com", "p@arndt.io"]
-  s.homepage          = "http://github.com/norman/friendly_id"
+  s.homepage          = "https://github.com/norman/friendly_id"
   s.summary           = "A comprehensive slugging and pretty-URL plugin."
   s.rubyforge_project = "friendly_id"
   s.files             = `git ls-files`.split("\n")

data/gemfiles/Gemfile.rails-4.0.rb

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

data/gemfiles/Gemfile.rails-4.1.rb

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

data/gemfiles/Gemfile.rails-5.0.rb

@@ -0,0 +1,28 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'railties', '~> 5.0.0'
+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'
+    gem 'pg'
+    gem 'redcarpet'
+  end
+
+  platforms :rbx do
+    gem 'rubysl', '~> 2.0'
+    gem 'rubinius-developer_tools'
+  end
+end

data/lib/friendly_id.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'active_record'
 require "friendly_id/base"
 require "friendly_id/object_utils"
 require "friendly_id/configuration"
@@ -51,19 +52,6 @@ module FriendlyId
   autoload :Finders,             "friendly_id/finders"
   autoload :SequentiallySlugged, "friendly_id/sequentially_slugged"
 
-  # Instances of these classes will never be considered a friendly id.
-  # @see FriendlyId::ObjectUtils#friendly_id
-  UNFRIENDLY_CLASSES = [
-    ActiveRecord::Base,
-    Array,
-    FalseClass,
-    Hash,
-    NilClass,
-    Numeric,
-    Symbol,
-    TrueClass
-  ]
-
   # FriendlyId takes advantage of `extended` to do basic model setup, primarily
   # extending {FriendlyId::Base} to add {FriendlyId::Base#friendly_id
   # friendly_id} as a class method.

data/lib/friendly_id/base.rb

@@ -187,9 +187,22 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     #   allows an alternate configuration syntax, and conditional configuration
     #   logic.
     #
+    # @option options [Symbol,Boolean] :dependent Available when using `:history`.
+    #   Sets the value used for the slugged association's dependent option. Use
+    #   `false` if you do not want to dependently destroy the associated slugged
+    #   record. Defaults to `:destroy`.
+    #
+    # @option options [Symbol] :routes When set to anything other than :friendly,
+    #   ensures that all routes generated by default do *not* use the slug.  This
+    #   allows `form_for` and `polymorphic_path` to continue to generate paths like
+    #   `/team/1` instead of `/team/number-one`.  You can still generate paths
+    #   like the latter using: team_path(team.slug).  When set to :friendly, or
+    #   omitted, the default friendly_id behavior is maintained.
+    #
     # @yieldparam config The model class's {FriendlyId::Configuration friendly_id_config}.
     def friendly_id(base = nil, options = {}, &block)
       yield friendly_id_config if block_given?
+      friendly_id_config.dependent = options.delete :dependent
       friendly_id_config.use options.delete :use
       friendly_id_config.send :set, base ? options.merge(:base => base) : options
       include Model
@@ -244,11 +257,15 @@ often better and easier to use {FriendlyId::Slugged slugs}.
 
     # Either the friendly_id, or the numeric id cast to a string.
     def to_param
-      if attribute_changed?(friendly_id_config.query_field)
-        diff = changes[friendly_id_config.query_field]
-        diff.first || diff.second
+      if friendly_id_config.routes == :friendly
+        if attribute_changed?(friendly_id_config.query_field)
+          diff = changes[friendly_id_config.query_field]
+          diff.first || diff.second
+        else
+          friendly_id.presence.to_param || super
+        end
       else
-        friendly_id.presence.to_param || super
+        super
       end
     end
 

data/lib/friendly_id/configuration.rb

@@ -18,11 +18,18 @@ module FriendlyId
     # The module to use for finders
     attr_accessor :finder_methods
 
+    # The value used for the slugged association's dependent option
+    attr_accessor :dependent
+
+    # Route generation preferences
+    attr_accessor :routes
+
     def initialize(model_class, values = nil)
       @model_class    = model_class
       @defaults       = {}
       @modules        = []
       @finder_methods = FriendlyId::FinderMethods
+      self.routes = :friendly
       set values
     end
 

data/lib/friendly_id/finder_methods.rb

@@ -20,7 +20,7 @@ module FriendlyId
       return super if args.count != 1 || id.unfriendly_id?
       first_by_friendly_id(id).tap {|result| return result unless result.nil?}
       return super if potential_primary_key?(id)
-      raise ActiveRecord::RecordNotFound
+      raise ActiveRecord::RecordNotFound, "can't find record with friendly id: #{id.inspect}"
     end
 
     # Returns true if a record with the given id exists.
@@ -33,7 +33,7 @@ module FriendlyId
     # `find`.
     # @raise ActiveRecord::RecordNotFound
     def find_by_friendly_id(id)
-      first_by_friendly_id(id) or raise ActiveRecord::RecordNotFound
+      first_by_friendly_id(id) or raise ActiveRecord::RecordNotFound, "can't find record with friendly id: #{id.inspect}"
     end
 
     def exists_by_friendly_id?(id)
@@ -54,8 +54,8 @@ module FriendlyId
     end
 
     def first_by_friendly_id(id)
-      where(friendly_id_config.query_field => id).first
+      find_by(friendly_id_config.query_field => id)
     end
 
   end
-end
+end

data/lib/friendly_id/finders.rb

@@ -76,17 +76,14 @@ for models that use FriendlyId with something similar to the following:
     def self.setup(model_class)
       model_class.instance_eval do
         relation.class.send(:include, friendly_id_config.finder_methods)
-        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2
+        if (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2) || ActiveRecord::VERSION::MAJOR == 5
           model_class.send(:extend, friendly_id_config.finder_methods)
         end
       end
-    end
-
-    def self.included(model_class)
-      model_class.extend(ClassMethods)
 
       # Support for friendly finds on associations for Rails 4.0.1 and above.
       if ::ActiveRecord.const_defined?('AssociationRelation')
+        model_class.extend(ClassMethods)
         association_relation_delegate_class = model_class.relation_delegate_class(::ActiveRecord::AssociationRelation)
         association_relation_delegate_class.send(:include, model_class.friendly_id_config.finder_methods)
       end

data/lib/friendly_id/history.rb

@@ -41,7 +41,7 @@ method.
       ...
 
       def find_post
-        @post = Post.find params[:id]
+        @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
@@ -54,16 +54,18 @@ method.
 =end
   module History
 
+    module Configuration
+      def dependent_value
+        dependent.nil? ? :destroy : dependent
+      end
+    end
+
     def self.setup(model_class)
       model_class.instance_eval do
         friendly_id_config.use :slugged
+        friendly_id_config.class.send :include, History::Configuration
         friendly_id_config.finder_methods = FriendlyId::History::FinderMethods
-        if friendly_id_config.uses? :finders
-          relation.class.send(:include, friendly_id_config.finder_methods)
-          if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2
-            model_class.send(:extend, friendly_id_config.finder_methods)
-          end
-        end
+        FriendlyId::Finders.setup(model_class) if friendly_id_config.uses? :finders
       end
     end
 
@@ -72,7 +74,7 @@ method.
       model_class.class_eval do
         has_many :slugs, -> {order("#{Slug.quoted_table_name}.id DESC")}, {
           :as         => :sluggable,
-          :dependent  => :destroy,
+          :dependent  => @friendly_id_config.dependent_value,
           :class_name => Slug.to_s
         }
 
@@ -84,7 +86,7 @@ method.
       include ::FriendlyId::FinderMethods
 
       def exists_by_friendly_id?(id)
-        joins(:slugs).where(arel_table[friendly_id_config.query_field].eq(id)).exists? || joins(:slugs).where(slug_history_clause(id)).exists?
+        where(arel_table[friendly_id_config.query_field].eq(id)).exists? || joins(:slugs).where(slug_history_clause(id)).exists?
       end
 
       private
@@ -111,7 +113,7 @@ method.
     def scope_for_slug_generator
       relation = super
       return relation if new_record?
-      relation = relation.merge(Slug.where('sluggable_id <> ?', id))
+      relation = relation.joins(:slugs).merge(Slug.where('sluggable_id <> ?', id))
       if friendly_id_config.uses?(:scoped)
         relation = relation.where(Slug.arel_table[:scope].eq(serialized_scope))
       end

data/lib/friendly_id/migration.rb

@@ -8,8 +8,8 @@ class CreateFriendlyIdSlugs < ActiveRecord::Migration
       t.datetime :created_at
     end
     add_index :friendly_id_slugs, :sluggable_id
-    add_index :friendly_id_slugs, [:slug, :sluggable_type]
-    add_index :friendly_id_slugs, [:slug, :sluggable_type, :scope], :unique => true
+    add_index :friendly_id_slugs, [:slug, :sluggable_type], length: { slug: 140, sluggable_type: 50 }
+    add_index :friendly_id_slugs, [:slug, :sluggable_type, :scope], length: { slug: 70, sluggable_type: 50, scope: 70 }, unique: true
     add_index :friendly_id_slugs, :sluggable_type
   end
 end

data/lib/friendly_id/object_utils.rb

@@ -1,4 +1,17 @@
 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,
+    NilClass,
+    Numeric,
+    Symbol,
+    TrueClass
+  ]
+
   # Utility methods for determining whether any object is a friendly id.
   #
   # Monkey-patching Object is a somewhat extreme measure not to be taken lightly
@@ -27,13 +40,7 @@ module FriendlyId
     #     "123".friendly_id?                #=> nil
     #     "abc123".friendly_id?             #=> true
     def friendly_id?
-      # Considered unfriendly if this is an instance of an unfriendly class or
-      # one of its descendants.
-      if FriendlyId::UNFRIENDLY_CLASSES.detect {|klass| self.class <= klass}
-        false
-      elsif respond_to?(:to_i) && to_i.to_s != to_s
-        true
-      end
+      true if respond_to?(:to_i) && to_i.to_s != to_s
     end
 
     # True if the id is definitely unfriendly, false if definitely friendly,
@@ -42,6 +49,21 @@ module FriendlyId
       val = friendly_id? ; !val unless val.nil?
     end
   end
+
+  module UnfriendlyUtils
+    def friendly_id?
+      false
+    end
+
+    def unfriendly_id?
+      true
+    end
+  end
 end
 
 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) }

data/lib/friendly_id/sequentially_slugged.rb

@@ -4,13 +4,11 @@ module FriendlyId
       model_class.friendly_id_config.use :slugged
     end
 
-    def should_generate_new_friendly_id?
-      send(friendly_id_config.base).present? && super
-    end
-
     def resolve_friendly_id_conflict(candidate_slugs)
+      candidate = candidate_slugs.first
+      return if candidate.nil?
       SequentialSlugCalculator.new(scope_for_slug_generator,
-                                  candidate_slugs.first,
+                                  candidate,
                                   friendly_id_config.slug_column,
                                   friendly_id_config.sequence_separator).next_slug
     end

data/lib/friendly_id/simple_i18n.rb

@@ -37,15 +37,15 @@ friendly_id_globalize gem instead.
 Finds will take into consideration the current locale:
 
     I18n.locale = :es
-    Post.find("la-guerra-de-las-galaxias")
+    Post.friendly.find("la-guerra-de-las-galaxias")
     I18n.locale = :en
-    Post.find("star-wars")
+    Post.friendly.find("star-wars")
 
 To find a slug by an explicit locale, perform the find inside a block
 passed to I18n's `with_locale` method:
 
     I18n.with_locale(:es) do
-      Post.find("la-guerra-de-las-galaxias")
+      Post.friendly.find("la-guerra-de-las-galaxias")
     end
 
 ### Creating Records

data/lib/friendly_id/slugged.rb

@@ -263,6 +263,7 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     # ### Example
     #
     #     class Person < ActiveRecord::Base
+    #       extend FriendlyId
     #       friendly_id :name_and_location
     #
     #       def name_and_location

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.2.0.beta.1"
+  VERSION = "5.2.0"
 end

data/test/benchmarks/finders.rb

@@ -0,0 +1,88 @@
+require File.expand_path("../../helper", __FILE__)
+require "ffaker"
+
+# This benchmark tests ActiveRecord and FriendlyId methods for performing a find
+#
+# ActiveRecord: where.first                     8.970000   0.040000   9.010000 (  9.029544)
+# ActiveRecord: where.take                      8.100000   0.030000   8.130000 (  8.157024)
+# ActiveRecord: find                            2.720000   0.010000   2.730000 (  2.733527)
+# ActiveRecord: find_by(:id)                    2.920000   0.000000   2.920000 (  2.926318)
+# ActiveRecord: find_by(:slug)                  2.650000   0.020000   2.670000 (  2.662677)
+# FriendlyId: find (in-table slug w/ finders)   9.820000   0.030000   9.850000 (  9.873358)
+# FriendlyId: friendly.find (in-table slug)    12.890000   0.050000  12.940000 ( 12.951156)
+
+N = 50000
+
+def transaction
+  ActiveRecord::Base.transaction { yield ; raise ActiveRecord::Rollback }
+end
+
+class Array
+  def rand
+    self[Kernel.rand(length)]
+  end
+end
+
+Book = Class.new ActiveRecord::Base
+
+class Journalist < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, :use => :slugged
+end
+
+class Manual < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, :use => :history
+end
+
+class Restaurant < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, :use => :finders
+end
+
+
+BOOKS       = []
+JOURNALISTS = []
+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
+end
+
+ActiveRecord::Base.connection.execute "UPDATE manuals SET slug = NULL"
+
+Benchmark.bmbm do |x|
+  x.report 'ActiveRecord: where.first' do
+    N.times {Book.where(:id=>BOOKS.rand).first}
+  end
+
+  x.report 'ActiveRecord: where.take' do
+    N.times {Book.where(:id=>BOOKS.rand).take}
+  end
+
+  x.report 'ActiveRecord: find' do
+    N.times {Book.find BOOKS.rand}
+  end
+
+  x.report 'ActiveRecord: find_by(:id)' do
+    N.times {Book.find_by(:id=>BOOKS.rand)}
+  end
+
+  x.report 'ActiveRecord: find_by(:slug)' do
+    N.times {Restaurant.find_by(:slug=>RESTAURANTS.rand)}
+  end
+
+  x.report 'FriendlyId: find (in-table slug w/ finders)' do
+    N.times {Restaurant.find RESTAURANTS.rand}
+  end
+
+  x.report 'FriendlyId: friendly.find (in-table slug)' do
+    N.times {Restaurant.friendly.find RESTAURANTS.rand}
+  end
+
+end

data/test/benchmarks/object_utils.rb

@@ -0,0 +1,56 @@
+require File.expand_path("../../helper", __FILE__)
+
+# This benchmark compares the timings of the friendly_id? and unfriendly_id? on various objects
+#
+# integer friendly_id?            6.370000   0.000000   6.370000 (  6.380925)
+# integer unfriendly_id?          6.640000   0.010000   6.650000 (  6.646057)
+# AR::Base friendly_id?           2.340000   0.000000   2.340000 (  2.340743)
+# AR::Base unfriendly_id?         2.560000   0.000000   2.560000 (  2.560039)
+# hash friendly_id?               5.090000   0.010000   5.100000 (  5.097662)
+# hash unfriendly_id?             5.430000   0.000000   5.430000 (  5.437160)
+# nil friendly_id?                5.610000   0.010000   5.620000 (  5.611487)
+# nil unfriendly_id?              5.870000   0.000000   5.870000 (  5.880484)
+# numeric string friendly_id?     9.270000   0.030000   9.300000 (  9.308452)
+# numeric string unfriendly_id?   9.190000   0.040000   9.230000 (  9.252890)
+# test_string friendly_id?        8.380000   0.010000   8.390000 (  8.411762)
+# test_string unfriendly_id?      8.450000   0.010000   8.460000 (  8.463662)
+
+# From the ObjectUtils docs...
+#     123.friendly_id?                  #=> false
+#     :id.friendly_id?                  #=> false
+#     {:name => 'joe'}.friendly_id?     #=> false
+#     ['name = ?', 'joe'].friendly_id?  #=> false
+#     nil.friendly_id?                  #=> false
+#     "123".friendly_id?                #=> nil
+#     "abc123".friendly_id?             #=> true
+
+Book = Class.new ActiveRecord::Base
+
+test_integer = 123
+test_active_record_object = Book.new
+test_hash = {:name=>'joe'}
+test_nil = nil
+test_numeric_string = "123"
+test_string = "abc123"
+
+N = 5_000_000
+
+Benchmark.bmbm do |x|
+  x.report('integer friendly_id?') { N.times {test_integer.friendly_id?} }
+  x.report('integer unfriendly_id?') { N.times {test_integer.unfriendly_id?} }
+
+  x.report('AR::Base friendly_id?') { N.times {test_active_record_object.friendly_id?} }
+  x.report('AR::Base unfriendly_id?') { N.times {test_active_record_object.unfriendly_id?} }
+
+  x.report('hash friendly_id?') { N.times {test_hash.friendly_id?} }
+  x.report('hash unfriendly_id?') { N.times {test_hash.unfriendly_id?} }
+
+  x.report('nil friendly_id?') { N.times {test_nil.friendly_id?} }
+  x.report('nil unfriendly_id?') { N.times {test_nil.unfriendly_id?} }
+
+  x.report('numeric string friendly_id?') { N.times {test_numeric_string.friendly_id?} }
+  x.report('numeric string unfriendly_id?') { N.times {test_numeric_string.unfriendly_id?} }
+
+  x.report('test_string friendly_id?') { N.times {test_string.friendly_id?} }
+  x.report('test_string unfriendly_id?') { N.times {test_string.unfriendly_id?} }
+end

data/test/history_test.rb

@@ -1,15 +1,15 @@
 require "helper"
 
-class Manual < ActiveRecord::Base
-  extend FriendlyId
-  friendly_id :name, :use => [:slugged, :history]
-end
-
 class HistoryTest < TestCaseClass
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
 
+  class Manual < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => [:slugged, :history]
+  end
+
   def model_class
     Manual
   end
@@ -172,6 +172,45 @@ class HistoryTestWithAutomaticSlugRegeneration < HistoryTest
   end
 end
 
+class DependentDestroyTest < HistoryTest
+
+  include FriendlyId::Test
+
+  class FalseManual < ActiveRecord::Base
+    self.table_name = 'manuals'
+
+    extend FriendlyId
+    friendly_id :name, :use => :history, :dependent => false
+  end
+
+  class DefaultManual < ActiveRecord::Base
+    self.table_name = 'manuals'
+
+    extend FriendlyId
+    friendly_id :name, :use => :history
+  end
+
+  test 'should allow disabling of dependent destroy' do
+    transaction do
+      assert FriendlyId::Slug.find_by_slug('foo').nil?
+      l = FalseManual.create! :name => 'foo'
+      assert FriendlyId::Slug.find_by_slug('foo').present?
+      l.destroy
+      assert FriendlyId::Slug.find_by_slug('foo').present?
+    end
+  end
+
+  test 'should dependently destroy by default' do
+    transaction do
+      assert FriendlyId::Slug.find_by_slug('baz').nil?
+      l = DefaultManual.create! :name => 'baz'
+      assert FriendlyId::Slug.find_by_slug('baz').present?
+      l.destroy
+      assert FriendlyId::Slug.find_by_slug('baz').nil?
+    end
+  end
+end
+
 class HistoryTestWithSti < HistoryTest
   class Journalist < ActiveRecord::Base
     extend FriendlyId
@@ -217,6 +256,36 @@ class HistoryTestWithFriendlyFinders < HistoryTest
   end
 end
 
+class HistoryTestWithFindersBeforeHistory < HistoryTest
+  class Novelist < ActiveRecord::Base
+    has_many :novels
+  end
+
+  class Novel < ActiveRecord::Base
+    extend FriendlyId
+
+    belongs_to :novelist
+
+    friendly_id :name, :use => [:finders, :history]
+
+    def should_generate_new_friendly_id?
+      slug.blank? || name_changed?
+    end
+  end
+
+  test "should be findable by old slug through has_many association" do
+    transaction do
+      novelist = Novelist.create!(:name => "Stephen King")
+      novel = novelist.novels.create(:name => "Rita Hayworth and Shawshank Redemption")
+      slug = novel.slug
+      novel.name = "Shawshank Redemption"
+      novel.save!
+      assert_equal novel, Novel.find(slug)
+      assert_equal novel, novelist.novels.find(slug)
+    end
+  end
+end
+
 class City < ActiveRecord::Base
   has_many :restaurants
 end

data/test/sequentially_slugged_test.rb

@@ -89,6 +89,22 @@ class SequentiallySluggedTest < TestCaseClass
     end
   end
 
+  test "should not generate a slug when canidates set is empty" do
+    model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "cities"
+      extend FriendlyId
+      friendly_id :slug_candidates, :use => [ :sequentially_slugged ]
+
+      def slug_candidates
+        [name, [name, code]]
+      end
+    end
+    transaction do
+      record = model_class.create!(:name => nil, :code => nil)
+      assert_nil record.slug
+    end
+  end
+
   test "should not generate a slug when the sluggable attribute is blank" do
     record = model_class.create!(:name => '')
     assert_nil record.slug

data/test/slugged_test.rb

@@ -373,3 +373,35 @@ class FailedValidationAfterUpdateRegressionTest < TestCaseClass
   end
 
 end
+
+class ConfigurableRoutesTest < TestCaseClass
+  include FriendlyId::Test
+
+  class Article < ActiveRecord::Base
+    extend FriendlyId
+
+    friendly_id :name, :use => :slugged, :routes => :friendly
+  end
+
+  class Novel < ActiveRecord::Base
+    extend FriendlyId
+
+    friendly_id :name, :use => :slugged, :routes => :default
+  end
+
+  test "to_param should return a friendly id when the routes option is set to :friendly" do
+    transaction do
+      article = Article.create! :name => "Titanic Hits; Iceberg Sinks"
+
+      assert_equal "titanic-hits-iceberg-sinks", article.to_param
+    end
+  end
+
+  test "to_param should return the id when the routes option is set to anything but friendly" do
+    transaction do
+      novel = Novel.create! :name => "Don Quixote"
+
+      assert_equal novel.id.to_s, novel.to_param
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.2.0.beta.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -163,6 +163,7 @@ files:
 - gemfiles/Gemfile.rails-4.0.rb
 - gemfiles/Gemfile.rails-4.1.rb
 - gemfiles/Gemfile.rails-4.2.rb
+- gemfiles/Gemfile.rails-5.0.rb
 - guide.rb
 - lib/friendly_id.rb
 - lib/friendly_id/.gitattributes
@@ -185,6 +186,8 @@ files:
 - lib/friendly_id/version.rb
 - lib/generators/friendly_id_generator.rb
 - test/base_test.rb
+- test/benchmarks/finders.rb
+- test/benchmarks/object_utils.rb
 - test/candidates_test.rb
 - test/configuration_test.rb
 - test/core_test.rb
@@ -202,7 +205,7 @@ files:
 - test/simple_i18n_test.rb
 - test/slugged_test.rb
 - test/sti_test.rb
-homepage: http://github.com/norman/friendly_id
+homepage: https://github.com/norman/friendly_id
 licenses:
 - MIT
 metadata: {}
@@ -217,14 +220,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: []
-has_rdoc: