friendly_id 4.0.8 → 4.0.9

data/Changelog.md

@@ -6,6 +6,10 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 4.0.9 (2012-10-31)
+
+* Fixed support for Rails 3.2.9.rc1
+
 ## 4.0.8 (2012-08-01)
 
 * Name internal anonymous class to fix marshall dump/load error (Jess Brown, Philip Arndt and Norman Clarke).

data/Guide.rdoc

@@ -114,8 +114,8 @@ store them in a field in your model. By default, this field must be named
 +:slug+, though you may change this using the
 {FriendlyId::Slugged::Configuration#slug_column slug_column} configuration
 option. You should add an index to this column, and in most cases, make it
-unique. Do not make the column unique in case you wish to scope the slug 
-(more on this later). You may also wish to constrain it to NOT NULL, but this 
+unique. Do not make the column unique in case you wish to scope the slug
+(more on this later). You may also wish to constrain it to NOT NULL, but this
 depends on your app's behavior and requirements.
 
 === Example Setup
@@ -316,7 +316,7 @@ method.
       ...
 
       def find_post
-        Post.find params[:id]
+        @post = Post.find params[:id]
 
         # If an old id or a numeric id was used to find the record, then
         # the request path will not match the post_path, and we should do

data/lib/friendly_id.rb

@@ -45,7 +45,7 @@ with numeric ids:
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.8"
+  VERSION = "4.0.9"
 
   @mutex = Mutex.new
 

data/lib/friendly_id/base.rb

@@ -207,12 +207,24 @@ often better and easier to use {FriendlyId::Slugged slugs}.
 
     private
 
-    # Gets an instance of an anonymous subclass of ActiveRecord::Relation.
+    # Gets an instance of an the relation class.
+    #
+    # With FriendlyId this will be a subclass of ActiveRecord::Relation, rather than
+    # Relation itself, in order to avoid tainting all Active Record models with
+    # FriendlyId.
+    #
+    # Note that this method is essentially copied and pasted from Rails 3.2.9.rc1,
+    # with the exception of changing the relation class. Obviously this is less than
+    # ideal, but I know of no better way to accomplish this.
     # @see #relation_class
-    def relation
-      @relation = nil unless @relation.class <= relation_class
-      @relation ||= relation_class.new(self, arel_table)
-      super
+    def relation #:nodoc:
+      relation = relation_class.new(self, arel_table)
+
+      if finder_needs_type_condition?
+        relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
+      else
+        relation
+      end
     end
 
     # Gets (and if necessary, creates) a subclass of the model's relation class.

data/lib/friendly_id/history.rb

@@ -43,7 +43,7 @@ method.
       ...
 
       def find_post
-        Post.find params[:id]
+        @post = Post.find params[:id]
 
         # If an old id or a numeric id was used to find the record, then
         # the request path will not match the post_path, and we should do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -260,18 +260,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4530033734929849472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4530033734929849472
 requirements: []
 rubyforge_project: friendly_id
 rubygems_version: 1.8.24