friendly_id 3.3.1.1 → 3.3.2.0

data/Changelog.md

@@ -6,6 +6,10 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.1.2 (2012-01-24)
+
+* Fix for 3.2 support ([Philip Arndt](https://github.com/parndt))
+
 ## 3.1.1 (2011-12-12)
 
 * Fix for "can't modify frozen hash" on 3.1 ([Theo Cushion](https://github.com/theozaurus))

data/README.md

@@ -21,8 +21,7 @@ please see the [FriendlyId Guide](https://github.com/norman/friendly_id/blob/3.x
 
 ## Compatibility
 
-FriendlyId 3.3.0 is compatible with Active Record 3.0 and 3.1. For Rails 3.2
-and higher, please use FriendlyId 4.x.
+FriendlyId 3.3.0 is compatible with Active Record 3.0, 3.1 and 3.2.
 
 If you are still on Rails 2.3, please use FriendlyId 3.2.x.
 

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -11,6 +11,12 @@ module FriendlyId
           after_update :update_scope
           after_update :update_dependent_scopes
           protect_friendly_id_attributes
+
+          def slug_with_rails_3_2_patch
+            slug_without_rails_3_2_patch || slugs.first
+          end
+
+          alias_method_chain :slug, :rails_3_2_patch
         end
       end
 

data/lib/friendly_id/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 3.3.1.1
+  version: 3.3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &70152084303600 !ruby/object:Gem::Requirement
+  requirement: &70323991149600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,21 +23,24 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152084303600
+  version_requirements: *70323991149600
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70152084303020 !ruby/object:Gem::Requirement
+  requirement: &70323991234980 !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - <
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *70152084303020
+  version_requirements: *70323991234980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70152084302000 !ruby/object:Gem::Requirement
+  requirement: &70323991231140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +48,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70152084302000
+  version_requirements: *70323991231140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70152084300900 !ruby/object:Gem::Requirement
+  requirement: &70323991229820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +59,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70152084300900
+  version_requirements: *70323991229820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70152084300300 !ruby/object:Gem::Requirement
+  requirement: &70323991227820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,7 +70,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70152084300300
+  version_requirements: *70323991227820
 description: ! "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink
   plugins\n    for Ruby on Rails. It allows you to create pretty URL's and work with\n
   \   human-friendly strings as if they were numeric ids for ActiveRecord models.\n"