norman-friendly_id 2.1.1 → 2.1.2

data/History.txt

@@ -1,3 +1,9 @@
+== 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:

data/Manifest.txt

@@ -20,6 +20,7 @@ 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

data/README.rdoc

@@ -242,7 +242,9 @@ discouraged:
 
 == 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:
 
@@ -279,6 +281,17 @@ The default is to remove dead slugs older than 45 days, but is configurable:
 
 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
 
 If you installed an older version of FriendlyId and want to upgrade to 2.0.x,

data/Rakefile

@@ -4,7 +4,7 @@ require 'lib/friendly_id/version'
 $hoe = Hoe.new("friendly_id", FriendlyId::Version::STRING) do |p|
   p.rubyforge_name = "friendly-id"
   p.author = ['Norman Clarke', 'Adrian Mugnolo', 'Emilio Tagua']
-  p.email = ['norman@randomba.org', 'adrian@randomba.org', 'miloops@gmail.com']
+  p.email = ['norman@rubysouth.com', 'adrian@rubysouth.com', 'miloops@gmail.com']
   p.summary = "A comprehensive slugging and pretty-URL plugin for ActiveRecord."
   p.description = 'A comprehensive slugging and pretty-URL plugin for ActiveRecord.'
   p.url = 'http://friendly-id.rubyforge.org/'
@@ -12,7 +12,6 @@ $hoe = Hoe.new("friendly_id", FriendlyId::Version::STRING) do |p|
   p.extra_deps << ['activerecord', '>= 2.0.0']
   p.extra_deps << ['activesupport', '>= 2.0.0']
   p.extra_dev_deps << ['newgem', ">= #{::Newgem::VERSION}"]
-  p.extra_dev_deps << ['Shoulda', ">= 1.2.0"]
   p.extra_dev_deps << ['sqlite3-ruby']
   p.remote_rdoc_dir = ""
 end

data/friendly_id.gemspec

@@ -2,47 +2,44 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_id}
-  s.version = "2.1.1"
+  s.version = "2.1.2"
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Norman Clarke", "Adrian Mugnolo", "Emilio Tagua"]
-  s.date = %q{2009-03-25}
+  s.date = %q{2009-05-21}
   s.description = %q{A comprehensive slugging and pretty-URL plugin for ActiveRecord.}
-  s.email = ["norman@randomba.org", "adrian@randomba.org", "miloops@gmail.com"]
+  s.email = ["norman@rubysouth.com", "adrian@rubysouth.com", "miloops@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "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", "generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb", "init.rb", "lib/friendly_id.rb", "lib/friendly_id/helpers.rb", "lib/friendly_id/non_sluggable_class_methods.rb", "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/version.rb", "lib/tasks/friendly_id.rake", "lib/tasks/friendly_id.rb", "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"]
-  s.has_rdoc = true
+  s.files = ["History.txt", "MIT-LICENSE", "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", "generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb", "init.rb", "lib/friendly_id.rb", "lib/friendly_id/helpers.rb", "lib/friendly_id/non_sluggable_class_methods.rb", "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/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/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"]
   s.homepage = %q{http://friendly-id.rubyforge.org/}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{friendly-id}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{A comprehensive slugging and pretty-URL plugin for ActiveRecord.}
   s.test_files = ["test/custom_slug_normalizer_test.rb", "test/non_slugged_test.rb", "test/scoped_model_test.rb", "test/slug_test.rb", "test/slugged_model_test.rb", "test/sti_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
-      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_development_dependency(%q<Shoulda>, [">= 1.2.0"])
+      s.add_development_dependency(%q<newgem>, [">= 1.4.1"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.0.0"])
       s.add_dependency(%q<activesupport>, [">= 2.0.0"])
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_dependency(%q<Shoulda>, [">= 1.2.0"])
+      s.add_dependency(%q<newgem>, [">= 1.4.1"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.0.0"])
     s.add_dependency(%q<activesupport>, [">= 2.0.0"])
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
-    s.add_dependency(%q<Shoulda>, [">= 1.2.0"])
+    s.add_dependency(%q<newgem>, [">= 1.4.1"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end

data/lib/friendly_id/version.rb

@@ -2,7 +2,7 @@ module FriendlyId #:nodoc:
   module Version #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY = 1
+    TINY = 2
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/lib/friendly_id.rb

@@ -76,7 +76,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/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/test_helper.rb

@@ -4,7 +4,7 @@ $KCODE = 'UTF8' if RUBY_VERSION < '1.9'
 $VERBOSE = false
 require 'rubygems'
 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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norman-friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-25 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,17 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: Shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -76,8 +66,8 @@ dependencies:
     version: 
 description: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 email: 
-- norman@randomba.org
-- adrian@randomba.org
+- norman@rubysouth.com
+- adrian@rubysouth.com
 - miloops@gmail.com
 executables: []
 
@@ -110,6 +100,7 @@ files:
 - 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
@@ -125,7 +116,7 @@ files:
 - test/slugged_model_test.rb
 - test/sti_test.rb
 - test/test_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://friendly-id.rubyforge.org/
 post_install_message: 
 rdoc_options: 
@@ -150,7 +141,7 @@ requirements: []
 rubyforge_project: friendly-id
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 test_files: 
 - test/custom_slug_normalizer_test.rb