test/models/event.rb @@ -1,3 +1,8 @@ +== 2.1.3 2009-06-03 + +* 1 minor enhancement: + * Always call #to_s on slug_text to allow objects such as DateTimes to be used for the friendly_id text. (reported by Jon Ng) + == 2.1.2 2009-05-21 * 2 minor enhancements: History.txt @@ -24,6 +24,7 @@ test/contest.rb test/custom_slug_normalizer_test.rb test/models/book.rb test/models/country.rb +test/models/event.rb test/models/novel.rb test/models/person.rb test/models/post.rb Manifest.txt @@ -2,15 +2,14 @@ Gem::Specification.new do |s| s.name = %q{friendly_id} - s.version = "2.1.2" - + s.version = "2.1.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-05-21} + s.date = %q{2009-06-03} s.description = %q{A comprehensive slugging and pretty-URL plugin for ActiveRecord.} s.email = ["norman@rubysouth.com", "adrian@rubysouth.com", "miloops@gmail.com"] s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"] - s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "config/website.yml", "friendly_id.gemspec", "generators/friendly_id/friendly_id_generator.rb", "generators/friendly_id/templates/create_slugs.rb", "generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb", "generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb", "init.rb", "lib/friendly_id.rb", "lib/friendly_id/helpers.rb", "lib/friendly_id/non_sluggable_class_methods.rb", "lib/friendly_id/non_sluggable_instance_methods.rb", "lib/friendly_id/slug.rb", "lib/friendly_id/sluggable_class_methods.rb", "lib/friendly_id/sluggable_instance_methods.rb", "lib/friendly_id/version.rb", "lib/tasks/friendly_id.rake", "lib/tasks/friendly_id.rb", "test/contest.rb", "test/custom_slug_normalizer_test.rb", "test/models/book.rb", "test/models/country.rb", "test/models/novel.rb", "test/models/person.rb", "test/models/post.rb", "test/models/thing.rb", "test/models/user.rb", "test/non_slugged_test.rb", "test/schema.rb", "test/scoped_model_test.rb", "test/slug_test.rb", "test/slugged_model_test.rb", "test/sti_test.rb", "test/test_helper.rb"] + s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "config/website.yml", "friendly_id.gemspec", "generators/friendly_id/friendly_id_generator.rb", "generators/friendly_id/templates/create_slugs.rb", "generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb", "generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb", "init.rb", "lib/friendly_id.rb", "lib/friendly_id/helpers.rb", "lib/friendly_id/non_sluggable_class_methods.rb", "lib/friendly_id/non_sluggable_instance_methods.rb", "lib/friendly_id/slug.rb", "lib/friendly_id/sluggable_class_methods.rb", "lib/friendly_id/sluggable_instance_methods.rb", "lib/friendly_id/version.rb", "lib/tasks/friendly_id.rake", "lib/tasks/friendly_id.rb", "test/contest.rb", "test/custom_slug_normalizer_test.rb", "test/models/book.rb", "test/models/country.rb", "test/models/event.rb", "test/models/novel.rb", "test/models/person.rb", "test/models/post.rb", "test/models/thing.rb", "test/models/user.rb", "test/non_slugged_test.rb", "test/schema.rb", "test/scoped_model_test.rb", "test/slug_test.rb", "test/slugged_model_test.rb", "test/sti_test.rb", "test/test_helper.rb"] s.homepage = %q{http://friendly-id.rubyforge.org/} s.rdoc_options = ["--main", "README.rdoc"] s.require_paths = ["lib"] friendly_id.gemspec @@ -34,7 +34,7 @@ class Slug < ActiveRecord::Base # better urls in your application. def normalize(slug_text) return "" if slug_text.nil? || slug_text == "" - ActiveSupport::Multibyte.proxy_class.new(slug_text).normalize(:kc). + ActiveSupport::Multibyte.proxy_class.new(slug_text.to_s).normalize(:kc). # For some reason Spanish ¡ and ¿ are not detected as non-word # characters. Bug in Ruby? gsub(/[\W|¡|¿]/u, ' '). lib/friendly_id/slug.rb @@ -2,7 +2,7 @@ module FriendlyId #:nodoc: module Version #:nodoc: MAJOR = 2 MINOR = 1 - TINY = 2 + TINY = 3 STRING = [MAJOR, MINOR, TINY].join('.') end end \ No newline at end of file lib/friendly_id/version.rb @@ -32,6 +32,11 @@ ActiveRecord::Schema.define(:version => 1) do t.column "name", "string" end + create_table "events", :force => true do |t| + t.column "name", "string" + t.column "event_date", "datetime" + end + create_table "slugs", :force => true do |t| t.column "name", "string" t.column "sluggable_id", "integer" test/schema.rb @@ -86,6 +86,10 @@ class SluggedModelTest < Test::Unit::TestCase assert_match(/--2\z/, @post2.friendly_id) end + should "allow datetime columns to be used as slugs" do + assert Event.create(:name => "Test", :event_date => DateTime.now) + end + should "not strip diacritics" do @post = Post.new(:title => "¡Feliz año!") assert_match(/#{'ñ'}/, @post.slug_text) test/slugged_model_test.rb @@ -22,6 +22,7 @@ require 'models/country' require 'models/book' require 'models/novel' require 'models/thing' +require 'models/event' # Borrowed from ActiveSupport def silence_stream(stream) test/test_helper.rb 421b2a7f5d413f59a74288e0d8a05f24ac784362 Norman Clarke norman@randomba.org http://github.com/norman/friendly_id/commit/d3bb8f97518260ab823506ea978ebf504283bb2e d3bb8f97518260ab823506ea978ebf504283bb2e 2009-06-03T06:52:07-07:00 2009-06-03T06:48:56-07:00 Always call #to_s on slug_text to allow objects such as DateTimes to be used for the friendly_id text. (reported by Jon Ng) f1936d7cacbf912ebc4c498a1cd2159ec4e59b90 Norman Clarke norman@randomba.org