friendly_id 2.1.0 → 2.1.1

data/History.txt

@@ -1,6 +1,14 @@
+== 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:
+* 2 major enhancements:
   * Ruby 1.9 compatibility.
   * Removed dependency on ancient Unicode gem.
 

data/friendly_id.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_id}
-  s.version = "2.1.0"
+  s.version = "2.1.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.date = %q{2009-03-25}

data/lib/friendly_id/sluggable_class_methods.rb

@@ -63,7 +63,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 +97,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 +106,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/version.rb

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

data/test/slugged_model_test.rb

@@ -95,7 +95,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
@@ -235,10 +235,23 @@ class SluggedModelTest < Test::Unit::TestCase
         @post2 = Post.create!(:title => "another post", :content => "more content")
       end
 
-      should "return results" do
+      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 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 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]
         @posts.each { |p| assert p.found_using_friendly_id? }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Norman Clarke