friendly_id 2.1.5 → 2.2.0

data/History.txt

@@ -1,14 +1,18 @@
-== 2.1.5 2011-02-22
+== 2.2.0 2009-10-19
 
-* 1 major bugfix
-  * Fixed compatibility with Rails 2.1 multibyte
+* 1 major enhancement:
+  *  Added slug caching, offers huge performance boost (Bruno Michel)
+
+* 2 minor enhancements:
+  * Handle Unicode string length correctly (Mikhail Shirkov)
+  * Remove alias_method_chain in favor of super (Diego Carrion)
 
 == 2.1.4 2009-09-01
 
-* 1 minor enhancement:
+* 3 minor enhancements:
   * Fixed upgrade generator not installing rake tasks (Harry Love)
   * Fixed handling of very large id's (Nathan Phelps)
-  * Fixed long index name on migration (Ron Ingram)
+  * Fixed long index name on migration (Rob Ingram)
 
 == 2.1.3 2009-06-03
 
@@ -109,7 +113,7 @@ an error being thrown. (Steve Luscher)
 
 == 2008-07-14
 
-* Improved slug generation for friendly id's with apostrophes. (alistairholt)
+* Improved slug generation for friendly id's with apostrophes. (Alistair Holt)
 * Added support for namespaced models in Rakefile. (David Ramalho)
 
 == 2008-06-23

data/README.rdoc

@@ -143,6 +143,50 @@ As of FriendlyId version 2.0.2, "new" and "index" are reseved by default. When
 you attempt to store a reserved value, FriendlyId raises a
 FriendlyId::SlugGenerationError.
 
+=== Cached slugs
+
+Checking the slugs table all the time has an impact on performance, so as of
+2.3.0, FriendlyId offers slug caching.
+
+This feature can improve the performance of some views by about 25%, and reduce
+memory consumption by about 40% as compared to the same view without cached
+slugs. The biggest improvement will be for "index" type views with many links
+that depend on slugs to generate the URL.
+
+==== Automagic setup:
+
+To enable slug caching, simply add a column named "cached_slug" to your model.
+FriendlyId will automagically use this column if it detects it:
+
+  class AddCachedSlugToUsers < ActiveRecord::Migration
+    def self.up
+      add_column :users, :cached_slug, :string
+    end
+
+    def self.down
+      remove_column :users, :cached_slug
+    end
+  end
+
+Then, redo the slugs:
+
+  rake friendly_id:redo_slugs MODEL=User
+
+*DO NOT* forget to redo the slugs, or else this feature will not work!
+
+Also note that this feature exists largely to improve the performance of URL
+generation, the part of Rails where FriendlyId has the biggest performance
+impact. FriendlyId never queries against this column, so it's not necessary to
+add an index on it unless your application does.
+
+==== Using a custom column name:
+
+You can also use a different name for the column if you choose, via the
+:cache_column config option:
+
+  class User < ActiveRecord::Base
+    has_friendly_id :name, :use_slug => true, :cache_column => 'my_cached_slug'
+  end
 
 === Scoped Slugs
 
@@ -212,7 +256,7 @@ that uses a non-Roman writing system, your feedback would be most welcome.
   @post.friendly_id # "友好编号在中国"
   @post2 = Post.create(:title => "友好编号在中国")
   @post2.friendly_id # "友好编号在中国--2"
-  
+
 === Custom Slug Generation
 
 While FriendlyId's slug generation options work for most people, you may need
@@ -224,7 +268,7 @@ generation block:
       MySlugGeneratorClass::my_slug_method(text)
     end
   end
-  
+
 FriendlyId will still respect your settings for max length and reserved words,
 but will use your block rather than the baked-in methods to normalize the
 friendly_id text.
@@ -253,14 +297,10 @@ an older version of FriendlyId. Here's how to set it up.
   script/generate friendly_id
   rake db:migrate
 
-2) Load FriendlyId in your app:
+2) Add the gem to config/environment.rb:
 
-  # Rails 2.1 and higher; add this to the gem section of environment.rb:
   config.gem "friendly_id"
 
-  # Rails 2.0; this goes at the bottom of environment.rb
-  require 'friendly_id'
-
 3) Add some code to your models:
 
   class Post < ActiveRecord::Base
@@ -283,46 +323,8 @@ rake friendly_id:remove_old_slugs MODEL=MyModelName DAYS=60
 
 == Installing an older version
 
-If you are still on Rails 2.1 or lower, please install version 2.0.4:
-
-gem install friendly_id --version 2.0.4
-
-Note that this version depends on the Unicode gem, which doesn't compile on
-Windows and is incompatible with Ruby 1.9. It also can't be installed on
-Heroku. If these are problems, you'll need to update your application to Rails
-2.2 or higher and use the current release of FriendlyId.
-
-== Upgrading from an older version
-
-If you installed an older version of FriendlyId and want to upgrade to 2.0.x,
-follow these steps:
-
-==== Install the friendly_id Gem:
-
-  sudo gem install friendly_id
-
-==== Add FriendlyId to environment.rb:
-
-===== For Rails 2.1 and higher:
-
-  config.gem "friendly_id"
-
-===== For Rails 2.0:
-
-Add this to the bottom of environment.rb:
-
-  require 'friendly_id'
-
-==== Remove the older version of FriendlyId:
-
-  git rm -rf vendor/plugins/friendly_id
-  svn delete vendor/plugins/friendly_id
-  # or whatever
-
-====  Generate the upgrade migration and run it
-
-  ./script/generate friendly_id_20_upgrade
-  rake db:migrate
+You can download older versions of FriendlyId from Github that work with Rails <
+2.2. These versions are, however, no longer maintained or supported.
 
 == Hacking FriendlyId:
 
@@ -331,13 +333,36 @@ we love pull requests. :-)
 
 == Bugs:
 
-Please report them on Lighthouse[http://randomba.lighthouseapp.com/projects/14675-friendly_id].
-
+Please report them on the {Github issue tracker}[http://github.com/norman/friendly_id/issues]
+for this project.
 
 == Credits:
 
 FriendlyId was created by {Norman Clarke}[mailto:norman@randomba.org],
 {Adrian Mugnolo}[mailto:adrian@randomba.org], and {Emilio Tagua}[mailto:miloops@gmail.com].
 
+We are grateful for many contributions from the Ruby and Rails community, in
+particular from the following people:
+
+* Adam Cigánek
+* Alistair Holt
+* Andrew Loe III
+* Bence Nagy
+* Bruno Michel
+* Chris Nolan
+* David Ramalho
+* Diego Carrion
+* Florian Aßmann
+* Harry Love
+* Jesse Crouch
+* Joe Van Dyk
+* Josh Nichols
+* Mikhail Shirkov
+* Nathan Phelps
+* Rob Ingram
+* Sean Abrahams
+* Steve Luscher
+* Tim Kadom
+
 Copyright (c) 2008 Norman Clarke, Adrian Mugnolo and Emilio Tagua, released
 under the MIT license.

data/Rakefile

@@ -1,49 +1,31 @@
 require 'newgem'
+require 'hoe'
 require 'lib/friendly_id/version'
+require 'hoe'
 
-$hoe = Hoe.new("friendly_id", FriendlyId::Version::STRING) do |p|
-  p.rubyforge_name = "friendly-id"
-  p.author = ['Norman Clarke', 'Adrian Mugnolo', 'Emilio Tagua']
-  p.email = ['norman@rubysouth.com', 'adrian@rubysouth.com', 'miloops@gmail.com']
-  p.summary = "A comprehensive slugging and pretty-URL plugin for ActiveRecord."
-  p.description = 'A comprehensive slugging and pretty-URL plugin for ActiveRecord.'
-  p.url = 'http://friendly-id.rubyforge.org/'
-  p.test_globs = ['test/**/*_test.rb']
-  p.extra_deps << ['activerecord', '>= 2.0.0']
-  p.extra_deps << ['activesupport', '>= 2.0.0']
-  p.extra_dev_deps << ['newgem', ">= #{::Newgem::VERSION}"]
-  p.extra_dev_deps << ['sqlite3-ruby']
-  p.remote_rdoc_dir = ""
+Hoe.spec "friendly_id" do
+  self.version = FriendlyId::Version::STRING
+  self.rubyforge_name = "friendly-id"
+  self.author = ['Norman Clarke', 'Adrian Mugnolo', 'Emilio Tagua']
+  self.email = ['norman@njclarke.com', 'adrian@mugnolo.com', 'miloops@gmail.com']
+  self.summary = "A comprehensive slugging and pretty-URL plugin for ActiveRecord."
+  self.description = 'A comprehensive slugging and pretty-URL plugin for ActiveRecord.'
+  self.url = 'http://friendly-id.rubyforge.org/'
+  self.test_globs = ['test/**/*_test.rb']
+  self.extra_deps << ['activerecord', '>= 2.2.3']
+  self.extra_deps << ['activesupport', '>= 2.2.3']
+  self.extra_dev_deps << ['newgem', ">= #{::Newgem::VERSION}"]
+  self.extra_dev_deps << ['sqlite3-ruby']
+  self.remote_rdoc_dir = ""
+  self.extra_rdoc_files = ["README.rdoc"]
 end
 
 require 'newgem/tasks'
 
-desc "Run RCov"
-task :rcov do
-  run_coverage Dir["test/**/*_test.rb"]
-end
-
-def run_coverage(files)
-  rm_f "coverage"
-  rm_f "coverage.data"
-  if files.length == 0
-    puts "No files were specified for testing"
-    return
-  end
-  files = files.join(" ")
-  # if RUBY_PLATFORM =~ /darwin/
-  #   exclude = '--exclude "gems/"'
-  # else
-  #   exclude = '--exclude "rubygems"'
-  # end
-  rcov = ENV["RCOV"] ? ENV["RCOV"] : "rcov"
-  sh "#{rcov} -Ilib:test --sort coverage --text-report #{files}"
-end
-
 desc 'Publish RDoc to RubyForge.'
 task :publish_docs => [:clean, :docs] do
   host = "compay@rubyforge.org"
   remote_dir = "/var/www/gforge-projects/friendly-id"
   local_dir = 'doc'
   sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
-end
+end

data/friendly_id.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_id}
-  s.version = "2.1.5"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Norman Clarke", "Adrian Mugnolo", "Emilio Tagua"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2009-09-21}
   s.description = %q{A comprehensive slugging and pretty-URL plugin for ActiveRecord.}
-  s.email = ["norman@njclarke.com", "adrian@mugnolo.com", "miloops@gmail.com"]
+  s.email = ["norman@rubysouth.com", "adrian@rubysouth.com", "miloops@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
   s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "config/website.yml", "friendly_id.gemspec", "generators/friendly_id/friendly_id_generator.rb", "generators/friendly_id/templates/create_slugs.rb", "generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb", "generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb", "init.rb", "lib/friendly_id.rb", "lib/friendly_id/helpers.rb", "lib/friendly_id/non_sluggable_class_methods.rb", "lib/friendly_id/non_sluggable_instance_methods.rb", "lib/friendly_id/slug.rb", "lib/friendly_id/sluggable_class_methods.rb", "lib/friendly_id/sluggable_instance_methods.rb", "lib/friendly_id/version.rb", "lib/tasks/friendly_id.rake", "lib/tasks/friendly_id.rb", "test/contest.rb", "test/custom_slug_normalizer_test.rb", "test/models/book.rb", "test/models/country.rb", "test/models/event.rb", "test/models/novel.rb", "test/models/person.rb", "test/models/post.rb", "test/models/thing.rb", "test/models/user.rb", "test/non_slugged_test.rb", "test/schema.rb", "test/scoped_model_test.rb", "test/slug_test.rb", "test/slugged_model_test.rb", "test/sti_test.rb", "test/test_helper.rb"]
-  s.homepage = %q{http://norman.github.com/friendly_id/}
+  s.homepage = %q{http://friendly-id.rubyforge.org/}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{friendly-id}

data/lib/friendly_id.rb

@@ -12,6 +12,7 @@ module FriendlyId
     :method => nil,
     :reserved => ["new", "index"],
     :reserved_message => 'can not be "%s"',
+    :cache_column => nil,
     :scope => nil,
     :strip_diacritics => false,
     :strip_non_ascii => false,
@@ -22,6 +23,7 @@ module FriendlyId
     :max_length,
     :reserved,
     :reserved_message,
+    :cache_column,
     :scope,
     :strip_diacritics,
     :strip_non_ascii,
@@ -40,9 +42,10 @@ module FriendlyId
     # Options:
     # * <tt>:use_slug</tt> - Defaults to false. Use slugs when you want to use a non-unique text field for friendly ids.
     # * <tt>:max_length</tt> - Defaults to 255. The maximum allowed length for a slug.
+    # * <tt>:cache_column</tt> - Defaults to nil. Use this column as a cache for generating to_param (experimental).
     # * <tt>:strip_diacritics</tt> - Defaults to false. If true, it will remove accents, umlauts, etc. from western characters.
     # * <tt>:strip_non_ascii</tt> - Defaults to false. If true, it will all non-ascii ([^a-z0-9]) characters.
-    # * <tt>:reserved</tt> - Array of words that are reserved and can't be used as friendly_id's. For sluggable models, if such a word is used, it will be treated the same as if that slug was already taken (numeric extension will be appended). Defaults to ["new", "index"].
+    # * <tt>:reserved</tt> - Array of words that are reserved and can't be used as friendly_id's. For sluggable models, if such a word is used, it will raise a FriendlyId::SlugGenerationError. Defaults to ["new", "index"].
     # * <tt>:reserved_message</tt> - The validation message that will be shown when a reserved word is used as a frindly_id. Defaults to '"%s" is reserved'.
     #
     # You can also optionally pass a block if you want to use your own custom
@@ -55,9 +58,15 @@ module FriendlyId
     #       # Use stringex to generate the friendly_id rather than the baked-in methods
     #       text.to_url
     #     end
-    #   end    
+    #   end
     def has_friendly_id(column, options = {}, &block)
       options.assert_valid_keys VALID_FRIENDLY_ID_KEYS
+      unless options.has_key?(:cache_column)
+        if columns.any? { |c| c.name == 'cached_slug' }
+          options[:use_slug] = true
+          options[:cache_column] = :cached_slug
+        end
+      end
       options = DEFAULT_FRIENDLY_ID_OPTIONS.merge(options).merge(:column => column)
       write_inheritable_attribute :friendly_id_options, options
       class_inheritable_accessor :friendly_id_options
@@ -73,6 +82,9 @@ module FriendlyId
         if block_given?
           write_inheritable_attribute :slug_normalizer_block, block
         end
+        if options[:cache_column]
+          attr_protected options[:cache_column].to_sym
+        end
       else
         require 'friendly_id/non_sluggable_class_methods'
         require 'friendly_id/non_sluggable_instance_methods'

data/lib/friendly_id/non_sluggable_class_methods.rb

@@ -4,25 +4,18 @@ module FriendlyId::NonSluggableClassMethods
 
   include FriendlyId::Helpers
 
-  def self.extended(base) #:nodoc:#
-    class << base
-      alias_method_chain :find_one, :friendly
-      alias_method_chain :find_some, :friendly
-    end
-  end
-
   protected
 
-  def find_one_with_friendly(id, options) #:nodoc:#
+  def find_one(id, options) #:nodoc:#
     if id.is_a?(String) && result = send("find_by_#{ friendly_id_options[:column] }", id, options)
       result.send(:found_using_friendly_id=, true)
     else
-      result = find_one_without_friendly id, options
+      result = super id, options
     end
     result
   end
 
-  def find_some_with_friendly(ids_and_names, options) #:nodoc:#
+  def find_some(ids_and_names, options) #:nodoc:#
 
     results = with_scope :find => options do
       find :all, :conditions => ["#{quoted_table_name}.#{primary_key} IN (?) OR #{friendly_id_options[:column].to_s} IN (?)",

data/lib/friendly_id/slug.rb

@@ -28,13 +28,10 @@ class Slug < ActiveRecord::Base
     #   slug.normalize('This... is an example!') # => "this-is-an-example"
     #
     # Note that the Unicode handling in ActiveSupport may fail to process some
-    # characters from Polish, Icelandic and other languages. If your
-    # application uses these languages, check {out this
-    # article}[http://link-coming-soon.com] for information on how to get
-    # better urls in your application.
+    # characters from Polish, Icelandic and other languages.
     def normalize(slug_text)
       return "" if slug_text.nil? || slug_text == ""
-      ActiveSupport::Multibyte::Chars.new(slug_text.to_s).normalize(:kc).
+      ActiveSupport::Multibyte.proxy_class.new(slug_text.to_s).normalize(:kc).
         gsub(/[\W]/u, ' ').
         strip.
         gsub(/\s+/u, '-').
@@ -52,7 +49,8 @@ class Slug < ActiveRecord::Base
     # Remove diacritics (accents, umlauts, etc.) from the string. Borrowed
     # from "The Ruby Way."
     def strip_diacritics(string)
-      ActiveSupport::Multibyte::Chars.new(string).normalize(:kd).unpack('U*').inject([]) { |a, u|
+      a = ActiveSupport::Multibyte.proxy_class.new(string).normalize(:kd) || ""
+      a.unpack('U*').inject([]) { |a, u|
         if ASCII_APPROXIMATIONS[u]
           a += ASCII_APPROXIMATIONS[u].unpack('U*')
         elsif (u < 0x300 || u > 0x036F)
@@ -99,4 +97,4 @@ class Slug < ActiveRecord::Base
     self.sequence = last.sequence + 1 if last
   end
 
-end
+end

data/lib/friendly_id/sluggable_class_methods.rb

@@ -4,21 +4,11 @@ module FriendlyId::SluggableClassMethods
 
   include FriendlyId::Helpers
 
-  def self.extended(base) #:nodoc:#
-
-    class << base
-      alias_method_chain :find_one, :friendly
-      alias_method_chain :find_some, :friendly
-      alias_method_chain :validate_find_options, :friendly
-    end
-
-  end
-
   # Finds a single record using the friendly id, or the record's id.
-  def find_one_with_friendly(id_or_name, options) #:nodoc:#
+  def find_one(id_or_name, options) #:nodoc:#
 
     scope = options.delete(:scope)
-    return find_one_without_friendly(id_or_name, options) if id_or_name.is_a?(Integer)
+    return super(id_or_name, options) if id_or_name.is_a?(Integer)
 
     find_options = {:select => "#{self.table_name}.*"}
     find_options[:joins] = :slugs unless options[:include] && [*options[:include]].flatten.include?(:slugs)
@@ -35,8 +25,10 @@ module FriendlyId::SluggableClassMethods
 
     if result
       result.finder_slug_name = id_or_name
+    elsif id_or_name.to_i.to_s != id_or_name
+      raise ActiveRecord::RecordNotFound
     else
-      result = find_one_without_friendly id_or_name, options
+      result = super id_or_name, options
     end
 
     result
@@ -44,9 +36,11 @@ module FriendlyId::SluggableClassMethods
 
     if friendly_id_options[:scope]
       if !scope
-        e.message << "; expected scope but got none"
+        raise ActiveRecord::RecordNotFound.new("%s; expected scope but got none" % e.message)
+        # e.message << "; expected scope but got none"
       else
-        e.message << " and scope=#{scope}"
+        raise ActiveRecord::RecordNotFound.new("%s and scope=#{scope}" % e.message)
+        # e.message << " and scope=#{scope}"
       end
     end
 
@@ -55,7 +49,7 @@ module FriendlyId::SluggableClassMethods
   end
 
   # Finds multiple records using the friendly ids, or the records' ids.
-  def find_some_with_friendly(ids_and_names, options) #:nodoc:#
+  def find_some(ids_and_names, options) #:nodoc:#
 
     slugs, ids = get_slugs_and_ids(ids_and_names, options)
     results = []
@@ -77,7 +71,7 @@ module FriendlyId::SluggableClassMethods
     results
   end
 
-  def validate_find_options_with_friendly(options) #:nodoc:#
+  def validate_find_options(options) #:nodoc:#
     options.assert_valid_keys([:conditions, :include, :joins, :limit, :offset,
       :order, :select, :readonly, :group, :from, :lock, :having, :scope])
   end

data/lib/friendly_id/sluggable_instance_methods.rb

@@ -13,7 +13,7 @@ module FriendlyId::SluggableInstanceMethods
 
   # Was the record found using one of its friendly ids?
   def found_using_friendly_id?
-    finder_slug
+    !!@finder_slug_name
   end
 
   # Was the record found using its numeric id?
@@ -23,12 +23,20 @@ module FriendlyId::SluggableInstanceMethods
 
   # Was the record found using an old friendly id?
   def found_using_outdated_friendly_id?
+    if cache = friendly_id_options[:cache_column]
+      return false if send(cache) == @finder_slug_name
+    end
     finder_slug.id != slug.id
   end
 
   # Was the record found using an old friendly id, or its numeric id?
   def has_better_id?
-    slug and found_using_numeric_id? || found_using_outdated_friendly_id?
+    has_a_slug? and found_using_numeric_id? || found_using_outdated_friendly_id?
+  end
+
+  # Does the record have (at least) one slug?
+  def has_a_slug?
+    @finder_slug_name || slug
   end
 
   # Returns the friendly id.
@@ -47,11 +55,14 @@ module FriendlyId::SluggableInstanceMethods
   # id.
   def slug(reload = false)
     @most_recent_slug = nil if reload
-    @most_recent_slug ||= slugs.first
+    @most_recent_slug ||= slugs.first(:order => "id DESC")
   end
 
   # Returns the friendly id, or if none is available, the numeric id.
   def to_param
+    if cache = friendly_id_options[:cache_column]
+      return read_attribute(cache) || id.to_s
+    end
     slug ? slug.to_friendly_id : id.to_s
   end
 
@@ -69,9 +80,9 @@ module FriendlyId::SluggableInstanceMethods
       end
       base = Slug::normalize(base)
     end
-    
-    if base.length > friendly_id_options[:max_length]
-      base = base[0...friendly_id_options[:max_length]]
+
+    if base.mb_chars.length > friendly_id_options[:max_length]
+      base = base.mb_chars[0...friendly_id_options[:max_length]]
     end
     if friendly_id_options[:reserved].include?(base)
       raise FriendlyId::SlugGenerationError.new("The slug text is a reserved value")
@@ -79,7 +90,7 @@ module FriendlyId::SluggableInstanceMethods
     return base
   end
 
-  private
+private
 
   def finder_slug=(finder_slug)
     @finder_slug_name = finder_slug.name
@@ -108,6 +119,10 @@ module FriendlyId::SluggableInstanceMethods
       # slug so that we can recycle the name without having to use a sequence.
       slugs.find(:all, :conditions => {:name => slug_text, :scope => scope}).each { |s| s.destroy }
       slug = slugs.build slug_attributes
+      if cache = friendly_id_options[:cache_column]
+        new_slug = slug.to_friendly_id
+        send("#{cache}=", new_slug) unless send(cache) == new_slug
+      end
       slug
     end
   end

data/lib/friendly_id/version.rb

@@ -3,8 +3,8 @@
 module FriendlyId #:nodoc:
   module Version #:nodoc:
     MAJOR = 2
-    MINOR = 1
-    TINY = 4
+    MINOR = 2
+    TINY = 0
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/cached_slug_test.rb

@@ -0,0 +1,96 @@
+# encoding: utf-8!
+# @paris.reload
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class CachedSlugModelTest < Test::Unit::TestCase
+
+  context "A slugged model with a cached_slugs column" do
+
+    setup do
+      City.delete_all
+      Slug.delete_all
+      @paris = City.new(:name => "Paris")
+      @paris.save!
+    end
+
+    should "have a slug" do
+      assert_not_nil @paris.slug
+    end
+
+    should "have a cached slug" do
+      assert_not_nil @paris.my_slug
+    end
+
+    should "have a to_param method that returns the cached slug" do
+      assert_equal "paris", @paris.to_param
+    end
+
+    should "protect the cached slug value" do
+      @paris.update_attributes(:my_slug => "Madrid")
+      @paris.reload
+      assert_equal("paris", @paris.my_slug)
+    end
+
+    context "found by its friendly id" do
+
+      setup do
+        @paris = City.find(@paris.friendly_id)
+      end
+
+      should "not indicate that it has a better id" do
+        assert !@paris.has_better_id?
+      end
+
+    end
+
+    context "found by its numeric id" do
+
+      setup do
+        @paris = City.find(@paris.id)
+      end
+
+      should "indicate that it has a better id" do
+        assert @paris.has_better_id?
+      end
+
+    end
+
+
+    context "with a new slug" do
+
+      setup do
+        @paris.name = "Paris, France"
+        @paris.save!
+        @paris.reload
+      end
+
+      should "have its cached slug updated" do
+        assert_equal "paris-france", @paris.my_slug
+      end
+
+      should "have its cached slug synchronized with its friendly_id" do
+        assert_equal @paris.my_slug, @paris.friendly_id
+      end
+
+    end
+
+
+    context "with a cached_slug column" do
+
+      setup do
+        District.delete_all
+        @district = District.new(:name => "Latin Quarter")
+        @district.save!
+      end
+
+      should "have its cached_slug filled automatically" do
+        assert_equal @district.cached_slug, "latin-quarter"
+      end
+
+    end
+
+  end
+
+end
+

data/test/schema.rb

@@ -40,6 +40,16 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column "event_date", "datetime"
   end
 
+  create_table "cities", :force => true do |t|
+    t.column "name", "string"
+    t.column "my_slug", "string"
+  end
+
+  create_table "districts", :force => true do |t|
+    t.column "name", "string"
+    t.column "cached_slug", "string"
+  end
+
   create_table "slugs", :force => true do |t|
     t.column "name", "string"
     t.column "sluggable_id", "integer"

data/test/slug_test.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/test_helper'
 class SlugTest < Test::Unit::TestCase
 
   context "a slug" do
-    
+
     setup do
       Slug.delete_all
       Post.delete_all
@@ -20,13 +20,13 @@ class SlugTest < Test::Unit::TestCase
     end
 
   end
-  
+
   context "the Slug class" do
-    
+
     should "parse the slug name and sequence" do
       assert_equal ["test", "2"], Slug::parse("test--2")
     end
-    
+
     should "parse with a default sequence of 1" do
       assert_equal ["test", "1"], Slug::parse("test")
     end
@@ -34,7 +34,7 @@ class SlugTest < Test::Unit::TestCase
     should "should strip diacritics" do
       assert_equal "acai", Slug::strip_diacritics("açaí")
     end
-  
+
     should "strip diacritics correctly " do
       input  = "ÀÁÂÃÄÅÆÇÈÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
       output = Slug::strip_diacritics(input).split(//)
@@ -43,64 +43,64 @@ class SlugTest < Test::Unit::TestCase
         assert_equal expected[i], output[i]
       end
     end
-  
+
   end
-  
+
   context "the Slug class's to_friendly_id method" do
-    
+
     should "include the sequence if the sequence is greater than 1" do
       slug = Slug.new(:name => "test", :sequence => 2)
       assert_equal "test--2", slug.to_friendly_id
     end
-  
+
     should "not include the sequence if the sequence is 1" do
       slug = Slug.new(:name => "test", :sequence => 1)
       assert_equal "test", slug.to_friendly_id
     end
-    
+
   end
-  
-  context "the Slug class's normalize method" do  
-    
+
+  context "the Slug class's normalize method" do
+
     should "should lowercase  strings" do
       assert_match /abc/, Slug::normalize("ABC")
     end
-  
+
     should "should replace whitespace with dashes" do
       assert_match /a-b/, Slug::normalize("a b")
     end
-  
+
     should "should replace 2spaces with 1dash" do
       assert_match /a-b/, Slug::normalize("a  b")
     end
-  
+
     should "should remove punctuation" do
       assert_match /abc/, Slug::normalize('abc!@#$%^&*•¶§∞¢££¡¿()><?"":;][]\.,/')
     end
-  
+
     should "should strip trailing space" do
       assert_match /ab/, Slug::normalize("ab ")
     end
-  
+
     should "should strip leading space" do
       assert_match /ab/, Slug::normalize(" ab")
     end
-  
+
     should "should strip trailing slashes" do
       assert_match /ab/, Slug::normalize("ab-")
     end
-  
+
     should "should strip leading slashes" do
       assert_match /ab/, Slug::normalize("-ab")
     end
-  
+
     should "should not modify valid name strings" do
       assert_match /a-b-c-d/, Slug::normalize("a-b-c-d")
     end
-  
+
     should "work with non roman chars" do
       assert_equal "検-索", Slug::normalize("検 索")
     end
-  
+
   end
-end
+end

data/test/slugged_model_test.rb

@@ -32,6 +32,16 @@ class SluggedModelTest < Test::Unit::TestCase
       assert Post.find(@post.id)
     end
 
+    should "be findable by its regular id as a string" do
+      assert Post.find(@post.id.to_s)
+    end
+
+    should "not be findable by its id if looking for something else" do
+      assert_raises ActiveRecord::RecordNotFound do
+        Post.find("#{@post.id}-i-dont-exists")
+      end
+    end
+
     should "generate slug text" do
       post = Post.new :title => "Test post", :content => "Test content"
       assert_not_nil @post.slug_text
@@ -111,6 +121,11 @@ class SluggedModelTest < Test::Unit::TestCase
       assert_equal @post.slug_text.length, Post.friendly_id_options[:max_length]
     end
 
+    should "truncate slug in 'right way' when slug is unicode" do
+      @post = Post.new(:title => "ё" * 100 + 'ю' *(Post.friendly_id_options[:max_length] - 100 + 1))
+      assert_equal @post.slug_text.mb_chars[-1], 'ю'
+    end
+
     should "be able to reuse an old friendly_id without incrementing the sequence" do
       old_title = @post.title
       old_friendly_id = @post.friendly_id

data/test/sti_test.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/test_helper'
 
-class SluggedModelTest < Test::Unit::TestCase
+class STIModelTest < Test::Unit::TestCase
 
   context "A slugged model using single table inheritance" do
 
@@ -45,4 +45,4 @@ class SluggedModelTest < Test::Unit::TestCase
 
   end
 
-end
+end

data/test/test_helper.rb

@@ -14,6 +14,16 @@ if ENV["AR_VERSION"]
 end
 require 'active_record'
 require 'active_support'
+
+ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
+silence_stream(STDOUT) do
+  load(File.dirname(__FILE__) + "/schema.rb")
+end
+
+class ActiveRecord::Base
+  def log_protected_attribute_removal(*args) end
+end
+
 require 'friendly_id'
 require 'models/post'
 require 'models/person'
@@ -23,8 +33,5 @@ require 'models/book'
 require 'models/novel'
 require 'models/thing'
 require 'models/event'
-
-ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
-silence_stream(STDOUT) do
-  load(File.dirname(__FILE__) + "/schema.rb")
-end
+require 'models/city'
+require 'models/district'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors: 
 - Norman Clarke
@@ -12,64 +11,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -03:00
+date: 2009-10-19 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
-  type: :runtime
-  version_requirements: *id001
+        version: 2.2.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
-  type: :runtime
-  version_requirements: *id002
+        version: 2.2.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.1
-  type: :development
-  version_requirements: *id003
+        version: 1.5.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
-  type: :development
-  version_requirements: *id005
+        version: 2.3.3
+    version: 
 description: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 email: 
 - norman@njclarke.com
@@ -124,35 +118,36 @@ files:
 - test/sti_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://norman.github.com/friendly_id/
+homepage: http://friendly-id.rubyforge.org/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: friendly-id
-rubygems_version: 1.5.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 test_files: 
+- test/cached_slug_test.rb
 - test/custom_slug_normalizer_test.rb
 - test/non_slugged_test.rb
 - test/scoped_model_test.rb