rakutenusa-friendly_id 2.0.6 → 2.0.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 6
+:patch: 7
 :major: 2

data/lib/friendly_id.rb

@@ -13,7 +13,8 @@ module FriendlyId
     :scope => nil,
     :strip_diacritics => false,
     :strip_non_ascii => false,
-    :use_slug => false }.freeze
+    :use_slug => false,
+    :replace_slug_on_save => true }.freeze
 
   # Valid keys for has_friendly_id options.
   VALID_FRIENDLY_ID_KEYS = [
@@ -23,7 +24,8 @@ module FriendlyId
     :scope,
     :strip_diacritics,
     :strip_non_ascii,
-    :use_slug ].freeze
+    :use_slug,
+    :replace_slug_on_save ].freeze
 
   # This error is raised when it's not possible to generate a unique slug.
   class SlugGenerationError < StandardError ; end
@@ -37,6 +39,7 @@ module FriendlyId
     #
     # Options:
     # * <tt>:use_slug</tt> - Defaults to false. Use slugs when you want to use a non-unique text field for friendly ids.
+    # * <tt>:replace_slug_on_save</tt> - 
     # * <tt>:max_length</tt> - Defaults to 255. The maximum allowed length for a slug.
     # * <tt>:strip_diacritics</tt> - Defaults to false. If true, it will remove accents, umlauts, etc. from western characters.
     # * <tt>:strip_non_ascii</tt> - Defaults to false. If true, it will all non-ascii ([^a-z0-9]) characters.

data/lib/friendly_id/sluggable_instance_methods.rb

@@ -38,7 +38,11 @@ module FriendlyId::SluggableInstanceMethods
   # Has the basis of our friendly id changed, requiring the generation of a
   # new slug?
   def new_slug_needed?
-    !slug || slug_text != slug.name
+    !slug || ((slug_text != slug.name) && replace_slug?)
+  end
+
+  def replace_slug?
+    friendly_id_options[:replace_slug_on_save]
   end
 
   # Returns the most recent slug, which is used to determine the friendly

data/test/slugged_model_test.rb

@@ -122,6 +122,11 @@ class SluggedModelTest < Test::Unit::TestCase
       end
     end
 
+    should "determine that a new slug is needed" do
+      @post.title = "Changed title"
+      assert_equal true, @post.new_slug_needed?
+    end
+
     context "and configured to strip diacritics" do
       setup do
         Post.friendly_id_options = Post.friendly_id_options.merge(:strip_diacritics => true)
@@ -260,4 +265,23 @@ class SluggedModelTest < Test::Unit::TestCase
 
   end
 
+  context "A slugged model with replace_slug_on_save option set to false" do
+
+    setup do
+      Post.friendly_id_options = FriendlyId::DEFAULT_FRIENDLY_ID_OPTIONS.merge(:column => :title, :use_slug => true, :replace_slug_on_save => false)
+      @post = Post.new :title => "Test post", :content => "Test content"
+      @post.save!
+    end
+    
+    should "decide to not replace a slug" do
+      assert_equal false, @post.replace_slug?
+    end
+    
+    should "determine that a new slug is not needed" do
+      @post.title = "Changed title"
+      assert_equal false, @post.new_slug_needed?
+    end
+    
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rakutenusa-friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors: 
 - RakutenUSA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -07:00
+date: 2009-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -80,7 +80,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: TODO
 test_files: 
 - test/custom_slug_normalizer_test.rb