friendly_id4 4.0.0.beta1 → 4.0.0.beta3

data/Gemfile

@@ -7,12 +7,13 @@ platform :jruby do
 end
 
 platform :ruby do
-  gem "mysql"
-  gem "pg"
+  # gem "mysql"
+  # gem "pg"
   gem "sqlite3"
 end
 
-gem "activerecord", ENV["AR"] || "3.0.9"
+#gem "activerecord", ENV["AR"] || "3.0.9"
+gem "rails", :path => "../rails"
 
 gem "ffaker"
 gem "minitest"

data/Guide.md

@@ -25,8 +25,9 @@ column with no spaces or special characters, and that is seldom or never
 updated. The most common example of this is a user name or login column:
 
     class User < ActiveRecord::Base
+      extend FriendlyId
       validates_format_of :login, :with => /\A[a-z0-9]+\z/i
-      has_friendly_id :login
+      friendly_id :login
     end
 
     @user = User.find "joe"   # the old User.find(1) still works, too
@@ -38,7 +39,8 @@ modify the value of the column, and your application should ensure that the valu
 is admissible in a URL:
 
     class City < ActiveRecord::Base
-      has_friendly_id :name
+      extend FriendlyId
+      friendly_id :name
     end
 
     @city.find "Viña del Mar"
@@ -55,8 +57,8 @@ title, which may have spaces, uppercase characters, or other attributes you
 wish to modify to make them more suitable for use in URL's.
 
     class Post < ActiveRecord::Base
-      include FriendlyId::Slugged
-      has_friendly_id :title
+      extend FriendlyId
+      friendly_id :title, :use => :slugged
     end
 
     @post = Post.create(:title => "This is the first post!")
@@ -83,16 +85,13 @@ dropped until a stable release of 3.2 is out, or possibly longer.
 
 ## Configuration
 
-FriendlyId is configured in your model using the `has_friendly_id` method. Additional
-features can be activated by including various modules:
+FriendlyId is configured in your model using the `friendly_id` method. Additional
+features can be passing the names of modules into the `:use` option:
 
     class Post < ActiveRecord::Base
-      # use slugs
-      include FriendlyId::Slugged
-      # record slug history
-      include FriendlyId::History
+      extend FriendlyId
       # use the "title" accessor as the basis of the friendly_id
-      has_friendly_id :title
+      friendly_id :title, :use => [:slugged, :history]
     end
 
 Read on to learn about the various features that can be configured. For the
@@ -121,10 +120,9 @@ FriendlyId can use either a column or a method to generate the slug text for
 your model:
 
     class City < ActiveRecord::Base
-
+      extend FriendlyId
       belongs_to :country
-      include FriendlyId::Slugged
-      has_friendly_id :name_and_country
+      friendly_id :name_and_country, :use => :slugged
 
       def name_and_country
         #{name} #{country.name}
@@ -148,9 +146,8 @@ you can override the `normalize_friendly_id` method in your model class in
 order to fine-tune the output:
 
     class City < ActiveRecord::Base
-
-      include FriendlyId::Slugged
-      has_friendly_id :whatever
+      extend FriendlyId
+      friendly_id :whatever, :use => :slugged
 
       def normalize_friendly_id(text)
         my_text_modifier_method(text)
@@ -186,9 +183,8 @@ FriendlyId can maintain a history of your record's older slugs, so if your
 record's friendly_id changes, your URL's won't break.
 
     class Post < ActiveRecord::Base
-      include FriendlyId::Slugged
-      include FriendlyId::History
-      has_friendly_id :title
+      extend FriendlyId
+      friendly_id :title, :use => :history
     end
 
     class PostsController < ApplicationController
@@ -230,10 +226,9 @@ the rest of the slug. This is important to enable having slugs like:
     /cars/peugeot-206--2
 
 You can configure the separator string used by your model by setting the
-`:sequence_separator` option in `has_friendly_id`:
+`:sequence_separator` option in `friendly_id`:
 
-    include FriendlyId::Slugged
-    has_friendly_id :title, :sequence_separator => ":"
+    friendly_id :title, :use => :slugged, :sequence_separator => ":"
 
 You can also override the default used in
 {FriendlyId::Configuration::DEFAULTS} to set the value for any model using
@@ -259,16 +254,15 @@ names unique for each city, so that the second "Joe's Diner" can also have the
 slug "joes-diner", as long as it's located in a different city:
 
     class Restaurant < ActiveRecord::Base
+      extend FriendlyId
       belongs_to :city
-      include FriendlyId::Slugged
-      include FriendlyId::Scoped
-      has_friendly_id :name, :scope => :city
+      friendly_id :name, :use => :scoped, :scope => :city
     end
 
     class City < ActiveRecord::Base
+      extend FriendlyId
       has_many :restaurants
-      include FriendlyId::Slugged
-      has_friendly_id :name
+      friendly_id :name, :use => :slugged
     end
 
     City.find("seattle").restaurants.find("joes-diner")
@@ -355,14 +349,15 @@ performance of your application. Of course your results may vary.
 
     activerecord (3.0.9)
     ruby 1.9.2p180 (2011-02-18 revision 30909) [x86_64-darwin10.6.0]
-    friendly_id (4.0.0.pre3)
+    friendly_id (4.0.0.beta1)
     sqlite3 (1.3.3) gem
     sqlite3 3.6.12 in-memory database
 
-                                  user     system      total        real
-    find (without FriendlyId)     0.280000   0.000000   0.280000 (  0.278086)
-    find (in-table slug)          0.320000   0.000000   0.320000 (  0.320151)
-    find (external slug)          3.040000   0.010000   3.050000 (  3.048054)
-    insert (without FriendlyId)   0.780000   0.000000   0.780000 (  0.785427)
-    insert (in-table-slug)        1.520000   0.010000   1.530000 (  1.532350)
-    insert (external slug)        3.310000   0.020000   3.330000 (  3.335548)
+
+                                      user     system      total        real
+    find (without FriendlyId)     0.300000   0.000000   0.300000 (  0.306729)
+    find (in-table slug)          0.350000   0.000000   0.350000 (  0.351760)
+    find (external slug)          3.320000   0.000000   3.320000 (  3.326749)
+    insert (without FriendlyId)   0.810000   0.010000   0.820000 (  0.810513)
+    insert (in-table-slug)        1.740000   0.000000   1.740000 (  1.743511)
+    insert (external slug)        3.540000   0.010000   3.550000 (  3.544898)

data/README.md

@@ -58,8 +58,8 @@ FriendlyId is compatible with Active Record **3.0** and **3.1**.
 
     # edit app/models/user.rb
     class User < ActiveRecord::Base
-      include FriendlyId::Slugged
-      has_friendly_id :name
+      extend FriendlyId
+      friendly_id :name, :use => :slugged
     end
 
     User.create! :name => "Joe Schmoe"
@@ -70,14 +70,14 @@ FriendlyId is compatible with Active Record **3.0** and **3.1**.
 
 ## Bugs
 
-Please report them on the [Github issue tracker](http://github.com/norman/friendly_id/issues)
-for this project.
+Please report them on the [Github issue
+tracker](http://github.com/norman/friendly_id/issues) for this project.
 
 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 your
+ * 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,
@@ -85,8 +85,9 @@ and add a test that reproduces the error you are experiencing.
 
 ## Credits
 
-FriendlyId was created by Norman Clarke, Adrian Mugnolo, and Emilio Tagua, and
-has had significant contributions over the years from [many
+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).
 
 Copyright (c) 2008-2011 Norman Clarke, released under the MIT license.

data/Rakefile

@@ -3,25 +3,28 @@ require "rake/testtask"
 
 def rubies(&block)
   ["ruby-1.9.2-p180", "ree-1.8.7-2011.03", "jruby-1.6.2", "rbx-2.0.0pre"].each do |ruby|
+    old = ENV["RB"]
     ENV["RB"] = ruby
     yield
-    ENV["RB"] = nil
+    ENV["RB"] = old
   end
 end
 
 def versions(&block)
   ["3.1.0.rc4", "3.0.9"].each do |version|
+    old = ENV["AR"]
     ENV["AR"] = version
     yield
-    ENV["AR"] = nil
+    ENV["AR"] = old
   end
 end
 
 def adapters(&block)
   ["mysql", "postgres", "sqlite3"].each do |adapter|
+    old = ENV["DB"]
     ENV["DB"] = adapter
     yield
-    ENV["DB"] = nil
+    ENV["DB"] = old
   end
 end
 
@@ -33,7 +36,7 @@ Rake::TestTask.new do |t|
 end
 
 task :clean do
-  %x{rm -rf *.gem doc pkg}
+  %x{rm -rf *.gem doc pkg coverage}
   %x{rm -f `find . -name '*.rbc'`}
 end
 
@@ -42,7 +45,11 @@ task :gem do
 end
 
 task :yard do
-  %x{bundle exec yard doc --files=*.md}
+  puts %x{bundle exec yard doc --files=*.md}
+end
+
+task :bench do
+  require File.expand_path("../bench", __FILE__)
 end
 
 desc "Bundle for all supported Ruby/AR versions"

data/bench.rb

@@ -1,49 +1,41 @@
 require File.expand_path("../test/helper", __FILE__)
 require "ffaker"
-require "friendly_id/migration"
 
 N = 1000
 
-migration do |m|
-  m.add_column :users, :slug, :string
-  m.add_index  :users, :slug, :unique => true
+def transaction
+  ActiveRecord::Base.transaction { yield ; raise ActiveRecord::Rollback }
 end
 
-migration do |m|
-  m.create_table :posts do |t|
-    t.string :name
-    t.string :slug
-  end
-  m.add_index  :posts, :slug, :unique => true
-end
-CreateFriendlyIdSlugs.up
-
-
 class Array
   def rand
     self[Kernel.rand(length)]
   end
 end
 
-class User
+Book = Class.new ActiveRecord::Base
+
+class Journalist < ActiveRecord::Base
+  extend FriendlyId
   include FriendlyId::Slugged
-  has_friendly_id :name
+  friendly_id :name
 end
 
-class Post < ActiveRecord::Base
+class Manual < ActiveRecord::Base
+  extend FriendlyId
   include FriendlyId::History
-  has_friendly_id :name
+  friendly_id :name
 end
 
-USERS = []
-BOOKS = []
-POSTS = []
+BOOKS       = []
+JOURNALISTS = []
+MANUALS     = []
 
 100.times do
   name = Faker::Name.name
-  USERS << (User.create! :name => name).friendly_id
-  POSTS << (Post.create! :name => name).friendly_id
-  BOOKS << (Book.create! :name => name).id
+  BOOKS       << (Book.create! :name => name).id
+  JOURNALISTS << (Journalist.create! :name => name).friendly_id
+  MANUALS     << (Manual.create! :name => name).friendly_id
 end
 
 Benchmark.bmbm do |x|
@@ -51,10 +43,10 @@ Benchmark.bmbm do |x|
     N.times {Book.find BOOKS.rand}
   end
   x.report 'find (in-table slug)' do
-    N.times {User.find USERS.rand}
+    N.times {Journalist.find JOURNALISTS.rand}
   end
   x.report 'find (external slug)' do
-    N.times {Post.find_by_friendly_id POSTS.rand}
+    N.times {Manual.find_by_friendly_id MANUALS.rand}
   end
 
   x.report 'insert (without FriendlyId)' do
@@ -62,10 +54,10 @@ Benchmark.bmbm do |x|
   end
 
   x.report 'insert (in-table-slug)' do
-    N.times {transaction {User.create :name => Faker::Name.name}}
+    N.times {transaction {Journalist.create :name => Faker::Name.name}}
   end
 
   x.report 'insert (external slug)' do
-    N.times {transaction {Post.create :name => Faker::Name.name}}
+    N.times {transaction {Manual.create :name => Faker::Name.name}}
   end
 end

data/lib/friendly_id/base.rb

@@ -1,29 +1,24 @@
 module FriendlyId
   # Class methods that will be added to ActiveRecord::Base.
   module Base
-    extend self
 
-    def has_friendly_id(*args)
-      options = args.extract_options!
-      base = args.shift
-      friendly_id_config.set options.merge(:base => base)
-      include Model
-      # @NOTE: AR-specific code here
-      validates_exclusion_of base, :in => Configuration::DEFAULTS[:reserved_words]
+    def friendly_id(*args, &block)
+      if block_given?
+        yield(friendly_id_config)
+      else
+        base    = args.shift
+        options = args.extract_options!
+        @friendly_id_config.use options.delete :use
+        @friendly_id_config.send :set, options.merge(:base => base)
+      end
       before_save do |record|
         record.instance_eval {@current_friendly_id = friendly_id}
       end
-      self
+      include Model
     end
 
     def friendly_id_config
-      @friendly_id_config ||= Configuration.new(self)
-    end
-
-    def uses_friendly_id?
-      defined? @friendly_id_config
+      @friendly_id_config
     end
   end
 end
-
-ActiveRecord::Base.extend FriendlyId::Base

data/lib/friendly_id/configuration.rb

@@ -1,31 +1,96 @@
 module FriendlyId
-  # The configuration paramters passed to +has_friendly_id+ will be stored
-  # in this object.
+  # The configuration paramters passed to +friendly_id+ will be stored in
+  # this object.
   class Configuration
-    attr_accessor :base
-    attr_reader   :klass
 
-    DEFAULTS = {
-      :config_error_message => 'FriendlyId has no such config option "%s"',
-      :reserved_words       => ["new", "edit"]
+    # The base column or method used by FriendlyId as the basis of a friendly id
+    # or slug.
+    #
+    # For models that don't use FriendlyId::Slugged, the base is the column that
+    # is used as the FriendlyId directly. For models using FriendlyId::Slugged,
+    # the base is a column or method whose value is used as the basis of the
+    # slug.
+    #
+    # For example, if you have a model representing blog posts and that uses
+    # slugs, you likely will want to use the "title" attribute as the base, and
+    # FriendlyId will take care of transforming the human-readable title into
+    # something suitable for use in a URL.
+    #
+    # @param [Symbol] A symbol referencing a column or method in the model. This
+    #   value is usually set by passing it as the first argument to
+    #   {FriendlyId::Base#friendly_id friendly_id}:
+    #
+    # @example
+    #   class Book < ActiveRecord::Base
+    #     extend FriendlyId
+    #     friendly_id :name
+    #   end
+    attr_reader :base
+
+    # The model class that this configuration belongs to.
+    # @return ActiveRecord::Base
+    attr_reader :klass
+
+    # The configuration parameters for the {#klass model class} using FriendlyId.
+    # @return Hash
+    attr_reader :defaults
+
+    @@defaults = {
+      :reserved_words => ["new", "edit"]
     }
 
+    # The default configuration parameters for models using FriendlyId.
+    # @return Hash
+    def self.defaults
+      @@defaults
+    end
+
     def initialize(klass, values = nil)
       @klass = klass
+      @defaults = self.class.defaults.dup
       set values
     end
 
-    def method_missing(symbol, *args, &block)
-      option = symbol.to_s.gsub(/=\z/, '')
-      raise ArgumentError, DEFAULTS[:config_error_message] % option
+    def base=(base)
+      @base = base
+      if @base.respond_to?(:to_s)
+        @klass.validates_exclusion_of @base, :in => defaults[:reserved_words]
+      end
     end
 
-    def set(values)
-      values and values.each {|name, value| self.send "#{name}=", value}
+    # Lets you specify the modules to use with FriendlyId.
+    #
+    # This method is invoked by {FriendlyId::Base#friendly_id friendly_id} when
+    # passing the +:use+ option, or when using {FriendlyId::Base#friendly_id
+    # friendly_id} with a block.
+    #
+    # @example
+    #   class Book < ActiveRecord::Base
+    #     extend FriendlyId
+    #     friendly_id :name, :use => :slugged
+    #   end
+    # @param [#to_s] *modules Arguments should be a symbols or strings that
+    #   correspond with the name of a module inside the FriendlyId namespace. By
+    #   default FriendlyId provides +:slugged+, +:history+ and +:scoped+.
+    def use(*modules)
+      modules.to_a.flatten.compact.map do |name|
+        klass.send :include, FriendlyId.const_get(name.to_s.classify)
+      end
     end
 
+    # The column that FriendlyId will use to find the record when querying by
+    # friendly id.
+    #
+    # This method is generally only used internally by FriendlyId.
+    # @return String
     def query_field
-      base
+      base.to_s
+    end
+
+    private
+
+    def set(values)
+      values and values.each {|name, value| self.send "#{name}=", value}
     end
   end
 end

data/lib/friendly_id/finder_methods.rb

@@ -5,10 +5,8 @@ module FriendlyId
     protected
 
     def find_one(id)
-      return super if !@klass.uses_friendly_id? or id.unfriendly_id?
+      return super if !@klass.respond_to?(:friendly_id) || id.unfriendly_id?
       where(@klass.friendly_id_config.query_field => id).first or super
     end
   end
 end
-
-ActiveRecord::Relation.send :include, FriendlyId::FinderMethods

data/lib/friendly_id/history.rb

@@ -3,12 +3,14 @@ require "friendly_id/slug"
 module FriendlyId
   module History
 
-    def self.included(base)
-      base.class_eval do
-        include Slugged unless include? Slugged
-        extend  Finder
+    def self.included(klass)
+      klass.instance_eval do
+        raise "FriendlyId::History is incompatibe with FriendlyId::Scoped" if self < Scoped
+        include Slugged unless self < Slugged
         has_many :friendly_id_slugs, :as => :sluggable, :dependent => :destroy
         before_save :build_friendly_id_slug, :if => lambda {|r| r.slug_sequencer.slug_changed?}
+        scope :with_friendly_id, lambda {|id| includes(:friendly_id_slugs).where("friendly_id_slugs.slug = ?", id)}
+        extend  Finder
       end
     end
 
@@ -21,7 +23,7 @@ module FriendlyId
 
   module Finder
     def find_by_friendly_id(*args)
-      where("friendly_id_slugs.slug = ?", args.shift).includes(:friendly_id_slugs).first(*args)
+      with_friendly_id(args.shift).first(*args)
     end
   end
 end

data/lib/friendly_id/object_utils.rb

@@ -6,10 +6,13 @@ module FriendlyId
 
     # True is the id is definitely friendly, false if definitely unfriendly,
     # else nil.
+    #
+    # An object is considired "definitely unfriendly" if its class is or
+    # inherits from Numeric, Symbol or ActiveRecord::Base.
     def friendly_id?
-      if kind_of?(Integer) or kind_of?(Symbol) or self.class.respond_to? :friendly_id_config
+      if [Numeric, Symbol, ActiveRecord::Base].detect {|klass| self.class < klass}
         false
-      elsif to_i.to_s != to_s
+      elsif respond_to?(:to_i) && to_i.to_s != to_s
         true
       end
     end

data/lib/friendly_id/scoped.rb

@@ -12,43 +12,38 @@ module FriendlyId
   #   class Restaurant < ActiveRecord::Base
   #     belongs_to :city
   #     include FriendlyId::Scoped
-  #     has_friendly_id :name, :scope => :city
+  #     friendly_id :name, :scope => :city
   #   end
   module Scoped
     def self.included(klass)
-      klass.send :include, Slugged unless klass.include? Slugged
+      klass.instance_eval do
+        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
+      end
     end
-  end
-
-  class SlugSequencer
-    private
 
-    alias conflict_without_scope conflict
-
-    # Checks for naming conflicts, taking scopes into account.
-    # @return ActiveRecord::Base
-    def conflict_with_scope
-      column = friendly_id_config.scope_column
-      conflicts.where("#{column} = ?", sluggable.send(column)).first
+    module Configuration
+      attr_accessor :scope
+
+      # Gets the scope column.
+      #
+      # Checks to see if the +:scope+ option passed to {#friendly_id}
+      # refers to a relation, and if so, returns the realtion's foreign key.
+      # Otherwise it assumes the option value was the name of column and returns
+      # it cast to a String.
+      # @return String The scope column
+      def scope_column
+        (klass.reflections[@scope].try(:association_foreign_key) || @scope).to_s
+      end
     end
 
-    def conflict
-      friendly_id_config.scope ? conflict_with_scope : conflict_without_scope
-    end
-  end
-
-  class Configuration
-    attr_accessor :scope
-
-    # Gets the scope column.
-    #
-    # Checks to see if the +:scope+ option passed to {#has_friendly_id}
-    # refers to a relation, and if so, returns the realtion's foreign key.
-    # Otherwise it assumes the option value was the name of column and returns
-    # it cast to a String.
-    # @return String The scope column
-    def scope_column
-      (klass.reflections[@scope].try(:association_foreign_key) || @scope).to_s
+    module SlugSequencer
+      def conflict
+        column = friendly_id_config.scope_column
+        conflicts.where("#{column} = ?", sluggable.send(column)).first
+      end
     end
   end
 end

data/lib/friendly_id/slug_sequencer.rb

@@ -15,7 +15,7 @@ module FriendlyId
     end
 
     def generate
-      if slug_changed? or new_record?
+      if new_record? or slug_changed?
         conflict? ? self.next : normalized
       else
         sluggable.friendly_id
@@ -48,7 +48,6 @@ module FriendlyId
       @conflict
     end
 
-    # @NOTE AR-specific code here
     def conflicts
       pkey  = sluggable.class.primary_key
       value = sluggable.send pkey

data/lib/friendly_id/slugged.rb

@@ -5,19 +5,22 @@ module FriendlyId
   # This module adds in-table slugs to an ActiveRecord model.
   module Slugged
 
-    # @NOTE AR-specific code here
     def self.included(klass)
-      klass.before_save :set_slug
-      klass.friendly_id_config.use_slugs = true
+      klass.instance_eval do
+        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)
+        before_validation :set_slug
+      end
     end
 
-    # @NOTE AS-specific code here
     def normalize_friendly_id(value)
       value.to_s.parameterize
     end
 
     def slug_sequencer
-      SlugSequencer.new(self)
+      friendly_id_config.slug_sequencer_class.new(self)
     end
 
     private
@@ -25,27 +28,22 @@ module FriendlyId
     def set_slug
       send "#{friendly_id_config.slug_column}=", slug_sequencer.generate
     end
-  end
-
-  class Configuration
-    attr :use_slugs
-    attr_writer :slug_column, :sequence_separator, :use_slugs
 
-    DEFAULTS[:slug_column]        = 'slug'
-    DEFAULTS[:sequence_separator] = '--'
+    module Configuration
+      attr_writer :slug_column, :sequence_separator
+      attr_accessor :slug_sequencer_class
 
-    undef query_field
+      def query_field
+        slug_column
+      end
 
-    def query_field
-      use_slugs ? slug_column : base
-    end
-
-    def sequence_separator
-      @sequence_separator ||= DEFAULTS[:sequence_separator]
-    end
+      def sequence_separator
+        @sequence_separator or defaults[:sequence_separator]
+      end
 
-    def slug_column
-      @slug_column ||= DEFAULTS[:slug_column]
+      def slug_column
+        @slug_column or defaults[:slug_column]
+      end
     end
   end
 end

data/lib/friendly_id/version.rb

@@ -3,7 +3,7 @@ module FriendlyId
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    BUILD = 'beta1'
+    BUILD = 'beta3'
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 end

data/lib/friendly_id.rb

@@ -6,9 +6,34 @@ require "friendly_id/finder_methods"
 
 # FriendlyId is a comprehensive Ruby library for ActiveRecord permalinks and
 # slugs.
+#
 # @author Norman Clarke
 module FriendlyId
   autoload :Slugged,  "friendly_id/slugged"
   autoload :Scoped,   "friendly_id/scoped"
   autoload :History,  "friendly_id/history"
+
+  # FriendlyId takes advantage of `extended` to do basic model setup, primarily
+  # extending FriendlyId::Base to add #friendly_id as a class method for
+  # configuring how a model is going to use FriendlyId. In previous versions of
+  # this library, ActiveRecord::Base was patched by default to include methods
+  # needed to configure friendly_id, but this version tries to be a little less
+  # invasive.
+  #
+  # In addition to adding the #friendly_id method, the class instance variable
+  # +@friendly_id_config+ is added. This variable is an instance of an anonymous
+  # subclass of FriendlyId::Configuration. This is done to allow for
+  # subsequently loaded modules like FriendlyId::Slugged to add functionality to
+  # the configuration only for the current class, and thereby isolating other
+  # classes from large feature changes a module could potentially introduce. 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.
+  def self.extended(base)
+    base.instance_eval do
+      extend FriendlyId::Base
+      @friendly_id_config = Class.new(FriendlyId::Configuration).new(base)
+    end
+    ActiveRecord::Relation.send :include, FriendlyId::FinderMethods
+  end
 end

data/test/base_test.rb

@@ -0,0 +1,31 @@
+require File.expand_path("../helper.rb", __FILE__)
+
+class CoreTest < MiniTest::Unit::TestCase
+  include FriendlyId::Test
+
+  test "friendly_id should accept a base and a hash" do
+    klass = Class.new(ActiveRecord::Base) do
+      extend FriendlyId
+      friendly_id :foo, :use => :slugged, :slug_column => :bar
+    end
+    assert klass < FriendlyId::Slugged
+    assert_equal :foo, klass.friendly_id_config.base
+    assert_equal :bar, klass.friendly_id_config.slug_column
+  end
+
+
+  test "friendly_id should accept a block" do
+    klass = Class.new(ActiveRecord::Base) do
+      extend FriendlyId
+      friendly_id do |config|
+        config.use :slugged
+        config.base = :foo
+        config.slug_column = :bar
+      end
+    end
+    assert klass < FriendlyId::Slugged
+    assert_equal :foo, klass.friendly_id_config.base
+    assert_equal :bar, klass.friendly_id_config.slug_column
+  end
+
+end

data/test/configuration_test.rb

@@ -0,0 +1,27 @@
+require File.expand_path("../helper", __FILE__)
+
+class ConfigurationTest < MiniTest::Unit::TestCase
+
+  include FriendlyId::Test
+
+  def setup
+    @klass = Class.new(ActiveRecord::Base)
+  end
+
+  test "should set klass on initialization" do
+    config = FriendlyId::Configuration.new @klass
+    assert_equal @klass, config.klass
+  end
+
+  test "should set options on initialization if present" do
+    config = FriendlyId::Configuration.new @klass, :base => "hello"
+    assert_equal "hello", config.base
+  end
+
+  test "should raise error if passed unrecognized option" do
+    assert_raises NoMethodError do
+      FriendlyId::Configuration.new @klass, :foo => "bar"
+    end
+  end
+
+end

data/test/core_test.rb

@@ -2,7 +2,8 @@ require File.expand_path("../helper.rb", __FILE__)
 
 Author, Book = 2.times.map do
   Class.new(ActiveRecord::Base) do
-    has_friendly_id :name
+    extend FriendlyId
+    friendly_id :name
   end
 end
 
@@ -16,17 +17,11 @@ class CoreTest < MiniTest::Unit::TestCase
   end
 
   test "models don't use friendly_id by default" do
-    assert !Class.new(ActiveRecord::Base).uses_friendly_id?
+    assert !Class.new(ActiveRecord::Base).respond_to?(:friendly_id)
   end
 
   test "model classes should have a friendly id config" do
-    assert klass.has_friendly_id(:name).friendly_id_config
-  end
-
-  test "should raise error when bad config options are set" do
-    assert_raises ArgumentError do
-      klass.has_friendly_id :name, :garbage => :in
-    end
+    assert klass.friendly_id(:name).friendly_id_config
   end
 
   test "should reserve 'new' and 'edit' by default" do

data/test/helper.rb

@@ -7,10 +7,14 @@ require "bundler/setup"
 require "mocha"
 require "minitest/unit"
 require "active_record"
+# require "active_support/core_ext/class"
 
 if ENV["COVERAGE"]
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter "test/"
+    add_filter "friendly_id/migration"
+  end
 end
 
 require "friendly_id"
@@ -77,7 +81,7 @@ end
 
 class Module
   def test(name, &block)
-    define_method("test_#{name.gsub(/[^a-z0-9]/i, "_")}".to_sym, &block)
+    define_method("test_#{name.gsub(/[^a-z0-9']/i, "_")}".to_sym, &block)
   end
 end
 

data/test/history_test.rb

@@ -1,8 +1,8 @@
 require File.expand_path("../helper.rb", __FILE__)
 
 class Manual < ActiveRecord::Base
-  include FriendlyId::History
-  has_friendly_id :name
+  extend FriendlyId
+  friendly_id :name, :use => :history
 end
 
 class HistoryTest < MiniTest::Unit::TestCase
@@ -43,4 +43,13 @@ class HistoryTest < MiniTest::Unit::TestCase
       assert !found.readonly?
     end
   end
+
+  test "should raise error if used with scoped" do
+    klass = Class.new(ActiveRecord::Base)
+    klass.extend FriendlyId
+    assert_raises RuntimeError do
+      klass.friendly_id :name, :use => [:history, :scoped]
+    end
+  end
+
 end

data/test/scoped_test.rb

@@ -1,14 +1,14 @@
 require File.expand_path("../helper", __FILE__)
 
 class Novelist < ActiveRecord::Base
-  include FriendlyId::Slugged
-  has_friendly_id :name
+  extend FriendlyId
+  friendly_id :name, :use => :slugged
 end
 
 class Novel < ActiveRecord::Base
-  include FriendlyId::Scoped
+  extend FriendlyId
   belongs_to :novelist
-  has_friendly_id :name, :scope => :novelist
+  friendly_id :name, :use => :scoped, :scope => :novelist
 end
 
 class ScopedTest < MiniTest::Unit::TestCase
@@ -26,7 +26,8 @@ class ScopedTest < MiniTest::Unit::TestCase
 
   test "should detect scope column from explicit column name" do
     klass = Class.new(ActiveRecord::Base)
-    klass.has_friendly_id :empty, :scope => :dummy
+    klass.extend FriendlyId
+    klass.friendly_id :empty, :use => :scoped, :scope => :dummy
     assert_equal "dummy", klass.friendly_id_config.scope_column
   end
 
@@ -46,4 +47,11 @@ class ScopedTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "should raise error if used with history" do
+    klass = Class.new(ActiveRecord::Base)
+    klass.extend FriendlyId
+    assert_raises RuntimeError do
+      klass.friendly_id :name, :use => [:scoped, :history]
+    end
+  end
 end

data/test/slugged_test.rb

@@ -2,8 +2,8 @@ require File.expand_path("../helper.rb", __FILE__)
 
 Journalist, Article = 2.times.map do
   Class.new(ActiveRecord::Base) do
-    include FriendlyId::Slugged
-    has_friendly_id :name
+    extend FriendlyId
+    friendly_id :name, :use => :slugged
   end
 end
 
@@ -53,8 +53,8 @@ class SlugSequencerTest < MiniTest::Unit::TestCase
   test "should quote column names" do
     klass            = Class.new(ActiveRecord::Base)
     klass.table_name = "journalists"
-    klass.send :include, FriendlyId::Slugged
-    klass.has_friendly_id :name, :slug_column => "strange name"
+    klass.extend FriendlyId
+    klass.friendly_id :name, :use => :slugged, :slug_column => "strange name"
     begin
       with_instance_of(klass) {|record| assert klass.find(record.friendly_id)}
     rescue ActiveRecord::StatementInvalid
@@ -68,8 +68,8 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 
   class Journalist < ActiveRecord::Base
-    include FriendlyId::Slugged
-    has_friendly_id :name, :sequence_separator => ":"
+    extend FriendlyId
+    friendly_id :name, :use => :slugged, :sequence_separator => ":"
   end
 
   def klass

metadata

@@ -1,104 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: friendly_id4
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 4.0.0.beta3
   prerelease: 6
-  version: 4.0.0.beta1
 platform: ruby
-authors: 
+authors:
 - Norman Clarke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-26 00:00:00.000000000 -03:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70311865559640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70311865559640
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70311865558600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cutest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70311865558600
+- !ruby/object:Gem::Dependency
+  name: cutest
+  requirement: &70311865558040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ffaker
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70311865558040
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: &70311865557340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: maruku
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70311865557340
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: &70311865556780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70311865556780
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70311865556100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70311865556100
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70311865555640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink plugins\n    for Ruby on Rails. It allows you to create pretty URL's and work with\n    human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
-email: 
+  prerelease: false
+  version_requirements: *70311865555640
+description: ! "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink
+  plugins\n    for Ruby on Rails. It allows you to create pretty URL's and work with\n
+  \   human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
+email:
 - norman@njclarke.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gemtest
 - .gitignore
 - Gemfile
 - Guide.md
@@ -121,9 +121,11 @@ files:
 - lib/friendly_id/slugged.rb
 - lib/friendly_id/version.rb
 - lib/generators/friendly_id_generator.rb
+- test/base_test.rb
 - test/config/mysql.yml
 - test/config/postgres.yml
 - test/config/sqlite3.yml
+- test/configuration_test.rb
 - test/core_test.rb
 - test/helper.rb
 - test/history_test.rb
@@ -132,32 +134,29 @@ files:
 - test/scoped_test.rb
 - test/shared.rb
 - test/slugged_test.rb
+has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: friendly_id
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: []
-