@@ -1,3 +1,8 @@ +== 2.0.3 2009-02-11 + +* 1 minor enhancment: + * Fixed to_param returning an empty string for non-slugged models with a null friendly_id. + == 2.0.2 2009-02-09 * 2 major enhancements: History.txt @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{friendly_id} - s.version = "2.0.2" + s.version = "2.0.3" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Norman Clarke", "Adrian Mugnolo", "Emilio Tagua"] - s.date = %q{2009-02-09} + s.date = %q{2009-02-11} s.description = %q{A comprehensive slugging and pretty-URL plugin for ActiveRecord.} s.email = ["norman@randomba.org", "adrian@randomba.org", "miloops@gmail.com"] s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"] friendly_id.gemspec @@ -21,7 +21,7 @@ module FriendlyId::NonSluggableInstanceMethods # Returns the friendly id, or if none is available, the numeric id. def to_param - friendly_id.to_s || id.to_s + (friendly_id || id).to_s end private lib/friendly_id/non_sluggable_instance_methods.rb @@ -2,7 +2,7 @@ module FriendlyId #:nodoc: module Version #:nodoc: MAJOR = 2 MINOR = 0 - TINY = 2 + TINY = 3 STRING = [MAJOR, MINOR, TINY].join('.') end end \ No newline at end of file lib/friendly_id/version.rb @@ -55,6 +55,12 @@ class NonSluggedTest < Test::Unit::TestCase assert_equal String, @user.to_param.class end + should "return its id if the friendly_id is null" do + @user.login = nil + assert_equal @user.id.to_s, @user.to_param + end + + context "when using an array as the find argument" do setup do test/non_slugged_test.rb 8d462856b299fe71912887d57a5e84ad851dee98 Norman Clarke norman@randomba.org http://github.com/norman/friendly_id/commit/50a75b9f9eec615c2ad6517f4d928d0ba98b5fcf 50a75b9f9eec615c2ad6517f4d928d0ba98b5fcf 2009-02-10T18:15:51-08:00 2009-02-10T18:12:38-08:00 Fixed to_param for non-slugged models when friendly_id is null. Resolves #25. 6b73a9bfeca5a6dc29af4668b79c20ed2694149c Norman Clarke norman@randomba.org