rakutenusa-friendly_id 2.0.7 → 2.0.8

data/History.txt

@@ -1,3 +1,28 @@
+== 2.1.3 2009-06-03
+
+* 1 minor enhancement:
+  * Always call #to_s on slug_text to allow objects such as DateTimes to be used for the friendly_id text. (reported by Jon Ng)
+
+== 2.1.2 2009-05-21
+
+* 2 minor enhancements:
+  * Non-slugged models now validate the friendly_id on save as well as create (Joe Van Dyk).
+  * Replaced Shoulda with Contest.
+
+== 2.1.1 2009-03-25
+
+* 2 minor enhancements:
+  * Fixed bug with find_some; if a record has old slugs, find_some will no longer return 
+multiple copies of that record when finding by numerical ID. (Steve Luscher)
+  * Fixed bug with find_some: you can now find_some with an array of numerical IDs without 
+an error being thrown. (Steve Luscher)
+
+== 2.1.0 2009-03-25
+
+* 2 major enhancements:
+  * Ruby 1.9 compatibility.
+  * Removed dependency on ancient Unicode gem.
+
 == 2.0.4 2009-02-12
 
 * 1 major enhancment:

data/Manifest.txt

@@ -20,9 +20,11 @@ lib/friendly_id/sluggable_instance_methods.rb
 lib/friendly_id/version.rb
 lib/tasks/friendly_id.rake
 lib/tasks/friendly_id.rb
+test/contest.rb
 test/custom_slug_normalizer_test.rb
 test/models/book.rb
 test/models/country.rb
+test/models/event.rb
 test/models/novel.rb
 test/models/person.rb
 test/models/post.rb

data/README.rdoc

@@ -219,30 +219,19 @@ While FriendlyId's slug generation options work for most people, you may need
 something else. As of version 2.0.4 you can pass in your own custom slug
 generation block:
 
-  require 'stringex'
   class Post < ActiveRecord::Base
     has_friendly_id :title, :use_slug => true do |text|
-      # User stringex to generate the friendly_id rather than the baked-in methods
-      text.to_url
+      MySlugGeneratorClass::my_slug_method(text)
     end
   end
   
-  ...
-  
-  @post = Post.create(:title => "tell your readers 你好")
-  @post.friendly_id # "tell-your-readers-ni-hao"
-
 FriendlyId will still respect your settings for max length and reserved words,
 but will use your block rather than the baked-in methods to normalize the
 friendly_id text.
 
-(As an aside, the stringex[http://github.com/rsl/stringex/tree/master] library
-provides some very cool slugging functionality and is a great option for
-apps using FriendlyId in either English or Chinese. Definitely check it out.)
-
 == Getting it
 
-FriendlyId is installed as a Ruby Gem:
+FriendlyId is best installed as a Ruby Gem:
 
   gem install friendly_id
 
@@ -251,15 +240,11 @@ discouraged:
 
   ./script/plugin install git://github.com/norman/friendly_id.git
 
-If you are installing as a plugin, make sure you have installed the unicode gem,
-which FriendlyId depends on:
-
-  gem install unicode
-
-
 == Setting it up
 
-FriendlyId currently works with Rails 2.0.0 - 2.3.0. Here's how to set it up.
+The current release works with Rails 2.2 and above, and is compatible with
+Ruby 1.8 and 1.9. If you need support for Rails 2.0 - 2.1, you need to install
+an older version of FriendlyId. Here's how to set it up.
 
 1) Install the Gem:
 
@@ -285,16 +270,27 @@ FriendlyId currently works with Rails 2.0.0 - 2.3.0. Here's how to set it up.
 4) If you are using slugs, you can use a Rake task to generate slugs for your
 existing records:
 
-friendly_id:make_slugs MODEL=MyModelName
+rake friendly_id:make_slugs MODEL=MyModelName
 
 If you eventually want to expire old slugs every so often, or perhaps every
 day via cron, you can do:
 
-rake:friendly_id:remove_old_slugs
+rake friendly_id:remove_old_slugs
 
 The default is to remove dead slugs older than 45 days, but is configurable:
 
-rake:friendly_id:remove_old_slugs MODEL=MyModelName DAYS=60
+rake friendly_id:remove_old_slugs MODEL=MyModelName DAYS=60
+
+== Installing an older version
+
+If you are still on Rails 2.1 or lower, please install version 2.0.4:
+
+gem install friendly_id --version 2.0.4
+
+Note that this version depends on the Unicode gem, which doesn't compile on
+Windows and is incompatible with Ruby 1.9. It also can't be installed on
+Heroku. If these are problems, you'll need to update your application to Rails
+2.2 or higher and use the current release of FriendlyId.
 
 == Upgrading from an older version
 
@@ -325,7 +321,7 @@ Add this to the bottom of environment.rb:
 
 ====  Generate the upgrade migration and run it
 
-  ./script generate friendly_id_20_upgrade
+  ./script/generate friendly_id_20_upgrade
   rake db:migrate
 
 == Hacking FriendlyId:

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 0
-:patch: 7
+:patch: 8
 :major: 2
+:minor: 0

data/lib/friendly_id.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'friendly_id/helpers'
 require 'friendly_id/slug'
 
@@ -45,6 +47,18 @@ module FriendlyId
     # * <tt>:strip_non_ascii</tt> - Defaults to false. If true, it will all non-ascii ([^a-z0-9]) characters.
     # * <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'.
+    #
+    # You can also optionally pass a block if you want to use your own custom
+    # slugnormalization routines rather than the default ones that come with
+    # friendly_id:
+    #
+    #   require 'stringex'
+    #   class Post < ActiveRecord::Base
+    #     has_friendly_id :title, :use_slug => true do |text|
+    #       # Use stringex to generate the friendly_id rather than the baked-in methods
+    #       text.to_url
+    #     end
+    #   end    
     def has_friendly_id(column, options = {}, &block)
       options.assert_valid_keys VALID_FRIENDLY_ID_KEYS
       options = DEFAULT_FRIENDLY_ID_OPTIONS.merge(options).merge(:column => column)
@@ -67,7 +81,7 @@ module FriendlyId
         require 'friendly_id/non_sluggable_instance_methods'
         extend NonSluggableClassMethods
         include NonSluggableInstanceMethods
-        validate_on_create :validate_friendly_id
+        validate :validate_friendly_id
       end
     end
 

data/lib/friendly_id/helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId
   
   module Helpers

data/lib/friendly_id/non_sluggable_class_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId::NonSluggableClassMethods
 
   include FriendlyId::Helpers

data/lib/friendly_id/non_sluggable_instance_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId::NonSluggableInstanceMethods
 
   attr :found_using_friendly_id

data/lib/friendly_id/slug.rb

@@ -1,9 +1,23 @@
-require 'unicode'
+#encoding: utf-8
+
 # A Slug is a unique, human-friendly identifier for an ActiveRecord.
 class Slug < ActiveRecord::Base
 
   belongs_to :sluggable, :polymorphic => true
   before_save :check_for_blank_name, :set_sequence
+  
+  
+  ASCII_APPROXIMATIONS = {
+    198 => "AE",
+    208 => "D",
+    216 => "O",
+    222 => "Th",
+    223 => "ss",
+    230 => "ae",
+    240 => "d",
+    248 => "o",
+    254 => "th"
+  }.freeze
 
   class << self
 
@@ -13,30 +27,22 @@ class Slug < ActiveRecord::Base
     #
     #   slug.normalize('This... is an example!') # => "this-is-an-example"
     #
-    # Note that Rails 2.2.x offers a parameterize method for this. It's not
-    # used here because it assumes you want to strip away accented characters,
-    # and this may not always be your desire.
-    #
-    # At the time of writing, it also handles several characters incorrectly,
-    # for instance replacing Icelandic's "thorn" character with "y" rather
-    # than "d." This might be pedantic, but I don't want to piss off the
-    # Vikings. The last time anyone pissed them off, they uleashed a wave of
-    # terror in Europe unlike anything ever seen before or after. I'm not
-    # taking any chances.
+    # Note that the Unicode handling in ActiveSupport may fail to process some
+    # characters from Polish, Icelandic and other languages. If your
+    # application uses these languages, check {out this
+    # article}[http://link-coming-soon.com] for information on how to get
+    # better urls in your application.
     def normalize(slug_text)
       return "" if slug_text.nil? || slug_text == ""
-      Unicode::normalize_KC(slug_text).
-        send(chars_func).
-        # For some reason Spanish ¡ and ¿ are not detected as non-word
-        # characters. Bug in Ruby?
-        gsub(/[\W|¡|¿]/u, ' ').
+      ActiveSupport::Multibyte.proxy_class.new(slug_text.to_s).normalize(:kc).
+        gsub(/[\W]/u, ' ').
         strip.
         gsub(/\s+/u, '-').
         gsub(/-\z/u, '').
         downcase.
         to_s
     end
-
+    
     def parse(friendly_id)
       name, sequence = friendly_id.split('--')
       sequence ||= "1"
@@ -46,8 +52,17 @@ class Slug < ActiveRecord::Base
     # Remove diacritics (accents, umlauts, etc.) from the string. Borrowed
     # from "The Ruby Way."
     def strip_diacritics(string)
-      Unicode::normalize_KD(string).unpack('U*').select { |u| u < 0x300 || u > 0x036F }.pack('U*')
+      ActiveSupport::Multibyte.proxy_class.new(string).normalize(:kd).unpack('U*').inject([]) { |a, u| 
+        if ASCII_APPROXIMATIONS[u]
+          a += ASCII_APPROXIMATIONS[u].unpack('U*')
+        elsif (u < 0x300 || u > 0x036F)
+          a << u
+        end
+        a
+      }.pack('U*')
     end
+
+
     
     # Remove non-ascii characters from the string.
     def strip_non_ascii(string)
@@ -56,10 +71,6 @@ class Slug < ActiveRecord::Base
 
     private
 
-    def chars_func
-      "".respond_to?(:mb_chars) ? :mb_chars : :chars
-    end
-
   end
 
   # Whether or not this slug is the most recent of its owner's slugs.
@@ -75,7 +86,7 @@ class Slug < ActiveRecord::Base
 
   # Raise a FriendlyId::SlugGenerationError if the slug name is blank.
   def check_for_blank_name #:nodoc:#
-    if name == "" || name.nil?
+    if name.blank?
       raise FriendlyId::SlugGenerationError.new("The slug text is blank.")
     end
   end

data/lib/friendly_id/sluggable_class_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId::SluggableClassMethods
 
   include FriendlyId::Helpers
@@ -63,7 +65,7 @@ module FriendlyId::SluggableClassMethods
     find_options[:conditions] = "#{quoted_table_name}.#{primary_key} IN (#{ids.empty? ? 'NULL' : ids.join(',')}) "
     find_options[:conditions] << "OR slugs.id IN (#{slugs.to_s(:db)})"
 
-    results = with_scope(:find => find_options) { find_every(options) }
+    results = with_scope(:find => find_options) { find_every(options) }.uniq
 
     expected = expected_size(ids_and_names, options)
     if results.size != expected
@@ -97,7 +99,7 @@ module FriendlyId::SluggableClassMethods
     slugs = []
     ids = []
     ids_and_names.each do |id_or_name|
-      name, sequence = Slug.parse id_or_name
+      name, sequence = Slug.parse id_or_name.to_s
       slug = Slug.find(:first, :conditions => {
         :name           => name,
         :scope          => scope,
@@ -106,7 +108,7 @@ module FriendlyId::SluggableClassMethods
       })
       # If the slug was found, add it to the array for later use. If not, and
       # the id_or_name is a number, assume that it is a regular record id.
-      slug ? slugs << slug : (ids << id_or_name if id_or_name =~ /\A\d*\z/)
+      slug ? slugs << slug : (ids << id_or_name if id_or_name.to_s =~ /\A\d*\z/)
     end
     return slugs, ids
   end

data/lib/friendly_id/sluggable_instance_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId::SluggableInstanceMethods
 
   NUM_CHARS_RESERVED_FOR_FRIENDLY_ID_EXTENSION = 2

data/lib/friendly_id/version.rb

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 module FriendlyId #:nodoc:
   module Version #:nodoc:
     MAJOR = 2
-    MINOR = 0
-    TINY = 4
+    MINOR = 1
+    TINY = 3
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/lib/tasks/friendly_id.rake

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 namespace :friendly_id do
   desc "Make slugs for a model."
   task :make_slugs => :environment do

data/test/contest.rb

@@ -0,0 +1,94 @@
+# License
+# -------
+# 
+# Contest is copyright (c) 2009 Damian Janowski and Michel Martens for
+# Citrusbyte
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+require "test/unit"
+
+# Test::Unit loads a default test if the suite is empty, whose purpose is to
+# fail. Since having empty contexts is a common practice, we decided to
+# overwrite TestSuite#empty? in order to allow them. Having a failure when no
+# tests have been defined seems counter-intuitive.
+class Test::Unit::TestSuite
+  def empty?
+    false
+  end
+end
+
+# Contest adds +teardown+, +test+ and +context+ as class methods, and the
+# instance methods +setup+ and +teardown+ now iterate on the corresponding
+# blocks. Note that all setup and teardown blocks must be defined with the
+# block syntax. Adding setup or teardown instance methods defeats the purpose
+# of this library.
+class Test::Unit::TestCase
+  def self.setup(&block)
+    define_method :setup do
+      super(&block)
+      instance_eval(&block)
+    end
+  end
+
+  def self.teardown(&block)
+    define_method :teardown do
+      instance_eval(&block)
+      super(&block)
+    end
+  end
+
+  def self.context(name, &block)
+    subclass = Class.new(self)
+    remove_tests(subclass)
+    subclass.class_eval(&block)
+    const_set(context_name(name), subclass)
+  end
+
+  def self.test(name, &block)
+    define_method(test_name(name), &block)
+  end
+
+  class << self
+    alias_method :should, :test
+    alias_method :describe, :context
+  end
+
+private
+
+  def self.context_name(name)
+    "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+  end
+
+  def self.test_name(name)
+    "test_#{sanitize_name(name).gsub(/\s+/,'_')}".to_sym
+  end
+
+  def self.sanitize_name(name)
+    name.gsub(/\W+/, ' ').strip
+  end
+
+  def self.remove_tests(subclass)
+    subclass.public_instance_methods.grep(/^test_/).each do |meth|
+      subclass.send(:undef_method, meth.to_sym)
+    end
+  end
+end

data/test/models/event.rb

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

data/test/models/post.rb

@@ -1,3 +1,6 @@
 class Post < ActiveRecord::Base
   has_friendly_id :title, :use_slug => true
+  
+  named_scope :published, :conditions => { :published => true }
+  
 end

data/test/non_slugged_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/test_helper'
 
 class NonSluggedTest < Test::Unit::TestCase

data/test/schema.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 ActiveRecord::Schema.define(:version => 1) do
 
   create_table "books", :force => true do |t|
@@ -12,6 +14,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table "posts", :force => true do |t|
     t.column "title", "string"
     t.column "content", "text"
+    t.column "published", "boolean", :default => false
     t.column "created_at", "datetime"
     t.column "updated_at", "datetime"
   end
@@ -32,6 +35,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column "name", "string"
   end
 
+  create_table "events", :force => true do |t|
+    t.column "name", "string"
+    t.column "event_date", "datetime"
+  end
+
   create_table "slugs", :force => true do |t|
     t.column "name", "string"
     t.column "sluggable_id", "integer"

data/test/scoped_model_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/test_helper'
 
 class ScopedModelTest < Test::Unit::TestCase

data/test/slug_test.rb

@@ -39,8 +39,8 @@ class SlugTest < Test::Unit::TestCase
       input  = "ÀÁÂÃÄÅÆÇÈÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
       output = Slug::strip_diacritics(input).split(//)
       expected = "AAAAAAAECEEEIIIIDNOOOOOOUUUUYThssaaaaaaaeceeeeiiiidnoooooouuuuythy".split(//)
-      output.split.each_index do |i|
-        assert_equal output[i], expected[i]
+      output.each_index do |i|
+        assert_equal expected[i], output[i]
       end
     end
   

data/test/slugged_model_test.rb

@@ -11,7 +11,7 @@ class SluggedModelTest < Test::Unit::TestCase
       Post.delete_all
       Person.delete_all
       Slug.delete_all
-      @post = Post.new :title => "Test post", :content => "Test content"
+      @post = Post.new :title => "Test post", :content => "Test content", :published => true
       @post.save!
     end
 
@@ -86,6 +86,10 @@ class SluggedModelTest < Test::Unit::TestCase
       assert_match(/--2\z/, @post2.friendly_id)
     end
 
+    should "allow datetime columns to be used as slugs" do
+      assert Event.create(:name => "Test", :event_date => DateTime.now)
+    end
+
     should "not strip diacritics" do
       @post = Post.new(:title => "¡Feliz año!")
       assert_match(/#{'ñ'}/, @post.slug_text)
@@ -95,7 +99,7 @@ class SluggedModelTest < Test::Unit::TestCase
       @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
@@ -237,12 +241,29 @@ class SluggedModelTest < Test::Unit::TestCase
     context "when using an array as the find argument" do
 
       setup do
-        @post2 = Post.create!(:title => "another post", :content => "more content")
+        @post2 = Post.create!(:title => "another post", :content => "more content", :published => true)
+      end
+
+      should "return results when passed an array of non-friendly ids" do
+        assert_equal 2, Post.find([@post.id, @post2.id]).size
       end
 
-      should "return results" do
+      should "return results when passed an array of friendly ids" do
         assert_equal 2, Post.find([@post.friendly_id, @post2.friendly_id]).size
       end
+      
+      should "return results when searching using a named scope" do
+        assert_equal 2, Post.published.find([@post.id, @post2.id]).size
+      end
+
+      should "return results when passed a mixed array of friendly and non-friendly ids" do
+        assert_equal 2, Post.find([@post.friendly_id, @post2.id]).size
+      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]')
+        assert_equal 2, Post.find([@post.id, @post2.id]).size
+      end
 
       should "indicate that the results were found using a friendly_id" do
         @posts = Post.find [@post.friendly_id, @post2.friendly_id]

data/test/sti_test.rb

@@ -17,9 +17,9 @@ class SluggedModelTest < Test::Unit::TestCase
     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
@@ -29,10 +29,10 @@ class SluggedModelTest < Test::Unit::TestCase
       end
 
     end
-    
+
 
     context "found by its numeric id" do
-      
+
       setup do
         @novel = Novel.find(@novel.id)
       end

data/test/test_helper.rb

@@ -1,16 +1,19 @@
+# encoding: utf-8
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__))
-$VERBOSE=false
-require 'rubygems'
+$KCODE = 'UTF8' if RUBY_VERSION < '1.9'
+$VERBOSE = false
 require 'test/unit'
-require 'shoulda'
+require 'contest'
 # 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"]}"
+  gem 'activesupport', "#{ENV["AR_VERSION"]}"
 end
 require 'active_record'
-
+require 'active_support'
 require 'friendly_id'
 require 'models/post'
 require 'models/person'
@@ -19,16 +22,7 @@ require 'models/country'
 require 'models/book'
 require 'models/novel'
 require 'models/thing'
-
-# 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
+require 'models/event'
 
 ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
 silence_stream(STDOUT) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rakutenusa-friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors: 
 - RakutenUSA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -07:00
+date: 2009-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,19 +19,22 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
-- Rakefile
 - VERSION.yml
+- generators/friendly_id
 - generators/friendly_id/friendly_id_generator.rb
+- generators/friendly_id/templates
 - generators/friendly_id/templates/create_slugs.rb
+- generators/friendly_id_20_upgrade
 - generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb
+- generators/friendly_id_20_upgrade/templates
 - generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb
-- lib/friendly_id.rb
+- lib/friendly_id
 - lib/friendly_id/helpers.rb
 - lib/friendly_id/non_sluggable_class_methods.rb
 - lib/friendly_id/non_sluggable_instance_methods.rb
@@ -39,11 +42,16 @@ files:
 - lib/friendly_id/sluggable_class_methods.rb
 - lib/friendly_id/sluggable_instance_methods.rb
 - lib/friendly_id/version.rb
+- lib/friendly_id.rb
+- lib/tasks
 - lib/tasks/friendly_id.rake
 - lib/tasks/friendly_id.rb
+- test/contest.rb
 - test/custom_slug_normalizer_test.rb
+- test/models
 - test/models/book.rb
 - test/models/country.rb
+- test/models/event.rb
 - test/models/novel.rb
 - test/models/person.rb
 - test/models/post.rb
@@ -60,6 +68,7 @@ has_rdoc: true
 homepage: http://github.com/rakutenusa/friendly_id
 post_install_message: 
 rdoc_options: 
+- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -82,19 +91,5 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: TODO
-test_files: 
-- test/custom_slug_normalizer_test.rb
-- test/models/book.rb
-- test/models/country.rb
-- test/models/novel.rb
-- test/models/person.rb
-- test/models/post.rb
-- test/models/thing.rb
-- test/models/user.rb
-- test/non_slugged_test.rb
-- test/schema.rb
-- test/scoped_model_test.rb
-- test/slug_test.rb
-- test/slugged_model_test.rb
-- test/sti_test.rb
-- test/test_helper.rb
+test_files: []
+

data/Rakefile

@@ -1,47 +0,0 @@
-require 'lib/friendly_id/version'
-
-desc "Run RCov"
-task :rcov do
-  run_coverage Dir["test/**/*_test.rb"]
-end
-
-def run_coverage(files)
-  rm_f "coverage"
-  rm_f "coverage.data"
-  if files.length == 0
-    puts "No files were specified for testing"
-    return
-  end
-  files = files.join(" ")
-  if PLATFORM =~ /darwin/
-    exclude = '--exclude "gems/"'
-  else
-    exclude = '--exclude "rubygems"'
-  end
-  rcov = "rcov -Ilib:test --sort coverage --text-report #{exclude} --no-validator-links"
-  cmd = "#{rcov} #{files}"
-  puts cmd
-  sh cmd
-end
-
-desc 'Publish RDoc to RubyForge.'
-task :publish_docs => [:clean, :docs] do
-  host = "compay@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/friendly-id"
-  local_dir = 'doc'
-  sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "friendly_id"
-    gemspec.summary = "TODO"
-    gemspec.email = "dev@rakutenusa.com"
-    gemspec.homepage = "http://github.com/rakutenusa/friendly_id"
-    gemspec.description = "TODO"
-    gemspec.authors = ["RakutenUSA"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end