friendly_id 4.0.0.beta8 → 4.0.0.beta10

data/README.md

@@ -29,6 +29,12 @@ upgrading, please [read the
 docs](http://norman.github.com/friendly_id/file.WhatsNew.html) to see what's
 new.
 
+## Docs
+
+The current docs can always be found
+[here](http://rubydoc.info/github/norman/friendly_id/master/frames).
+
+
 ## Rails Quickstart
 
     gem install friendly_id
@@ -39,7 +45,6 @@ new.
 
     gem "friendly_id", "~> 4.0.0.beta8"
 
-
     rails generate scaffold user name:string slug:string
 
     # edit db/migrate/*_create_users.rb
@@ -59,10 +64,11 @@ new.
 
     GET http://localhost:3000/users/joe-schmoe
 
-## Docs
+    # If you're adding FriendlyId to an existing app and need
+    # to generate slugs for existing users, do this from the
+    # console, runner, or add a Rake task:
+    User.all.map(&:save)
 
-The current docs can be found
-[here](http://norman.github.com/friendly_id/)
 
 ## Benchmarks
 
@@ -79,22 +85,56 @@ If you have a bug to report, please include the following information:
 
 * **Version information for FriendlyId, Rails and Ruby.**
 * Stack trace and error message.
- * Any snippets of relevant model, view or controller code that shows how you
+* Any snippets of relevant model, view or controller code that shows how you
   are using FriendlyId.
 
 If you are able to, it helps even more if you can fork FriendlyId on Github,
 and add a test that reproduces the error you are experiencing.
 
-## Credits
+## Thanks and Credits
 
 FriendlyId was originally created by Norman Clarke and Adrian Mugnolo, with
 significant help early in its life by Emilio Tagua. I'm deeply gratful for the
 generous contributions over the years from [many
 volunteers](https://github.com/norman/friendly_id/contributors).
 
+Part of the inspiration to rework FriendlyId came from Darcy Laycock's library
+[Slugged](https://github.com/Sutto/slugged), which he was inspired to create
+because of frustrations he experienced while using FriendlyId 3.x. Seeing a
+smart programmer become frustrated with my code was enough of a kick in the
+butt to make me want to improve this library significantly.
+
+Many thanks to him for providing valid, real criticism while still being a cool
+about it. I definitely recommend you check out his library if for some reason
+FriendlyId doesn't do it for you.
+
+Thanks also to Loren Segal and Nick Plante for YARD and the
+[rubydoc.info](http://rubydoc.info/) website which FriendlyId uses for
+documentation.
+
 Lastly, FriendlyId uses [Travis](http://travis-ci.org/) for continuous
 integration. It's an excellent, free service created by a whole bunch of [good
 people](https://github.com/travis-ci) - if you're not already using it, you
 should be!
 
+## License
+
 Copyright (c) 2008-2011 Norman Clarke, released under the MIT license.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/friendly_id.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ffaker", "~> 1.8.0"
   s.add_development_dependency "maruku", "~> 0.6.0"
   s.add_development_dependency "yard", "~> 0.7.2"
+  s.add_development_dependency "i18n", "~> 0.5.0"
 
   s.description = <<-EOM
 FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for

data/gemfiles/Gemfile.rails-3.0.rb

@@ -12,7 +12,7 @@ platform :ruby do
   gem "sqlite3", "~> 1.3.4"
 end
 
-gem "activerecord", "3.0.9"
+gem "activerecord", "3.0.10"
 gem "minitest", "~> 2.4.0"
 gem "mocha", "~> 0.9.12"
 gem "rake"

data/gemfiles/Gemfile.rails-3.0.rb.lock

@@ -1,13 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
     activerecord-jdbc-adapter (1.1.3)
@@ -20,7 +20,7 @@ GEM
     activerecord-jdbcsqlite3-adapter (1.1.3)
       activerecord-jdbc-adapter (= 1.1.3)
       jdbc-sqlite3 (~> 3.7.0)
-    activesupport (3.0.9)
+    activesupport (3.0.10)
     arel (2.0.10)
     builder (2.1.2)
     i18n (0.5.0)
@@ -40,7 +40,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 3.0.9)
+  activerecord (= 3.0.10)
   activerecord-jdbcmysql-adapter
   activerecord-jdbcpostgresql-adapter
   activerecord-jdbcsqlite3-adapter

data/gemfiles/Gemfile.rails-3.1.rb

@@ -12,7 +12,7 @@ platform :ruby do
   gem "sqlite3", "~> 1.3.4"
 end
 
-gem "activerecord", "~> 3.1.0.rc5"
+gem "activerecord", "~> 3.1.0"
 gem "minitest", "~> 2.4.0"
 gem "mocha", "~> 0.9.12"
 gem "rake"

data/gemfiles/Gemfile.rails-3.1.rb.lock

@@ -1,15 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-      bcrypt-ruby (~> 2.1.4)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc5)
-      activemodel (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-      arel (~> 2.1.4)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
     activerecord-jdbc-adapter (1.1.3)
     activerecord-jdbcmysql-adapter (1.1.3)
@@ -21,11 +21,11 @@ GEM
     activerecord-jdbcsqlite3-adapter (1.1.3)
       activerecord-jdbc-adapter (= 1.1.3)
       jdbc-sqlite3 (~> 3.7.0)
-    activesupport (3.1.0.rc5)
+    activesupport (3.1.0)
       multi_json (~> 1.0)
-    arel (2.1.4)
-    bcrypt-ruby (2.1.4)
-    bcrypt-ruby (2.1.4-java)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.0-java)
     builder (3.0.0)
     i18n (0.6.0)
     jdbc-mysql (5.1.13)
@@ -45,7 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.1.0.rc5)
+  activerecord (~> 3.1.0)
   activerecord-jdbcmysql-adapter
   activerecord-jdbcpostgresql-adapter
   activerecord-jdbcsqlite3-adapter

data/lib/friendly_id.rb

@@ -81,11 +81,12 @@ In general, use slugs by default unless you know for sure you don't need them.
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.0.beta8"
+  VERSION = "4.0.0.beta10"
 
   @mutex = Mutex.new
 
   autoload :History,  "friendly_id/history"
+  autoload :I18n,     "friendly_id/i18n"
   autoload :Reserved, "friendly_id/reserved"
   autoload :Scoped,   "friendly_id/scoped"
   autoload :Slugged,  "friendly_id/slugged"

data/lib/friendly_id/configuration.rb

@@ -53,7 +53,7 @@ module FriendlyId
     #   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+ and +:scoped+.
+    #   default FriendlyId provides +:slugged+, +:history+, +:i18n+ and +:scoped+.
     def use(*modules)
       modules.to_a.flatten.compact.map do |name|
         mod = FriendlyId.const_get(name.to_s.classify)

data/lib/friendly_id/history.rb

@@ -63,9 +63,9 @@ method.
       klass.instance_eval do
         raise "FriendlyId::History is incompatibe with FriendlyId::Scoped" if self < Scoped
         @friendly_id_config.use :slugged
-        has_many :slugs, :as => :sluggable, :dependent => :destroy, :class_name => "FriendlyId::Slug"
+        has_many :slugs, :as => :sluggable, :dependent => :destroy, :class_name => Slug.to_s
         before_save :build_slug, :if => lambda {|r| r.slug_sequencer.slug_changed?}
-        scope :with_friendly_id, lambda {|id| includes(:slugs).where("friendly_id_slugs.slug = ?", id)}
+        scope :with_friendly_id, lambda {|id| includes(:slugs).where("#{Slug.table_name}.slug" => id)}
         extend Finder
       end
     end

data/lib/friendly_id/i18n.rb

@@ -0,0 +1,85 @@
+require "i18n"
+
+module FriendlyId
+
+=begin
+This module adds very basic i18n support to FriendlyId.
+
+In order to use this module, your model must have a slug column for each locale.
+The slug column for your default locale should, however, still be named "slug".
+An i18n module that uses external slugs and doesn't require a column for each
+locale is planned, but has not been created yet.
+
+== Example migration
+
+  def self.up
+    create_table :posts do |t|
+      t.string :title
+      t.string :slug
+      t.string :slug_es
+      t.text   :body
+    end
+    add_index :posts, :slug
+    add_index :posts, :slug_es
+  end
+
+== Finds
+
+Finds will take into consideration the current locale:
+
+  I18n.locale = :es
+  Post.find("la-guerra-de-las-galaxas")
+  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(:es) do
+    Post.find("la-guerra-de-las-galaxas")
+  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, use {#set_friendly_id}. This will
+ensure that the slug you add is properly escaped, transliterated and sequenced:
+
+  post = Post.create :name => "Star Wars"
+  post.set_friendly_id("La guerra de las galaxas", :es)
+
+If you don't pass in a locale argument, FriendlyId::I18n will just use the
+current locale:
+
+  I18n.with_locale(:es) do
+    post.set_friendly_id("la-guerra-de-las-galaxas")
+  end
+=end
+  module I18n
+    def self.included(model_class)
+      model_class.instance_eval do
+        friendly_id_config.use :slugged
+        friendly_id_config.class.send :include, Configuration
+        include Model
+      end
+    end
+
+    module Model
+      def set_friendly_id(text, locale = nil)
+        ::I18n.with_locale(locale || ::I18n.current_locale) do
+          slug = slug_sequencer(normalize_friendly_id(text)).generate
+          send "#{friendly_id_config.slug_column}=", slug
+        end
+      end
+    end
+
+    module Configuration
+      def slug_column
+        ::I18n.locale == ::I18n.default_locale ? super : [super, "_", ::I18n.locale].join
+      end
+    end
+  end
+end

data/lib/friendly_id/reserved.rb

@@ -34,7 +34,7 @@ is included. You can configure this globally by using {FriendlyId.defaults Frien
       def base=(base)
         super
         reserved_words = model_class.friendly_id_config.reserved_words
-        model_class.validates_exclusion_of base, :in => reserved_words
+        model_class.validates_exclusion_of :friendly_id, :in => reserved_words
       end
 
       # An array of words forbidden as slugs.
@@ -43,4 +43,4 @@ is included. You can configure this globally by using {FriendlyId.defaults Frien
       end
     end
   end
-end
+end

data/lib/friendly_id/scoped.rb

@@ -124,7 +124,7 @@ an example of one way to set this up:
 
       def conflict
         column = friendly_id_config.scope_column
-        conflicts.where("#{column} = ?", sluggable.send(column)).first
+        conflicts.where(column => sluggable.send(column)).first
       end
     end
   end

data/lib/friendly_id/slug_sequencer.rb

@@ -2,15 +2,16 @@ module FriendlyId
   # This class offers functionality to check slug strings for uniqueness and,
   # if necessary, append a sequence to ensure it.
   class SlugSequencer
-    attr_reader :sluggable
+    attr_reader :sluggable, :normalized
 
-    def initialize(sluggable)
-      @sluggable = sluggable
+    def initialize(sluggable, normalized)
+      @sluggable  = sluggable
+      @normalized = normalized
     end
 
     # Given a slug, get the next available slug in the sequence.
     def next
-      sequence = conflict.slug.split(separator)[1].to_i
+      sequence = conflict.to_param.split(separator)[1].to_i
       next_sequence = sequence == 0 ? 2 : sequence.next
       "#{normalized}#{separator}#{next_sequence}"
     end
@@ -37,7 +38,7 @@ module FriendlyId
     end
 
     def column
-      sluggable.connection.quote_column_name friendly_id_config.query_field
+      sluggable.connection.quote_column_name friendly_id_config.slug_column
     end
 
     def conflict?
@@ -54,7 +55,7 @@ module FriendlyId
     def conflicts
       pkey  = sluggable.class.primary_key
       value = sluggable.send pkey
-      scope = sluggable.class.where("#{column} = ? OR #{column} LIKE ?", normalized, wildcard)
+      scope = sluggable.class.unscoped.where("#{column} = ? OR #{column} LIKE ?", normalized, wildcard)
       scope = scope.where("#{pkey} <> ?", value) unless sluggable.new_record?
       scope = scope.order("LENGTH(#{column}) DESC, #{column} DESC")
     end
@@ -67,10 +68,6 @@ module FriendlyId
       sluggable.new_record?
     end
 
-    def normalized
-      @normalized ||= sluggable.normalize_friendly_id(base)
-    end
-
     def separator
       friendly_id_config.sequence_separator
     end

data/lib/friendly_id/slugged.rb

@@ -148,7 +148,7 @@ This functionality was in fact taken from earlier versions of FriendlyId.
     #       "#{name} from #{location}"
     #     end
     #
-    #     # Use default slug, but uupper case and with underscores
+    #     # Use default slug, but upper case and with underscores
     #     def normalize_friendly_id(string)
     #       super.upcase.gsub("-", "_")
     #     end
@@ -172,8 +172,9 @@ This functionality was in fact taken from earlier versions of FriendlyId.
     # Gets a new instance of the configured slug sequencing class.
     #
     # @see FriendlyId::SlugSequencer
-    def slug_sequencer
-      friendly_id_config.slug_sequencer_class.new(self)
+    def slug_sequencer(normalized = nil)
+      normalized ||= normalize_friendly_id(send(friendly_id_config.base))
+      friendly_id_config.slug_sequencer_class.new(self, normalized)
     end
 
     # Sets the slug.

data/test/compatibility/ancestry/ancestry_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path("../../../helper", __FILE__)
+
+require "ancestry"
+
+ActiveRecord::Migration.create_table("things") do |t|
+  t.string  :name
+  t.string  :slug
+  t.string :ancestry
+end
+ActiveRecord::Migration.add_index :things, :ancestry
+
+class Thing < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id do |config|
+    config.use :slugged
+    config.use :scoped
+    config.base  = :name
+    config.scope = :ancestry
+  end
+  has_ancestry
+end
+
+class AncestryTest < MiniTest::Unit::TestCase
+  include FriendlyId::Test
+
+  test "should sequence slugs when scoped by ancestry" do
+    3.times.inject([]) do |memo, _|
+      memo << Thing.create!(:name => "a", :parent => memo.last)
+    end.each do |thing|
+      assert_equal "a", thing.friendly_id
+    end
+  end
+end
+

data/test/i18n_test.rb

@@ -0,0 +1,101 @@
+require File.expand_path("../helper.rb", __FILE__)
+
+class I18nTest < MiniTest::Unit::TestCase
+  include FriendlyId::Test
+
+  I18n = ::I18n
+
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => :i18n
+  end
+
+  test "friendly_id should return a the current locale's slug" do
+    journalist = Journalist.new(:name => "John Doe")
+    journalist.slug_es = "juan-fulano"
+    journalist.valid?
+    I18n.with_locale(I18n.default_locale) do
+      assert_equal "john-doe", journalist.friendly_id
+    end
+    I18n.with_locale(:es) do
+      assert_equal "juan-fulano", journalist.friendly_id
+    end
+  end
+
+  test "should create record with slug in column for the current locale" do
+    I18n.with_locale(I18n.default_locale) do
+      journalist = Journalist.new(:name => "John Doe")
+      journalist.valid?
+      assert_equal "john-doe", journalist.slug
+      assert_nil journalist.slug_es
+    end
+    I18n.with_locale(:es) do
+      journalist = Journalist.new(:name => "John Doe")
+      journalist.valid?
+      assert_equal "john-doe", journalist.slug_es
+      assert_nil journalist.slug
+    end
+  end
+
+  test "to_param should return the numeric id when there's no slug for the current locale" do
+    transaction do
+      journalist = Journalist.new(:name => "Juan Fulano")
+      I18n.with_locale(:es) do
+        journalist.save!
+        assert_equal "juan-fulano", journalist.to_param
+      end
+      assert_equal journalist.id.to_s, journalist.to_param
+    end
+  end
+
+  test "should set friendly id for locale" do
+    transaction do
+      journalist = Journalist.create!(:name => "John Smith")
+      journalist.set_friendly_id("Juan Fulano", :es)
+      journalist.save!
+      assert_equal "john-smith", journalist.to_param
+      I18n.with_locale(:es) do
+        assert_equal "juan-fulano", journalist.to_param
+      end
+    end
+  end
+
+  test "should sequence localized slugs" do
+    transaction do
+      journalist = Journalist.create!(:name => "John Smith")
+      I18n.with_locale(:es) do
+        Journalist.create!(:name => "Juan Fulano")
+      end
+      journalist.set_friendly_id("Juan Fulano", :es)
+      journalist.save!
+      assert_equal "john-smith", journalist.to_param
+      I18n.with_locale(:es) do
+        assert_equal "juan-fulano--2", journalist.to_param
+      end
+    end
+  end
+
+  class ConfigurationTest < MiniTest::Unit::TestCase
+    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
+      end
+    end
+
+    test "should add locale to non-default slug column and non-default locale" do
+      model_class = Class.new(ActiveRecord::Base) do
+        extend FriendlyId
+        friendly_id :name, :use => :i18n, :slug_column => :foo
+      end
+      I18n.with_locale :es do
+        assert_equal "foo_es", model_class.friendly_id_config.slug_column
+      end
+    end
+
+    test "should not add locale to slug column for default locale" do
+      I18n.with_locale(I18n.default_locale) do
+        assert_equal "slug", Journalist.friendly_id_config.slug_column
+      end
+    end
+  end
+end

data/test/schema.rb

@@ -37,6 +37,11 @@ module FriendlyId
 
           # This will be used to test STI
           add_column :journalists, "type", :string
+
+          # These will be used to test i18n
+          add_column :journalists, "slug_es", :string
+          add_column :journalists, "slug_de", :string
+          
           @done = true
         end
 

data/test/shared.rb

@@ -40,6 +40,17 @@ module FriendlyId
             assert record2.friendly_id.match(/2\z/)
           end
         end
+
+        test "should create slug on save if the slug is nil" do
+          with_instance_of model_class do |record|
+            record.slug = nil
+            record.save!
+            assert_nil record.slug
+            record.save
+            refute_nil record.slug
+          end
+        end
+
       end
 
       module Core

data/test/slugged_test.rb

@@ -16,6 +16,15 @@ class SluggedTest < MiniTest::Unit::TestCase
   def model_class
     Journalist
   end
+
+  test "should not allow reserved words in resulting slug" do
+    ["new", "New", "NEW"].each do |word|
+      transaction do
+        assert_raises(ActiveRecord::RecordInvalid) {model_class.create! :name => word}
+      end
+    end
+  end
+
 end
 
 class SlugSequencerTest < MiniTest::Unit::TestCase
@@ -65,6 +74,30 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
   end
 end
 
+class DefaultScopeTest < MiniTest::Unit::TestCase
+
+  include FriendlyId::Test
+
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => :slugged
+    default_scope :order => 'id ASC', :conditions => { :active => true }
+  end
+
+  test "friendly_id should correctly sequence a default_scoped ordered table" do
+    transaction do
+      3.times { assert Journalist.create :name => "a", :active => true }
+    end
+  end
+
+  test "friendly_id should correctly sequence a default_scoped scoped table" do
+    transaction do
+      assert Journalist.create :name => "a", :active => false
+      assert Journalist.create :name => "a", :active => true
+    end
+  end
+end
+
 class SluggedRegressionsTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
@@ -80,4 +113,4 @@ class SluggedRegressionsTest < MiniTest::Unit::TestCase
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta8
+  version: 4.0.0.beta10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000 -03:00
-default_executable: 
+date: 2011-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70172556099120 !ruby/object:Gem::Requirement
+  requirement: &70208447070040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70172556099120
+  version_requirements: *70208447070040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70172556098620 !ruby/object:Gem::Requirement
+  requirement: &70208447069380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70172556098620
+  version_requirements: *70208447069380
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70172556098140 !ruby/object:Gem::Requirement
+  requirement: &70208447068760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70172556098140
+  version_requirements: *70208447068760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70172556097640 !ruby/object:Gem::Requirement
+  requirement: &70208447068060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70172556097640
+  version_requirements: *70208447068060
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70172556097180 !ruby/object:Gem::Requirement
+  requirement: &70208447067380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70172556097180
+  version_requirements: *70208447067380
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70172556096720 !ruby/object:Gem::Requirement
+  requirement: &70208447066800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70172556096720
+  version_requirements: *70208447066800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70172556096260 !ruby/object:Gem::Requirement
+  requirement: &70208447066100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +87,18 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70172556096260
+  version_requirements: *70208447066100
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70208447065460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: *70208447065460
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -124,6 +134,7 @@ files:
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finder_methods.rb
 - lib/friendly_id/history.rb
+- lib/friendly_id/i18n.rb
 - lib/friendly_id/migration.rb
 - lib/friendly_id/model.rb
 - lib/friendly_id/object_utils.rb
@@ -134,11 +145,14 @@ files:
 - lib/friendly_id/slugged.rb
 - lib/generators/friendly_id_generator.rb
 - test/base_test.rb
+- test/compatibility/ancestry/Gemfile
+- test/compatibility/ancestry/ancestry_test.rb
 - test/configuration_test.rb
 - test/core_test.rb
 - test/databases.yml
 - test/helper.rb
 - test/history_test.rb
+- test/i18n_test.rb
 - test/object_utils_test.rb
 - test/reserved_test.rb
 - test/schema.rb
@@ -146,7 +160,6 @@ files:
 - test/shared.rb
 - test/slugged_test.rb
 - test/sti_test.rb
-has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
 post_install_message: ! 'NOTE: FriendlyId 4.x breaks compatibility with 3.x. If you''re
@@ -176,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.