friendly_id 3.3.2.0 → 3.3.3.0

data/Changelog.md

@@ -6,6 +6,10 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.1.3 (2012-04-28)
+
+* Fix for sequenced scoped slugs ([Louise Crow](https://github.com/crowbot))
+
 ## 3.1.2 (2012-01-24)
 
 * Fix for 3.2 support ([Philip Arndt](https://github.com/parndt))

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -80,7 +80,7 @@ module FriendlyId
           slug.scope = send(friendly_id_config.scope).to_param
           similar = Slug.similar_to(slug)
           if !similar.empty?
-            slug.sequence = similar.first.sequence.succ
+            slug.sequence = similar.last.sequence.succ
           end
           slug.save!
         end

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/scoped_model_test.rb

@@ -64,6 +64,15 @@ module FriendlyId
         assert_equal "canada", @resident.slugs(true).first.scope
       end
 
+      test "updating the scope should increment sequence correctly when there's more than one
+            existing slug in scope" do
+        resident4 = Resident.create!(:name => "John Smith", :country => @canada)
+        old_friendly_id = @resident.friendly_id
+        @resident.update_attributes! :country => @canada
+        assert_equal "#{old_friendly_id}--3", @resident.friendly_id
+        assert_equal "canada", @resident.slugs(true).first.scope
+      end
+
       test "a non-slugged model should update its child model's scopes when its friendly_id changes" do
         @user.update_attributes(:name => "jack")
         assert_equal "jack", @user.to_param

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 3.3.2.0
+  version: 3.3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &70323991149600 !ruby/object:Gem::Requirement
+  requirement: &70213652491800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70323991149600
+  version_requirements: *70213652491800
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70323991234980 !ruby/object:Gem::Requirement
+  requirement: &70213652491280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,10 +37,10 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *70323991234980
+  version_requirements: *70213652491280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70323991231140 !ruby/object:Gem::Requirement
+  requirement: &70213652490560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70323991231140
+  version_requirements: *70213652490560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70323991229820 !ruby/object:Gem::Requirement
+  requirement: &70213652490100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70323991229820
+  version_requirements: *70213652490100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70323991227820 !ruby/object:Gem::Requirement
+  requirement: &70213652489640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,7 +70,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70323991227820
+  version_requirements: *70213652489640
 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"
@@ -155,15 +155,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1898456187298114319
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1898456187298114319
 requirements: []
 rubyforge_project: friendly-id
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.