friendly_id 2.0.2 → 2.0.3

data/History.txt

@@ -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:

data/friendly_id.gemspec

@@ -2,12 +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.cert_chain = ["/Users/norman/.gem/gem-public_cert.pem"]
-  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"]
@@ -27,14 +26,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<unicode>, [">= 0.1"])
-      s.add_runtime_dependency(%q<active_record>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
       s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_development_dependency(%q<Shoulda>, [">= 1.2.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<unicode>, [">= 0.1"])
-      s.add_dependency(%q<active_record>, [">= 2.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 2.0.0"])
       s.add_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_dependency(%q<Shoulda>, [">= 1.2.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -42,7 +41,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<unicode>, [">= 0.1"])
-    s.add_dependency(%q<active_record>, [">= 2.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 2.0.0"])
     s.add_dependency(%q<newgem>, [">= 1.2.3"])
     s.add_dependency(%q<Shoulda>, [">= 1.2.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/lib/friendly_id.rb

@@ -40,8 +40,8 @@ module FriendlyId
     # * <tt>:max_length</tt> - Defaults to 255. The maximum allowed length for a slug.
     # * <tt>:strip_diacritics</tt> - Defaults to false. If true, it will remove accents, umlauts, etc. from western characters.
     # * <tt>:strip_non_ascii</tt> - Defaults to false. If true, it will all non-ascii ([^a-z0-9]) characters.
-    # * <tt>:reseved</tt> - Array of words that are reserved and can't be used as friendly_id's. For sluggable models, if such a word is used, it will be treated the same as if that slug was already taken (numeric extension will be appended). Defaults to ["new", "index"].
-    # * <tt>:reseved_message</tt> - The validation message that will be shown when a reserved word is used as a frindly_id. Defaults to '"%s" is reserved'.
+    # * <tt>:reserved</tt> - Array of words that are reserved and can't be used as friendly_id's. For sluggable models, if such a word is used, it will be treated the same as if that slug was already taken (numeric extension will be appended). Defaults to ["new", "index"].
+    # * <tt>:reserved_message</tt> - The validation message that will be shown when a reserved word is used as a frindly_id. Defaults to '"%s" is reserved'.
     def has_friendly_id(column, options = {})
       options.assert_valid_keys VALID_FRIENDLY_ID_KEYS
       options = DEFAULT_FRIENDLY_ID_OPTIONS.merge(options).merge(:column => column)

data/lib/friendly_id/non_sluggable_instance_methods.rb

@@ -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

data/lib/friendly_id/version.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

data/test/non_slugged_test.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

data/test/schema.rb

@@ -1,4 +1,9 @@
 ActiveRecord::Schema.define(:version => 1) do
+  
+  create_table "books", :force => true do |t|
+    t.column "title", "string"
+    t.column "type", "text"
+  end
 
   create_table "posts", :force => true do |t|
     t.column "title", "string"

data/test/sti_test.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class SluggedModelTest < Test::Unit::TestCase
+
+  context "A slugged model using single table inheritance" do
+
+    setup do
+      Novel.friendly_id_options = FriendlyId::DEFAULT_FRIENDLY_ID_OPTIONS.merge(:column => :title, :use_slug => true)
+      Novel.delete_all
+      Slug.delete_all
+      @novel = Novel.new :title => "Test novel"
+      @novel.save!
+    end
+
+    should "have a slug" do
+      assert_not_nil @novel.slug
+    end
+    
+    context "found by its friendly id" do
+      
+      setup do
+        @novel = Novel.find(@novel.friendly_id)
+      end
+
+      should "not indicate that it has a better id" do
+        assert !@novel.has_better_id?
+      end
+
+    end
+    
+
+    context "found by its numeric id" do
+      
+      setup do
+        @novel = Novel.find(@novel.id)
+      end
+
+      should "indicate that it has a better id" do
+        assert @novel.has_better_id?
+      end
+
+    end
+
+  end
+
+end

data/test/test_helper.rb

@@ -16,6 +16,8 @@ require 'models/post'
 require 'models/person'
 require 'models/user'
 require 'models/country'
+require 'models/book'
+require 'models/novel'
 
 # Borrowed from ActiveSupport
 def silence_stream(stream)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -32,7 +32,7 @@ cert_chain:
   h7fbBRfStxI=
   -----END CERTIFICATE-----
 
-date: 2009-02-09 00:00:00 -02:00
+date: 2009-02-11 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,3 +173,4 @@ test_files:
 - test/scoped_model_test.rb
 - test/slug_test.rb
 - test/slugged_model_test.rb
+- test/sti_test.rb