norman-friendly_id 2.0.2 → 2.0.3

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

data/test/slugged_model_test.rb

@@ -0,0 +1,263 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class SluggedModelTest < Test::Unit::TestCase
+
+  context "A slugged model with default FriendlyId options" do
+
+    setup do
+      Post.friendly_id_options = FriendlyId::DEFAULT_FRIENDLY_ID_OPTIONS.merge(:column => :title, :use_slug => true)
+      Post.delete_all
+      Person.delete_all
+      Slug.delete_all
+      @post = Post.new :title => "Test post", :content => "Test content"
+      @post.save!
+    end
+
+    should "have friendly_id options" do
+      assert_not_nil Post.friendly_id_options
+    end
+
+    should "have a slug" do
+      assert_not_nil @post.slug
+    end
+
+    should "be findable by its friendly_id" do
+      assert Post.find(@post.friendly_id)
+    end
+
+    should "be findable by its regular id" do
+      assert Post.find(@post.id)
+    end
+
+    should "generate slug text" do
+      post = Post.new :title => "Test post", :content => "Test content"
+      assert_not_nil @post.slug_text
+    end
+
+    should "respect finder conditions" do
+      assert_raises ActiveRecord::RecordNotFound do
+        Post.find(@post.friendly_id, :conditions => "1 = 2")
+      end
+    end
+
+    should "raise an error if the friendly_id text is reserved" do
+      assert_raises(FriendlyId::SlugGenerationError) do
+        Post.create!(:title => "new")
+      end
+    end
+
+    should "raise an error if the friendly_id text is blank" do
+      assert_raises(FriendlyId::SlugGenerationError) do
+        Post.create(:title => "")
+      end
+    end
+
+    should "raise an error if the normalized friendly id becomes blank" do
+      assert_raises(FriendlyId::SlugGenerationError) do
+        post = Post.create!(:title => "-.-")
+      end
+    end
+
+    should "not make a new slug unless the friendly_id method value has changed" do
+      @post.content = "Changed content"
+      @post.save!
+      assert_equal 1, @post.slugs.size
+    end
+
+    should "make a new slug if the friendly_id method value has changed" do
+      @post.title = "Changed title"
+      @post.save!
+      assert_equal 2, @post.slugs.size
+    end
+
+    should "have a slug sequence of 1 by default" do
+      assert_equal 1, @post.slug.sequence
+    end
+
+    should "increment sequence for duplicate slug names" do
+      @post2 = Post.create! :title => @post.title, :content => "Test content for post2"
+      assert_equal 2, @post2.slug.sequence
+    end
+
+    should "have a friendly_id that terminates with -- and the slug sequence if the sequence is greater than 1" do
+      @post2 = Post.create! :title => @post.title, :content => "Test content for post2"
+      assert_match(/--2\z/, @post2.friendly_id)
+    end
+
+    should "not strip diacritics" do
+      @post = Post.new(:title => "¡Feliz año!")
+      assert_match(/#{'ñ'}/, @post.slug_text)
+    end
+
+    should "not convert to ASCII" do
+      @post = Post.new(:title => "katakana: ゲコゴサザシジ")
+      assert_equal "katakana-ゲコゴサザシジ", @post.slug_text
+    end
+    
+    should "allow the same friendly_id across models" do
+      @person = Person.create!(:name => @post.title)
+      assert_equal @person.friendly_id, @post.friendly_id
+    end
+
+    should "truncate slug text longer than the max length" do
+      @post = Post.new(:title => "a" * (Post.friendly_id_options[:max_length] + 1))
+      assert_equal @post.slug_text.length, Post.friendly_id_options[:max_length]
+    end
+
+    should "be able to reuse an old friendly_id without incrementing the sequence" do
+      old_title = @post.title
+      old_friendly_id = @post.friendly_id
+      @post.title = "A changed title"
+      @post.save!
+      @post.title = old_title
+      @post.save!
+      assert_equal old_friendly_id, @post.friendly_id
+    end
+
+    should "allow eager loading of slugs" do
+      assert_nothing_raised do
+        Post.find(@post.friendly_id, :include => :slugs)
+      end
+    end
+
+    context "and configured to strip diacritics" do
+      setup do
+        Post.friendly_id_options = Post.friendly_id_options.merge(:strip_diacritics => true)
+      end
+
+      should "strip diacritics from Roman alphabet based characters" do
+        @post = Post.new(:title => "¡Feliz año!")
+        assert_no_match(/#{'ñ'}/, @post.slug_text)
+      end
+    end
+
+    context "and configured to convert to ASCII" do
+      setup do
+        Post.friendly_id_options = Post.friendly_id_options.merge(:strip_non_ascii => true)
+      end
+
+      should "strip non-ascii characters" do
+        @post = Post.new(:title => "katakana: ゲコゴサザシジ")
+        assert_equal "katakana", @post.slug_text
+      end
+    end
+
+    context "that doesn't have a slug" do
+
+      setup do
+        @post.slug.destroy
+        @post = Post.find(@post.id)
+      end
+
+      should "have a to_param method that returns the id cast to a string" do
+        assert_equal @post.id.to_s, @post.to_param
+      end
+
+    end
+
+    context "when found using its friendly_id" do
+      setup do
+        @post = Post.find(@post.friendly_id)
+      end
+
+      should "indicate that it was found using the friendly_id" do
+        assert @post.found_using_friendly_id?
+      end
+
+      should "not indicate that it has a better id" do
+        assert !@post.has_better_id?
+      end
+
+      should "not indicate that it was found using its numeric id" do
+        assert !@post.found_using_numeric_id?
+      end
+
+      should "have a finder slug" do
+        assert_not_nil @post.finder_slug
+      end
+
+    end
+
+    context "when found using its regular id" do
+      setup do
+        @post = Post.find(@post.id)
+      end
+
+      should "indicate that it was not found using the friendly id" do
+        assert !@post.found_using_friendly_id?
+      end
+
+      should "indicate that it has a better id" do
+        assert @post.has_better_id?
+      end
+
+      should "indicate that it was found using its numeric id" do
+        assert @post.found_using_numeric_id?
+      end
+
+      should "not have a finder slug" do
+        assert_nil @post.finder_slug
+      end
+
+    end
+
+    context "when found using an outdated friendly id" do
+      setup do
+        old_id = @post.friendly_id
+        @post.title = "Title changed"
+        @post.save!
+        @post = Post.find(old_id)
+      end
+
+      should "indicate that it was found using a friendly_id" do
+        assert @post.found_using_friendly_id?
+      end
+
+      should "indicate that it has a better id" do
+        assert @post.has_better_id?
+      end
+
+      should "not indicate that it was found using its numeric id" do
+        assert !@post.found_using_numeric_id?
+      end
+
+      should "should have a finder slug different from its default slug" do
+        assert_not_equal @post.slug, @post.finder_slug
+      end
+
+    end
+
+    context "when using an array as the find argument" do
+
+      setup do
+        @post2 = Post.create!(:title => "another post", :content => "more content")
+      end
+
+      should "return results" do
+        assert_equal 2, Post.find([@post.friendly_id, @post2.friendly_id]).size
+      end
+
+      should "indicate that the results were found using a friendly_id" do
+        @posts = Post.find [@post.friendly_id, @post2.friendly_id]
+        @posts.each { |p| assert p.found_using_friendly_id? }
+      end
+
+      should "raise an error when all records are not found" do
+        assert_raises(ActiveRecord::RecordNotFound) do
+          Post.find([@post.friendly_id, 'non-existant-slug-record'])
+        end
+      end
+
+      should "allow eager loading of slugs" do
+        assert_nothing_raised do
+          Post.find([@post.friendly_id, @post2.friendly_id], :include => :slugs)
+        end
+      end
+
+    end
+
+  end
+
+end

data/test/test_helper.rb

@@ -1,35 +1,35 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-$VERBOSE = false
-
-ENV['RAILS_ENV'] = 'test'
-require File.dirname(__FILE__) + '/rails/2.x/config/environment.rb'
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-
+$:.unshift(File.dirname(__FILE__))
+$VERBOSE=false
+require 'rubygems'
 require 'test/unit'
-require 'active_record/fixtures'
-require 'action_controller/test_process'
-require 'sqlite3'
-require 'friendly_id/slug'
-
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection
-
-silence_stream(STDOUT) do
-  load(File.dirname(__FILE__) + "/schema.rb")
+require 'shoulda'
+# You can use "rake test AR_VERSION=2.0.5" to test against 2.0.5, for example.
+# The default is to use the latest installed ActiveRecord.
+if ENV["AR_VERSION"]
+  gem 'activerecord', "#{ENV["AR_VERSION"]}"
 end
+require 'active_record'
 
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+require 'friendly_id'
+require 'models/post'
+require 'models/person'
+require 'models/user'
+require 'models/country'
+require 'models/book'
+require 'models/novel'
 
-class Test::Unit::TestCase #:nodoc:
-  include ActionController::TestProcess
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
+# Borrowed from ActiveSupport
+def silence_stream(stream)
+  old_stream = stream.dup
+  stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+  stream.sync = true
+  yield
+ensure
+  stream.reopen(old_stream)
 end
+
+ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
+silence_stream(STDOUT) do
+  load(File.dirname(__FILE__) + "/schema.rb")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norman-friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-07 00:00:00 -08:00
+date: 2009-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,6 +23,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.1"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   version_requirement: 
@@ -32,6 +41,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: Shoulda
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
@@ -41,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: A comprehensive slugging and pretty-URL plugin for Ruby on Rails.
+description: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 email: 
 - norman@randomba.org
 - adrian@randomba.org
@@ -71,37 +98,24 @@ files:
 - lib/friendly_id/helpers.rb
 - lib/friendly_id/non_sluggable_class_methods.rb
 - lib/friendly_id/non_sluggable_instance_methods.rb
-- lib/friendly_id/shoulda_macros.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/database.yml
-- test/fixtures/countries.yml
-- test/fixtures/country.rb
-- test/fixtures/people.yml
-- test/fixtures/person.rb
-- test/fixtures/post.rb
-- test/fixtures/posts.yml
-- test/fixtures/slugs.yml
-- test/fixtures/user.rb
-- test/fixtures/users.yml
+- test/models/country.rb
+- test/models/person.rb
+- test/models/post.rb
+- test/models/user.rb
 - test/non_slugged_test.rb
-- test/rails/2.x/app/controllers/application.rb
-- test/rails/2.x/config/boot.rb
-- test/rails/2.x/config/database.yml
-- test/rails/2.x/config/environment.rb
-- test/rails/2.x/config/environments/test.rb
-- test/rails/2.x/config/routes.rb
 - test/schema.rb
 - test/scoped_model_test.rb
 - test/slug_test.rb
-- test/sluggable_test.rb
+- test/slugged_model_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://randomba.org
+homepage: http://friendly-id.rubyforge.org/
 post_install_message: 
 rdoc_options: 
 - --main
@@ -126,9 +140,9 @@ rubyforge_project: friendly-id
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A comprehensive slugging and pretty-URL plugin for Ruby on Rails.
+summary: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 test_files: 
 - test/non_slugged_test.rb
 - test/scoped_model_test.rb
 - test/slug_test.rb
-- test/sluggable_test.rb
+- test/slugged_model_test.rb