friendly_id 3.0.2 → 3.0.3

data/Changelog.md

@@ -6,6 +6,10 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.0.3 (2010-04-26)
+
+* Fixed scope update when models use polymorphic relations.
+
 ## 3.0.2 (2010-04-09)
 
 * Fixed finding non-slugged models by an array of ids.

data/Contributors.md

@@ -24,13 +24,15 @@ community, in particular from the following people:
 * Josh Nichols
 * Juan Schwindt
 * Kamal Fariz Mahyuddin
+* Laurence A. Lee
 * Louis T.
 * Mikhail Shirkov
-* Nathan Phelps
 * Nash Kabbara
+* Nathan Phelps
 * Ramon Soares
 * Rdavila
 * Rob Ingram
+* Ryan Wood
 * Sean Abrahams
 * Steve Luscher
 * Steven Noble

data/lib/friendly_id/active_record_adapter/configuration.rb

@@ -57,9 +57,11 @@ module FriendlyId
 
       def associated_friendly_classes
         configured_class.reflect_on_all_associations.select { |assoc|
-          assoc.klass.uses_friendly_id? }.map(&:klass)
+          !assoc.options[:polymorphic] &&
+          assoc.klass.uses_friendly_id?
+        }.map(&:klass)
       end
 
     end
   end
-end
+end

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/ar_test_helper.rb

@@ -105,4 +105,15 @@ end
 # A model with no table
 class Question < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
+end
+
+# A model to test polymorphic associations
+class Site < ActiveRecord::Base
+  belongs_to :owner, :polymorphic => true
+  has_friendly_id :name, :use_slug => true
+end
+
+# A model used as a polymorphic owner
+class Company < ActiveRecord::Base
+  has_many :sites, :as => :owner
 end

data/test/active_record_adapter/scoped_model_test.rb

@@ -17,6 +17,8 @@ module FriendlyId
         @canada = Country.create!(:name => "Canada")
         @resident = Resident.create!(:name => "John Smith", :country => @usa)
         @resident2 = Resident.create!(:name => "John Smith", :country => @canada)
+        @owner = Company.create!(:name => "Acme Events")
+        @site = Site.create!(:name => "Downtown Venue", :owner => @owner)
       end
 
       def teardown
@@ -105,6 +107,11 @@ module FriendlyId
           assert_match(/scope: badscope/, e.message)
         end
       end
+      
+      test "should update the sluggable field when a polymorphic relationship exists" do
+        @site.update_attributes(:name => "Uptown Venue")
+        assert_equal "Uptown Venue", @site.name
+      end
 
     end
   end

data/test/active_record_adapter/support/models.rb

@@ -71,6 +71,15 @@ class CreateSupportModels < ActiveRecord::Migration
     end
     add_index :users, :name, :unique => true
 
+    create_table :sites do |t|
+      t.string :name
+      t.integer :owner_id
+      t.string :owner_type
+    end
+    
+    create_table :companies do |t|
+      t.string :name
+    end
   end
 
   def self.down

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 -03:00
+date: 2010-04-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency