friendly_id 4.0.0.beta10 → 4.0.0.beta11

data/.gitignore

@@ -9,3 +9,4 @@ coverage
 *.gem
 *.sqlite3
 *.rbc
+*.lock

data/.travis.yml

@@ -3,10 +3,6 @@ rvm:
   - 1.9.2
   - 1.8.7
   - rbx-2.0
-  # Temporarily not testing JRuby in CI because ActiveRecord JDBC does not
-  # support 3.1 well yet. Rest assured I'm testing this and want to target
-  # JRuby, I just don't want to see broken build messages all the time when I
-  # already know what the probelem is.
   # - jruby
 
 branches:

data/README.md

@@ -18,7 +18,7 @@ instead of:
 ## FriendlyId Features
 
 FriendlyId offers many advanced features, including: slug history and
-versioning, scoped slugs, reserved words, and custom slug generators.
+versioning, i18n, scoped slugs, reserved words, and custom slug generators.
 
 FriendlyId is compatible with Active Record **3.0** and **3.1**.
 
@@ -26,7 +26,7 @@ FriendlyId is compatible with Active Record **3.0** and **3.1**.
 
 FriendlyId 4.x introduces many changes incompatible with 3.x. If you're
 upgrading, please [read the
-docs](http://norman.github.com/friendly_id/file.WhatsNew.html) to see what's
+docs](http://rubydoc.info/github/norman/friendly_id/master/file/WhatsNew.md) to see what's
 new.
 
 ## Docs
@@ -73,7 +73,7 @@ The current docs can always be found
 ## Benchmarks
 
 The latest benchmarks for FriendlyId are maintained
-[here](https://gist.github.com/1129745).
+[here](http://bit.ly/friendly-id-benchmarks).
 
 
 ## Bugs

data/WhatsNew.md

@@ -38,8 +38,8 @@ It also adds a new "defaults" method for configuring all models:
 
 ## Active Record 3+ only
 
-For 2.3 support, you can use FriendlyId 3.x, which will continue to be maintained
-until people don't want it any more.
+For 2.3 support, you can use FriendlyId 3.x, which will continue to be
+maintained until people don't want it any more.
 
 ## In-table slugs
 

data/bench.rb

@@ -17,14 +17,12 @@ Book = Class.new ActiveRecord::Base
 
 class Journalist < ActiveRecord::Base
   extend FriendlyId
-  include FriendlyId::Slugged
-  friendly_id :name
+  friendly_id :name, :use => :slugged
 end
 
 class Manual < ActiveRecord::Base
   extend FriendlyId
-  include FriendlyId::History
-  friendly_id :name
+  friendly_id :name, :use => :history
 end
 
 BOOKS       = []
@@ -38,6 +36,8 @@ MANUALS     = []
   MANUALS     << (Manual.create! :name => name).friendly_id
 end
 
+ActiveRecord::Base.connection.execute "UPDATE manuals SET slug = NULL"
+
 Benchmark.bmbm do |x|
   x.report 'find (without FriendlyId)' do
     N.times {Book.find BOOKS.rand}
@@ -46,7 +46,7 @@ Benchmark.bmbm do |x|
     N.times {Journalist.find JOURNALISTS.rand}
   end
   x.report 'find (external slug)' do
-    N.times {Manual.find_by_friendly_id MANUALS.rand}
+    N.times {Manual.find MANUALS.rand}
   end
 
   x.report 'insert (without FriendlyId)' do
@@ -60,4 +60,4 @@ Benchmark.bmbm do |x|
   x.report 'insert (external slug)' do
     N.times {transaction {Manual.create :name => Faker::Name.name}}
   end
-end
+end

data/friendly_id.gemspec

@@ -15,14 +15,15 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- {test}/*`.split("\n")
   s.require_paths     = ["lib"]
 
-  s.add_development_dependency "activerecord", "~> 3.0"
+  s.add_development_dependency "activerecord", "~> 3.1"
   s.add_development_dependency "sqlite3", "~> 1.3"
   s.add_development_dependency "minitest", "~> 2.4.0"
   s.add_development_dependency "mocha", "~> 0.9.12"
   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.add_development_dependency "i18n", "~> 0.6.0"
+  s.add_development_dependency "simplecov"
 
   s.description = <<-EOM
 FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for

data/gemfiles/Gemfile.rails-3.0.rb

@@ -1,10 +1,10 @@
 source :rubygems
 
-platform :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
+# platform :jruby do
+#   gem "activerecord-jdbcmysql-adapter"
+#   gem "activerecord-jdbcpostgresql-adapter"
+#   gem "activerecord-jdbcsqlite3-adapter"
+# end
 
 platform :ruby do
   gem "mysql2", "~> 0.2.0"

data/gemfiles/Gemfile.rails-3.1.rb

@@ -1,10 +1,11 @@
 source :rubygems
 
-platform :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
+# platform :jruby do
+#   gem "activerecord-jdbc-adapter", :git => "https://github.com/nicksieger/activerecord-jdbc-adapter.git"
+#   gem "activerecord-jdbcmysql-adapter"
+#   gem "activerecord-jdbcpostgresql-adapter"
+#   gem "activerecord-jdbcsqlite3-adapter"
+# end
 
 platform :ruby do
   gem "mysql2", "~> 0.3.6"

data/lib/friendly_id.rb

@@ -81,7 +81,7 @@ 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.beta10"
+  VERSION = "4.0.0.beta11"
 
   @mutex = Mutex.new
 
@@ -107,19 +107,21 @@ module FriendlyId
   # {FriendlyId::Configuration} directly. This isolates other models from large
   # feature changes an addon to FriendlyId could potentially introduce.
   #
-  # The upshot of this is, you can htwo Active Record models that both have a
-  # @friendly_id_config, but each config object can have different methods and
-  # behaviors depending on what modules have been loaded, without conflicts.
-  # Keep this in mind if you're hacking on FriendlyId.
+  # The upshot of this is, you can have two Active Record models that both have
+  # a @friendly_id_config, but each config object can have different methods
+  # and behaviors depending on what modules have been loaded, without
+  # conflicts.  Keep this in mind if you're hacking on FriendlyId.
   #
   # For examples of this, see the source for {Scoped.included}.
   def self.extended(model_class)
+    class << model_class
+      alias relation_without_friendly_id relation
+    end
     model_class.instance_eval do
       extend Base
       @friendly_id_config = Class.new(Configuration).new(self)
       FriendlyId.defaults.call @friendly_id_config
     end
-    ActiveRecord::Relation.send :include, FinderMethods
   end
 
   # Set global defaults for all models using FriendlyId.

data/lib/friendly_id/base.rb

@@ -100,10 +100,10 @@ module FriendlyId
     #   Configures the name of the column where FriendlyId will store the slug.
     #   Defaults to +:slug+.
     #
-    # @option options [Symbol] :slug_sequencer_class Available when using +:slugged+.
+    # @option options [Symbol] :slug_generator_class Available when using +:slugged+.
     #   Sets the class used to generate unique slugs. You should not specify this
     #   unless you're doing some extensive hacking on FriendlyId. Defaults to
-    #   {FriendlyId::SlugSequencer}.
+    #   {FriendlyId::SlugGenerator}.
     #
     # @yield Provides access to the model class's friendly_id_config, which
     #   allows an alternate configuration syntax, and conditional configuration
@@ -128,5 +128,45 @@ module FriendlyId
        @friendly_id_config = base_class.friendly_id_config.dup
       end
     end
+
+    private
+
+    # Gets an instance of an anonymous subclass of ActiveRecord::Relation.
+    # @see #relation_class
+    def relation
+      @relation = nil unless @relation.class <= relation_class
+      @relation ||= relation_class.new(self, arel_table)
+      super
+    end
+
+    # Gets an anonymous subclass of the model's relation class.
+    #
+    # Rather than including FriendlyId's overridden finder methods in
+    # ActiveRecord::Relation directly, FriendlyId adds them to the anonymous
+    # subclass, and makes #relation return an instance of this class. By doing
+    # this, we ensure that only models that specifically extend FriendlyId have
+    # their finder methods overridden.
+    #
+    # Note that this method does not directly subclass ActiveRecord::Relation,
+    # but rather whatever class the @relation class instance variable is an
+    # instance of.  In practice, this will almost always end up being
+    # ActiveRecord::Relation, but in case another plugin is using this same
+    # pattern to extend a model's finder functionality, FriendlyId will not
+    # replace it, but rather override it.
+    #
+    # This pattern can be seen as a poor man's "refinement"
+    # (http://timelessrepo.com/refinements-in-ruby), and while I **think** it
+    # will work quite well, I realize that it could cause unexpected issues,
+    # since the authors of Rails are probably not intending this kind of usage
+    # against a private API. If this ends up being problematic I will probably
+    # revert back to the old behavior of simply extending
+    # ActiveRecord::Relation.
+    def relation_class
+      @relation_class ||= Class.new(relation_without_friendly_id.class) do
+        alias_method :find_one_without_friendly_id, :find_one
+        alias_method :exists_without_friendly_id?, :exists?
+        include FriendlyId::FinderMethods
+      end
+    end
   end
 end

data/lib/friendly_id/finder_methods.rb

@@ -1,5 +1,5 @@
 module FriendlyId
-  # These methods will override the finder methods in ActiveRecord::Relation.
+  # These methods will be added to the model's {FriendlyId::Base#relation_class relation_class}.
   module FinderMethods
 
     protected
@@ -13,8 +13,21 @@ module FriendlyId
     #
     # @see FriendlyId::ObjectUtils
     def find_one(id)
-      return super if !@klass.respond_to?(:friendly_id) || id.unfriendly_id?
+      return super if id.unfriendly_id?
       where(@klass.friendly_id_config.query_field => id).first or super
     end
+
+    # FriendlyId overrides this method to make it possible to use friendly id's
+    # identically to numeric ids in finders.
+    #
+    # @example
+    #  person = Person.exists?(123)
+    #  person = Person.exists?("joe")
+    #
+    # @see FriendlyId::ObjectUtils
+    def exists?(id = nil)
+      return super if id.unfriendly_id?
+      super @klass.friendly_id_config.query_field => id
+    end
   end
 end

data/lib/friendly_id/history.rb

@@ -41,12 +41,8 @@ method.
       ...
 
       def find_post
-        return unless params[:id]
-        @post = begin
-          Post.find params[:id]
-        rescue ActiveRecord::RecordNotFound
-          Post.find_by_friendly_id params[:id]
-        end
+        Post.find params[:id]
+
         # If an old id or a numeric id was used to find the record, then
         # the request path will not match the post_path, and we should do
         # a 301 redirect that uses the current friendly id.
@@ -59,14 +55,13 @@ method.
   module History
 
     # Configures the model instance to use the History add-on.
-    def self.included(klass)
-      klass.instance_eval do
-        raise "FriendlyId::History is incompatibe with FriendlyId::Scoped" if self < Scoped
+    def self.included(model_class)
+      model_class.instance_eval do
+        raise "FriendlyId::History is incompatible with FriendlyId::Scoped" if self < Scoped
         @friendly_id_config.use :slugged
         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("#{Slug.table_name}.slug" => id)}
-        extend Finder
+        before_save :build_slug, :if => lambda {|r| r.should_generate_new_friendly_id?}
+        relation_class.send :include, FinderMethods
       end
     end
 
@@ -75,14 +70,35 @@ method.
     def build_slug
       slugs.build :slug => friendly_id
     end
-  end
 
-  # Adds a finder that explictly uses slugs from the slug table.
-  module Finder
+    # Adds a finder that explictly uses slugs from the slug table.
+    module FinderMethods
+
+      # Search for a record in the slugs table using the specified slug.
+      def find_one(id)
+        return super if id.unfriendly_id?
+        where(@klass.friendly_id_config.query_field => id).first or
+        with_old_friendly_id(id) {|x| find_one_without_friendly_id(x)} or
+        find_one_without_friendly_id(id)
+      end
 
-    # Search for a record in the slugs table using the specified slug.
-    def find_by_friendly_id(*args)
-      with_friendly_id(args.shift).first(*args)
+      # Search for a record in the slugs table using the specified slug.
+      def exists?(id = nil)
+        return super if id.unfriendly_id?
+        exists_without_friendly_id?(@klass.friendly_id_config.query_field => id) or
+        with_old_friendly_id(id) {|x| exists_without_friendly_id?(x)} or
+        exists_without_friendly_id?(id)
+      end
+
+      private
+
+      # 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)}
+        sluggable_id = connection.select_values(sql).first
+        yield sluggable_id if sluggable_id
+      end
     end
   end
-end
+end

data/lib/friendly_id/i18n.rb

@@ -6,20 +6,21 @@ module FriendlyId
 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.
+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.
 
 == Example migration
 
   def self.up
     create_table :posts do |t|
       t.string :title
-      t.string :slug
+      t.string :slug_en
       t.string :slug_es
       t.text   :body
     end
-    add_index :posts, :slug
+    add_index :posts, :slug_en
     add_index :posts, :slug_es
   end
 
@@ -59,6 +60,7 @@ current locale:
   end
 =end
   module I18n
+
     def self.included(model_class)
       model_class.instance_eval do
         friendly_id_config.use :slugged
@@ -70,15 +72,14 @@ current locale:
     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
+          set_slug(normalize_friendly_id(text))
         end
       end
     end
 
     module Configuration
       def slug_column
-        ::I18n.locale == ::I18n.default_locale ? super : [super, "_", ::I18n.locale].join
+        "#{super}_#{::I18n.locale}"
       end
     end
   end

data/lib/friendly_id/model.rb

@@ -16,7 +16,11 @@ module FriendlyId
 
     # Either the friendly_id, or the numeric id cast to a string.
     def to_param
-      (friendly_id.present? ? friendly_id : id).to_s
+      if diff = changes[friendly_id_config.query_field]
+        diff.first
+      else
+        friendly_id.present? ? friendly_id : id.to_s
+      end
     end
   end
 end

data/lib/friendly_id/scoped.rb

@@ -87,7 +87,7 @@ an example of one way to set this up:
         raise "FriendlyId::Scoped is incompatibe with FriendlyId::History" if self < History
         include Slugged unless self < Slugged
         friendly_id_config.class.send :include, Configuration
-        friendly_id_config.slug_sequencer_class.send :include, SlugSequencer
+        friendly_id_config.slug_generator_class.send :include, SlugGenerator
       end
     end
 
@@ -112,13 +112,25 @@ an example of one way to set this up:
       #
       # @return String The scope column
       def scope_column
-        (model_class.reflections[@scope].try(:association_foreign_key) || @scope).to_s
+        (reflection_foreign_key or @scope).to_s
+      end
+
+      private
+
+      if ActiveRecord::VERSION::STRING < "3.1"
+        def reflection_foreign_key
+          model_class.reflections[@scope].try(:primary_key_name)
+        end
+      else
+        def reflection_foreign_key
+          model_class.reflections[@scope].try(:foreign_key)
+        end
       end
     end
 
-    # This module overrides {FriendlyId::SlugSequencer#conflict} to consider
+    # This module overrides {FriendlyId::SlugGenerator#conflict} to consider
     # scope, to avoid adding sequences to slugs under different scopes.
-    module SlugSequencer
+    module SlugGenerator
 
       private
 

data/lib/friendly_id/{slug_sequencer.rb → slug_generator.rb}

@@ -1,9 +1,10 @@
 module FriendlyId
-  # This class offers functionality to check slug strings for uniqueness and,
-  # if necessary, append a sequence to ensure it.
-  class SlugSequencer
+  # The default slug generator offers functionality to check slug strings for
+  # uniqueness and, if necessary, appends a sequence to guarantee it.
+  class SlugGenerator
     attr_reader :sluggable, :normalized
 
+    # Create a new slug generator.
     def initialize(sluggable, normalized)
       @sluggable  = sluggable
       @normalized = normalized
@@ -18,25 +19,11 @@ module FriendlyId
 
     # Generate a new sequenced slug.
     def generate
-      if new_record? or slug_changed?
-        conflict? ? self.next : normalized
-      else
-        sluggable.friendly_id
-      end
-    end
-
-    # Whether or not the model instance's slug has changed.
-    def slug_changed?
-      separator = Regexp.escape friendly_id_config.sequence_separator
-      base != sluggable.current_friendly_id.try(:sub, /#{separator}[\d]*\z/, '')
+      conflict? ? self.next : normalized
     end
 
     private
 
-    def base
-      sluggable.send friendly_id_config.base
-    end
-
     def column
       sluggable.connection.quote_column_name friendly_id_config.slug_column
     end
@@ -64,10 +51,6 @@ module FriendlyId
       sluggable.friendly_id_config
     end
 
-    def new_record?
-      sluggable.new_record?
-    end
-
     def separator
       friendly_id_config.sequence_separator
     end

data/lib/friendly_id/slugged.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require "friendly_id/slug_sequencer"
+require "friendly_id/slug_generator"
 
 module FriendlyId
 =begin
@@ -95,6 +95,27 @@ Here's an example of a class that uses a custom method to generate the slug:
 You can override {Slugged#normalize_friendly_id} in your model for total
 control over the slug format.
 
+==== Deciding when to generate new slugs
+
+Overriding {Slugged#should_generate_new_friendly_id?} lets you control whether
+new friendly ids are created when a model is updated. For example, if you only
+want to generate slugs once and then treat them as read-only:
+
+  class Post < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :title, :use => :slugged
+
+    def should_generate_new_friendly_id?
+      new_record?
+    end
+  end
+
+  post = Post.create!(:title => "Hello world!")
+  post.slug #=> "hello-world"
+  post.title = "Hello there, world!"
+  post.save!
+  post.slug #=> "hello-world"
+
 ==== Locale-specific Transliterations
 
 Active Support's +parameterize+ uses
@@ -125,7 +146,7 @@ This functionality was in fact taken from earlier versions of FriendlyId.
         friendly_id_config.class.send :include, Configuration
         friendly_id_config.defaults[:slug_column]        ||= 'slug'
         friendly_id_config.defaults[:sequence_separator] ||= '--'
-        friendly_id_config.slug_sequencer_class          ||= Class.new(SlugSequencer)
+        friendly_id_config.slug_generator_class          ||= Class.new(SlugGenerator)
         before_validation :set_slug
       end
     end
@@ -169,26 +190,33 @@ This functionality was in fact taken from earlier versions of FriendlyId.
       value.to_s.parameterize
     end
 
-    # Gets a new instance of the configured slug sequencing class.
+    # Whether to generate a new slug.
     #
-    # @see FriendlyId::SlugSequencer
-    def slug_sequencer(normalized = nil)
-      normalized ||= normalize_friendly_id(send(friendly_id_config.base))
-      friendly_id_config.slug_sequencer_class.new(self, normalized)
+    # You can override this method in your model if, for example, you only want
+    # slugs to be generated once, and then never updated.
+    def should_generate_new_friendly_id?
+      return true if new_record?
+      slug_base = send friendly_id_config.base
+      separator = Regexp.escape friendly_id_config.sequence_separator
+      slug_base != current_friendly_id.try(:sub, /#{separator}[\d]*\z/, '')
     end
 
     # Sets the slug.
-    def set_slug
-      send "#{friendly_id_config.slug_column}=", slug_sequencer.generate
+    def set_slug(normalized_slug = nil)
+      if should_generate_new_friendly_id?
+        normalized_slug ||= normalize_friendly_id send(friendly_id_config.base)
+        generator = friendly_id_config.slug_generator_class.new self, normalized_slug
+        send "#{friendly_id_config.slug_column}=", generator.generate
+      end
     end
     private :set_slug
 
     # This module adds the +:slug_column+, and +:sequence_separator+, and
-    # +:slug_sequencer_class+ configuration options to
+    # +:slug_generator_class+ configuration options to
     # {FriendlyId::Configuration FriendlyId::Configuration}.
     module Configuration
       attr_writer :slug_column, :sequence_separator
-      attr_accessor :slug_sequencer_class
+      attr_accessor :slug_generator_class
 
       # Makes FriendlyId use the slug column for querying.
       # @return String The slug column.

data/lib/generators/friendly_id_generator.rb

@@ -13,6 +13,8 @@ class FriendlyIdGenerator < Rails::Generators::Base
     migration_template 'migration.rb', 'db/migrate/create_friendly_id_slugs.rb'
   end
 
+  # TODO: use the module provided with Rails, no need to do this
+  # any more
   # Taken from ActiveRecord's migration generator
   def self.next_migration_number(dirname) #:nodoc:
     if ActiveRecord::Base.timestamped_migrations
@@ -21,4 +23,4 @@ class FriendlyIdGenerator < Rails::Generators::Base
       "%.3d" % (current_migration_number(dirname) + 1)
     end
   end
-end
+end

data/test/core_test.rb

@@ -1,10 +1,13 @@
 require File.expand_path("../helper.rb", __FILE__)
 
-Author, Book = 2.times.map do
-  Class.new(ActiveRecord::Base) do
-    extend FriendlyId
-    friendly_id :name
-  end
+class Author < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name
+end
+
+class Book < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name
 end
 
 class CoreTest < MiniTest::Unit::TestCase

data/test/helper.rb

@@ -8,7 +8,7 @@ require "mocha"
 require "minitest/unit"
 require "active_record"
 require 'active_support/core_ext/time/conversions'
-# require "active_support/core_ext/class"
+
 
 if ENV["COVERAGE"]
   require 'simplecov'
@@ -47,11 +47,22 @@ module FriendlyId
       extend self
 
       def connect
-        ActiveRecord::Base.establish_connection config[driver]
         version = ActiveRecord::VERSION::STRING
         driver  = FriendlyId::Test::Database.driver
-        engine = RUBY_ENGINE rescue "ruby"
+        engine  = RUBY_ENGINE rescue "ruby"
+
+        # This hack is needed to get AR 3.1 + JDBC to play nicely together
+        if version >= "3.1" && engine == "jruby"
+          if driver == "sqlite3"
+            puts "Skipping SQLite3 test on JRuby with AR 3.1; it doesn't currently work."
+            exit 0
+          end
+          config.each { |_, value| value["adapter"] = "jdbc" + value["adapter"].gsub(/2\z/, '') }
+        end
+
+        ActiveRecord::Base.establish_connection config[driver]
         message = "Using #{engine} #{RUBY_VERSION} AR #{version} with #{driver}"
+
         puts "-" * 72
         if in_memory?
           ActiveRecord::Migration.verbose = false
@@ -85,4 +96,5 @@ end
 
 require "schema"
 require "shared"
-FriendlyId::Test::Database.connect
+FriendlyId::Test::Database.connect
+at_exit {ActiveRecord::Base.connection.disconnect!}

data/test/history_test.rb

@@ -39,11 +39,25 @@ class HistoryTest < MiniTest::Unit::TestCase
       old_friendly_id = record.friendly_id
       record.name = record.name + "b"
       record.save!
-      assert found = model_class.find_by_friendly_id(old_friendly_id)
-      assert !found.readonly?
+      begin
+        assert model_class.find(old_friendly_id)
+        assert model_class.exists?(old_friendly_id), "should exist? by old id"
+      rescue ActiveRecord::RecordNotFound
+        flunk "Could not find record by old id"
+      end
     end
   end
 
+  test "should not be read only when found by old slug" do
+    with_instance_of(model_class) do |record|
+      old_friendly_id = record.friendly_id
+      record.name = record.name + "b"
+      record.save!
+      assert !model_class.find(old_friendly_id).readonly?
+    end
+  end
+
+
   test "should raise error if used with scoped" do
     model_class = Class.new(ActiveRecord::Base)
     model_class.extend FriendlyId

data/test/i18n_test.rb

@@ -26,14 +26,14 @@ class I18nTest < MiniTest::Unit::TestCase
     I18n.with_locale(I18n.default_locale) do
       journalist = Journalist.new(:name => "John Doe")
       journalist.valid?
-      assert_equal "john-doe", journalist.slug
+      assert_equal "john-doe", journalist.slug_en
       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
+      assert_nil journalist.slug_en
     end
   end
 
@@ -92,9 +92,9 @@ class I18nTest < MiniTest::Unit::TestCase
       end
     end
 
-    test "should not add locale to slug column for default locale" do
+    test "should 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
+        assert_equal "slug_en", Journalist.friendly_id_config.slug_column
       end
     end
   end

data/test/schema.rb

@@ -39,9 +39,10 @@ module FriendlyId
           add_column :journalists, "type", :string
 
           # These will be used to test i18n
+          add_column :journalists, "slug_en", :string
           add_column :journalists, "slug_es", :string
           add_column :journalists, "slug_de", :string
-          
+
           @done = true
         end
 

data/test/shared.rb

@@ -25,7 +25,7 @@ module FriendlyId
         test "should not add slug sequence on update after other conflicting slugs were added" do
           with_instance_of model_class do |record|
             old = record.friendly_id
-            record2 = model_class.create! :name => record.name
+            model_class.create! :name => record.name
             record.save!
             record.reload
             assert_equal old, record.to_param
@@ -66,6 +66,15 @@ module FriendlyId
           with_instance_of(model_class) {|record| assert model_class.find record.friendly_id}
         end
 
+        test "should exist? by friendly id" do
+          with_instance_of(model_class) do |record|
+            assert model_class.exists? record.id
+            assert model_class.exists? record.friendly_id
+            assert !model_class.exists?(record.friendly_id + "-hello")
+            assert !model_class.exists?(0)
+          end
+        end
+
         test "should be findable by id as integer" do
           with_instance_of(model_class) {|record| assert model_class.find record.id.to_i}
         end

data/test/slugged_test.rb

@@ -1,10 +1,13 @@
 require File.expand_path("../helper.rb", __FILE__)
 
-Journalist, Article = 2.times.map do
-  Class.new(ActiveRecord::Base) do
-    extend FriendlyId
-    friendly_id :name, :use => :slugged
-  end
+class Journalist < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, :use => :slugged
+end
+
+class Article < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :name, :use => :slugged
 end
 
 class SluggedTest < MiniTest::Unit::TestCase
@@ -27,7 +30,7 @@ class SluggedTest < MiniTest::Unit::TestCase
 
 end
 
-class SlugSequencerTest < MiniTest::Unit::TestCase
+class SlugGeneratorTest < MiniTest::Unit::TestCase
 
   include FriendlyId::Test
 
@@ -67,9 +70,9 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
   test "should detect when a sequenced slug has changed" do
     with_instance_of model_class do |record|
       record2 = model_class.create! :name => record.name
-      assert !record2.slug_sequencer.slug_changed?
+      assert !record2.should_generate_new_friendly_id?
       record2.name = "hello world"
-      assert record2.slug_sequencer.slug_changed?
+      assert record2.should_generate_new_friendly_id?
     end
   end
 end
@@ -114,3 +117,27 @@ class SluggedRegressionsTest < MiniTest::Unit::TestCase
     end
   end
 end
+
+# https://github.com/norman/friendly_id/issues/148
+class FailedValidationAfterUpdateRegressionTest < MiniTest::Unit::TestCase
+  include FriendlyId::Test
+
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => :slugged
+    validates_presence_of :slug_de
+  end
+
+  test "to_param should return the unchanged value if the slug changes before validation fails" do
+    transaction do
+      journalist = Journalist.create! :name => "Joseph Pulitzer", :slug_de => "value"
+      assert_equal "joseph-pulitzer", journalist.to_param
+      assert journalist.valid?
+      assert journalist.persisted?
+      journalist.name = "Joe Pulitzer"
+      journalist.slug_de = nil
+      assert !journalist.valid?
+      assert_equal "joseph-pulitzer", journalist.to_param
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta10
+  version: 4.0.0.beta11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000 Z
+date: 2011-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70208447070040 !ruby/object:Gem::Requirement
+  requirement: &70177920323920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70208447070040
+  version_requirements: *70177920323920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70208447069380 !ruby/object:Gem::Requirement
+  requirement: &70177920323260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70208447069380
+  version_requirements: *70177920323260
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70208447068760 !ruby/object:Gem::Requirement
+  requirement: &70177920322440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70208447068760
+  version_requirements: *70177920322440
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70208447068060 !ruby/object:Gem::Requirement
+  requirement: &70177920321640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70208447068060
+  version_requirements: *70177920321640
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70208447067380 !ruby/object:Gem::Requirement
+  requirement: &70177920321060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70208447067380
+  version_requirements: *70177920321060
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70208447066800 !ruby/object:Gem::Requirement
+  requirement: &70177920499500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70208447066800
+  version_requirements: *70177920499500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70208447066100 !ruby/object:Gem::Requirement
+  requirement: &70177920498640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,18 +87,29 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70208447066100
+  version_requirements: *70177920498640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70208447065460 !ruby/object:Gem::Requirement
+  requirement: &70177920497740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *70177920497740
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70177920496960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208447065460
+  version_requirements: *70177920496960
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for
 
@@ -126,9 +137,7 @@ files:
 - bench.rb
 - friendly_id.gemspec
 - gemfiles/Gemfile.rails-3.0.rb
-- gemfiles/Gemfile.rails-3.0.rb.lock
 - gemfiles/Gemfile.rails-3.1.rb
-- gemfiles/Gemfile.rails-3.1.rb.lock
 - lib/friendly_id.rb
 - lib/friendly_id/base.rb
 - lib/friendly_id/configuration.rb
@@ -141,7 +150,7 @@ files:
 - lib/friendly_id/reserved.rb
 - lib/friendly_id/scoped.rb
 - lib/friendly_id/slug.rb
-- lib/friendly_id/slug_sequencer.rb
+- lib/friendly_id/slug_generator.rb
 - lib/friendly_id/slugged.rb
 - lib/generators/friendly_id_generator.rb
 - test/base_test.rb

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

@@ -1,52 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    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)
-    activerecord-jdbcmysql-adapter (1.1.3)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-mysql (~> 5.1.0)
-    activerecord-jdbcpostgresql-adapter (1.1.3)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-postgres (~> 9.0.0)
-    activerecord-jdbcsqlite3-adapter (1.1.3)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-sqlite3 (~> 3.7.0)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
-    jdbc-mysql (5.1.13)
-    jdbc-postgres (9.0.801)
-    jdbc-sqlite3 (3.7.2)
-    minitest (2.4.0)
-    mocha (0.9.12)
-    mysql2 (0.2.11)
-    pg (0.11.0)
-    rake (0.9.2)
-    sqlite3 (1.3.4)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.0.10)
-  activerecord-jdbcmysql-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
-  minitest (~> 2.4.0)
-  mocha (~> 0.9.12)
-  mysql2 (~> 0.2.0)
-  pg (~> 0.11.0)
-  rake
-  sqlite3 (~> 1.3.4)

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

@@ -1,57 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    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)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-mysql (~> 5.1.0)
-    activerecord-jdbcpostgresql-adapter (1.1.3)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-postgres (~> 9.0.0)
-    activerecord-jdbcsqlite3-adapter (1.1.3)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-sqlite3 (~> 3.7.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    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)
-    jdbc-postgres (9.0.801)
-    jdbc-sqlite3 (3.7.2)
-    minitest (2.4.0)
-    mocha (0.9.12)
-    multi_json (1.0.3)
-    mysql2 (0.3.6)
-    pg (0.11.0)
-    rake (0.9.2)
-    sqlite3 (1.3.4)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.1.0)
-  activerecord-jdbcmysql-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
-  minitest (~> 2.4.0)
-  mocha (~> 0.9.12)
-  mysql2 (~> 0.3.6)
-  pg (~> 0.11.0)
-  rake
-  sqlite3 (~> 1.3.4)