friendly_id_globalize3 3.2.1.1 → 3.2.1.2

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -6,7 +6,7 @@ module FriendlyId
         base.class_eval do
           has_many :slugs, :order => 'id DESC', :as => :sluggable, :dependent => :destroy
           has_one :slug, :order => 'id DESC', :as => :sluggable, :dependent => :destroy,
-                  :conditions => (proc{ {:locale => (Thread.current[:globalize_locale] || ::I18n.locale)} } if friendly_id_config.class.locales_used?)
+                  :conditions => (proc{ {:locale => Globalize.locale} } if friendly_id_config.class.locales_used?)
           before_save :build_a_slug
           after_save :set_slug_cache
           after_update :update_scope
@@ -44,8 +44,7 @@ module FriendlyId
         unless friendly_id_config.class.locales_used?
           slug? ? slug.to_friendly_id : id.to_s
         else
-          locale = (Thread.current[:globalize_locale] || ::I18n.locale).to_s
-          if (locale_slug = slugs.detect{|s| s.locale.to_s == locale}).present?
+          if (locale_slug = slugs.detect{|s| s.locale.to_s == Globalize.locale.to_s}).present?
             locale_slug.to_friendly_id
           else
             id.to_s
@@ -58,7 +57,7 @@ module FriendlyId
         return unless new_slug_needed?
         @slug = slugs.build :name => slug_text.to_s, :scope => friendly_id_config.scope_for(self),
           :sluggable => self
-        @slug.locale = Thread.current[:globalize_locale] || ::I18n.locale if friendly_id_config.class.locales_used?
+        @slug.locale = Globalize.locale if friendly_id_config.class.locales_used?
         @new_friendly_id = @slug.to_friendly_id
       end
 

data/lib/friendly_id/configuration.rb

@@ -152,7 +152,11 @@ module FriendlyId
 
       # Are localed used by the slugs model?
       def locales_used?
-        ::Slug.table_exists? && ::Slug.column_names.include?('locale')
+        unless @locales_used.nil?
+          @locales_used
+        else
+          @locales_used = ::Slug.table_exists? && ::Slug.column_names.map(&:to_sym).include?(:locale)
+        end
       end
     end
 

data/lib/friendly_id/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: friendly_id_globalize3
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.2.1.1
+  version: 3.2.1.2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -12,8 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 +13:00
-default_executable: 
+date: 2011-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: babosa
@@ -129,7 +128,6 @@ files:
 - extras/template-gem.rb
 - extras/template-plugin.rb
 - .gemtest
-has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
 
@@ -153,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: friendly-id
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin. Fork for globalize3 support.