friendly_id 2.2.5 → 2.2.6

data/test/scoped_model_test.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
-
 require File.dirname(__FILE__) + '/test_helper'
 
+
 class ScopedModelTest < Test::Unit::TestCase
 
   context "A slugged model that uses a scope" do
@@ -9,33 +8,42 @@ class ScopedModelTest < Test::Unit::TestCase
     setup do
       @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)
+      @resident = Resident.create!(:name => "John Smith", :country => @usa)
+      @resident2 = Resident.create!(:name => "John Smith", :country => @canada)
     end
 
     teardown do
-      Person.delete_all
+      Resident.delete_all
       Country.delete_all
       Slug.delete_all
     end
 
+    should "should not show the scope in the friendly_id" do
+      assert_equal "john-smith", @resident.friendly_id
+      assert_equal "john-smith", @resident2.friendly_id
+    end
+
     should "find all scoped records without scope" do
-      assert_equal 2, Person.find(:all, @person.friendly_id).size
+      assert_equal 2, Resident.find(:all, @resident.friendly_id).size
+    end
+
+    should "find a single scoped records with a scope as a string" do
+      assert Resident.find(@resident.friendly_id, :scope => @resident.country.to_param)
     end
 
     should "find a single scoped records with a scope" do
-      assert Person.find(@person.friendly_id, :scope => @person.country.to_param)
+      assert Resident.find(@resident.friendly_id, :scope => @resident.country)
     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)
+        Resident.find(@resident.friendly_id)
       end
     end
 
     should "append scope error info when missing scope causes a find to fail" do
       begin
-        Person.find(@person.friendly_id)
+        Resident.find(@resident.friendly_id)
         fail "The find should not have succeeded"
       rescue ActiveRecord::RecordNotFound => e
         assert_match /expected scope/, e.message
@@ -44,7 +52,7 @@ class ScopedModelTest < Test::Unit::TestCase
 
     should "append scope error info when the scope value causes a find to fail" do
       begin
-        Person.find(@person.friendly_id, :scope => "badscope")
+        Resident.find(@resident.friendly_id, :scope => "badscope")
         fail "The find should not have succeeded"
       rescue ActiveRecord::RecordNotFound => e
         assert_match /scope=badscope/, e.message

data/test/slug_test.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require File.dirname(__FILE__) + '/test_helper'
 
 class SlugTest < Test::Unit::TestCase
@@ -12,8 +11,8 @@ class SlugTest < Test::Unit::TestCase
     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 = Post.create!(:name => "test title")
+      post.name = "a new title"
       post.save!
       assert post.slugs.last.is_most_recent?
       assert !post.slugs.first.is_most_recent?

data/test/slugged_model_test.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require File.dirname(__FILE__) + '/test_helper'
 
 class SluggedModelTest < Test::Unit::TestCase
@@ -7,17 +6,16 @@ class SluggedModelTest < Test::Unit::TestCase
   context "A slugged model with default FriendlyId options" do
 
     setup do
-      Post.friendly_id_options = FriendlyId::DEFAULT_OPTIONS.merge(:method => :title, :use_slug => true)
-      @post = Post.new :title => "Test post", :content => "Test content", :published => true
+      Post.friendly_id_options = FriendlyId::DEFAULT_OPTIONS.merge(:method => :name, :use_slug => true)
+      @post = Post.new :name => "Test post", :published => true
       @post.save!
     end
 
     teardown do
       Post.delete_all
       Person.delete_all
+      Place.delete_all
       Slug.delete_all
-      Thing.delete_all
-      LegacyThing.delete_all
     end
 
     should "have friendly_id options" do
@@ -51,7 +49,7 @@ class SluggedModelTest < Test::Unit::TestCase
     end
 
     should "generate slug text" do
-      post = Post.new :title => "Test post", :content => "Test content"
+      post = Post.new :name => "Test post"
       assert_not_nil post.slug_text
     end
 
@@ -63,36 +61,36 @@ class SluggedModelTest < Test::Unit::TestCase
 
     should "raise an error if the friendly_id text is reserved" do
       assert_raises(FriendlyId::SlugGenerationError) do
-        Post.create!(:title => "new")
+        Post.create!(:name => "new")
       end
     end
 
     should "raise an error if the friendly_id text is an empty string" do
       assert_raises(FriendlyId::SlugGenerationError) do
-        Post.create(:title => "")
+        Post.create(:name => "")
       end
     end
 
     should "raise an error if the friendly_id text is nil" do
       assert_raises(FriendlyId::SlugGenerationError) do
-        Post.create(:title => nil)
+        Post.create(:name => nil)
       end
     end
 
     should "raise an error if the normalized friendly id becomes blank" do
       assert_raises(FriendlyId::SlugGenerationError) do
-        post = Post.create!(:title => "-.-")
+        post = Post.create!(:name => "-.-")
       end
     end
 
     should "not make a new slug unless the friendly_id method value has changed" do
-      @post.content = "Changed content"
+      @post.published = !@post.published
       @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.name = "Changed title"
       @post.save!
       assert_equal 2, @post.slugs.size
     end
@@ -102,12 +100,12 @@ class SluggedModelTest < Test::Unit::TestCase
     end
 
     should "increment sequence for duplicate slug names" do
-      @post2 = Post.create! :title => @post.title, :content => "Test content for post2"
+      @post2 = Post.create! :name => @post.name
       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"
+      @post2 = Post.create! :name => @post.name
       assert_match(/--2\z/, @post2.friendly_id)
     end
 
@@ -116,36 +114,36 @@ class SluggedModelTest < Test::Unit::TestCase
     end
 
     should "not strip diacritics" do
-      post = Post.new(:title => "¡Feliz año!")
+      post = Post.new(:name => "¡Feliz año!")
       assert_match(/#{'ñ'}/, post.slug_text)
     end
 
     should "not convert to ASCII" do
-      post = Post.new(:title => "katakana: ゲコゴサザシジ")
+      post = Post.new(:name => "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
+      district = District.create!(:name => @post.name)
+      assert_equal district.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))
+      post = Post.new(:name => "a" * (Post.friendly_id_options[:max_length] + 1))
       assert_equal post.slug_text.length, Post.friendly_id_options[:max_length]
     end
 
     should "truncate slug in 'right way' when slug is unicode" do
-      post = Post.new(:title => "ё" * 100 + 'ю' *(Post.friendly_id_options[:max_length] - 100 + 1))
+      post = Post.new(:name => "ё" * 100 + 'ю' *(Post.friendly_id_options[:max_length] - 100 + 1))
       assert_equal post.slug_text.mb_chars[-1], 'ю'
     end
 
     should "be able to reuse an old friendly_id without incrementing the sequence" do
-      old_title = @post.title
+      old_title = @post.name
       old_friendly_id = @post.friendly_id
-      @post.title = "A changed title"
+      @post.name = "A changed title"
       @post.save!
-      @post.title = old_title
+      @post.name = old_title
       @post.save!
       assert_equal old_friendly_id, @post.friendly_id
     end
@@ -158,8 +156,8 @@ class SluggedModelTest < Test::Unit::TestCase
 
     # This emulates a fairly common issue where id's generated by fixtures are very high.
     should "continue to admit very large ids" do
-      Thing.connection.execute("INSERT INTO things (id, name) VALUES (2147483647, 'big')")
-      assert Thing.find(2147483647)
+      Person.connection.execute("INSERT INTO people (id, name) VALUES (2147483647, 'Joe Schmoe')")
+      assert Person.find(2147483647)
     end
 
     context "and configured to strip diacritics" do
@@ -168,19 +166,19 @@ class SluggedModelTest < Test::Unit::TestCase
       end
 
       should "strip diacritics from Roman alphabet based characters" do
-        post = Post.new(:title => "¡Feliz año!")
+        post = Post.new(:name => "¡Feliz año!")
         assert_no_match(/#{'ñ'}/, post.slug_text)
       end
 
       should "raise an error if the friendly_id text is an empty string" do
         assert_raises(FriendlyId::SlugGenerationError) do
-          Post.create(:title => "")
+          Post.create(:name => "")
         end
       end
 
       should "raise an error if the friendly_id text is nil" do
         assert_raises(FriendlyId::SlugGenerationError) do
-          Post.create(:title => nil)
+          Post.create(:name => nil)
         end
       end
 
@@ -192,14 +190,14 @@ class SluggedModelTest < Test::Unit::TestCase
       end
 
       should "strip non-ascii characters" do
-        post = Post.new(:title => "katakana: ゲコゴサザシジ")
+        post = Post.new(:name => "katakana: ゲコゴサザシジ")
         assert_equal "katakana", post.slug_text
       end
     end
 
     context "that uses a custom table name" do
       should "support normal CRUD operations" do
-        assert thing = LegacyThing.create!(:name => "a name")
+        assert thing = Place.create!(:name => "a name")
         thing.name = "a new name"
         assert thing.save!
         assert thing.destroy
@@ -268,7 +266,7 @@ class SluggedModelTest < Test::Unit::TestCase
     context "when found using an outdated friendly id" do
       setup do
         old_id = @post.friendly_id
-        @post.title = "Title changed"
+        @post.name = "Title changed"
         @post.save!
         @post = Post.find(old_id)
       end
@@ -291,10 +289,18 @@ class SluggedModelTest < Test::Unit::TestCase
 
     end
 
+    context "when table does not exist" do
+      should "not raise an error when doing friendly_id setup" do
+        assert_nothing_raised do
+          Question.has_friendly_id :title, :use_slug => true
+        end
+      end
+    end
+
     context "when using an array as the find argument" do
 
       setup do
-        @post2 = Post.create!(:title => "another post", :content => "more content", :published => true)
+        @post2 = Post.create!(:name => "another post", :published => true)
       end
 
       should "return results when passed an array of non-friendly ids" do
@@ -314,7 +320,7 @@ class SluggedModelTest < Test::Unit::TestCase
       end
 
       should "return results when passed an array of non-friendly ids, of which one represents a record with multiple slugs" do
-        @post2.update_attributes(:title => 'another post [updated]')
+        @post2.update_attributes(:name => 'another post [updated]')
         assert_equal 2, Post.find([@post.id, @post2.id]).size
       end
 

data/test/sti_test.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require File.dirname(__FILE__) + '/test_helper'
 
 class STIModelTest < Test::Unit::TestCase
@@ -7,8 +5,8 @@ class STIModelTest < Test::Unit::TestCase
   context "A slugged model using single table inheritance" do
 
     setup do
-      Novel.friendly_id_options = FriendlyId::DEFAULT_OPTIONS.merge(:method => :title, :use_slug => true)
-      @novel = Novel.new :title => "Test novel"
+      Novel.friendly_id_options = FriendlyId::DEFAULT_OPTIONS.merge(:method => :name, :use_slug => true)
+      @novel = Novel.new :name => "Test novel"
       @novel.save!
     end
 

data/test/support/database.yml.postgres

@@ -0,0 +1,6 @@
+adapter: postgresql
+host: localhost
+port: 5432
+username: postgres
+database: friendly_id_test
+encoding: utf8

data/test/support/database.yml.sqlite3

@@ -0,0 +1,2 @@
+adapter: sqlite3
+database: ":memory:"

data/test/support/models.rb

@@ -0,0 +1,45 @@
+class CreateSupportModels < ActiveRecord::Migration
+  def self.up
+    create_table :books do |t|
+      t.string :name
+      t.string :type
+    end
+    create_table :cities do |t|
+      t.string :name
+      t.string :my_slug
+      t.integer :population
+    end
+    create_table :countries do |t|
+      t.string :name
+    end
+    create_table :districts do |t|
+      t.string :name
+      t.string :cached_slug
+    end
+    create_table :events do |t|
+      t.string :name
+      t.datetime :event_date
+    end
+    create_table :legacy_table do |t|
+      t.string :name
+    end
+    create_table :people do |t|
+      t.string :name
+    end
+    create_table :posts do |t|
+      t.string :name
+      t.boolean :published
+    end
+    create_table :residents do |t|
+      t.string :name
+      t.integer :country_id
+    end
+    create_table :users do |t|
+      t.string :name
+    end
+  end
+
+  def self.down
+  end
+end
+

data/test/tasks_test.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
 require "friendly_id/tasks"
-require "mocha"
 
 class TasksTest < Test::Unit::TestCase
 
@@ -42,7 +41,7 @@ class TasksTest < Test::Unit::TestCase
   context "The 'delete_slugs_for' task" do
 
     setup do
-      @post = Post.create! :title => "Slugs Considered Harmful"
+      @post = Post.create! :name => "Slugs Considered Harmful"
       @city = City.create! :name => "Buenos Aires"
     end
 
@@ -59,9 +58,9 @@ class TasksTest < Test::Unit::TestCase
     end
 
     should "set the cached_slug column to NULL" do
-      FriendlyId::Tasks.delete_slugs_for("City")
-      @city.reload
-      assert_nil @city.my_slug
+      District.create! :name => "Garment"
+      FriendlyId::Tasks.delete_slugs_for("District")
+      assert_nil District.first.cached_slug
     end
 
   end
@@ -69,7 +68,7 @@ class TasksTest < Test::Unit::TestCase
   context "The 'delete_old_slugs' task" do
 
     setup do
-      @post = Post.create! :title => "Slugs Considered Harmful"
+      @post = Post.create! :name => "Slugs Considered Harmful"
       @city = City.create! :name => "Buenos Aires"
       City.connection.execute "UPDATE slugs SET created_at = '%s' WHERE id = %d" % [
         45.days.ago.strftime("%Y-%m-%d"), @city.slug.id]

data/test/test_helper.rb

@@ -1,38 +1,104 @@
-# encoding: utf-8
-
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__))
+
 $KCODE = 'UTF8' if RUBY_VERSION < '1.9'
 $VERBOSE = false
+
+require 'rubygems'
 require 'test/unit'
 require 'contest'
-# You can use "rake test AR_VERSION=2.0.5" to test against 2.0.5, for example.
+require 'mocha'
+
+# You can use "rake test AR_VERSION=2.2.3" to test against 2.2.3 for example.
 # The default is to use the latest installed ActiveRecord.
 if ENV["AR_VERSION"]
   gem 'activerecord', "#{ENV["AR_VERSION"]}"
   gem 'activesupport', "#{ENV["AR_VERSION"]}"
 end
+
 require 'active_record'
 require 'active_support'
+require 'friendly_id'
+require File.dirname(__FILE__) + '/../generators/friendly_id/templates/create_slugs'
+require File.dirname(__FILE__) + '/support/models'
 
-ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
-silence_stream(STDOUT) do
-  load(File.dirname(__FILE__) + "/schema.rb")
-end
+local_db_settings = File.dirname(__FILE__) + '/support/database.yml'
+default_db_settings = File.dirname(__FILE__) + '/support/database.yml.sqlite3'
+db_settings = File.exists?(local_db_settings) ? local_db_settings : default_db_settings
+ActiveRecord::Base.establish_connection(YAML::load(File.open(db_settings)))
 
 class ActiveRecord::Base
   def log_protected_attribute_removal(*args) end
 end
 
-require 'friendly_id'
-require 'models/post'
-require 'models/person'
-require 'models/user'
-require 'models/country'
-require 'models/book'
-require 'models/novel'
-require 'models/thing'
-require 'models/event'
-require 'models/city'
-require 'models/district'
-require 'models/legacy_thing'
+ActiveRecord::Base.connection.tables.each do |table|
+  ActiveRecord::Base.connection.drop_table(table)
+end
+ActiveRecord::Migration.verbose = false
+CreateSlugs.up
+CreateSupportModels.up
+
+# A model that uses the automagically configured "cached_slug" column
+class District < ActiveRecord::Base
+  has_friendly_id :name, :use_slug => true
+end
+
+# A model that specifies a custom cached slug column
+class City < ActiveRecord::Base
+  attr_accessible :name
+  has_friendly_id :name, :use_slug => true, :cache_column => 'my_slug'
+end
+
+# A model with a custom slug text normalizer
+class Person < ActiveRecord::Base
+  has_friendly_id :name, :use_slug => true do |text|
+    text.upcase
+  end
+end
+
+# A slugged model that uses a scope
+class Resident < ActiveRecord::Base
+  belongs_to :country
+  has_friendly_id :name, :use_slug => true, :scope => :country
+end
+
+# A model used as a scope
+class Country < ActiveRecord::Base
+  has_many :people
+  has_friendly_id :name, :use_slug => true
+end
+
+# A model that doesn't use slugs
+class User < ActiveRecord::Base
+  has_friendly_id :name
+end
+
+# A model that uses default slug settings and has a named scope
+class Post < ActiveRecord::Base
+  has_friendly_id :name, :use_slug => true
+  named_scope :published, :conditions => { :published => true }
+end
+
+# Model that uses a custom table name
+class Place < ActiveRecord::Base
+  self.table_name = "legacy_table"
+  has_friendly_id :name, :use_slug => true
+end
+
+# A model that uses a datetime field for its friendly_id
+class Event < ActiveRecord::Base
+  has_friendly_id :event_date, :use_slug => true
+end
+
+# A base model for single table inheritence
+class Book < ActiveRecord::Base ; end
+
+# A model that uses STI
+class Novel < ::Book
+  has_friendly_id :name, :use_slug => true
+end
+
+# A model with no table
+class Question < ActiveRecord::Base
+  has_friendly_id :name, :use_slug => true
+end