Merge pull request #562 from xymbol/fix-scope

Drop conditional in slug generator scope

lib/friendly_id/scoped.rb

@@ -126,11 +126,8 @@ def scope_for_slug_generator
       friendly_id_config.scope_columns.each do |column|
         relation = relation.where(column => send(column))
       end
-      if changed.include?(friendly_id_config.slug_column)
-        primary_key_name = self.class.primary_key
-        relation = relation.where.not(primary_key_name => send(primary_key_name))
-      end
-      relation
+      primary_key_name = self.class.primary_key
+      relation.where.not(primary_key_name => send(primary_key_name))
     end
     private :scope_for_slug_generator
 

lib/friendly_id/slugged.rb

@@ -312,12 +312,8 @@ def set_slug(normalized_slug = nil)
     def scope_for_slug_generator
       scope = self.class.base_class.unscoped
       scope = scope.friendly unless scope.respond_to?(:exists_by_friendly_id?)
-
-      if changed.include?(friendly_id_config.slug_column)
-        primary_key_name = self.class.primary_key
-        scope = scope.where.not(primary_key_name => send(primary_key_name))
-      end
-      scope
+      primary_key_name = self.class.primary_key
+      scope.where.not(primary_key_name => send(primary_key_name))
     end
     private :scope_for_slug_generator
 

test/slugged_test.rb

@@ -77,6 +77,21 @@ def self.name
       assert_equal old_id, record.friendly_id
     end
   end
+
+  test "should not update matching slug" do
+    with_instance_of(model_class) do |record|
+      class << record
+        def should_generate_new_friendly_id?
+          name_changed?
+        end
+      end
+      old_id = record.friendly_id
+      record.name += " "
+      record.save!
+      assert_equal old_id, record.friendly_id
+    end
+  end
+
 end
 
 class SlugGeneratorTest < MiniTest::Unit::TestCase