lib/friendly_id/tasks.rb test/tasks_test.rb @@ -4,7 +4,6 @@ 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 @@ -17,13 +16,17 @@ 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/tasks.rb lib/friendly_id/version.rb lib/tasks/friendly_id.rake lib/tasks/friendly_id.rb +test/cached_slug_test.rb test/contest.rb test/custom_slug_normalizer_test.rb test/models/book.rb +test/models/city.rb test/models/country.rb +test/models/district.rb test/models/event.rb test/models/novel.rb test/models/person.rb @@ -36,4 +39,5 @@ test/scoped_model_test.rb test/slug_test.rb test/slugged_model_test.rb test/sti_test.rb +test/tasks_test.rb test/test_helper.rb Manifest.txt @@ -1,50 +1,27 @@ -# encoding: utf-8 +require "friendly_id/tasks" namespace :friendly_id do desc "Make slugs for a model." task :make_slugs => :environment do - raise 'USAGE: rake friendly_id:make_slugs MODEL=MyModelName' if ENV["MODEL"].nil? - if !sluggable_class.friendly_id_options[:use_slug] - raise "Class \"#{sluggable_class.to_s}\" doesn't appear to be using slugs" - end - while records = sluggable_class.find(:all, :include => :slugs, :conditions => "slugs.id IS NULL", :limit => 1000) do - break if records.size == 0 - records.each do |r| - r.send(:set_slug) - r.save! - puts "#{sluggable_class.to_s}(#{r.id}) friendly_id set to \"#{r.slug.name}\"" - end + validate_model_given + FriendlyId::Tasks.make_slugs(ENV["MODEL"]) do |r| + puts "%s(%d) friendly_id set to '%s'" % [r.class.to_s, r.id, r.slug.name] end end desc "Regenereate slugs for a model." task :redo_slugs => :environment do - raise 'USAGE: rake friendly_id:redo_slugs MODEL=MyModelName' if ENV["MODEL"].nil? - if !sluggable_class.friendly_id_options[:use_slug] - raise "Class \"#{sluggable_class.to_s}\" doesn't appear to be using slugs" - end - Slug.destroy_all(["sluggable_type = ?", sluggable_class.to_s]) + validate_model_given + FriendlyId::Tasks.delete_slugs_for(ENV["MODEL"]) Rake::Task["friendly_id:make_slugs"].invoke end - desc "Kill obsolete slugs older than 45 days." + desc "Kill obsolete slugs older than DAYS=45 days." task :remove_old_slugs => :environment do - if ENV["DAYS"].nil? - @days = 45 - else - @days = ENV["DAYS"].to_i - end - slugs = Slug.find(:all, :conditions => ["created_at < ?", DateTime.now - @days.days]) - slugs.each do |s| - s.destroy if !s.is_most_recent? - end + FriendlyId::Task.delete_old_slugs(ENV["DAYS"], ENV["MODEL"]) end end -def sluggable_class - if (ENV["MODEL"].split('::').size > 1) - ENV["MODEL"].split('::').inject(Kernel) {|scope, const_name| scope.const_get(const_name)} - else - Object.const_get(ENV["MODEL"]) - end -end \ No newline at end of file +def validate_model_given + raise 'USAGE: rake friendly_id:make_slugs MODEL=MyModelName' if ENV["MODEL"].nil? +end lib/tasks/friendly_id.rake @@ -8,12 +8,15 @@ class CachedSlugModelTest < Test::Unit::TestCase context "A slugged model with a cached_slugs column" do setup do - City.delete_all - Slug.delete_all @paris = City.new(:name => "Paris") @paris.save! end + teardown do + City.delete_all + Slug.delete_all + end + should "have a slug" do assert_not_nil @paris.slug end test/cached_slug_test.rb @@ -8,6 +8,9 @@ class CustomSlugNormalizerTest < Test::Unit::TestCase setup do Thing.friendly_id_options = FriendlyId::DEFAULT_FRIENDLY_ID_OPTIONS.merge(:column => :name, :use_slug => true) + end + + teardown do Thing.delete_all Slug.delete_all end @@ -29,7 +32,7 @@ class CustomSlugNormalizerTest < Test::Unit::TestCase Thing.create!(:name => "test") end end - + end -end \ No newline at end of file +end test/custom_slug_normalizer_test.rb @@ -7,10 +7,13 @@ class NonSluggedTest < Test::Unit::TestCase context "A non-slugged model with default FriendlyId options" do setup do - User.delete_all @user = User.create!(:login => "joe", :email => "joe@example.org") end + teardown do + User.delete_all + end + should "have friendly_id options" do assert_not_nil User.friendly_id_options end @@ -95,4 +98,4 @@ class NonSluggedTest < Test::Unit::TestCase end -end \ No newline at end of file +end test/non_slugged_test.rb @@ -7,15 +7,18 @@ class ScopedModelTest < Test::Unit::TestCase 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 + teardown do + Person.delete_all + Country.delete_all + Slug.delete_all + end + should "find all scoped records without scope" do assert_equal 2, Person.find(:all, @person.friendly_id).size end @@ -50,4 +53,4 @@ class ScopedModelTest < Test::Unit::TestCase end -end \ No newline at end of file +end test/scoped_model_test.rb @@ -6,7 +6,7 @@ class SlugTest < Test::Unit::TestCase context "a slug" do - setup do + teardown do Slug.delete_all Post.delete_all end test/slug_test.rb @@ -8,12 +8,15 @@ class SluggedModelTest < Test::Unit::TestCase setup do Post.friendly_id_options = FriendlyId::DEFAULT_FRIENDLY_ID_OPTIONS.merge(:column => :title, :use_slug => true) + @post = Post.new :title => "Test post", :content => "Test content", :published => true + @post.save! + end + + teardown do Post.delete_all Person.delete_all Slug.delete_all Thing.delete_all - @post = Post.new :title => "Test post", :content => "Test content", :published => true - @post.save! end should "have friendly_id options" do test/slugged_model_test.rb @@ -8,12 +8,15 @@ class STIModelTest < Test::Unit::TestCase 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 + teardown do + Novel.delete_all + Slug.delete_all + end + should "have a slug" do assert_not_nil @novel.slug end test/sti_test.rb 6ec718bb9d90e2041aac0a2ddb8da9139cdb8808 Norman Clarke norman@njclarke.com http://github.com/norman/friendly_id/commit/ba3e5dfc03153e1e542fc0c3cdb0ae1707b6662e ba3e5dfc03153e1e542fc0c3cdb0ae1707b6662e 2009-10-26T14:48:27-07:00 2009-10-26T14:01:52-07:00 Moved Rake task logic into class and added tests. Cleaned up setups/teardowns. d8f2c2c946f1c3256b52cdff6b7caf4b451a6238 Norman Clarke norman@njclarke.com