friendly_id 3.1.5 → 3.1.6

data/Changelog.md

@@ -6,6 +6,17 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.1.6 (2010-09-02)
+
+* Fix missing sluggable type in AR3 slug query. This was a fairly major oversight, and if you
+  are using 3.1.4 or 3.1.5, you should update right away.
+* Fix scoped queries when the model has a cached slug column. Bascially, the cached slug
+  is now completely ignored when a scope is configured.
+
+## 3.1.5 (2010-09-01)
+
+* Fix invalid empty symbol with 1.8.x.
+
 ## 3.1.4 (2010-09-01)
 
 * Significantly improve performance of queries using slugs with no cache on AR3.

data/lib/friendly_id/active_record_adapter/finders.rb

@@ -26,7 +26,7 @@ module FriendlyId
         end
 
         def find_one
-          return find_one_with_cached_slug if cache_column?
+          return find_one_with_cached_slug if !fc.scope? && cache_column?
           return find_one_with_slug if use_slugs?
           @result = scoped(:conditions => ["#{table_name}.#{fc.column} = ?", id]).first(options)
           assign_status

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -20,7 +20,7 @@ module FriendlyId
         end
 
         def find_one
-          if fc.cache_column?
+          if fc.cache_column? && !fc.scope?
             find_one_with_cached_slug
           elsif fc.use_slugs?
             find_one_with_slug
@@ -80,7 +80,7 @@ module FriendlyId
         end
 
         def friendly_records(friendly_ids, unfriendly_ids)
-          use_slugs_table =  fc.use_slugs? && (friendly_id_scope || !fc.cache_column?)
+          use_slugs_table =  fc.use_slugs? && (fc.scope? || !fc.cache_column?)
           return find_some_using_slug(friendly_ids, unfriendly_ids) if use_slugs_table
           column     = fc.cache_column || fc.column
           friendly   = arel_table[column].in(friendly_ids)
@@ -99,18 +99,19 @@ module FriendlyId
 
         def sluggable_ids_for(ids)
           return [] if ids.empty?
-          fragment = "(slugs.name = %s AND slugs.sequence = %d)"
+          fragment = "(slugs.sluggable_type = %s AND slugs.name = %s AND slugs.sequence = %d)"
           conditions = ids.inject(nil) do |clause, id|
             name, seq = id.parse_friendly_id
-            string = fragment % [connection.quote(name), seq]
+            string = fragment % [connection.quote(klass.base_class), connection.quote(name), seq]
             clause ? clause + " OR #{string}" : string
           end
           if fc.scope?
             scope = connection.quote(friendly_id_scope)
             conditions = "slugs.scope = %s AND (%s)" % [scope, conditions]
           end
-          connection.select_values "SELECT sluggable_id FROM slugs WHERE (%s)" % conditions
-        end
+          sql = "SELECT sluggable_id FROM slugs WHERE (%s)" % conditions
+          connection.select_values sql
+       end
 
         def validate_expected_size!(ids, result)
           expected_size =

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/ar_test_helper.rb

@@ -76,6 +76,12 @@ class Resident < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true, :scope => :country
 end
 
+# Like resident, but has a cached slug
+class Tourist < ActiveRecord::Base
+  belongs_to :country
+  has_friendly_id :name, :use_slug => true, :scope => :country
+end
+
 # A slugged model used as a scope
 class Country < ActiveRecord::Base
   has_many :people

data/test/active_record_adapter/scoped_model_test.rb

@@ -22,6 +22,13 @@ module FriendlyId
         User.delete_all
         House.delete_all
         Slug.delete_all
+        Tourist.delete_all
+      end
+
+      test "should not use cached slug column with scopes" do
+        @tourist  = Tourist.create!(:name => "John Smith", :country => @usa)
+        @tourist2 = Tourist.create!(:name => "John Smith", :country => @canada)
+        assert_equal @canada, Tourist.find(@tourist2.friendly_id, :scope => @canada).country
       end
 
       test "a slugged model should auto-detect that it is being used as a parent scope" do

data/test/active_record_adapter/support/models.rb

@@ -73,6 +73,12 @@ class CreateSupportModels < ActiveRecord::Migration
       t.integer :country_id
     end
 
+    create_table :tourists do |t|
+      t.string :name
+      t.integer :country_id
+      t.string  :cached_slug
+    end
+
     create_table :users do |t|
       t.string :name
     end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: false
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Norman Clarke
@@ -17,25 +16,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -03:00
+date: 2010-09-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: babosa
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
         - 0
         version: 0.2.0
-  requirement: *id001
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
 description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink plugins\n    for Ruby on Rails. It allows you to create pretty URL\xE2\x80\x99s and work with\n    human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
 email: 
 - norman@njclarke.com
@@ -118,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -182801105258368267
       segments: 
       - 0
       version: "0"
@@ -127,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -182801105258368267
       segments: 
       - 0
       version: "0"