friendly_id 4.0.2 → 4.0.3

data/.travis.yml

@@ -1,8 +1,8 @@
 rvm:
   - 1.9.3
   - 1.8.7
-  - jruby
-  - rbx
+#  - jruby
+#  - rbx
 
 branches:
   only:

data/.yardopts

@@ -1,3 +1,4 @@
 --files=WhatsNew.md,Changelog.md,Guide.rdoc
+--private
 --protected
 --exclude lib/friendly_id/migration

data/Changelog.md

@@ -6,6 +6,13 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 4.0.3 (2012-03-14)
+
+* Fix escape for '%' and '_' on SQLite (Norman Clarke and Sergey Petrunin)
+* Allow FriendlyId to be extended or included (Norman Clarke)
+* Allow Configuration#use to accept a Module (Norman Clarke)
+* Fix bugs with History module + STI (Norman Clarke and Sergey Petrunin)
+
 ## 4.0.2 (2012-03-12)
 
 * Improved conflict handling and performance in History module (Erik Ogan and Thomas Shafer)

data/Guide.rdoc

@@ -38,12 +38,13 @@ with numeric ids:
 
 == Setting Up FriendlyId in Your Model
 
-To use FriendlyId in your ActiveRecord models, you must first extend the
-FriendlyId module, then invoke the {FriendlyId::Base#friendly_id friendly_id}
-method to configure your desired options:
+To use FriendlyId in your ActiveRecord models, you must first either extend or
+include the FriendlyId module (it makes no difference), then invoke the
+{FriendlyId::Base#friendly_id friendly_id} method to configure your desired
+options:
 
     class Foo < ActiveRecord::Base
-      extend FriendlyId
+      include FriendlyId
       friendly_id :bar, :use => [:slugged, :simple_i18n]
     end
 
@@ -401,7 +402,7 @@ an example of one way to set this up:
     http://example.org/cities/chicago/restaurants/joes-diner
 
 
-== Simple I18n
+== Translating Slugs Using Simple I18n
 
 The {FriendlyId::SimpleI18n SimpleI18n} module adds very basic i18n support to
 FriendlyId.
@@ -409,8 +410,12 @@ FriendlyId.
 In order to use this module, your model must have a slug column for each locale.
 By default FriendlyId looks for columns named, for example, "slug_en",
 "slug_es", etc. The first part of the name can be configured by passing the
-+:slug_column+ option if you choose. Note that as of 4.0.0.beta11, the column
-for the default locale must also include the locale in its name.
++:slug_column+ option if you choose. Note that the column for the default locale
+must also include the locale in its name.
+
+This module is most suitable to applications that need to support few locales.
+If you need to support two or more locales, you may wish to use the
+{FriendlyId::Globalize Globalize} module instead.
 
 === Example migration
 
@@ -462,6 +467,54 @@ current locale:
   end
 
 
+== Translating Slugs Using Globalize
+
+The {FriendlyId::Globalize Globalize} module lets you use
+Globalize[https://github.com/svenfuchs/globalize3] to translate slugs. This
+module is most suitable for applications that need to be localized to many
+languages. If your application only needs to be localized to one or two
+languages, you may wish to consider the {FriendlyId::SimpleI18n SimpleI18n}
+module.
+
+In order to use this module, your model must have a slug column and set the
+field +slug+ as translable with Globalize:
+
+    class Post < ActiveRecord::Base
+      translates :title, :slug
+      extend FriendlyId
+      friendly_id :title, :use => :globalize
+    end
+
+=== Finds
+
+Finds will take the current locale into consideration:
+
+  I18n.locale = :it
+  Post.find("guerre-stellari")
+  I18n.locale = :en
+  Post.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(:it) do
+    Post.find("guerre-stellari")
+  end
+
+=== Creating Records
+
+When new records are created, the slug is generated for the current locale only.
+
+=== Translating Slugs
+
+To translate an existing record's friendly_id, simply change the locale and
+assign a value to the +slug+ field:
+
+  I18n.with_locale(:it) do
+    post.slug = "guerre-stellari"
+  end
+
+
 == Reserved Words
 
 The {FriendlyId::Reserved Reserved} module adds the ability to exlude a list of

data/Rakefile

@@ -3,7 +3,14 @@ require "rake/testtask"
 
 task :default => :test
 
+task :load_path do
+  %w(lib test).each do |path|
+    $LOAD_PATH.unshift(File.expand_path("../#{path}", __FILE__))
+  end
+end
+
 Rake::TestTask.new do |t|
+  t.libs << "test"
   t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
@@ -21,7 +28,7 @@ task :yard => :guide do
   puts %x{bundle exec yard}
 end
 
-task :bench do
+task :bench => :load_path do
   require File.expand_path("../bench", __FILE__)
 end
 
@@ -40,6 +47,7 @@ task :guide do
   buffer << read_comments("lib/friendly_id/history.rb")
   buffer << read_comments("lib/friendly_id/scoped.rb")
   buffer << read_comments("lib/friendly_id/simple_i18n.rb")
+  buffer << read_comments("lib/friendly_id/globalize.rb")
   buffer << read_comments("lib/friendly_id/reserved.rb")
 
   File.open("Guide.rdoc", "w") do |file|
@@ -55,7 +63,7 @@ namespace :test do
     dir = File.expand_path("../test", __FILE__)
     Dir["#{dir}/*_test.rb"].each do |test|
       puts "Running #{test}:"
-      puts %x{ruby #{test}}
+      puts %x{ruby -Ilib -Itest #{test}}
     end
   end
 end
@@ -63,8 +71,8 @@ end
 namespace :db do
 
   desc "Create the database"
-  task :create do
-    require File.expand_path("../test/helper", __FILE__)
+  task :create => :load_path do
+    require "helper"
     driver = FriendlyId::Test::Database.driver
     config = FriendlyId::Test::Database.config[driver]
     commands = {
@@ -75,8 +83,8 @@ namespace :db do
   end
 
   desc "Create the database"
-  task :drop do
-    require File.expand_path("../test/helper", __FILE__)
+  task :drop => :load_path do
+    require "helper"
     driver = FriendlyId::Test::Database.driver
     config = FriendlyId::Test::Database.config[driver]
     commands = {
@@ -87,8 +95,8 @@ namespace :db do
   end
 
   desc "Set up the database schema"
-  task :up do
-    require File.expand_path("../test/helper", __FILE__)
+  task :up => :load_path do
+    require "helper"
     FriendlyId::Test::Schema.up
   end
 

data/lib/friendly_id.rb

@@ -45,7 +45,7 @@ with numeric ids:
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 
   @mutex = Mutex.new
 
@@ -90,6 +90,11 @@ module FriendlyId
     end
   end
 
+  # Allow developers to `include` FriendlyId or `extend` it.
+  def self.included(model_class)
+    model_class.extend self
+  end
+
   # Set global defaults for all models using FriendlyId.
   #
   # The default defaults are to use the +:reserved+ module and nothing else.

data/lib/friendly_id/base.rb

@@ -3,12 +3,13 @@ module FriendlyId
 
 == Setting Up FriendlyId in Your Model
 
-To use FriendlyId in your ActiveRecord models, you must first extend the
-FriendlyId module, then invoke the {FriendlyId::Base#friendly_id friendly_id}
-method to configure your desired options:
+To use FriendlyId in your ActiveRecord models, you must first either extend or
+include the FriendlyId module (it makes no difference), then invoke the
+{FriendlyId::Base#friendly_id friendly_id} method to configure your desired
+options:
 
     class Foo < ActiveRecord::Base
-      extend FriendlyId
+      include FriendlyId
       friendly_id :bar, :use => [:slugged, :simple_i18n]
     end
 
@@ -129,10 +130,34 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     #     end
     #   end
     #
-    # @option options [Symbol] :use The name of an addon to use. By default,
-    #   FriendlyId provides {FriendlyId::Slugged :slugged},
+    # === Including Your Own Modules
+    #
+    # Because :use can accept a name or a Module, {FriendlyId.defaults defaults}
+    # can be a convenient place to set up behavior common to all classes using
+    # FriendlyId. You can include any module, or more conveniently, define one
+    # on-the-fly. For example, let's say you want to make
+    # Babosa[http://github.com/norman/babosa] the default slugging library in
+    # place of Active Support, and transliterate all slugs from Russian Cyrillic
+    # to ASCII:
+    #
+    #   require "babosa"
+    #
+    #   FriendlyId.defaults do |config|
+    #     config.base = :name
+    #     config.use :slugged
+    #     config.use Module.new {
+    #       def normalize_friendly_id(text)
+    #         text.to_slug.normalize(:transliterations => [:russian, :latin])
+    #       end
+    #     }
+    #   end
+    #
+    #
+    # @option options [Symbol,Module] :use The addon or name of an addon to use.
+    #   By default, FriendlyId provides {FriendlyId::Slugged :slugged},
     #   {FriendlyId::History :history}, {FriendlyId::Reserved :reserved}, and
-    #   {FriendlyId::Scoped :scoped}.
+    #   {FriendlyId::Scoped :scoped}, {FriendlyId::SimpleI18n :simple_i18n},
+    #   and {FriendlyId::Globalize :globalize}.
     #
     # @option options [Array] :reserved_words Available when using +:reserved+,
     #   which is loaded by default. Sets an array of words banned for use as
@@ -161,21 +186,24 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     #
     # @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.use options.delete :use
-      @friendly_id_config.send :set, base ? options.merge(:base => base) : options
+      yield friendly_id_config if block_given?
+      friendly_id_config.use options.delete :use
+      friendly_id_config.send :set, base ? options.merge(:base => base) : options
       before_save {|rec| rec.instance_eval {@current_friendly_id = friendly_id}}
       include Model
     end
 
     # Returns the model class's {FriendlyId::Configuration friendly_id_config}.
     # @note In the case of Single Table Inheritance (STI), this method will
-    #   duplicate the parent class's FriendlyId::Configuration instance on first
-    #   access. If you're concerned about thread safety, then be sure to invoke
-    #   {#friendly_id} in your class for each model.
+    #   duplicate the parent class's FriendlyId::Configuration and relation class
+    #   on first access. If you're concerned about thread safety, then be sure
+    #   to invoke {#friendly_id} in your class for each model.
     def friendly_id_config
       @friendly_id_config or begin
-       @friendly_id_config = base_class.friendly_id_config.dup
+        @friendly_id_config = base_class.friendly_id_config.dup.tap do |config|
+          config.model_class = self
+          @relation_class = base_class.send(:relation_class)
+        end
       end
     end
 

data/lib/friendly_id/configuration.rb

@@ -32,7 +32,7 @@ module FriendlyId
 
     # The model class that this configuration belongs to.
     # @return ActiveRecord::Base
-    attr_reader :model_class
+    attr_accessor :model_class
 
     def initialize(model_class, values = nil)
       @model_class = model_class
@@ -51,13 +51,14 @@ module FriendlyId
     #     extend FriendlyId
     #     friendly_id :name, :use => :slugged
     #   end
-    # @param [#to_s] *modules Arguments should be a symbols or strings that
-    #   correspond with the name of a module inside the FriendlyId namespace. By
-    #   default FriendlyId provides +:slugged+, +:history+, +:simple_i18n+ and +:scoped+.
+    # @param [#to_s,Module] *modules Arguments should be Modules, or symbols or
+    #   strings that correspond with the name of a module inside the FriendlyId
+    #   namespace. By default FriendlyId provides +:slugged+, +:history+,
+    #   +:simple_i18n+, +:globalize+, and +:scoped+.
     def use(*modules)
-      modules.to_a.flatten.compact.map do |name|
-        mod = FriendlyId.const_get(name.to_s.classify)
-        model_class.send(:include, mod) unless model_class < mod
+      modules.to_a.flatten.compact.map do |object|
+        mod = object.kind_of?(Module) ? object : FriendlyId.const_get(object.to_s.classify)
+        model_class.send(:include, mod)
       end
     end
 

data/lib/friendly_id/globalize.rb

@@ -4,13 +4,17 @@ module FriendlyId
 
 =begin
 
-== Translate slug db column using Globalize
+== Translating Slugs Using Globalize
 
-The {FriendlyId::Globalize Globalize} module allow to use
-Globalize (https://github.com/svenfuchs/globalize3) to translate slugs.
+The {FriendlyId::Globalize Globalize} module lets you use
+Globalize[https://github.com/svenfuchs/globalize3] to translate slugs. This
+module is most suitable for applications that need to be localized to many
+languages. If your application only needs to be localized to one or two
+languages, you may wish to consider the {FriendlyId::SimpleI18n SimpleI18n}
+module.
 
 In order to use this module, your model must have a slug column and set the
-field +slug+ translable with Globalize:
+field +slug+ as translable with Globalize:
 
     class Post < ActiveRecord::Base
       translates :title, :slug
@@ -20,7 +24,7 @@ field +slug+ translable with Globalize:
 
 === Finds
 
-Finds will take into consideration the current locale:
+Finds will take the current locale into consideration:
 
   I18n.locale = :it
   Post.find("guerre-stellari")
@@ -40,8 +44,8 @@ When new records are created, the slug is generated for the current locale only.
 
 === Translating Slugs
 
-To translate an existing record's friendly_id, simply change locale and assign
-+slug+ field:
+To translate an existing record's friendly_id, simply change the locale and
+assign a value to the +slug+ field:
 
   I18n.with_locale(:it) do
     post.slug = "guerre-stellari"

data/lib/friendly_id/history.rb

@@ -74,12 +74,15 @@ method.
     private
 
     def create_slug
+      return unless friendly_id
       return if slugs.first.try(:slug) == friendly_id
       # Allow reversion back to a previously used slug
       relation = slugs.where(:slug => friendly_id)
       result = relation.select("id").lock(true).all
       relation.delete_all unless result.empty?
-      slugs.create! :slug => friendly_id
+      slugs.create! do |record|
+        record.slug = friendly_id
+      end
     end
 
     # Adds a finder that explictly uses slugs from the slug table.
@@ -106,7 +109,7 @@ method.
       # Accepts a slug, and yields a corresponding sluggable_id into the block.
       def with_old_friendly_id(slug, &block)
         sql = "SELECT sluggable_id FROM #{Slug.quoted_table_name} WHERE sluggable_type = %s AND slug = %s"
-        sql = sql % [@klass.base_class.name, slug].map {|x| connection.quote(x)}
+        sql = sql % [@klass.base_class.to_s, slug].map {|x| connection.quote(x)}
         sluggable_id = connection.select_values(sql).first
         yield sluggable_id if sluggable_id
       end
@@ -117,17 +120,14 @@ method.
     module SlugGenerator
 
       private
-      def last_in_sequence
-        @_last_in_sequence ||= extract_sequence_from_slug(conflict.slug)
-      end
 
       def conflicts
-        sluggable_class = friendly_id_config.model_class
+        sluggable_class = friendly_id_config.model_class.base_class
         pkey            = sluggable_class.primary_key
         value           = sluggable.send pkey
 
         scope = Slug.where("slug = ? OR slug LIKE ?", normalized, wildcard)
-        scope = scope.where(:sluggable_type => sluggable_class.name)
+        scope = scope.where(:sluggable_type => sluggable_class.to_s)
         scope = scope.where("sluggable_id <> ?", value) unless sluggable.new_record?
         scope.order("LENGTH(slug) DESC, slug DESC")
       end

data/lib/friendly_id/simple_i18n.rb

@@ -4,7 +4,7 @@ module FriendlyId
 
 =begin
 
-== Simple I18n
+== Translating Slugs Using Simple I18n
 
 The {FriendlyId::SimpleI18n SimpleI18n} module adds very basic i18n support to
 FriendlyId.
@@ -12,8 +12,12 @@ FriendlyId.
 In order to use this module, your model must have a slug column for each locale.
 By default FriendlyId looks for columns named, for example, "slug_en",
 "slug_es", etc. The first part of the name can be configured by passing the
-+:slug_column+ option if you choose. Note that as of 4.0.0.beta11, the column
-for the default locale must also include the locale in its name.
++:slug_column+ option if you choose. Note that the column for the default locale
+must also include the locale in its name.
+
+This module is most suitable to applications that need to support few locales.
+If you need to support two or more locales, you may wish to use the
+{FriendlyId::Globalize Globalize} module instead.
 
 === Example migration
 

data/lib/friendly_id/slug.rb

@@ -5,5 +5,10 @@ module FriendlyId
   class Slug < ActiveRecord::Base
     self.table_name = "friendly_id_slugs"
     belongs_to :sluggable, :polymorphic => true
+
+    def to_param
+      slug
+    end
+
   end
 end

data/lib/friendly_id/slug_generator.rb

@@ -51,11 +51,14 @@ module FriendlyId
     end
 
     def conflicts
-      sluggable_class = friendly_id_config.model_class
+      sluggable_class = friendly_id_config.model_class.base_class
 
       pkey  = sluggable_class.primary_key
       value = sluggable.send pkey
-      scope = sluggable_class.unscoped.where("#{column} = ? OR #{column} LIKE ?", normalized, wildcard)
+      base = "#{column} = ? OR #{column} LIKE ?"
+      # Awful hack for SQLite3, which does not pick up '\' as the escape character without this.
+      base << "ESCAPE '\\'" if sluggable.connection.adapter_name =~ /sqlite/i
+      scope = sluggable_class.unscoped.where(base, normalized, wildcard)
       scope = scope.where("#{pkey} <> ?", value) unless sluggable.new_record?
       scope = scope.order("LENGTH(#{column}) DESC, #{column} DESC")
     end

data/test/base_test.rb

@@ -1,8 +1,22 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 class CoreTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
+  test "friendly_id can be added using 'extend'" do
+    klass = Class.new(ActiveRecord::Base) do
+      extend FriendlyId
+    end
+    assert klass.respond_to? :friendly_id
+  end
+
+  test "friendly_id can be added using 'include'" do
+    klass = Class.new(ActiveRecord::Base) do
+      include FriendlyId
+    end
+    assert klass.respond_to? :friendly_id
+  end
+
   test "friendly_id should accept a base and a hash" do
     klass = Class.new(ActiveRecord::Base) do
       self.abstract_class = true

data/test/configuration_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper", __FILE__)
+require "helper"
 
 class ConfigurationTest < MiniTest::Unit::TestCase
 
@@ -26,4 +26,23 @@ class ConfigurationTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "#use should accept a name that resolves to a module" do
+    refute @model_class < FriendlyId::Slugged
+    @model_class.class_eval do
+      extend FriendlyId
+      friendly_id :hello, :use => :slugged
+    end
+    assert @model_class < FriendlyId::Slugged
+  end
+
+  test "#use should accept a module" do
+    my_module = Module.new
+    refute @model_class < my_module
+    @model_class.class_eval do
+      extend FriendlyId
+      friendly_id :hello, :use => my_module
+    end
+    assert @model_class < my_module
+  end
+
 end

data/test/core_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 class Author < ActiveRecord::Base
   extend FriendlyId

data/test/generator_test.rb

@@ -1,5 +1,4 @@
-require File.expand_path("../helper", __FILE__)
-
+require "helper"
 require "rails/generators"
 require "generators/friendly_id_generator"
 

data/test/helper.rb

@@ -1,7 +1,3 @@
-$: << File.expand_path("../../lib", __FILE__)
-$: << File.expand_path("../", __FILE__)
-$:.uniq!
-
 require "rubygems"
 require "bundler/setup"
 require "mocha"

data/test/history_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 class Manual < ActiveRecord::Base
   extend FriendlyId
@@ -133,3 +133,17 @@ class HistoryTest < MiniTest::Unit::TestCase
   end
 
 end
+
+class HistoryTestWithSti < HistoryTest
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => [:slugged, :history]
+  end
+
+  class Editorialist < Journalist
+  end
+
+  def model_class
+    Editorialist
+  end
+end

data/test/i18n_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 class I18nTest < MiniTest::Unit::TestCase
   include FriendlyId::Test

data/test/object_utils_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 
 class ObjectUtilsTest < MiniTest::Unit::TestCase

data/test/reserved_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 class ReservedTest < MiniTest::Unit::TestCase
 

data/test/schema.rb

@@ -32,6 +32,7 @@ module FriendlyId
           add_column :novels, :novelist_id, :integer
           add_column :novels, :publisher_id, :integer
           remove_index :novels, :slug
+          add_index :novels, [:slug, :publisher_id, :novelist_id], :unique => true
 
           # This will be used to test column name quoting
           add_column :journalists, "strange name", :string

data/test/scoped_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper", __FILE__)
+require "helper"
 
 class Novelist < ActiveRecord::Base
   extend FriendlyId

data/test/shared.rb

@@ -46,7 +46,7 @@ module FriendlyId
             record.slug = nil
             record.save!
             assert_nil record.slug
-            record.save
+            record.save!
             refute_nil record.slug
           end
         end

data/test/slugged_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 class Journalist < ActiveRecord::Base
   extend FriendlyId
@@ -202,6 +202,26 @@ class SluggedRegressionsTest < MiniTest::Unit::TestCase
   end
 end
 
+class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase
+  include FriendlyId::Test
+
+  class Manual < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => :slugged, :sequence_separator => "_"
+  end
+
+  test "should not create duplicate slugs" do
+    3.times do
+      begin
+        assert Manual.create! :name => "foo"
+      rescue
+        flunk "Tried to insert duplicate slug"
+      end
+    end
+  end
+
+end
+
 # https://github.com/norman/friendly_id/issues/148
 class FailedValidationAfterUpdateRegressionTest < MiniTest::Unit::TestCase
   include FriendlyId::Test

data/test/sti_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../helper.rb", __FILE__)
+require "helper"
 
 class StiTest < MiniTest::Unit::TestCase
 
@@ -30,6 +30,10 @@ class StiTest < MiniTest::Unit::TestCase
     assert_equal :bar, klass.friendly_id_config.slug_column
   end
 
+  test "the configuration's model_class should be the class, not the base_class" do
+    assert_equal model_class, model_class.friendly_id_config.model_class
+  end
+
   test "friendly_id should accept a block with single table inheritance" do
     abstract_klass = Class.new(ActiveRecord::Base) do
       def self.table_exists?; false end
@@ -47,11 +51,27 @@ class StiTest < MiniTest::Unit::TestCase
   end
 
   test "friendly_id slugs should not clash with eachother" do
-    journalist  = Journalist.create! :name => 'foo bar'
-    editoralist = Editorialist.create! :name => 'foo bar'
+    transaction do
+      journalist  = model_class.base_class.create! :name => 'foo bar'
+      editoralist = model_class.create! :name => 'foo bar'
 
-    assert_equal 'foo-bar', journalist.slug
-    assert_equal 'foo-bar--2', editoralist.slug
+      assert_equal 'foo-bar', journalist.slug
+      assert_equal 'foo-bar--2', editoralist.slug
+    end
   end
 
 end
+
+class StiTestWithHistory < StiTest
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => [:slugged, :history]
+  end
+
+  class Editorialist < Journalist
+  end
+
+  def model_class
+    Editorialist
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70322875898160 !ruby/object:Gem::Requirement
+  requirement: &70135168764860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70322875898160
+  version_requirements: *70135168764860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70322875893740 !ruby/object:Gem::Requirement
+  requirement: &70135168764100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70322875893740
+  version_requirements: *70135168764100
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70322875889580 !ruby/object:Gem::Requirement
+  requirement: &70135168763460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322875889580
+  version_requirements: *70135168763460
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70322875886660 !ruby/object:Gem::Requirement
+  requirement: &70135171790060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322875886660
+  version_requirements: *70135171790060
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70322875883700 !ruby/object:Gem::Requirement
+  requirement: &70135171789640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322875883700
+  version_requirements: *70135171789640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70322875857480 !ruby/object:Gem::Requirement
+  requirement: &70135171789220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322875857480
+  version_requirements: *70135171789220
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70322875830720 !ruby/object:Gem::Requirement
+  requirement: &70135171788800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322875830720
+  version_requirements: *70135171788800
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70322875828040 !ruby/object:Gem::Requirement
+  requirement: &70135171788380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322875828040
+  version_requirements: *70135171788380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70322875809660 !ruby/object:Gem::Requirement
+  requirement: &70135171787960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322875809660
+  version_requirements: *70135171787960
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for