friendly_id 5.1.0 → 5.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05f2fb35bb72c551d82747fa97512d24f526e4d8
-  data.tar.gz: 82a341d6308aaa9f49bfe6cf70bcd53a45d35caf
+  metadata.gz: d11cd5a5fc78a05718add4cf44e44f4425700f02
+  data.tar.gz: 581623a3a24eff70d1e0ee307bdcaf814631a80c
 SHA512:
-  metadata.gz: 2635b18db56f42000f06a6ec6b7dd9ebb9c7189af7b21fa7ba1794611d3a3e0cef183e1f639dfdd238e6bcd53fd98d5e6e5bce58fe007a2cbe194dfbfa05e99f
-  data.tar.gz: 98cfc3779cbe4fc466622ebf00c16135341325965979fc6b985cde411201a2a98aa3ed5ae61b9d66492790187f5354cc753e7ad3997ed524c9c64353fc27fb7b
+  metadata.gz: 9068ff6f4efaab2c47673eb31b5f700898d5fad4f3d6f3fa754e7b9f9264ee1b02689637af319995c83a2b0771a40d7c70ce422b112e8337b0281ba42a5e41bb
+  data.tar.gz: 5726a377bc4573bfb59cbfdc0d0d4abe224516bd691017299809da5304abd51477da9c8c7bb0f48916afd44b4de9b77ddc81716e0e9be69e24427018eb7abe51

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
+cache: bundler
 
 rvm:
+  - 2.2.0
   - 2.0.0
   - 2.1.0
   - jruby-19mode
@@ -15,16 +17,14 @@ gemfile:
   - gemfiles/Gemfile.rails-4.1.rb
   - gemfiles/Gemfile.rails-4.2.rb
 
-sudo: false
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+      gemfile: gemfiles/Gemfile.rails-4.2.rb
+      env: DB=postgres
 
-# Per https://github.com/travis-ci/travis-ci/issues/2821
-install: bundle install --retry=3
+sudo: false
 
 before_script: 'bundle exec rake db:create db:up'
 
 script: 'COVERALLS=true bundle exec rake test'
-
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.rails-4.2.rb
-

data/Changelog.md

@@ -3,6 +3,14 @@
 We would like to think our many {file:Contributors contributors} for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.2.0 (NOT RELEASED YET)
+
+* 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)).
+
 ## 5.1.0 (2015-01-15)
 
 * FriendlyId will no longer allow blank strings as slugs ([#571](https://github.com/norman/friendly_id/pull/571)).
@@ -96,7 +104,7 @@ suggestions, ideas and improvements to FriendlyId.
 * `find` no longer falls back to super unless id is fully numeric string (Norman Clarke).
 * Default sequence separator is now '-' rather than '--'.
 * Support for Globalize has been removed until Globalize supports Rails 4.
-* Removed upport for Ruby < 1.9.3 and Rails < 4.0.
+* Removed support for Ruby < 1.9.3 and Rails < 4.0.
 
 ## 4.0.10.1 (2013-08-20)
 

data/README.md

@@ -7,7 +7,7 @@
 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 anwered.
+already been answered.
 
 Please only post issues in Github issues for actual bugs.
 
@@ -135,6 +135,11 @@ add_index    :friendly_id_slugs, [:slug, :sluggable_type]
 add_index    :friendly_id_slugs, [:slug, :sluggable_type, :scope], unique: true
 ```
 
+## 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
@@ -151,9 +156,12 @@ 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.
 
+For a getting started video, you may want to watch [GoRails #9](https://gorails.com/episodes/pretty-urls-with-friendly-id)
+
 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.
 
+
 ## Rails Quickstart
 
 ```shell

data/Rakefile

@@ -67,7 +67,7 @@ namespace :db do
     %x{#{commands[driver] || true}}
   end
 
-  desc "Create the database"
+  desc "Drop the database"
   task :drop => :load_path do
     require "helper"
     driver = FriendlyId::Test::Database.driver

data/gemfiles/Gemfile.rails-4.0.rb

@@ -2,12 +2,16 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
+gem 'activerecord', '~> 4.0.13'
+gem 'railties', '~> 4.0.13'
+gem 'minitest', '~> 4.5.0'
+
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta2'
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0.beta2'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0.beta2'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.14'
+    gem 'activerecord-jdbcmysql-adapter', '~> 1.3.14'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.14'
     gem 'kramdown'
   end
 

data/gemfiles/Gemfile.rails-4.1.rb

@@ -2,15 +2,15 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activerecord', '~> 4.1.0'
-gem 'railties', '~> 4.1.0'
+gem 'activerecord', '~> 4.1.9'
+gem 'railties', '~> 4.1.9'
 
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta2'
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0.beta2'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0.beta2'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.14'
+    gem 'activerecord-jdbcmysql-adapter', '~> 1.3.14'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.14'
     gem 'kramdown'
   end
 

data/gemfiles/Gemfile.rails-4.2.rb

@@ -2,19 +2,15 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'rails', '~> 4.2.0.rc3' do
-  gem 'activerecord'
-  gem 'railties'
-end
-
-gem 'i18n', '0.7.0.beta1'
+gem 'activerecord', '~> 4.2.1'
+gem 'railties', '~> 4.2.1'
+gem 'i18n', '~> 0.7.0'
 
 # Database Configuration
 group :development, :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta2'
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0.beta2'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0.beta2'
+    gem 'activerecord-jdbcmysql-adapter', '~> 1.3.14'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.14'
     gem 'kramdown'
   end
 

data/lib/friendly_id.rb

@@ -42,13 +42,14 @@ with numeric ids:
 =end
 module FriendlyId
 
-  autoload :History,    "friendly_id/history"
-  autoload :Slug,       "friendly_id/slug"
-  autoload :SimpleI18n, "friendly_id/simple_i18n"
-  autoload :Reserved,   "friendly_id/reserved"
-  autoload :Scoped,     "friendly_id/scoped"
-  autoload :Slugged,    "friendly_id/slugged"
-  autoload :Finders,    "friendly_id/finders"
+  autoload :History,             "friendly_id/history"
+  autoload :Slug,                "friendly_id/slug"
+  autoload :SimpleI18n,          "friendly_id/simple_i18n"
+  autoload :Reserved,            "friendly_id/reserved"
+  autoload :Scoped,              "friendly_id/scoped"
+  autoload :Slugged,             "friendly_id/slugged"
+  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

data/lib/friendly_id/base.rb

@@ -244,7 +244,8 @@ 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 diff = changes[friendly_id_config.query_field]
+      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

data/lib/friendly_id/candidates.rb

@@ -23,6 +23,9 @@ module FriendlyId
       unless pre_candidates.all? {|x| reserved?(x)}
         pre_candidates.reject! {|x| reserved?(x)}
       end
+
+      return pre_candidates unless block_given?
+
       pre_candidates.each {|x| yield x}
     end
 

data/lib/friendly_id/history.rb

@@ -95,7 +95,7 @@ method.
       end
 
       def slug_table_record(id)
-        select(quoted_table_name + '.*').joins(:slugs).where(slug_history_clause(id)).first
+        select(quoted_table_name + '.*').joins(:slugs).where(slug_history_clause(id)).order(Slug.arel_table[:id].desc).first
       end
 
       def slug_history_clause(id)

data/lib/friendly_id/initializer.rb

@@ -59,13 +59,17 @@ FriendlyId.defaults do |config|
   #
   # config.sequence_separator = '-'
   #
+  # Note that you must use the :slugged addon **prior** to the line which
+  # configures the sequence separator, or else FriendlyId will raise an undefined
+  # method error.
+  #
   #  ## Tips and Tricks
   #
   #  ### Controlling when slugs are generated
   #
   # As of FriendlyId 5.0, new slugs are generated only when the slug field is
   # nil, but if you're using a column as your base method can change this
-  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # 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.
   #

data/lib/friendly_id/sequentially_slugged.rb

@@ -0,0 +1,74 @@
+module FriendlyId
+  module SequentiallySlugged
+    def self.setup(model_class)
+      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)
+      SequentialSlugCalculator.new(scope_for_slug_generator,
+                                  candidate_slugs.first,
+                                  friendly_id_config.slug_column,
+                                  friendly_id_config.sequence_separator).next_slug
+    end
+
+    class SequentialSlugCalculator
+      attr_accessor :scope, :slug, :slug_column, :sequence_separator
+
+      def initialize(scope, slug, slug_column, sequence_separator)
+        @scope = scope
+        @slug = slug
+        @slug_column = scope.connection.quote_column_name(slug_column)
+        @sequence_separator = sequence_separator
+      end
+
+      def next_slug
+        slug + sequence_separator + next_sequence_number.to_s
+      end
+
+    private
+
+      def next_sequence_number
+        last_sequence_number ? last_sequence_number + 1 : 2
+      end
+
+      def last_sequence_number
+        if match = /#{slug}#{sequence_separator}(\d+)\z/.match(slug_conflicts.last)
+          match[1].to_i
+        end
+      end
+
+      def slug_conflicts
+        scope.
+          where(conflict_query, slug, sequential_slug_matcher).
+          order(ordering_query).pluck(slug_column)
+      end
+
+      def conflict_query
+        base = "#{slug_column} = ? OR #{slug_column} LIKE ?"
+        # Awful hack for SQLite3, which does not pick up '\' as the escape character
+        # without this.
+        base << " ESCAPE '\\'" if scope.connection.adapter_name =~ /sqlite/i
+        base
+      end
+
+      def sequential_slug_matcher
+        # Underscores (matching a single character) and percent signs (matching
+        # any number of characters) need to be escaped. While this looks like
+        # an excessive number of backslashes, it is correct.
+        "#{slug}#{sequence_separator}".gsub(/[_%]/, '\\\\\&') + '%'
+      end
+
+      # Return the unnumbered (shortest) slug first, followed by the numbered ones
+      # in ascending order.
+      def ordering_query
+        length_command = "LENGTH"
+        length_command = "LEN" if scope.connection.adapter_name =~ /sqlserver/i
+        "#{length_command}(#{slug_column}) ASC, #{slug_column} ASC"
+      end
+    end
+  end
+end

data/lib/friendly_id/slugged.rb

@@ -84,7 +84,9 @@ FriendlyId uses.
 Here's an example of a class that uses a custom method to generate the slug:
 
     class Person < ActiveRecord::Base
-      friendly_id :name_and_location
+      extend FriendlyId
+      friendly_id :name_and_location, use: :slugged
+
       def name_and_location
         "#{name} from #{location}"
       end
@@ -186,7 +188,7 @@ control exactly when new friendly ids are set:
       end
     end
 
-If you want to extend the default behavior but, adding your own conditions,
+If you want to extend the default behavior but add your own conditions,
 don't forget to invoke `super` from your implementation:
 
     class Category < ActiveRecord::Base
@@ -246,14 +248,15 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
         defaults[:sequence_separator] ||= '-'
       end
       model_class.before_validation :set_slug
+      model_class.after_validation :unset_slug_if_invalid
     end
 
     # 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.
     #
@@ -322,6 +325,14 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     end
     private :slug_generator
 
+    def unset_slug_if_invalid
+      if errors.present? && attribute_changed?(friendly_id_config.query_field)
+        diff = changes[friendly_id_config.query_field]
+        self.slug = diff.first
+      end
+    end
+    private :unset_slug_if_invalid
+
     # This module adds the `:slug_column`, and `:sequence_separator`, and
     # `:slug_generator_class` configuration options to
     # {FriendlyId::Configuration FriendlyId::Configuration}.

data/lib/friendly_id/version.rb

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

data/test/base_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class CoreTest < Minitest::Test
+class CoreTest < TestCaseClass
   include FriendlyId::Test
 
   test "friendly_id can be added using 'extend'" do

data/test/candidates_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class CandidatesTest < Minitest::Test
+class CandidatesTest < TestCaseClass
 
   include FriendlyId::Test
 
@@ -114,4 +114,30 @@ class CandidatesTest < Minitest::Test
     end
   end
 
+  test "allows to iterate through candidates without passing block" do
+    klass = Class.new model_class do
+      def slug_candidates
+        :name
+      end
+    end
+    with_instances_of klass do |_, city|
+      candidates = FriendlyId::Candidates.new(city, city.slug_candidates)
+      assert_equal candidates.each, ['new-york']
+    end
+  end
+
+  test "iterates through candidates with passed block" do
+    klass = Class.new model_class do
+      def slug_candidates
+        :name
+      end
+    end
+    with_instances_of klass do |_, city|
+      collected_candidates = []
+      candidates = FriendlyId::Candidates.new(city, city.slug_candidates)
+      candidates.each { |candidate| collected_candidates << candidate }
+      assert_equal collected_candidates, ['new-york']
+    end
+  end
+
 end

data/test/configuration_test.rb

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

data/test/core_test.rb

@@ -11,7 +11,7 @@ class Author < ActiveRecord::Base
   has_many :books
 end
 
-class CoreTest < Minitest::Test
+class CoreTest < TestCaseClass
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core

data/test/finders_test.rb

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

data/test/helper.rb

@@ -12,7 +12,18 @@ if ENV['COVERALLS'] || ENV['COVERAGE']
   end
 end
 
-require 'minitest'
+begin
+  require 'minitest'
+rescue LoadError
+  require 'minitest/unit'
+end
+
+begin
+  TestCaseClass = MiniTest::Test
+rescue NameError
+  TestCaseClass = MiniTest::Unit::TestCase
+end
+
 require "mocha/setup"
 require "active_record"
 require 'active_support/core_ext/time/conversions'
@@ -31,7 +42,12 @@ module FriendlyId
   module Test
 
     def self.included(base)
-      Minitest.autorun
+      if Minitest.respond_to?(:autorun)
+        Minitest.autorun
+      else
+        require 'minitest/autorun'
+      end
+    rescue LoadError
     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::Test
+class HistoryTest < TestCaseClass
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -117,6 +117,19 @@ class HistoryTest < Minitest::Test
     end
   end
 
+  test "should prefer product that used slug most recently" do
+    transaction do
+      first_record = model_class.create! name: "foo"
+      second_record = model_class.create! name: "bar"
+
+      first_record.update! slug: "not_foo"
+      second_record.update! slug: "foo" #now both records have used foo; second_record most recently
+      second_record.update! slug: "not_bar"
+
+      assert_equal model_class.friendly.find("foo"), second_record
+    end
+  end
+
   test 'should name table according to prefix and suffix' do
     transaction do
       begin
@@ -214,7 +227,7 @@ class Restaurant < ActiveRecord::Base
   friendly_id :name, :use => [:scoped, :history], :scope => :city
 end
 
-class ScopedHistoryTest < Minitest::Test
+class ScopedHistoryTest < TestCaseClass
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
 

data/test/object_utils_test.rb

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

data/test/reserved_test.rb

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

data/test/scoped_test.rb

@@ -20,7 +20,7 @@ class Publisher < ActiveRecord::Base
   has_many :novels
 end
 
-class ScopedTest < Minitest::Test
+class ScopedTest < TestCaseClass
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core

data/test/sequentially_slugged_test.rb

@@ -0,0 +1,96 @@
+require 'helper'
+
+class Article < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, :use => :sequentially_slugged
+end
+
+class SequentiallySluggedTest < TestCaseClass
+  include FriendlyId::Test
+  include FriendlyId::Test::Shared::Core
+
+  def model_class
+    Article
+  end
+
+  test "should generate numerically sequential slugs" do
+    transaction do
+      records = 12.times.map { model_class.create! :name => "Some news" }
+      assert_equal "some-news", records[0].slug
+      (1...12).each {|i| assert_equal "some-news-#{i + 1}", records[i].slug}
+    end
+  end
+
+  test "should cope when slugs are missing from the sequence" do
+    transaction do
+      record_1 = model_class.create!(:name => 'A thing')
+      record_2 = model_class.create!(:name => 'A thing')
+      record_3 = model_class.create!(:name => 'A thing')
+
+      assert_equal 'a-thing', record_1.slug
+      assert_equal 'a-thing-2', record_2.slug
+      assert_equal 'a-thing-3', record_3.slug
+
+      record_2.destroy
+
+      record_4 = model_class.create!(:name => 'A thing')
+
+      assert_equal 'a-thing-4', record_4.slug
+    end
+  end
+
+  test "should cope with strange column names" do
+    model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "journalists"
+      extend FriendlyId
+      friendly_id :name, :use => :sequentially_slugged, :slug_column => "strange name"
+    end
+
+    transaction do
+      record_1 = model_class.create! name: "Julian Assange"
+      record_2 = model_class.create! name: "Julian Assange"
+
+      assert_equal 'julian-assange', record_1.attributes["strange name"]
+      assert_equal 'julian-assange-2', record_2.attributes["strange name"]
+    end
+  end
+
+  test "should correctly sequence slugs that end in a number" do
+    transaction do
+      record1 = model_class.create! :name => "Peugeuot 206"
+      assert_equal "peugeuot-206", record1.slug
+      record2 = model_class.create! :name => "Peugeuot 206"
+      assert_equal "peugeuot-206-2", record2.slug
+    end
+  end
+
+  test "should correctly sequence slugs that begin with a number" do
+    transaction do
+      record1 = model_class.create! :name => "2010 to 2015 Records"
+      assert_equal "2010-to-2015-records", record1.slug
+      record2 = model_class.create! :name => "2010 to 2015 Records"
+      assert_equal "2010-to-2015-records-2", record2.slug
+    end
+  end
+
+  test "should sequence with a custom sequence separator" do
+    model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "novelists"
+      extend FriendlyId
+      friendly_id :name, :use => :sequentially_slugged, :sequence_separator => ':'
+    end
+
+    transaction do
+      record_1 = model_class.create! name: "Julian Barnes"
+      record_2 = model_class.create! name: "Julian Barnes"
+
+      assert_equal 'julian-barnes', record_1.slug
+      assert_equal 'julian-barnes:2', record_2.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
+  end
+end

data/test/simple_i18n_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class SimpleI18nTest < Minitest::Test
+class SimpleI18nTest < TestCaseClass
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
@@ -88,7 +88,7 @@ class SimpleI18nTest < Minitest::Test
     end
   end
 
-  class RegressionTest < Minitest::Test
+  class RegressionTest < TestCaseClass
     include FriendlyId::Test
 
     test "should not overwrite other locale's slugs on update_attributes" do
@@ -107,7 +107,7 @@ class SimpleI18nTest < Minitest::Test
     end
   end
 
-  class ConfigurationTest < Minitest::Test
+  class ConfigurationTest < TestCaseClass
     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::Test
+class SluggedTest < TestCaseClass
 
   include FriendlyId::Test
   include FriendlyId::Test::Shared::Core
@@ -92,9 +92,50 @@ class SluggedTest < Minitest::Test
     end
   end
 
+  test "should not set slug on create if unrelated validations fail" do
+    klass = Class.new model_class do
+      validates_presence_of :active
+      friendly_id :name, :use => :slugged
+
+      def self.name
+        "Journalist"
+      end
+    end
+
+    transaction do
+      instance = klass.new :name => 'foo'
+      refute instance.save
+      refute instance.valid?
+      assert_nil instance.slug
+    end
+  end
+
+  test "should not update slug on save if unrelated validations fail" do
+    klass = Class.new model_class do
+      validates_presence_of :active
+      friendly_id :name, :use => :slugged
+
+      def self.name
+        "Journalist"
+      end
+    end
+
+    transaction do
+      instance = klass.new :name => 'foo', :active => true
+      assert instance.save
+      assert instance.valid?
+      instance.name = 'foobar'
+      instance.slug = nil
+      instance.active = nil
+      refute instance.save
+      refute instance.valid?
+      assert_equal 'foo', instance.slug
+    end
+  end
+
 end
 
-class SlugGeneratorTest < Minitest::Test
+class SlugGeneratorTest < TestCaseClass
 
   include FriendlyId::Test
 
@@ -158,7 +199,7 @@ class SlugGeneratorTest < Minitest::Test
 
 end
 
-class SlugSeparatorTest < Minitest::Test
+class SlugSeparatorTest < TestCaseClass
 
   include FriendlyId::Test
 
@@ -210,7 +251,7 @@ class SlugSeparatorTest < Minitest::Test
 
 end
 
-class DefaultScopeTest < Minitest::Test
+class DefaultScopeTest < TestCaseClass
 
   include FriendlyId::Test
 
@@ -235,7 +276,7 @@ class DefaultScopeTest < Minitest::Test
 
 end
 
-class UuidAsPrimaryKeyFindTest < Minitest::Test
+class UuidAsPrimaryKeyFindTest < TestCaseClass
 
   include FriendlyId::Test
 
@@ -284,7 +325,7 @@ class UuidAsPrimaryKeyFindTest < Minitest::Test
 
 end
 
-class UnderscoreAsSequenceSeparatorRegressionTest < Minitest::Test
+class UnderscoreAsSequenceSeparatorRegressionTest < TestCaseClass
 
   include FriendlyId::Test
 
@@ -308,7 +349,7 @@ class UnderscoreAsSequenceSeparatorRegressionTest < Minitest::Test
 end
 
 # https://github.com/norman/friendly_id/issues/148
-class FailedValidationAfterUpdateRegressionTest < Minitest::Test
+class FailedValidationAfterUpdateRegressionTest < TestCaseClass
 
   include FriendlyId::Test
 

data/test/sti_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0.beta.1
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -177,6 +177,7 @@ files:
 - lib/friendly_id/object_utils.rb
 - lib/friendly_id/reserved.rb
 - lib/friendly_id/scoped.rb
+- lib/friendly_id/sequentially_slugged.rb
 - lib/friendly_id/simple_i18n.rb
 - lib/friendly_id/slug.rb
 - lib/friendly_id/slug_generator.rb
@@ -196,6 +197,7 @@ files:
 - test/reserved_test.rb
 - test/schema.rb
 - test/scoped_test.rb
+- test/sequentially_slugged_test.rb
 - test/shared.rb
 - test/simple_i18n_test.rb
 - test/slugged_test.rb
@@ -215,12 +217,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.