friendly_id 3.1.0 → 3.1.1.1

data/Changelog.md

@@ -6,6 +6,10 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.1.1 (2010-07-30)
+
+* Fixed call to method on nil value for failing unfriendly finds (thanks [jlippiner](http://github.com/jlippiner))
+
 ## 3.1.0 (2010-07-29)
 
 * Refactored/simplified Active Record 2 and 3 query code.

data/lib/friendly_id/active_record_adapter/finders.rb

@@ -3,7 +3,6 @@ module FriendlyId
     module Finders
 
       class Find
-
         extend Forwardable
         def_delegators :@klass, :scoped, :friendly_id_config, :quoted_table_name, :table_name, :primary_key,
           :connection, :name, :sanitize_sql
@@ -147,7 +146,7 @@ module FriendlyId
         finder = Find.new(self, id, options)
         finder.find_one or super
       rescue ActiveRecord::RecordNotFound => error
-        finder.raise_error(error)
+        finder ? finder.raise_error(error) : raise(error)
       end
 
       def find_some(ids, options)
@@ -155,7 +154,7 @@ module FriendlyId
         finder = Find.new(self, ids, options)
         finder.find_some
       rescue ActiveRecord::RecordNotFound => error
-        finder.raise_error(error)
+        finder ? finder.raise_error(error) : raise(error)
       end
     end
   end

data/lib/friendly_id/test.rb

@@ -94,6 +94,12 @@ module FriendlyId
         assert_equal instance, klass.send(find_method, "206")
       end
 
+      test "failing finds with unfriendly_id should raise errors normally" do
+        assert_raise ActiveRecord::RecordNotFound do
+          klass.send(find_method, 0)
+        end
+      end
+
       test "creation should raise an error if the friendly_id text is reserved" do
         assert_validation_error do
           klass.send(create_method, :name => "new")

data/lib/friendly_id/version.rb

@@ -2,8 +2,8 @@ module FriendlyId
   module Version
     MAJOR = 3
     MINOR = 1
-    TINY = 0
-    BUILD = nil
+    TINY = 1
+    BUILD = 1
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 end

data/test/active_record_adapter/core.rb

@@ -52,6 +52,12 @@ module FriendlyId
           assert_equal 2, klass.find([instance.friendly_id, second.friendly_id]).size
         end
 
+        test "failing finds with array of unfriendly_id should raise errors normally" do
+          assert_raise ActiveRecord::RecordNotFound do
+            klass.find([0, -1])
+          end
+        end
+
         test "instances should be findable by an array of numeric ids" do
           second = klass.create!(:name => "second_instance")
           third = klass.create!(:name => "third_instance")

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  - 1
+  version: 3.1.1.1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -03:00
+date: 2010-07-30 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency