friendly_id 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6650a7d112a806cb566708865ade666184dab77a
-  data.tar.gz: 2cde3e354e65e588d566a02f7e61d2b7e5e77657
+  metadata.gz: 8e06bb63996e0c196fdc9b046374456806184bec
+  data.tar.gz: 51da9c8b121bd5a6ced25d80ca159c3eb2e993d9
 SHA512:
-  metadata.gz: 38805122e7a3cef575c89dab8945589815c80d871ec01f6f2932fb7542a9240b00cdb3506d8cc1edbe5f42aa65d96c66cf5c3909dd9f4eefd5dfa03745f846c9
-  data.tar.gz: fc87f81b4c941571d34c961efa2fa6c81fbb02c29befa9a7b615ff7a3c392884f8dea699be2774c231449aeb2c982a38aea47bc7504b70e5f34b2847d0a491ae
+  metadata.gz: 71d163c9f61753d7a9333885de13623458e2f41ab00aa0b26d29c772ad796678e50efb27c0026e584300453391302d5eeec6bfe2cb6e3258a4162df02791d70e
+  data.tar.gz: 87b4bccf78201f7c6bf16b596e4ac77f7d34e494e8ebef11e8189f5da13af61b754b8341caff647f528d0f1b5ac7a336284d9f74f47965eb8d05f7797f5c93f0

data/.travis.yml

@@ -1,27 +1,30 @@
 language: ruby
+
 rvm:
   - 2.0.0
   - 2.1.0
   - jruby-19mode
   - rbx-2
+
 env:
   - DB=postgres
   - DB=mysql
+
 gemfile:
   - gemfiles/Gemfile.rails-4.0.rb
-  - gemfiles/Gemfile.rails-stable.rb
   - gemfiles/Gemfile.rails-4.1.rb
+  - gemfiles/Gemfile.rails-4.2.rb
+
+sudo: false
+
+# Per https://github.com/travis-ci/travis-ci/issues/2821
+install: bundle install --retry=3
 
 before_script: 'bundle exec rake db:create db:up'
-script: 'COVERAGE=true bundle exec rake test'
+
+script: 'COVERALLS=true bundle exec rake test'
+
 matrix:
   allow_failures:
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile.rails-4.1.rb
-      env: DB=postgres
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile.rails-4.1.rb
-      env: DB=mysql
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile.rails-4.1.rb
-      env: DB=sqlite3
+    - gemfile: gemfiles/Gemfile.rails-4.2.rb
+

data/Changelog.md

@@ -3,14 +3,25 @@
 We would like to think our many {file:Contributors contributors} for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.1.0 (2015-01-15)
+
+* FriendlyId will no longer allow blank strings as slugs ([#571](https://github.com/norman/friendly_id/pull/571)).
+* FriendlyId will now try to use the first non-reserved candidate as its
+  slug and will only mark the record invalid if all candidates ([#536](https://github.com/norman/friendly_id/issues/536)).
+* Fix order dependence bug between history and scoped modules ([#588](https://github.com/norman/friendly_id/pull/588)).
+* Fix "friendly" finds on Rails 4.2 ([#607](https://github.com/norman/friendly_id/issues/607)).
+
+## 5.0.5 (2015-01-15)
+
+* Backported bugfixes and Rails 4.2 support from 5.1.0.
+
 ## 5.0.4 (2014-05-29)
 
 * Bug fix for call to removed `primary` method on Edge Rails. ([#557](https://github.com/norman/friendly_id/pull/557)).
-* Bug for for unwanted slug regeneration when the slug source was not changed, but not the actual generated slug ([#563](https://github.com/norman/friendly_id/pull/562)).
+* Bug fix for unwanted slug regeneration when the slug source was changed, but not the actual generated slug ([#563](https://github.com/norman/friendly_id/pull/562)).
 * Big fix to look for UUIDs only at the end of slugs ([#548](https://github.com/norman/friendly_id/pull/548)).
 * Various documentation and test setup improvements.
 
-
 ## 5.0.3 (2013-02-14)
 
 * Bug fix for calls to #dup with unslugged models ([#518](https://github.com/norman/friendly_id/pull/518)).

data/Gemfile

@@ -2,8 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
-# Database Configuration
 group :development, :test do
+  platforms :ruby do
+    gem 'byebug'
+  end
+
   platforms :jruby do
     gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta2'
     gem 'kramdown'

data/README.md

@@ -1,4 +1,6 @@
-[![Build Status](https://travis-ci.org/norman/friendly_id.png)](https://travis-ci.org/norman/friendly_id)
+[![Build Status](https://travis-ci.org/norman/friendly_id.svg)](https://travis-ci.org/norman/friendly_id)
+[![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**
 
@@ -12,19 +14,6 @@ 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.
 
-**VERSION NOTE**
-
-**Rails 4**:
-
-The master branch of this repository contains FriendlyId 5, the current stable version.
-5.x is the only version that is compatible with Rails 4.
-
-**Rails 3**:
-
-If you wish to use this gem with Rails 3.1 or 3.2 you must use FriendlyId 4,
-which is the previous stable release. Please see the [4.0-stable
-branch](https://github.com/norman/friendly_id/tree/4.0-stable).
-
 # FriendlyId
 
 <em>For the most complete, user-friendly documentation, see the [FriendlyId Guide](http://norman.github.io/friendly_id/file.Guide.html).</em>
@@ -47,6 +36,16 @@ instead of:
 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
@@ -107,7 +106,7 @@ The most important changes are:
   `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 (currently in alpha).
+* 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
@@ -143,6 +142,7 @@ The most current docs from the master branch can always be found
 
 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/)
@@ -162,7 +162,7 @@ cd my_app
 ```
 ```ruby
 # Gemfile
-gem 'friendly_id', '~> 5.0.0' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
+gem 'friendly_id', '~> 5.1.0' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
 ```
 ```shell
 rails generate friendly_id

data/friendly_id.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'railties', '~> 4.0'
-  s.add_development_dependency 'minitest', '>= 4.4.0'
-  s.add_development_dependency 'mocha', '~> 0.13.3'
+  s.add_development_dependency 'minitest', '~> 5.3.5'
+  s.add_development_dependency 'mocha', '~> 1.1.0'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'i18n'
   s.add_development_dependency 'ffaker'

data/gemfiles/{Gemfile.rails-stable.rb → Gemfile.rails-4.2.rb}

@@ -2,11 +2,13 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'rails', github: 'rails/rails', branch: '4-1-stable' do
+gem 'rails', '~> 4.2.0.rc3' do
   gem 'activerecord'
   gem 'railties'
 end
 
+gem 'i18n', '0.7.0.beta1'
+
 # Database Configuration
 group :development, :test do
   platforms :jruby do

data/lib/friendly_id.rb

@@ -28,7 +28,7 @@ The concept of *slugs* is at the heart of FriendlyId.
 
 A slug is the part of a URL which identifies a page using human-readable
 keywords, rather than an opaque identifier such as a numeric id. This can make
-your application more friendly both for users and search engine.
+your application more friendly both for users and search engines.
 
 #### Finders: Slugs Act Like Numeric IDs
 

data/lib/friendly_id/base.rb

@@ -14,7 +14,7 @@ options:
     end
 
 The most important option is `:use`, which you use to tell FriendlyId which
-addons it should use. See the documentation for this method for a list of all
+addons it should use. See the documentation for {FriendlyId::Base#friendly_id} for a list of all
 available addons, or skim through the rest of the docs to get a high-level
 overview.
 
@@ -222,7 +222,7 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     end
 
     def primary_key_type
-      @primary_key_type ||= columns.find { |c| c.name == primary_key}.type
+      @primary_key_type ||= columns_hash[primary_key].type
     end
   end
 

data/lib/friendly_id/candidates.rb

@@ -13,11 +13,12 @@ module FriendlyId
       @candidates = to_candidate_array(object, array.flatten(1))
     end
 
-
-    # Visits each slug candidate, calls it, passes it to `normalize_friendly_id` and yields the result.
+    # Visits each candidate, calls it, passes it to `normalize_friendly_id` and
+    # yields the wanted slug candidates.
     def each(*args, &block)
-      @candidates.each(*args) do |candidate|
-        yield @object.normalize_friendly_id(candidate.map(&:call).join(' '))
+      @candidates.map do |candidate|
+        slug = @object.normalize_friendly_id(candidate.map(&:call).join(' '))
+        yield slug if wanted?(slug)
       end
     end
 
@@ -41,5 +42,9 @@ module FriendlyId
         end
       end
     end
+
+    def wanted?(slug)
+      !slug.blank?
+    end
   end
-end
+end

data/lib/friendly_id/finders.rb

@@ -76,6 +76,9 @@ 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
+          model_class.send(:extend, friendly_id_config.finder_methods)
+        end
       end
     end
 

data/lib/friendly_id/history.rb

@@ -60,6 +60,9 @@ method.
         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
       end
     end
@@ -87,7 +90,11 @@ method.
       private
 
       def first_by_friendly_id(id)
-        where(friendly_id_config.query_field => id).first ||
+        matching_record = where(friendly_id_config.query_field => id).first
+        matching_record || slug_table_record(id)
+      end
+
+      def slug_table_record(id)
         select(quoted_table_name + '.*').joins(:slugs).where(slug_history_clause(id)).first
       end
 
@@ -106,7 +113,7 @@ method.
       return relation if new_record?
       relation = relation.merge(Slug.where('sluggable_id <> ?', id))
       if friendly_id_config.uses?(:scoped)
-        relation = relation.where(:scope => serialized_scope)
+        relation = relation.where(Slug.arel_table[:scope].eq(serialized_scope))
       end
       relation
     end

data/lib/friendly_id/initializer.rb

@@ -76,9 +76,9 @@ FriendlyId.defaults do |config|
   # }
   #
   # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
-  # languages that don't use the Roman alphabet, that's not usually suffient. Here
-  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
-  # you use this, don't forget to add "babosa" to your Gemfile.
+  # languages that don't use the Roman alphabet, that's not usually sufficient.
+  # Here we use the Babosa library to transliterate Russian Cyrillic slugs to
+  # ASCII. If you use this, don't forget to add "babosa" to your Gemfile.
   #
   # config.use Module.new {
   #   def normalize_friendly_id(text)

data/lib/friendly_id/scoped.rb

@@ -127,7 +127,7 @@ an example of one way to set this up:
         relation = relation.where(column => send(column))
       end
       primary_key_name = self.class.primary_key
-      relation.where.not(primary_key_name => send(primary_key_name))
+      relation.where(self.class.arel_table[primary_key_name].not_eq(send(primary_key_name)))
     end
     private :scope_for_slug_generator
 
@@ -163,7 +163,8 @@ an example of one way to set this up:
       private
 
       def reflection_foreign_key(scope)
-        model_class.reflections[scope].try(:foreign_key)
+        reflection = model_class.reflections[scope] || model_class.reflections[scope.to_s]
+        reflection.try(:foreign_key)
       end
     end
   end

data/lib/friendly_id/slug_generator.rb

@@ -1,6 +1,6 @@
 module FriendlyId
-  # The default slug generator offers functionality to check slug strings for
-  # uniqueness and, if necessary, appends a sequence to guarantee it.
+  # The default slug generator offers functionality to check slug candidates for
+  # availability.
   class SlugGenerator
 
     def initialize(scope)
@@ -11,12 +11,8 @@ module FriendlyId
       !@scope.exists_by_friendly_id?(slug)
     end
 
-    def add(slug)
-      slug
-    end
-
     def generate(candidates)
-      candidates.each {|c| return add c if available?(c)}
+      candidates.each {|c| return c if available?(c)}
       nil
     end
 

data/lib/friendly_id/slugged.rb

@@ -12,7 +12,7 @@ some text processing.
 
 For example, blog applications typically use a post title to provide the basis
 of a search engine friendly URL. Such identifiers typically lack uppercase
-characters, use ASCII to approximate UTF-8 character, and strip out other
+characters, use ASCII to approximate UTF-8 characters, and strip out other
 characters which may make them aesthetically unappealing or error-prone when
 used in a URL.
 
@@ -100,11 +100,11 @@ FriendlyId refers to this internally as the "base" method.
 When you try to insert a record that would generate a duplicate friendly id,
 FriendlyId will append a UUID to the generated slug to ensure uniqueness:
 
-    car = Car.create :title => "Peugot 206"
-    car2 = Car.create :title => "Peugot 206"
+    car = Car.create :title => "Peugeot 206"
+    car2 = Car.create :title => "Peugeot 206"
 
-    car.friendly_id #=> "peugot-206"
-    car2.friendly_id #=> "peugot-206-f9f3789a-daec-4156-af1d-fab81aa16ee5"
+    car.friendly_id #=> "peugeot-206"
+    car2.friendly_id #=> "peugeot-206-f9f3789a-daec-4156-af1d-fab81aa16ee5"
 
 Previous versions of FriendlyId appended a numeric sequence to make slugs
 unique, but this was removed to simplify using FriendlyId in concurrent code.
@@ -251,9 +251,9 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     # Process the given value to make it suitable for use as a slug.
     #
     # This method is not intended to be invoked directly; FriendlyId uses it
-    # internaly to process strings into slugs.
+    # internally to process strings into slugs.
     #
-    # However, if FriendlyId's default slug generation doesn't suite your needs,
+    # However, if FriendlyId's default slug generation doesn't suit your needs,
     # you can override this method in your model class to control exactly how
     # slugs are generated.
     #
@@ -296,7 +296,7 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     end
 
     def resolve_friendly_id_conflict(candidates)
-      candidates.first + friendly_id_config.sequence_separator + SecureRandom.uuid
+      [candidates.first, SecureRandom.uuid].compact.join(friendly_id_config.sequence_separator)
     end
 
     # Sets the slug.
@@ -313,7 +313,7 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
       scope = self.class.base_class.unscoped
       scope = scope.friendly unless scope.respond_to?(:exists_by_friendly_id?)
       primary_key_name = self.class.primary_key
-      scope.where.not(primary_key_name => send(primary_key_name))
+      scope.where(self.class.base_class.arel_table[primary_key_name].not_eq(send(primary_key_name)))
     end
     private :scope_for_slug_generator
 
@@ -342,12 +342,12 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
       # sequence_separator} configuration option.
       # @return String The sequence separator string. Defaults to "`-`".
       def sequence_separator
-        @sequence_separator or defaults[:sequence_separator]
+        @sequence_separator ||= defaults[:sequence_separator]
       end
 
       # The column that will be used to store the generated slug.
       def slug_column
-        @slug_column or defaults[:slug_column]
+        @slug_column ||= defaults[:slug_column]
       end
     end
   end

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.0.4"
+  VERSION = "5.0.5"
 end

data/test/base_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class CoreTest < MiniTest::Unit::TestCase
+class CoreTest < Minitest::Test
   include FriendlyId::Test
 
   test "friendly_id can be added using 'extend'" do
@@ -69,4 +69,4 @@ class CoreTest < MiniTest::Unit::TestCase
       FriendlyId.instance_variable_set :@defaults, nil
     end
   end
-end
+end

data/test/configuration_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class ConfigurationTest < MiniTest::Unit::TestCase
+class ConfigurationTest < Minitest::Test
 
   include FriendlyId::Test
 

data/test/core_test.rb

@@ -11,7 +11,7 @@ class Author < ActiveRecord::Base
   has_many :books
 end
 
-class CoreTest < MiniTest::Unit::TestCase
+class CoreTest < Minitest::Test
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -33,16 +33,4 @@ class CoreTest < MiniTest::Unit::TestCase
   test "instances should have a friendly id" do
     with_instance_of(model_class) {|record| assert record.friendly_id}
   end
-
-  test "instances can be marshaled when a relationship is used" do
-    transaction do
-      author = Author.create :name => 'Philip'
-      author.books.create :name => 'my book'
-      begin
-        assert Marshal.load(Marshal.dump(author))
-      rescue TypeError => e
-        flunk(e.to_s)
-      end
-    end
-  end
 end

data/test/finders_test.rb

@@ -7,7 +7,7 @@ class JournalistWithFriendlyFinders < ActiveRecord::Base
   friendly_id :name, use: [:slugged, :finders]
 end
 
-class Finders < MiniTest::Unit::TestCase
+class Finders < Minitest::Test
 
   include FriendlyId::Test
 

data/test/helper.rb

@@ -1,23 +1,22 @@
 require "bundler/setup"
-if ENV['COVERAGE']
-  require 'coveralls'
-  Coveralls.wear!
-end
-
-require "minitest/unit"
-require "mocha/setup"
-require "active_record"
-require 'active_support/core_ext/time/conversions'
-
 
-if ENV["COVERAGE"]
+if ENV['COVERALLS'] || ENV['COVERAGE']
   require 'simplecov'
+  if ENV['COVERALLS']
+    require 'coveralls'
+    SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  end
   SimpleCov.start do
-    add_filter "test/"
-    add_filter "friendly_id/migration"
+    add_filter 'test'
+    add_filter 'friendly_id/migration'
   end
 end
 
+require 'minitest'
+require "mocha/setup"
+require "active_record"
+require 'active_support/core_ext/time/conversions'
+
 I18n.enforce_available_locales = false
 
 require "friendly_id"
@@ -32,7 +31,7 @@ module FriendlyId
   module Test
 
     def self.included(base)
-      MiniTest::Unit.autorun
+      Minitest.autorun
     end
 
     def transaction

data/test/history_test.rb

@@ -5,7 +5,7 @@ class Manual < ActiveRecord::Base
   friendly_id :name, :use => [:slugged, :history]
 end
 
-class HistoryTest < MiniTest::Unit::TestCase
+class HistoryTest < Minitest::Test
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -195,9 +195,9 @@ class HistoryTestWithFriendlyFinders < HistoryTest
         record.save!
         begin
           assert model_class.find(old_friendly_id)
-          assert model_class.exists?(old_friendly_id), "should exist? by old id"
-        rescue ActiveRecord::RecordNotFound
-          flunk "Could not find record by old id"
+          assert model_class.exists?(old_friendly_id), "should exist? by old id for #{model_class.name}"
+        rescue ActiveRecord::RecordNotFound => e
+          flunk "Could not find record by old id for #{model_class.name}"
         end
       end
     end
@@ -211,10 +211,10 @@ end
 class Restaurant < ActiveRecord::Base
   extend FriendlyId
   belongs_to :city
-  friendly_id :name, :use => [:history, :scoped], :scope => :city
+  friendly_id :name, :use => [:scoped, :history], :scope => :city
 end
 
-class ScopedHistoryTest < MiniTest::Unit::TestCase
+class ScopedHistoryTest < Minitest::Test
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
 
@@ -274,4 +274,4 @@ class ScopedHistoryTest < MiniTest::Unit::TestCase
       assert_equal record.slug, second_record.slug
     end
   end
-end
+end

data/test/object_utils_test.rb

@@ -1,7 +1,7 @@
 require "helper"
 
 
-class ObjectUtilsTest < MiniTest::Unit::TestCase
+class ObjectUtilsTest < Minitest::Test
 
   include FriendlyId::Test
 

data/test/reserved_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class ReservedTest < MiniTest::Unit::TestCase
+class ReservedTest < Minitest::Test
 
   include FriendlyId::Test
 

data/test/scoped_test.rb

@@ -20,7 +20,7 @@ class Publisher < ActiveRecord::Base
   has_many :novels
 end
 
-class ScopedTest < MiniTest::Unit::TestCase
+class ScopedTest < Minitest::Test
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -58,46 +58,14 @@ class ScopedTest < MiniTest::Unit::TestCase
     end
   end
 
-  test "should not allow duplicate slugs inside scope after regeneration for persisted record" do
-    with_instance_of Novelist do |novelist|
-      novel1 = Novel.create! :name => "a", :novelist => novelist
-      novel2 = Novel.new :name => "a", :novelist => novelist
-      novel2.save!
-
-      novel2.send(:set_slug)
-      first_generated_friendly_id = novel2.friendly_id
-      novel2.send(:set_slug)
-      second_generated_friendly_id = novel2.friendly_id
-
-      assert novel1.friendly_id != novel2.friendly_id
-    end
-  end
-
-  test "should not allow duplicate slugs inside scope after regeneration for new record" do
-    with_instance_of Novelist do |novelist|
-      novel1 = Novel.create! :name => "a", :novelist => novelist
-      novel2 = Novel.new :name => "a", :novelist => novelist
-
-      novel2.send(:set_slug)
-      first_generated_friendly_id = novel2.friendly_id
-      novel2.send(:set_slug)
-      second_generated_friendly_id = novel2.friendly_id
-      novel2.save!
-
-      assert novel1.friendly_id != novel2.friendly_id
-    end
-  end
-
   test "should apply scope with multiple columns" do
     transaction do
       novelist = Novelist.create! :name => "a"
       publisher = Publisher.create! :name => "b"
-
       novel1 = Novel.create! :name => "c", :novelist => novelist, :publisher => publisher
       novel2 = Novel.create! :name => "c", :novelist => novelist, :publisher => Publisher.create(:name => "d")
       novel3 = Novel.create! :name => "c", :novelist => Novelist.create(:name => "e"), :publisher => publisher
       novel4 = Novel.create! :name => "c", :novelist => novelist, :publisher => publisher
-
       assert_equal novel1.friendly_id, novel2.friendly_id
       assert_equal novel2.friendly_id, novel3.friendly_id
       assert novel3.friendly_id != novel4.friendly_id
@@ -112,4 +80,5 @@ class ScopedTest < MiniTest::Unit::TestCase
       assert_equal old_id, record.friendly_id
     end
   end
+
 end

data/test/shared.rb

@@ -124,8 +124,10 @@ module FriendlyId
           with_instance_of(model_class) {|record| assert_equal record.friendly_id, record.to_param}
         end
 
-        test "should be findable by themselves" do
-          with_instance_of(model_class) {|record| assert_equal record, model_class.friendly.find(record)}
+        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 2
+          test "should be findable by themselves" do
+            with_instance_of(model_class) {|record| assert_equal record, model_class.friendly.find(record)}
+          end
         end
 
         test "updating record's other values should not change the friendly_id" do

data/test/simple_i18n_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class SimpleI18nTest < MiniTest::Unit::TestCase
+class SimpleI18nTest < Minitest::Test
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
@@ -88,7 +88,7 @@ class SimpleI18nTest < MiniTest::Unit::TestCase
     end
   end
 
-  class RegressionTest < MiniTest::Unit::TestCase
+  class RegressionTest < Minitest::Test
     include FriendlyId::Test
 
     test "should not overwrite other locale's slugs on update_attributes" do
@@ -107,7 +107,7 @@ class SimpleI18nTest < MiniTest::Unit::TestCase
     end
   end
 
-  class ConfigurationTest < MiniTest::Unit::TestCase
+  class ConfigurationTest < Minitest::Test
     test "should add locale to slug column for a non-default locale" do
       I18n.with_locale :es do
         assert_equal "slug_es", Journalist.friendly_id_config.slug_column

data/test/slugged_test.rb

@@ -19,7 +19,7 @@ class Novelist < ActiveRecord::Base
   end
 end
 
-class SluggedTest < MiniTest::Unit::TestCase
+class SluggedTest < Minitest::Test
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -79,12 +79,12 @@ class SluggedTest < MiniTest::Unit::TestCase
   end
 
   test "should not update matching slug" do
-    with_instance_of(model_class) do |record|
-      class << record
-        def should_generate_new_friendly_id?
-          name_changed?
-        end
+    klass = Class.new model_class do
+      def should_generate_new_friendly_id?
+        name_changed?
       end
+    end
+    with_instance_of klass do |record|
       old_id = record.friendly_id
       record.name += " "
       record.save!
@@ -94,7 +94,7 @@ class SluggedTest < MiniTest::Unit::TestCase
 
 end
 
-class SlugGeneratorTest < MiniTest::Unit::TestCase
+class SlugGeneratorTest < Minitest::Test
 
   include FriendlyId::Test
 
@@ -156,38 +156,9 @@ class SlugGeneratorTest < MiniTest::Unit::TestCase
     end
   end
 
-  test "should not allow duplicate slugs after regeneration for persisted record" do
-    transaction do
-      model1 = model_class.create! :name => "a"
-      model2 = model_class.new :name => "a"
-      model2.save!
-
-      model2.send(:set_slug)
-      first_generated_friendly_id = model2.friendly_id
-      model2.send(:set_slug)
-      second_generated_friendly_id = model2.friendly_id
-
-      assert model1.friendly_id != model2.friendly_id
-    end
-  end
-
-  test "should not allow duplicate slugs after regeneration for new record" do
-    transaction do
-      model1 = model_class.create! :name => "a"
-      model2 = model_class.new :name => "a"
-
-      model2.send(:set_slug)
-      first_generated_friendly_id = model2.friendly_id
-      model2.send(:set_slug)
-      second_generated_friendly_id = model2.friendly_id
-
-      assert model1.friendly_id != model2.friendly_id
-    end
-  end
-
 end
 
-class SlugSeparatorTest < MiniTest::Unit::TestCase
+class SlugSeparatorTest < Minitest::Test
 
   include FriendlyId::Test
 
@@ -230,9 +201,16 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
       assert_match(/\Apeugeot-206-([a-z0-9]+\-){4}[a-z0-9]+\z/, record2.slug)
     end
   end
+
+  test "should sequence blank slugs without a separator" do
+    with_instance_of model_class, :name => "" do |record|
+      assert_match(/\A([a-z0-9]+\-){4}[a-z0-9]+\z/, record.slug)
+    end
+  end
+
 end
 
-class DefaultScopeTest < MiniTest::Unit::TestCase
+class DefaultScopeTest < Minitest::Test
 
   include FriendlyId::Test
 
@@ -254,9 +232,11 @@ class DefaultScopeTest < MiniTest::Unit::TestCase
       assert Journalist.create :name => "a", :active => true
     end
   end
+
 end
 
-class UuidAsPrimaryKeyFindTest < MiniTest::Unit::TestCase
+class UuidAsPrimaryKeyFindTest < Minitest::Test
+
   include FriendlyId::Test
 
   class MenuItem < ActiveRecord::Base
@@ -284,9 +264,8 @@ class UuidAsPrimaryKeyFindTest < MiniTest::Unit::TestCase
   end
 
   test "should have a uuid_key as a primary key" do
-    assert_equal model_class.primary_key, "uuid_key"
-    assert_equal model_class.columns.find { |c| c.name == model_class.primary_key}.name, "uuid_key"
-    assert_equal model_class.primary_key_type, :uuid
+    assert_equal "uuid_key", model_class.primary_key
+    assert_equal :uuid, model_class.primary_key_type
   end
 
   test "should be findable by the UUID primary key" do
@@ -302,9 +281,11 @@ class UuidAsPrimaryKeyFindTest < MiniTest::Unit::TestCase
       end
     end
   end
+
 end
 
-class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase
+class UnderscoreAsSequenceSeparatorRegressionTest < Minitest::Test
+
   include FriendlyId::Test
 
   class Manual < ActiveRecord::Base
@@ -314,10 +295,12 @@ class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase
 
   test "should not create duplicate slugs" do
     3.times do
-      begin
-        assert Manual.create! :name => "foo"
-      rescue
-        flunk "Tried to insert duplicate slug"
+      transaction do
+        begin
+          assert Manual.create! :name => "foo"
+        rescue
+          flunk "Tried to insert duplicate slug"
+        end
       end
     end
   end
@@ -325,7 +308,8 @@ class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase
 end
 
 # https://github.com/norman/friendly_id/issues/148
-class FailedValidationAfterUpdateRegressionTest < MiniTest::Unit::TestCase
+class FailedValidationAfterUpdateRegressionTest < Minitest::Test
+
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
@@ -346,4 +330,5 @@ class FailedValidationAfterUpdateRegressionTest < MiniTest::Unit::TestCase
       assert_equal "joseph-pulitzer", journalist.to_param
     end
   end
+
 end

data/test/sti_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class StiTest < MiniTest::Unit::TestCase
+class StiTest < Minitest::Test
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -76,7 +76,7 @@ class StiTestWithHistory < StiTest
 end
 
 
-class StiTestWithFinders < MiniTest::Unit::TestCase
+class StiTestWithFinders < Minitest::Test
 
   include FriendlyId::Test
 
@@ -110,7 +110,7 @@ class StiTestWithFinders < MiniTest::Unit::TestCase
 
 end
 
-class StiTestSubClass < MiniTest::Unit::TestCase
+class StiTestSubClass < Minitest::Test
 
   include FriendlyId::Test
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,30 +57,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 5.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 5.3.5
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ files:
 - friendly_id.gemspec
 - gemfiles/Gemfile.rails-4.0.rb
 - gemfiles/Gemfile.rails-4.1.rb
-- gemfiles/Gemfile.rails-stable.rb
+- gemfiles/Gemfile.rails-4.2.rb
 - guide.rb
 - lib/friendly_id.rb
 - lib/friendly_id/.gitattributes
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.