friendly_id 5.0.0.beta3 → 5.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7dc57b3098c5b155bf109e9cefccf404bce14e5
-  data.tar.gz: 2958d34628cca3ae7c93fc828d10ec11da863a47
+  metadata.gz: 04766b0ed96f1b271571b983cf3b73cf9385406c
+  data.tar.gz: 5881c90dc07cf35780402d04211cc93ebd597d01
 SHA512:
-  metadata.gz: aa871391245ae44af48c1e6676681f169ebf25a4d922a871e1d68344cab69705c5f63464caf1bfa0f4bb37f80ff6be45569005ea5b26fb1629477046285834b2
-  data.tar.gz: 2c4658fea02b39fea957a833ce3e533abaa9273c29d77af9a7f720099130fe3c63e6c4f4394217af2166d1477a1ff83251a3cab5c670fb6861f748c5718b6c11
+  metadata.gz: 06b4a78391d3a6f9ca7a42e4769087e4dbf70a559e29313147b48b655dbc59ffddfbaf3f91e78854d64c8b1cedf1bf2e088280c9747fcb9fc45318ec7243d925
+  data.tar.gz: 2e66f50e25d14cf807e2f2719c49e13e2936656ac50a6842f1225357089e0561b2ec39effad76571558999d04d905715f365649cd1119b7a2a8765dd81084c79

data/Changelog.md

@@ -3,6 +3,12 @@
 We would like to think our many {file:Contributors contributors} for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.0.0.beta4 (2013-08-21)
+
+* Add an initializer to the generator; move the default reserved words there.
+* Allow assignment from {FriendlyId::Configuration#base}.
+* Fix bug whereby records could not reuse their own slugs.
+
 ## 5.0.0.beta3 (2013-08-20)
 
 * Update gemspec to ensure FriendlyId 5.0 is only used with AR 4.0.x.

data/README.md

@@ -3,12 +3,14 @@
 **VERSION NOTE**
 
 **Rails 4**:
-Master branch of this repository contains FriendlyId 5 which is compatible with Rails 4.
-This version is in beta and will be released soon.
+
+The master branch of this repository contains FriendlyId 5, which is compatible
+with Rails 4. This version is in beta and will be released soon.
 
 **Rails 3**:
-If you wish to use this gem with Rails 3.1 or 3.2 you need to use FriendlyId version 4, which is the current stable release.
-Please see [4.0-stable
+
+If you wish to use this gem with Rails 3.1 or 3.2 you must use FriendlyId 4,
+which is the current stable release. Please see the [4.0-stable
 branch](https://github.com/norman/friendly_id/tree/4.0-stable).
 
 # FriendlyId
@@ -16,10 +18,10 @@ branch](https://github.com/norman/friendly_id/tree/4.0-stable).
 <em>For the most complete, user-friendly documentation, see the [FriendlyId Guide](http://rubydoc.info/github/norman/friendly_id/master/file/Guide.md).</em>
 
 FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for
-Ruby on Rails. It allows you to create pretty URLs and work with human-friendly
-strings as if they were numeric ids for Active Record models.
+Active Record. It lets you create pretty URLs and work with human-friendly
+strings as if they were numeric ids.
 
-Using FriendlyId, it's easy to make your application use URLs like:
+With FriendlyId, it's easy to make your application use URLs like:
 
     http://example.com/states/washington
 
@@ -33,49 +35,41 @@ instead of:
 FriendlyId offers many advanced features, including: slug history and
 versioning, i18n, scoped slugs, reserved words, and custom slug generators.
 
-Note: FriendlyId 5.0 is compatible with Active Record **4.0** and higher only.
-For Rails 3.x, please use FriendlyId 4.x.
-
-
-## Version 5.x
+### What Changed in Version 5.0
 
 As of version 5.0, FriendlyId uses semantic versioning. Therefore, as you might
-infer from the version number, FriendlyId 5.0 introduces changes incompatible
-with 4.x.
+infer from the version number, 5.0 introduces changes incompatible with 4.0.
 
-Here's a summary of the most important changes:
+The most important changes are:
 
-* FriendlyId no longer overrides `find` by default. If you want to do friendly finds,
-  you must do `Model.friendly.find` rather than `Model.find`. You can however easily
+* Finders are no longer overridden by default. If you want to do friendly finds,
+  you must do `Model.friendly.find` rather than `Model.find`. You can however
   restore FriendlyId 4-style finders by using the `:finders` addon:
 
-```ruby
-friendly_id :foo, use: :slugged # you must do MyClass.friendly.find('bar')
-# or...
-friendly_id :foo, use: [:slugged, :finders] # you can now do MyClass.find('bar')
-```
+          friendly_id :foo, use: :slugged # you must do MyClass.friendly.find('bar')
+          # or...
+          friendly_id :foo, use: [:slugged, :finders] # you can now do MyClass.find('bar')
 
-* Version 5.0 offers a new "candidates" functionality which makes it easy to
-  set up a list of alternate slugs that can be used to uniquely distinguish
-  records, rather than appending a sequence. For example:
 
-```ruby
-class Restaurant < ActiveRecord::Base
-  extend FriendlyId
-  friendly_id :slug_candidates, use: :slugged
-
-  # Try building a slug based on the following fields in
-  # increasing order of specificity.
-  def slug_candidates
-    [
-      :name,
-      [:name, :city],
-      [:name, :street, :city],
-      [:name, :street_number, :street, :city]
-    ]
-  end
-end
-```
+* A new "candidates" functionality which makes it easy to set up a list of
+  alternate slugs that can be used to uniquely distinguish records, rather than
+  appending a sequence. For example:
+
+          class Restaurant < ActiveRecord::Base
+            extend FriendlyId
+            friendly_id :slug_candidates, use: :slugged
+
+            # Try building a slug based on the following fields in
+            # increasing order of specificity.
+            def slug_candidates
+              [
+                :name,
+                [:name, :city],
+                [:name, :street, :city],
+                [:name, :street_number, :street, :city]
+              ]
+            end
+          end
 
 * Now that candidates have been added, FriendlyId no longer uses a numeric
   sequence to differentiate conflicting slug, but rather a UUID (e.g. something
@@ -83,26 +77,56 @@ end
   codebase simpler and more reliable when running concurrently, at the expense
   of uglier ids being generated when there are conflicts.
 
-* The default sequence separator is now `-` rather than `--`.
+* The default sequence separator has been changed from two dashes to one dash.
 
 * Slugs are no longer regenerated when a record is saved. If you want to regenerate
   a slug, you must explicitly set the slug column to nil:
 
-```ruby
-restaurant.friendly_id # joes-diner
-restaurant.name = "The Plaza Diner"
-restaurant.save!
-restaurant.friendly_id # joes-diner
-restaurant.slug = nil
-restaurant.save!
-restaurant.friendly_id # the-plaza-diner
-```
+          restaurant.friendly_id # joes-diner
+          restaurant.name = "The Plaza Diner"
+          restaurant.save!
+          restaurant.friendly_id # joes-diner
+          restaurant.slug = nil
+          restaurant.save!
+          restaurant.friendly_id # the-plaza-diner
+
+  You can restore some of the old behavior by overriding the
+  `should_generate_new_friendly_id` method.
+
+* The `friendly_id` Rails generator now generates an initializer showing you
+  how to do some commmon global configuration.
+
+* The `:reserved` module no longer includes any default reserved words.
+  Previously it blocked "edit" and "new" everywhere. The default word list has
+  been moved to `config/initializers/friendly_id.rb` and now includes many more
+  words.
+
+* The `:history` and `:scoped` addons can now be used together.
+
+* Since it now requires Rails 4, FriendlyId also now requires Ruby 1.9.3 or
+  higher.
+
+#### Upgrading from FriendlyId 4.0
+
+Run `rails generate friendly_id --skip-migration` and edit the initializer
+generated in `config/initializers/friendly_id.rb`. This file contains notes
+describing how to restore (or not) some of the defaults from FriendlyId 4.0.
+
+If you want to use the `:history` and `:scoped` addons together, you must add a
+`:scope` column to your friendly_id slugs table and replace the unique index on
+`:slug` and `:sluggable_type` with a unique index on those two columns, plus
+the new `:scope` column.
+
+A migration like this should be sufficient:
 
-* Like Rails 4, FriendlyId now requires Ruby 1.9.3 or higher.
+    add_column   :friendly_id_slugs, :scope, :string
+    remove_index :friendly_id_slugs, [:slug, :sluggable_type]
+    add_index    :friendly_id_slugs, [:slug, :sluggable_type]
+    add_index    :friendly_id_slugs, [:slug, :sluggable_type, :scope], unique: true
 
 ## Docs
 
-The current docs can always be found
+The most current docs from the master branch can always be found
 [here](http://rubydoc.info/github/norman/friendly_id/master/frames).
 
 The best place to start is with the
@@ -110,7 +134,7 @@ The best place to start is with the
 which compiles the top-level RDocs into one outlined document.
 
 You might also want to watch Ryan Bates's [Railscast on FriendlyId](http://railscasts.com/episodes/314-pretty-urls-with-friendlyid),
-which is now somewhat outdated but still mostly relevant.
+which is now somewhat outdated but still relevant.
 
 ## Rails Quickstart
 
@@ -120,7 +144,7 @@ cd my_app
 ```
 ```ruby
 # Gemfile
-gem 'friendly_id', '5.0.0.beta1' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
+gem 'friendly_id', '5.0.0.beta4' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
 ```
 ```shell
 rails generate friendly_id

data/lib/friendly_id.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "thread"
 require "friendly_id/base"
 require "friendly_id/object_utils"
 require "friendly_id/configuration"
@@ -43,8 +42,6 @@ with numeric ids:
 =end
 module FriendlyId
 
-  @mutex = Mutex.new
-
   autoload :History,    "friendly_id/history"
   autoload :Slug,       "friendly_id/slug"
   autoload :SimpleI18n, "friendly_id/simple_i18n"
@@ -95,18 +92,16 @@ module FriendlyId
 
   # Set global defaults for all models using FriendlyId.
   #
-  # The default defaults are to use the +:reserved+ module and nothing else.
+  # The default defaults are to use the `:reserved` module and nothing else.
   #
   # @example
   #   FriendlyId.defaults do |config|
-  #     config.base = :name
+  #     config.base :name
   #     config.use :slugged
   #   end
   def self.defaults(&block)
-    @mutex.synchronize do
-      @defaults = block if block_given?
-      @defaults ||= lambda {|config| config.use :reserved}
-    end
+    @defaults = block if block_given?
+    @defaults ||= ->(config) {config.use :reserved}
   end
 
   # Set the ActiveRecord table name prefix to friendly_id_

data/lib/friendly_id/base.rb

@@ -55,10 +55,10 @@ often better and easier to use {FriendlyId::Slugged slugs}.
 
     # Configure FriendlyId's behavior in a model.
     #
-    #   class Post < ActiveRecord::Base
-    #     extend FriendlyId
-    #     friendly_id :title, :use => :slugged
-    #   end
+    #     class Post < ActiveRecord::Base
+    #       extend FriendlyId
+    #       friendly_id :title, :use => :slugged
+    #     end
     #
     # When given the optional block, this method will yield the class's instance
     # of {FriendlyId::Configuration} to the block before evaluating other
@@ -67,36 +67,36 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     # multiple models, while being able to override the values it sets. Here is
     # a contrived example:
     #
-    #   $friendly_id_config_proc = Proc.new do |config|
-    #     config.base = :name
-    #     config.use :slugged
-    #   end
+    #     $friendly_id_config_proc = Proc.new do |config|
+    #       config.base = :name
+    #       config.use :slugged
+    #     end
     #
-    #   class Foo < ActiveRecord::Base
-    #     extend FriendlyId
-    #     friendly_id &$friendly_id_config_proc
-    #   end
+    #     class Foo < ActiveRecord::Base
+    #       extend FriendlyId
+    #       friendly_id &$friendly_id_config_proc
+    #     end
     #
-    #   class Bar < ActiveRecord::Base
-    #     extend FriendlyId
-    #     friendly_id :title, &$friendly_id_config_proc
-    #   end
+    #     class Bar < ActiveRecord::Base
+    #       extend FriendlyId
+    #       friendly_id :title, &$friendly_id_config_proc
+    #     end
     #
     # However, it's usually better to use {FriendlyId.defaults} for this:
     #
-    #   FriendlyId.defaults do |config|
-    #     config.base = :name
-    #     config.use :slugged
-    #   end
+    #     FriendlyId.defaults do |config|
+    #       config.base = :name
+    #       config.use :slugged
+    #     end
     #
-    #   class Foo < ActiveRecord::Base
-    #     extend FriendlyId
-    #   end
+    #     class Foo < ActiveRecord::Base
+    #       extend FriendlyId
+    #     end
     #
-    #   class Bar < ActiveRecord::Base
-    #     extend FriendlyId
-    #     friendly_id :title
-    #   end
+    #     class Bar < ActiveRecord::Base
+    #       extend FriendlyId
+    #       friendly_id :title
+    #     end
     #
     # In general you should use the block syntax either because of your personal
     # aesthetic preference, or because you need to share some functionality
@@ -114,21 +114,21 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     # modules into your class, and these modules in turn may add required
     # configuration options to the `@friendly_id_configuraton`'s class:
     #
-    #   class Person < ActiveRecord::Base
-    #     friendly_id do |config|
-    #       # This will work
-    #       config.use :slugged
-    #       config.sequence_separator = ":"
+    #     class Person < ActiveRecord::Base
+    #       friendly_id do |config|
+    #         # This will work
+    #         config.use :slugged
+    #         config.sequence_separator = ":"
+    #       end
     #     end
-    #   end
     #
-    #   class Person < ActiveRecord::Base
-    #     friendly_id do |config|
-    #       # This will fail
-    #       config.sequence_separator = ":"
-    #       config.use :slugged
+    #     class Person < ActiveRecord::Base
+    #       friendly_id do |config|
+    #         # This will fail
+    #         config.sequence_separator = ":"
+    #         config.use :slugged
+    #       end
     #     end
-    #   end
     #
     # ### Including Your Own Modules
     #
@@ -136,21 +136,21 @@ often better and easier to use {FriendlyId::Slugged slugs}.
     # can be a convenient place to set up behavior common to all classes using
     # FriendlyId. You can include any module, or more conveniently, define one
     # on-the-fly. For example, let's say you want to make
-    # Babosa[http://github.com/norman/babosa] the default slugging library in
+    # [Babosa](http://github.com/norman/babosa) the default slugging library in
     # place of Active Support, and transliterate all slugs from Russian Cyrillic
     # to ASCII:
     #
-    #   require "babosa"
+    #     require "babosa"
     #
-    #   FriendlyId.defaults do |config|
-    #     config.base = :name
-    #     config.use :slugged
-    #     config.use Module.new {
-    #       def normalize_friendly_id(text)
-    #         text.to_slug.normalize(:transliterations => [:russian, :latin])
-    #       end
-    #     }
-    #   end
+    #     FriendlyId.defaults do |config|
+    #       config.base = :name
+    #       config.use :slugged
+    #       config.use Module.new {
+    #         def normalize_friendly_id(text)
+    #           text.to_slug.normalize! :transliterations => [:russian, :latin]
+    #         end
+    #       }
+    #     end
     #
     #
     # @option options [Symbol,Module] :use The addon or name of an addon to use.

data/lib/friendly_id/configuration.rb

@@ -1,31 +1,9 @@
 module FriendlyId
-  # The configuration paramters passed to +friendly_id+ will be stored in
+  # The configuration paramters passed to {Base#friendly_id} will be stored in
   # this object.
   class Configuration
 
-    # 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.
-    #
-    # 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_accessor :base
+    attr_writer :base
 
     # The default configuration options.
     attr_reader :defaults
@@ -44,10 +22,10 @@ module FriendlyId
       set values
     end
 
-    # Lets you specify the modules to use with FriendlyId.
+    # Lets you specify the addon 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
+    # passing the `:use` option, or when using {FriendlyId::Base#friendly_id
     # friendly_id} with a block.
     #
     # @example
@@ -55,10 +33,11 @@ module FriendlyId
     #     extend FriendlyId
     #     friendly_id :name, :use => :slugged
     #   end
+    #
     # @param [#to_s,Module] modules Arguments should be Modules, or symbols or
-    #   strings that correspond with the name of a module inside the FriendlyId
-    #   namespace. By default FriendlyId provides +:slugged+, +:history+,
-    #   +:simple_i18n+, and +:scoped+.
+    #   strings that correspond with the name of an addon to use with FriendlyId.
+    #   By default FriendlyId provides `:slugged`, `:history`, `:simple_i18n`,
+    #   and `:scoped`.
     def use(*modules)
       modules.to_a.flatten.compact.map do |object|
         mod = get_module(object)
@@ -81,6 +60,33 @@ module FriendlyId
       base.to_s
     end
 
+    # 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}, this is the column that
+    # is used to store the friendly id. 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.
+    #
+    # If you pass an argument, it will be used as the base. Otherwise the current
+    # value is returned.
+    #
+    # @param value 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}.
+    def base(*value)
+      if value.empty?
+        @base
+      else
+        self.base = value.first
+      end
+    end
+
     private
 
     def get_module(object)

data/lib/friendly_id/initializer.rb

@@ -0,0 +1,84 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://rubydoc.info/github/norman/friendly_id/master/file/Guide.md
+
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  config.use :reserved
+
+  config.reserved_words = %w(new edit index session login logout users admin
+    stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but you if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end

data/lib/friendly_id/reserved.rb

@@ -7,21 +7,15 @@ module FriendlyId
 The {FriendlyId::Reserved Reserved} module adds the ability to exlude a list of
 words from use as FriendlyId slugs.
 
-By default, FriendlyId reserves the words "new" and "edit" when this module is
-included. You can configure this globally by using {FriendlyId.defaults
-FriendlyId.defaults}:
+With Ruby on Rails, FriendlyId's generator generates an initializer that
+reserves some words such as "new" and "edit" using {FriendlyId.defaults
+FriendlyId.defaults}.
 
-  FriendlyId.defaults do |config|
-    config.use :reserved
-    # Reserve words for English and Spanish URLs
-    config.reserved_words = %w(new edit nueva nuevo editar)
-  end
-
-Note that the error message will appear on the field `:friendly_id`. If you are
-using Rails's scaffolded form errors display, then it will have no field to
-highlight. If you'd like to change this so that scaffolding works as expected,
-one way to accomplish this is to move the error message to a different field.
-For example:
+Note that the error messages for fields will appear on the field
+`:friendly_id`. If you are using Rails's scaffolded form errors display, then
+it will have no field to highlight. If you'd like to change this so that
+scaffolding works as expected, one way to accomplish this is to move the error
+message to a different field. For example:
 
   class Person < ActiveRecord::Base
     extend FriendlyId
@@ -42,27 +36,16 @@ For example:
     def self.included(model_class)
       model_class.class_eval do
         friendly_id_config.class.send :include, Reserved::Configuration
-        friendly_id_config.defaults[:reserved_words] ||= ["new", "edit"]
+        validates_exclusion_of :friendly_id, :in => ->(_) {
+          friendly_id_config.reserved_words || []
+        }
       end
     end
 
     # This module adds the `:reserved_words` configuration option to
     # {FriendlyId::Configuration FriendlyId::Configuration}.
     module Configuration
-      attr_writer :reserved_words
-
-      # Overrides {FriendlyId::Configuration#base} to add a validation to the
-      # model class.
-      def base=(base)
-        super
-        reserved_words = model_class.friendly_id_config.reserved_words
-        model_class.validates_exclusion_of :friendly_id, :in => reserved_words
-      end
-
-      # An array of words forbidden as slugs.
-      def reserved_words
-        @reserved_words ||= @defaults[:reserved_words]
-      end
+      attr_accessor :reserved_words
     end
   end
 end

data/lib/friendly_id/slugged.rb

@@ -298,7 +298,12 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     private :set_slug
 
     def slug_generator
-      friendly_id_config.slug_generator_class.new(self.class.base_class.unscoped.friendly)
+      scope = self.class.base_class.unscoped.friendly
+      if changed.include?(friendly_id_config.slug_column)
+        column = self.class.quoted_table_name + '.' + self.class.quoted_primary_key
+        scope = scope.where("#{column} <> ?", send(self.class.primary_key))
+      end
+      friendly_id_config.slug_generator_class.new(scope)
     end
     private :slug_generator
 

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.0.0.beta3"
+  VERSION = "5.0.0.beta4"
 end

data/lib/generators/friendly_id_generator.rb

@@ -8,11 +8,19 @@ class FriendlyIdGenerator < ActiveRecord::Generators::Base
   # new table name. Our generator always uses 'friendly_id_slugs', so we just set a random name here.
   argument :name, type: :string, default: 'random_name'
 
+  class_option :'skip-migration', :type => :boolean, :desc => "Don't generate a migration for the slugs table"
+  class_option :'skip-initializer', :type => :boolean, :desc => "Don't generate an initializer"
+
   source_root File.expand_path('../../friendly_id', __FILE__)
 
   # Copies the migration template to db/migrate.
   def copy_files
+    return if options['skip-migration']
     migration_template 'migration.rb', 'db/migrate/create_friendly_id_slugs.rb'
   end
 
+  def create_initializer
+    return if options['skip-initializer']
+    copy_file 'initializer.rb', 'config/initializers/friendly_id.rb'
+  end
 end

data/test/configuration_test.rb

@@ -45,4 +45,20 @@ class ConfigurationTest < MiniTest::Unit::TestCase
     assert @model_class < my_module
   end
 
+  test "#base should optionally set a value" do
+    config = FriendlyId::Configuration.new @model_class
+    assert_nil config.base
+    config.base = 'foo'
+    assert_equal 'foo', config.base
+  end
+
+  test "#base can set the value to nil" do
+    config = FriendlyId::Configuration.new @model_class
+    config.base 'foo'
+    config.base nil
+    assert_nil config.base
+
+  end
+
+
 end

data/test/generator_test.rb

@@ -17,4 +17,32 @@ class FriendlyIdGeneratorTest < Rails::Generators::TestCase
       FileUtils.rm_rf self.destination_root
     end
   end
+
+  test "should skip the migration when told to do so" do
+    begin
+      run_generator ['--skip-migration']
+      assert_no_migration "db/migrate/create_friendly_id_slugs"
+    ensure
+      FileUtils.rm_rf self.destination_root
+    end
+  end
+
+  test "should generate an initializer" do
+    begin
+      run_generator
+      assert_file "config/initializers/friendly_id.rb"
+    ensure
+      FileUtils.rm_rf self.destination_root
+    end
+  end
+
+  test "should skip the initializer when told to do so" do
+    begin
+      run_generator ['--skip-initializer']
+      assert_no_file "config/initializers/friendly_id.rb"
+    ensure
+      FileUtils.rm_rf self.destination_root
+    end
+  end
+
 end

data/test/reserved_test.rb

@@ -6,7 +6,7 @@ class ReservedTest < MiniTest::Unit::TestCase
 
   class Journalist < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name
+    friendly_id :name, :use => [:slugged, :reserved], :reserved_words => %w(new edit)
 
     after_validation :move_friendly_id_error_to_name
 
@@ -19,8 +19,8 @@ class ReservedTest < MiniTest::Unit::TestCase
     Journalist
   end
 
-  test "should reserve 'new' and 'edit' by default" do
-    %w(new edit).each do |word|
+  test "should reserve words" do
+    %w(new edit NEW Edit).each do |word|
       transaction do
         assert_raises(ActiveRecord::RecordInvalid) {model_class.create! :name => word}
       end

data/test/slugged_test.rb

@@ -29,14 +29,6 @@ class SluggedTest < MiniTest::Unit::TestCase
     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
-
   test "should allow validations on the slug" do
     model_class = Class.new(ActiveRecord::Base) do
       self.table_name = "articles"
@@ -76,6 +68,15 @@ class SluggedTest < MiniTest::Unit::TestCase
       refute instance2.valid?
     end
   end
+
+  test 'should allow a record to reuse its own slug' do
+    with_instance_of(model_class) do |record|
+      old_id = record.friendly_id
+      record.slug = nil
+      record.save!
+      assert_equal old_id, record.friendly_id
+    end
+  end
 end
 
 class SlugGeneratorTest < MiniTest::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta3
+  version: 5.0.0.beta4
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,6 +170,7 @@ files:
 - lib/friendly_id/finder_methods.rb
 - lib/friendly_id/finders.rb
 - lib/friendly_id/history.rb
+- lib/friendly_id/initializer.rb
 - lib/friendly_id/migration.rb
 - lib/friendly_id/object_utils.rb
 - lib/friendly_id/reserved.rb