@@ -41,9 +41,13 @@ module BeyondThePath # Adds class methods. module SingletonMethods - + + def friendly_identifier?(id) + id.is_a?(String) && id.to_i.to_s != id + end + def find(*args) - if args.first.is_a? String + if friendly_identifier? args.first super(:first, :conditions => ["#{identifier_options[:identifier_column]} = ?", args.first]) else super lib/friendly_identifier.rb @@ -63,6 +63,22 @@ class FriendlyIdentifierTest < Test::Unit::TestCase flunk "Can't find an object with a different identifier column" end + def test_should_also_allow_object_to_be_found_by_id + gadget = create_gadget(:name => "new name") + assert_not_nil gadget.url_slug + assert gadget.save, "Couldn't save object #{gadget.errors.inspect}" + assert_not_nil (g = Gadget.find(gadget.id)), "Can't find an object by id" + assert_equal gadget.name, g.name, "Gadget we found is not the same as the one we want" + end + + def test_should_also_allow_object_to_be_found_by_string_id + gadget = create_gadget(:name => "test name") + assert_not_nil gadget.url_slug + assert gadget.save, "Couldn't save object #{gadget.errors.inspect}" + assert_not_nil (g = Gadget.find(gadget.id.to_s)), "Can't find an object by id" + assert_equal gadget.name, g.name, "Gadget we found is not the same as the one we want" + end + def test_should_not_mess_with_validations_and_after_save gadget = create_gadget :required_stuff => nil assert !gadget.valid? test/friendly_identifier_test.rb a7994221a585de989911b1b7cff1c057b8b00740 Chad Pytel cpytel@thoughtbot.com http://github.com/thoughtbot/friendly-identifier/commit/9ad4b37d3fe074bc8b2791b6ce0c0608d5ce8e8b 9ad4b37d3fe074bc8b2791b6ce0c0608d5ce8e8b 2009-04-13T08:12:43-07:00 2009-04-13T08:12:43-07:00 allow records to be found with a string id 279ccca7b3eeda03c951cb87f4c1ef5167dd4a67 Chad Pytel cpytel@thoughtbot.com