@@ -199,12 +199,10 @@ module Randomba # Generate the text for the friendly id, ensuring no duplication. def generate_friendly_id slug_text = truncated_friendly_id_base - count = Slug.count_matches(slug_text, self.class.to_s, :all, - :conditions => "sluggable_id <> #{self.id or 0}") - if count == 0 + if !Slug.find_by_name(slug_text) return slug_text else - generate_friendly_id_with_extension(slug_text, count) + generate_friendly_id_with_extension(slug_text) end end @@ -256,20 +254,16 @@ module Randomba # extension is added. NUM_CHARS_RESERVED_FOR_EXTENSION = 5 - def generate_friendly_id_with_extension(slug_text, count) - extension = "-" + (count + 1).to_s - if extension.length > NUM_CHARS_RESERVED_FOR_EXTENSION - raise FriendlyId::SlugGenerationError.new("slug text #{slug_text} " + - "goes over limit for similarly named slugs") - end + def generate_friendly_id_with_extension(slug_text) + start = 0 + extension = "-" + (start + 1).to_s slug_text = truncated_friendly_id_base + extension - count = Slug.count_matches(slug_text, self.class.to_s, :all, - :conditions => "sluggable_id <> #{self.id or 0}") - if count != 0 - slug_text = truncated_friendly_id_base + "-" + (count + 1).to_s - else - return slug_text + while Slug.find_by_name(slug_text) + start = start + 1 + extension = "-" + (start + 1).to_s + slug_text = truncated_friendly_id_base + extension end + return slug_text end end lib/friendly_id.rb @@ -14,7 +14,7 @@ namespace :friendly_id do records.each do |r| r.set_slug r.save! - puts "#{sluggable_class.to_s}(#{r.id}) friendly_id set to \"#{r.slug.name}\"" + puts "#{sluggable_class.to_s}(#{r.id}) friendly_id set to \"#{r.slug.name}\"" end end end tasks/friendly_id_tasks.rake afbb161ac5de41a2079ba53c9555049e37118e7e Tim Kadom tkadom@skiptree.com http://github.com/tkadom/friendly_id/commit/0cfcde309b96bc718db204837a46098c8fcbec60 0cfcde309b96bc718db204837a46098c8fcbec60 2008-10-29T08:24:58-07:00 2008-10-29T08:24:58-07:00 friendly id was using the record count to determine the next id for a generated slug. This algorithm does not take into account hat aged records might have been removed with the associated rake task. i.e. if we created three slugs from the same base text and had base-val-1, base-val-2, and base-val-3 as our slugs initially. We then run a removal of aged slugs, leaving only base-val-2, and base-val-3, we would generate a count of 2 slugs which share the same slug root. the count would then try to create a base-val-3 slug which would error out on uniqueness validation. I changed the algorithm so that it is not as efficient, but it will actually re-use values that have been deleted by iterating through the mathing base slugs until an open slot is found for the new slug. 7a755ac0f2ab4550baa98605769bc6aab2ca6d84 Tim Kadom tkadom@skiptree.com