friendly_id_globalize3 3.2.1.5 → 3.2.1.6

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -61,8 +61,12 @@ module FriendlyId
         def find_one_with_slug
           sluggable_ids = sluggable_ids_for([id])
 
-          if sluggable_ids.size > 1 && fc.scope?
-            return relation.where(relation.primary_key.in(sluggable_ids)).first
+          if sluggable_ids.many? && fc.scope?
+            if relation.primary_key.respond_to?(:in)
+              return relation.where(relation.primary_key.in(sluggable_ids)).first
+            else
+              return relation.where(relation.primary_key => sluggable_ids).first
+            end
           end
 
           sluggable_id = sluggable_ids.first
@@ -83,7 +87,12 @@ module FriendlyId
           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)
-          unfriendly = arel_table[relation.primary_key.name].in unfriendly_ids
+          unfriendly = if relation.primary_key.respond_to?(:name)
+            arel_table[relation.primary_key.name].in unfriendly_ids
+          else
+            arel_table[relation.primary_key].in unfriendly_ids
+          end
+
           if friendly_ids.present? && unfriendly_ids.present?
             where(friendly.or(unfriendly))
           else
@@ -93,7 +102,11 @@ module FriendlyId
 
         def find_some_using_slug(friendly_ids, unfriendly_ids)
           ids = [unfriendly_ids + sluggable_ids_for(friendly_ids)].flatten.uniq
-          where(arel_table[relation.primary_key.name].in(ids))
+          if relation.primary_key.respond_to?(:name)
+            where(arel_table[relation.primary_key.name].in(ids))
+          else
+            where(arel_table[relation.primary_key].in(ids))
+          end
         end
 
         def sluggable_ids_for(ids)

data/lib/friendly_id/active_record_adapter/slug.rb

@@ -9,9 +9,8 @@ class Slug < ::ActiveRecord::Base
   named_scope :similar_to, lambda {|slug| {:conditions => {
         :name           => slug.name,
         :scope          => slug.scope,
-        :locale         => slug.locale,
         :sluggable_type => slug.sluggable_type
-      },
+      }.merge(({:locale => slug.locale} if slug.respond_to?(:locale)) || {}),
       :order => "sequence ASC"
     }
   }

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -15,6 +15,18 @@ module FriendlyId
           after_update :update_dependent_scopes
           protect_friendly_id_attributes
           extend FriendlyId::ActiveRecordAdapter::Finders unless FriendlyId.on_ar3?
+          def slug_with_rails_3_2_patch
+            unless (_slug = slug_without_rails_3_2_patch)
+              _slug = if friendly_id_config.class.locales_used?
+                slugs.where(:locale => (Thread.current[:globalize_locale] || ::I18n.locale)).first
+              else
+                slugs.first
+              end
+            end
+            _slug
+          end
+          alias_method_chain :slug, :rails_3_2_patch
+
         end
       end
 

data/lib/friendly_id/version.rb

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

metadata

@@ -1,24 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id_globalize3
 version: !ruby/object:Gem::Version 
-  hash: 97
+  hash: 103
   prerelease: 
   segments: 
   - 3
   - 2
   - 1
-  - 5
-  version: 3.2.1.5
+  - 6
+  version: 3.2.1.6
 platform: ruby
 authors: 
 - Norman Clarke
 - Adrian Mugnolo
 - Emilio Tagua
+- Philip Arndt
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: babosa
@@ -81,11 +82,28 @@ dependencies:
         version: "1.3"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id005
 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"
 email: 
 - norman@njclarke.com
 - adrian@mugnolo.com
 - miloops@gmail.com
+- parndt@gmail.com
 executables: []
 
 extensions: []