friendly_id 4.0.6 → 4.0.7

data/Changelog.md

@@ -6,6 +6,14 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 4.0.7 (2012-06-06)
+
+* to_param just calls super when no friendly_id is present, to keep the model's
+  default behavior. (Andrew White)
+
+* FriendlyId can now properly sequence slugs that end in numbers even when a
+  single dash is used as the separator (Tomás Arribas).
+
 ## 4.0.6 (2012-05-21)
 
 * Fix nil return value from to_param when save fails because of validation errors (Tomás Arribas)

data/lib/friendly_id.rb

@@ -45,7 +45,7 @@ with numeric ids:
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.6"
+  VERSION = "4.0.7"
 
   @mutex = Mutex.new
 

data/lib/friendly_id/base.rb

@@ -268,7 +268,7 @@ often better and easier to use {FriendlyId::Slugged slugs}.
       if diff = changes[friendly_id_config.query_field]
         diff.first || diff.second
       else
-        friendly_id.present? ? friendly_id : id.to_s
+        friendly_id.presence || super
       end
     end
   end

data/lib/friendly_id/slug_generator.rb

@@ -31,8 +31,7 @@ module FriendlyId
     end
 
     def extract_sequence_from_slug(slug)
-      # Don't assume that the separator is unique in the slug.
-      slug.gsub(/^#{Regexp.quote(normalized)}(#{Regexp.quote(separator)})?/, '').to_i
+      slug.split("#{normalized}#{separator}").last.to_i
     end
 
     def column

data/lib/friendly_id/slugged.rb

@@ -261,9 +261,10 @@ issue}[https://github.com/norman/friendly_id/issues/180] for discussion.
       return true if new_record?
       slug_base = normalize_friendly_id(base)
       separator = Regexp.escape friendly_id_config.sequence_separator
-      # If the slug base (without sequence) is different from either the current
+      # If the slug base (with and without sequence) is different from either the current
       # friendly id or the slug value, then we'll generate a new friendly_id.
-      slug_base != (current_friendly_id || slug_value).try(:sub, /#{separator}[\d]*\z/, '')
+      compare = (current_friendly_id || slug_value)
+      slug_base != compare && slug_base != compare.try(:sub, /#{separator}[\d]*\z/, '')
     end
 
     # Sets the slug.

data/test/shared.rb

@@ -145,6 +145,10 @@ module FriendlyId
             assert_equal record.id.to_s, record.to_param
           end
         end
+
+        test "should return nil for to_param with a new record" do
+          assert_equal nil, model_class.new.to_param
+        end
       end
     end
   end

data/test/slugged_test.rb

@@ -159,6 +159,39 @@ class SlugSeparatorTest < MiniTest::Unit::TestCase
       assert record2.should_generate_new_friendly_id?
     end
   end
+
+  test "should correctly sequence slugs that uses single dashes as sequence separator" do
+    model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "journalists"
+      extend FriendlyId
+      friendly_id :name, :use => :slugged, :sequence_separator => '-'
+      def self.name
+        "Journalist"
+      end
+    end
+    transaction do
+      record1 = model_class.create! :name => "Peugeuot 206"
+      assert_equal "peugeuot-206", record1.slug
+      record2 = model_class.create! :name => "Peugeuot 206"
+      assert_equal "peugeuot-206-2", record2.slug
+    end
+  end
+
+  test "should detect when a sequenced slug has changed when name ends in number and using single dash" do
+    model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "journalists"
+      extend FriendlyId
+      friendly_id :name, :use => :slugged, :sequence_separator => '-'
+    end
+    transaction do
+      record1 = model_class.create! :name => "Peugeuot 206"
+      assert !record1.should_generate_new_friendly_id?
+      record1.save!
+      assert !record1.should_generate_new_friendly_id?
+      record1.name = "Peugeot 307"
+      assert record1.should_generate_new_friendly_id?
+    end
+  end
 end
 
 class DefaultScopeTest < MiniTest::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties