friendly_id 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be471c9fdfbd158f951d1544207aa7adb87e0595
-  data.tar.gz: e2abb7c2074fbdfd5445e47e6ba01ae9a37a72d0
+  metadata.gz: 558d42d05561510d3b878d6c55a99eaac461d189
+  data.tar.gz: b56ebd579507441df27d8aa42e0b837d2ce0fc60
 SHA512:
-  metadata.gz: d97900b4d53ef7d02a48665386e97bee42b2aceed5283209246bdc249e2467d40268b08bde9805bc3d0aa7d78eac9500ad83ff39302d6c43df804f298b0cf86e
-  data.tar.gz: 661f24ec624dcca17544c5ccf72cb708f8261fc31f06312110c44a6aafbb47c30f56068a8e38c77df2115d875839a6be100818b73beec7f4f74070bbb6565995
+  metadata.gz: 0e11d6d309df06e6177eb24c03af2aff0f3119f5c545b15e8088599d19f62242266e71c01aa69beda1ccb2c4b8a113a651fdb25ab10ef54b856a552284bd02dd
+  data.tar.gz: 0eef987342060880f7d713948f8f12e04e90efbe89059e34debda4a78026989170538410ba9b981feaaf5df424fa8e475bfe51492049372dae4a023faad385c9

data/Changelog.md

@@ -3,6 +3,10 @@
 We would like to think our many {file:Contributors contributors} for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.0.1 (2013-10-27)
+
+* Fix compatibility with Rails 4.0.1.rc3 (thanks [Herman verschooten](https://github.com/Hermanverschooten)).
+
 ## 5.0.0 (2013-10-16)
 
 * Fix to let scoped records reuse their slugs (thanks [Donny

data/lib/friendly_id/base.rb

@@ -243,7 +243,7 @@ often better and easier to use {FriendlyId::Slugged slugs}.
       if diff = changes[friendly_id_config.query_field]
         diff.first || diff.second
       else
-        friendly_id.presence || super
+        friendly_id.presence.to_param || super
       end
     end
   end

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.0.0"
+  VERSION = "5.0.1"
 end

data/test/shared.rb

@@ -151,6 +151,13 @@ module FriendlyId
           end
         end
 
+        test "should return the friendly_id as a string" do
+          with_instance_of(model_class) do |record|
+            record.expects(:friendly_id).returns(5)
+            assert_equal "5", record.to_param
+          end
+        end
+
         test "should return numeric id if the friendly_id is blank" do
           with_instance_of(model_class) do |record|
             record.expects(:friendly_id).returns("  ")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord