@@ -1 +1 @@ -ActiveRecord::Base.send :extend, PermalinkFu \ No newline at end of file +ActiveRecord::Base.send :include, PermalinkFu \ No newline at end of file init.rb @@ -14,24 +14,61 @@ module PermalinkFu end end - # Specifies the given field(s) as a permalink, meaning it is passed through PermalinkFu.escape and set to the permalink_field. This - # is done - # - # class Foo < ActiveRecord::Base - # # stores permalink form of #title to the #permalink attribute - # has_permalink :title - # - # # stores a permalink form of "#{category}-#{title}" to the #permalink attribute - # - # has_permalink [:category, :title] - # - # # stores permalink form of #title to the #category_permalink attribute - # has_permalink [:category, :title], :category_permalink - # end - # - def has_permalink(attr_names = [], permalink_field = nil) - permalink_field ||= 'permalink' - before_validation { |record| record.send("#{permalink_field}=", Array(attr_names).collect { |attr_name| PermalinkFu.escape(record.send(attr_name).to_s) }.join('-')) if record.send(permalink_field).to_s.empty? } + def self.included(base) + base.extend ClassMethods + class << base + attr_accessor :permalink_attributes + attr_accessor :permalink_field + end + end + + module ClassMethods + # Specifies the given field(s) as a permalink, meaning it is passed through PermalinkFu.escape and set to the permalink_field. This + # is done + # + # class Foo < ActiveRecord::Base + # # stores permalink form of #title to the #permalink attribute + # has_permalink :title + # + # # stores a permalink form of "#{category}-#{title}" to the #permalink attribute + # + # has_permalink [:category, :title] + # + # # stores permalink form of #title to the #category_permalink attribute + # has_permalink [:category, :title], :category_permalink + # + # + # end + # + def has_permalink(attr_names = [], permalink_field = 'permalink') + self.permalink_attributes = Array(attr_names) + self.permalink_field = permalink_field + before_validation :create_unique_permalink + end + end + +protected + def create_unique_permalink + if send(self.class.permalink_field).to_s.empty? + send("#{self.class.permalink_field}=", create_permalink_for(self.class.permalink_attributes)) + end + base = send(self.class.permalink_field) + counter = 1 + conditions = ["#{self.class.permalink_field} = ?", send(self.class.permalink_field)] + unless new_record? + conditions.first << " and id != ?" + conditions << id + end + while self.class.count(:all, :conditions => conditions) > 0 + conditions[1] = "#{base}-#{counter += 1}" + send("#{self.class.permalink_field}=", conditions[1]) + end + end + + def create_permalink_for(attr_names) + attr_names.collect do |attr_name| + PermalinkFu.escape(send(attr_name).to_s) + end.join('-') end end lib/permalink_fu.rb @@ -2,36 +2,59 @@ require 'test/unit' require File.join(File.dirname(__FILE__), '../lib/permalink_fu') class MockModel - extend PermalinkFu + include PermalinkFu + attr_accessor :id attr_accessor :title attr_accessor :permalink - def self.before_validation(&block) - @@validation = block + def self.count(whatever, options = {}) + if options[:conditions][1] == 'foo' || options[:conditions][1] == 'bar' || + (options[:conditions][1] == 'bar-2' && options[:conditions][2] != 2) + 1 + else + 0 + end + end + + def self.before_validation(method) + @@validation = method end def validate - @@validation.call self + send @@validation permalink end - + + def new_record? + @id.nil? + end + has_permalink :title end class MockModelExtra - extend PermalinkFu + include PermalinkFu + attr_accessor :id attr_accessor :title attr_accessor :extra attr_accessor :permalink - def self.before_validation(&block) - @@validation = block + def self.count(*args) + 0 + end + + def self.before_validation(method) + @@validation = method end def validate - @@validation.call self + send @@validation permalink end + + def new_record? + !@id.nil? + end has_permalink [:title, :extra] end @@ -68,4 +91,23 @@ class PermalinkFuTest < Test::Unit::TestCase end end end + + def test_should_create_unique_permalink + @m = MockModel.new + @m.permalink = 'foo' + @m.validate + assert_equal 'foo-2', @m.permalink + + @m.permalink = 'bar' + @m.validate + assert_equal 'bar-3', @m.permalink + end + + def test_should_not_check_itself_for_unique_permalink + @m = MockModel.new + @m.id = 2 + @m.permalink = 'bar-2' + @m.validate + assert_equal 'bar-2', @m.permalink + end end test/permalink_fu_test.rb 8f215a0ec831685c124c784ad618559f4a6ae9ea technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/henrik/permalink_fu/commit/dd229ee5509da7e3159075ce988a77156a316a8e dd229ee5509da7e3159075ce988a77156a316a8e 2007-10-15T14:19:36-07:00 2007-10-15T14:19:36-07:00 append incrementing numbers for duplicate guids git-svn-id: http://svn.techno-weenie.net/projects/plugins/permalink_fu@2993 567b1171-46fb-0310-a4c9-b4bef9110e78 040d110c031cf2aae62b9e4dbcb6448e20c7fee4 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78