Allow records to reuse their own slugs

lib/friendly_id/slugged.rb

@@ -298,7 +298,12 @@ def set_slug(normalized_slug = nil)
     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
 

test/slugged_test.rb

@@ -68,6 +68,15 @@ def self.name
       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