dougcole-friendly_id 2.0.5 → 2.0.6

data/test/models/book.rb

@@ -0,0 +1,2 @@
+class Book < ActiveRecord::Base
+end

data/test/models/novel.rb

@@ -0,0 +1,3 @@
+class Novel < Book
+  has_friendly_id :title, :use_slug => true
+end

data/test/models/post.rb

@@ -0,0 +1,3 @@
+class Post < ActiveRecord::Base
+  has_friendly_id :title, :use_slug => true
+end

data/test/models/thing.rb

@@ -0,0 +1,6 @@
+require 'digest/sha1'
+class Thing < ActiveRecord::Base
+  has_friendly_id :name, :use_slug => true do |text|
+    Digest::SHA1::hexdigest(text)
+  end
+end

data/test/non_slugged_test.rb

@@ -2,84 +2,95 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class NonSluggedTest < Test::Unit::TestCase
 
-  fixtures :users
+  context "A non-slugged model with default FriendlyId options" do
 
-  def setup
-  end
+    setup do
+      User.delete_all
+      @user = User.create!(:login => "joe", :email => "joe@example.org")
+    end
 
-  def test_should_find_user_using_friendly_id
-    assert User.find(users(:joe).friendly_id)
-  end
+    should "have friendly_id options" do
+      assert_not_nil User.friendly_id_options
+    end
 
-  def test_should_find_users_using_friendly_id
-    assert User.find([users(:joe).friendly_id])
-  end
+    should "not have a slug" do
+      assert !@user.respond_to?(:slug)
+    end
 
-  def test_to_param_should_return_a_string
-    assert_equal String, users(:joe).to_param.class
-  end
+    should "be findable by its friendly_id" do
+      assert User.find(@user.friendly_id)
+    end
 
-  def test_should_not_find_users_using_non_existent_friendly_ids
-    assert_raises ActiveRecord::RecordNotFound do
-      User.find(['bad', 'bad2'])
+    should "be findable by its regular id" do
+      assert User.find(@user.id)
     end
-  end
-  
-  def test_finding_by_array_with_friendly_and_non_friendly_id_for_same_record_raises_error
-    assert_raises ActiveRecord::RecordNotFound do
-      User.find([users(:joe).id, "joe"]).size
+
+    should "respect finder conditions" do
+      assert_raises ActiveRecord::RecordNotFound do
+        User.find(@user.friendly_id, :conditions => "1 = 2")
+      end
     end
-  end
 
-  def test_finding_with_mixed_array_should_indicate_whether_found_by_numeric_or_friendly
-    @users = User.find([users(:jane).id, "joe"], :order => "login ASC")
-    assert @users[0].found_using_numeric_id?
-    assert @users[1].found_using_friendly_id?
-  end
+    should "indicate if it was found by its friendly id" do
+      @user = User.find(@user.friendly_id)
+      assert @user.found_using_friendly_id?
+    end
 
-  def test_finder_options_are_not_ignored
-    assert_raises ActiveRecord::RecordNotFound do
-       User.find(users(:joe).friendly_id, :conditions => "1 = 2")
+    should "indicate if it was found by its numeric id" do
+      @user = User.find(@user.id)
+      assert @user.found_using_numeric_id?
     end
-    assert_raises ActiveRecord::RecordNotFound do
-       User.find([users(:joe).friendly_id], :conditions => "1 = 2")
+
+    should "indicate if it has a better id" do
+      @user = User.find(@user.id)
+      assert @user.has_better_id?
     end
-  end
 
-  def test_user_should_have_friendly_id_options
-    assert_not_nil User.friendly_id_options
-  end
+    should "not validate if the friendly_id text is reserved" do
+      @user = User.new(:login => "new", :email => "test@example.org")
+      assert !@user.valid?
+    end
 
-  def test_user_should_not_be_found_using_friendly_id_unless_it_really_was
-    assert !User.find(users(:joe).id).found_using_friendly_id?
-  end
+    should "have always string for a friendly_id" do
+      assert_equal String, @user.to_param.class
+    end
 
-  def test_users_should_not_be_found_using_friendly_id_unless_they_really_were
-    @users = User.find([users(:jane).id])
-    assert @users[0].found_using_numeric_id?
-  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
 
-  def test_user_should_be_considered_found_by_numeric_id_as_default
-    @user = User.new
-    assert @user.found_using_numeric_id?
-  end
 
-  def test_user_should_indicate_if_it_was_found_using_numeric_id
-    @user = User.find(users(:joe).id)
-    assert @user.found_using_numeric_id?
-    assert !@user.found_using_friendly_id?
-  end
+    context "when using an array as the find argument" do
 
-  def test_user_should_indicate_if_it_was_found_using_friendly_id
-    @user = User.find(users(:joe).friendly_id)
-    assert !@user.found_using_numeric_id?
-    assert @user.found_using_friendly_id?
-  end
+      setup do
+        @user2 = User.create(:login => "jane", :email => "jane@example.org")
+      end
+
+      should "return results" do
+        assert_equal 2, User.find([@user.friendly_id, @user2.friendly_id]).size
+      end
+
+      should "not allow mixed friendly and non-friendly ids for the same record" do
+        assert_raises ActiveRecord::RecordNotFound do
+          User.find([@user.id, @user.friendly_id]).size
+        end
+      end
+
+      should "raise an error when all records are not found" do
+        assert_raises ActiveRecord::RecordNotFound do
+          User.find(['bad', 'bad2'])
+        end
+      end
+
+      should "indicate if the results were found using a friendly_id" do
+        @users = User.find([@user.id, @user2.friendly_id], :order => "login ASC")
+        assert @users[0].found_using_friendly_id?
+        assert @users[1].found_using_numeric_id?
+      end
+
+    end
 
-  def test_should_indicate_there_is_a_better_id_if_found_by_numeric_id
-    @user = User.find(users(:joe).id)
-    assert @user.found_using_numeric_id?
-    assert @user.has_better_id?
   end
 
 end

data/test/schema.rb

@@ -1,35 +1,44 @@
-ActiveRecord::Schema.define(:version => 3) do
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table "books", :force => true do |t|
+    t.column "title", "string"
+    t.column "type", "text"
+  end
+
+  create_table "things", :force => true do |t|
+    t.column "name", "string"
+  end
 
   create_table "posts", :force => true do |t|
-    t.string   "name"
-    t.text     "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.column "title", "string"
+    t.column "content", "text"
+    t.column "created_at", "datetime"
+    t.column "updated_at", "datetime"
   end
 
   create_table "users", :force => true do |t|
-    t.string   "login"
-    t.string   "email"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.column "login", "string"
+    t.column "email", "string"
+    t.column "created_at", "datetime"
+    t.column "updated_at", "datetime"
   end
-  
+
   create_table "people", :force => true do |t|
-    t.string "name"
-    t.integer "country_id"
+    t.column "name", "string"
+    t.column "country_id", "integer"
   end
-  
+
   create_table "countries", :force => true do |t|
-    t.string "name"
+    t.column "name", "string"
   end
 
   create_table "slugs", :force => true do |t|
-    t.string "name"
-    t.integer "sluggable_id"
-    t.integer "sequence", :null       => false, :default => 1
-    t.string "sluggable_type", :limit => 40
-    t.string "scope", :limit          => 40
-    t.datetime "created_at"
+    t.column "name", "string"
+    t.column "sluggable_id", "integer"
+    t.column "sequence", "integer", :null       => false, :default => 1
+    t.column "sluggable_type", "string", :limit => 40
+    t.column "scope", "string", :limit          => 40
+    t.column "created_at", "datetime"
   end
 
   add_index "slugs", ["sluggable_id"], :name           => "index_slugs_on_sluggable_id"

data/test/scoped_model_test.rb

@@ -2,20 +2,50 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class ScopedModelTest < Test::Unit::TestCase
 
-  fixtures :people, :countries, :slugs
-  
-  def test_should_find_scoped_records_without_scope
-    assert_equal 2, Person.find(:all, "john-smith").size
-  end
+  context "A slugged model that uses a scope" do
+
+    setup do
+      Person.delete_all
+      Country.delete_all
+      Slug.delete_all
+      @usa = Country.create!(:name => "USA")
+      @canada = Country.create!(:name => "Canada")
+      @person = Person.create!(:name => "John Smith", :country => @usa)
+      @person2 = Person.create!(:name => "John Smith", :country => @canada)
+    end
+
+    should "find all scoped records without scope" do
+      assert_equal 2, Person.find(:all, @person.friendly_id).size
+    end
+
+    should "find a single scoped records with a scope" do
+      assert Person.find(@person.friendly_id, :scope => @person.country.to_param)
+    end
+
+    should "raise an error when finding a single scoped record with no scope" do
+      assert_raises ActiveRecord::RecordNotFound do
+        Person.find(@person.friendly_id)
+      end
+    end
+
+    should "append scope error info when missing scope causes a find to fail" do
+      begin
+        Person.find(@person.friendly_id)
+        fail "The find should not have succeeded"
+      rescue ActiveRecord::RecordNotFound => e
+        assert_match /expected scope/, e.message
+      end
+    end
+
+    should "append scope error info when the scope value causes a find to fail" do
+      begin
+        Person.find(@person.friendly_id, :scope => "badscope")
+        fail "The find should not have succeeded"
+      rescue ActiveRecord::RecordNotFound => e
+        assert_match /scope=badscope/, e.message
+      end
+    end
 
-  def test_should_find_scoped_records_with_scope
-    assert_equal people(:john_smith), Person.find("john-smith", :scope => "argentina")
-    assert_equal people(:john_smith2), Person.find("john-smith", :scope => "usa")
-  end
-  
-  def test_should_create_scoped_records_with_scope
-    person = Person.create!(:name => "Joe Schmoe", :country => countries(:usa))
-    assert_equal "usa", person.slug.scope
   end
 
 end

data/test/slug_test.rb

@@ -1,87 +1,106 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/test_helper'
 
 class SlugTest < Test::Unit::TestCase
 
-  fixtures :posts, :slugs
-
-  def test_should_indicate_if_it_is_the_most_recent
-    assert slugs(:two_new).is_most_recent?
-    assert !slugs(:two_old).is_most_recent?
-  end
-
-  def test_parse_should_return_slug_name_and_sequence
-    assert_equal ["test", "2"], Slug::parse("test--2")
-  end
-
-  def test_parse_should_return_a_default_sequnce_of_1
-    assert_equal ["test", "1"], Slug::parse("test")
-  end
-
-  def test_strip_diacritics_should_strip_diacritics
-    assert_equal "acai", Slug::strip_diacritics("açaí")
-  end
-
-  def test_to_friendly_id_should_include_sequence_if_its_greater_than_1
-    slug = Slug.new(:name => "test", :sequence => 2)
-    assert_equal "test--2", slug.to_friendly_id
-  end
-
-  def test_to_friendly_id_should_include_sequence_if_its_than_1
-    slug = Slug.new(:name => "test", :sequence => 1)
-    assert_equal "test", slug.to_friendly_id
-  end
-
-  def test_normalize_should_lowercase_strings
-    assert_match /abc/, Slug::normalize("ABC")
-  end
-
-  def test_normalize_should_replace_whitespace_with_dashes
-    assert_match /a-b/, Slug::normalize("a b")
-  end
-
-  def test_normalize_should_replace_2spaces_with_1dash
-    assert_match /a-b/, Slug::normalize("a  b")
-  end
-
-  def test_normalize_should_remove_punctuation
-    assert_match /abc/, Slug::normalize('abc!@#$%^&*•¶§∞¢££¡¿()><?"":;][]\.,/')
-  end
-
-  def test_normalize_should_strip_trailing_space
-    assert_match /ab/, Slug::normalize("ab ")
-  end
-
-  def test_normalize_should_strip_leading_space
-    assert_match /ab/, Slug::normalize(" ab")
-  end
-
-  def test_normalize_should_strip_trailing_slashes
-    assert_match /ab/, Slug::normalize("ab-")
-  end
+  context "a slug" do
+    
+    setup do
+      Slug.delete_all
+      Post.delete_all
+    end
 
-  def test_normalize_should_strip_leading_slashes
-    assert_match /ab/, Slug::normalize("-ab")
-  end
+    should "indicate if it is the most recent slug" do
+      @post = Post.create!(:title => "test title", :content => "test content")
+      @post.title = "a new title"
+      @post.save!
+      assert @post.slugs.last.is_most_recent?
+      assert !@post.slugs.first.is_most_recent?
+    end
 
-  def test_normalize_should_not_modify_valid_name_strings
-    assert_match /a-b-c-d/, Slug::normalize("a-b-c-d")
   end
+  
+  context "the Slug class" do
+    
+    should "parse the slug name and sequence" do
+      assert_equal ["test", "2"], Slug::parse("test--2")
+    end
+    
+    should "parse with a default sequence of 1" do
+      assert_equal ["test", "1"], Slug::parse("test")
+    end
 
-  # These strings are taken from various international Google homepages. I
-  # would be most grateful if a fluent speaker of any language that uses a
-  # writing system other than the Roman alphabet could help me make some
-  # better tests to ensure this is working correctly.
-  def test_normalize_works_with_non_roman_chars
-    assert_equal "検-索", Slug::normalize("検 索")
+    should "should strip diacritics" do
+      assert_equal "acai", Slug::strip_diacritics("açaí")
+    end
+  
+    should "strip diacritics correctly " do
+      input  = "ÀÁÂÃÄÅÆÇÈÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
+      output = Slug::strip_diacritics(input).split(//)
+      expected = "AAAAAAAECEEEIIIIDNOOOOOOUUUUYThssaaaaaaaeceeeeiiiidnoooooouuuuythy".split(//)
+      output.split.each_index do |i|
+        assert_equal output[i], expected[i]
+      end
+    end
+  
   end
-
-  def test_strip_diactics_correctly_strips_diacritics
-    input  = "ÀÁÂÃÄÅÆÇÈÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
-    output = Slug::strip_diacritics(input).split(//)
-    expected = "AAAAAAAECEEEIIIIDNOOOOOOUUUUYThssaaaaaaaeceeeeiiiidnoooooouuuuythy".split(//)
-    output.split.each_index do |i|
-      assert_equal output[i], expected[i]
+  
+  context "the Slug class's to_friendly_id method" do
+    
+    should "include the sequence if the sequence is greater than 1" do
+      slug = Slug.new(:name => "test", :sequence => 2)
+      assert_equal "test--2", slug.to_friendly_id
     end
+  
+    should "not include the sequence if the sequence is 1" do
+      slug = Slug.new(:name => "test", :sequence => 1)
+      assert_equal "test", slug.to_friendly_id
+    end
+    
   end
   
+  context "the Slug class's normalize method" do  
+    
+    should "should lowercase  strings" do
+      assert_match /abc/, Slug::normalize("ABC")
+    end
+  
+    should "should replace whitespace with dashes" do
+      assert_match /a-b/, Slug::normalize("a b")
+    end
+  
+    should "should replace 2spaces with 1dash" do
+      assert_match /a-b/, Slug::normalize("a  b")
+    end
+  
+    should "should remove punctuation" do
+      assert_match /abc/, Slug::normalize('abc!@#$%^&*•¶§∞¢££¡¿()><?"":;][]\.,/')
+    end
+  
+    should "should strip trailing space" do
+      assert_match /ab/, Slug::normalize("ab ")
+    end
+  
+    should "should strip leading space" do
+      assert_match /ab/, Slug::normalize(" ab")
+    end
+  
+    should "should strip trailing slashes" do
+      assert_match /ab/, Slug::normalize("ab-")
+    end
+  
+    should "should strip leading slashes" do
+      assert_match /ab/, Slug::normalize("-ab")
+    end
+  
+    should "should not modify valid name strings" do
+      assert_match /a-b-c-d/, Slug::normalize("a-b-c-d")
+    end
+  
+    should "work with non roman chars" do
+      assert_equal "検-索", Slug::normalize("検 索")
+    end
+  
+  end
 end