friendly_id_globalize3 3.2.1.3 → 3.2.1.4

data/lib/friendly_id/active_record_adapter/slug.rb

@@ -9,6 +9,7 @@ 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
       },
       :order => "sequence ASC"
@@ -50,7 +51,9 @@ class Slug < ::ActiveRecord::Base
   # If we're renaming back to a previously used friendly_id, delete the
   # slug so that we can recycle the name without having to use a sequence.
   def enable_name_reversion
-    sluggable.slugs.find_all_by_name_and_scope(name, scope).each { |slug| slug.destroy }
+    slugs = sluggable.slugs.where(:name => name).where(:scope => scope)
+    slugs = slugs.where(:locale => locale) if sluggable.friendly_id_config.class.locales_used?
+    slugs.each(&:destroy) unless slugs.empty?
   end
 
   def friendly_id_with_sequence

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -6,7 +6,9 @@ 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 => (Thread.current[:globalize_locale] || ::I18n.locale)
+                  } } if friendly_id_config.class.locales_used?)
           before_save :build_a_slug
           after_save :set_slug_cache
           after_update :update_scope

data/lib/friendly_id/active_record_adapter/tasks.rb

@@ -30,7 +30,7 @@ module FriendlyId
         :include => :slug,
         :limit   => (ENV["LIMIT"] || 100).to_i,
         :offset  => 0,
-        :order   => ENV["ORDER"] || "#{klass.table_name}.id ASC",
+        :order   => ENV["ORDER"] || "#{klass.table_name}.#{klass.primary_key} ASC",
       }.merge(task_options || {})
 
       while records = find(:all, options) do

data/lib/friendly_id/version.rb

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

metadata

@@ -1,75 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: friendly_id_globalize3
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.2.1.4
   prerelease: 
-  version: 3.2.1.3
 platform: ruby
-authors: 
+authors:
 - Norman Clarke
 - Adrian Mugnolo
 - Emilio Tagua
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-25 00:00:00.000000000 +12:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: babosa
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156825120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156825120
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2156852760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156852760
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2156852300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156852300
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2156851840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id004
-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: 
+  prerelease: false
+  version_requirements: *2156851840
+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
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/friendly_id/active_record.rb
 - lib/friendly_id/active_record_adapter/configuration.rb
 - lib/friendly_id/active_record_adapter/finders.rb
@@ -128,34 +127,32 @@ files:
 - extras/template-gem.rb
 - extras/template-plugin.rb
 - .gemtest
+has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: friendly-id
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin. Fork for globalize3 support.
-test_files: 
+test_files:
 - test/active_record_adapter/basic_slugged_model_test.rb
 - test/active_record_adapter/cached_slug_test.rb
 - test/active_record_adapter/custom_normalizer_test.rb