friendly_id 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,9 @@
+== 2.0.1 2009-01-19
+
+* 1 minor enhancements:
+  * Fix infinite redirect bug when using .has_better_id? in your controllers (Sean Abrahams)
+
+
 == 2.0.0 2009-01-03
 
 * 5 major enhancements:
@@ -5,8 +11,8 @@
   * Support for UTF-8 friendly_ids (Norman Clarke)
   * Can now be installed via Ruby Gems, or as a Rails plugin (Norman Clarke)
   * Improved handling of non-unique slugs (Norman Clarke and Adrian Mugnolo)
-* 2 minor enhancements: 
-  * Shoulda macro (Josh Nichols - http://github.com/technicalpickles)
+* 2 minor enhancements:
+  * Shoulda macro (Josh Nichols)
   * Various small bugfixes, cleanups and refactorings
 
 == 2008-12-01

data/Manifest.txt

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

data/README.rdoc

@@ -315,4 +315,4 @@ FriendlyId was created by {Norman Clarke}[mailto:norman@randomba.org],
 {Adrian Mugnolo}[mailto:adrian@randomba.org], and {Emilio Tagua}[mailto:miloops@gmail.com].
 
 Copyright (c) 2008 Norman Clarke, Adrian Mugnolo and Emilio Tagua, released
-under the MIT license.
+under the MIT license.

data/Rakefile

@@ -1,7 +1,7 @@
 require 'newgem'
 require 'lib/friendly_id/version'
 
-Hoe.new("friendly_id", FriendlyId::Version::STRING) do |p|
+$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']
@@ -20,6 +20,8 @@ Hoe.new("friendly_id", FriendlyId::Version::STRING) do |p|
   p.remote_rdoc_dir = ""
 end
 
+require 'newgem/tasks'
+
 desc "Run RCov"
 task :rcov do
   run_coverage Dir["test/**/*_test.rb"]

data/config/website.yml

@@ -0,0 +1,2 @@
+host: compay@rubyforge.org
+remote_dir: /var/www/gforge-projects/friendly-id

data/friendly_id.gemspec

@@ -1,18 +1,19 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{friendly_id}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Norman Clarke", "Adrian Mugnolo", "Emilio Tagua"]
-  s.cert_chain = ["/Users/norman/.gem/gem-public_cert.pem"]
-  s.date = %q{2008-12-30}
+  s.date = %q{2009-01-19}
   s.description = %q{A comprehensive slugging and pretty-URL plugin for Ruby on Rails.}
   s.email = ["norman@randomba.org", "adrian@randomba.org", "miloops@gmail.com"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
   s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "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/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/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/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://randomba.org}
-  s.rdoc_options = ["--main", "README.txt"]
+  s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{friendly-id}
   s.rubygems_version = %q{1.3.1}
@@ -26,13 +27,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<unicode>, [">= 0.1"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
+      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<unicode>, [">= 0.1"])
-      s.add_dependency(%q<hoe>, [">= 1.8.2"])
+      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<unicode>, [">= 0.1"])
-    s.add_dependency(%q<hoe>, [">= 1.8.2"])
+    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/lib/friendly_id.rb

@@ -60,7 +60,6 @@ module FriendlyId
 
   end
 
-
 end
 
 if defined?(ActiveRecord)

data/lib/friendly_id/sluggable_instance_methods.rb

@@ -81,7 +81,8 @@ module FriendlyId::SluggableInstanceMethods
 
   def init_finder_slug
     return false if !@finder_slug_name
-    slug = Slug.find(:first, :conditions => {:sluggable_id => id, :name => @finder_slug_name, :sluggable_type => self.class.name })
+    name, sequence = Slug.parse(@finder_slug_name)
+    slug = Slug.find(:first, :conditions => {:sluggable_id => id, :name => name, :sequence => sequence, :sluggable_type => self.class.name })
     finder_slug = slug
   end
 

data/lib/friendly_id/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -32,7 +32,7 @@ cert_chain:
   h7fbBRfStxI=
   -----END CERTIFICATE-----
 
-date: 2009-01-04 00:00:00 -02:00
+date: 2009-01-19 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - 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