slug 0.5.5 → 0.5.6

data/VERSION.yml

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

data/lib/slug/slug.rb

@@ -36,13 +36,22 @@ module Slug
   module InstanceMethods
   
     # Sets the slug. Called before create.
-    def set_slug
-      validate_slug_columns
-      self[self.slug_column] = self.send(self.slug_source) if self[self.slug_column].blank?
+    # By default, set_slug won't change slug if one already exists.  Pass :force => true to overwrite.
+    def set_slug(opts={})
+      validate_slug_columns      
+      return unless self[self.slug_column].blank? || opts[:force] == true
+
+      original_slug = self[self.slug_column]
+      self[self.slug_column] = self.send(self.slug_source)
 
       strip_diacritics_from_slug
       normalize_slug
-      assign_slug_sequence
+      assign_slug_sequence unless self[self.slug_column] == original_slug # don't try to increment seq if slug hasn't changed
+    end
+  
+    # Overwrite existing slug based on current contents of source column.
+    def reset_slug
+      set_slug(:force => true)
     end
   
     # Overrides to_param to return the model's slug.

data/slug.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slug}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Koski"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-06-24}
   s.description = %q{Simple, straightforward slugs for your ActiveRecord models.}
   s.email = %q{ben.koski@gmail.com}
   s.extra_rdoc_files = [

data/test/test_slug.rb

@@ -90,6 +90,33 @@ class TestSlug < Test::Unit::TestCase
     assert_equal 'slug1', a.slug
   end
 
+  context "resetting a slug" do
+  
+    setup do
+      @article = Article.create(:headline => 'test headline')
+      @original_slug = @article.slug
+    end
+    
+    should "maintain the same slug if slug column hasn't changed" do
+      @article.reset_slug
+      assert_equal @original_slug, @article.slug      
+    end
+    
+    should "change slug if slug column has updated" do
+      @article.headline = "donkey"
+      @article.reset_slug
+      assert_not_equal @original_slug, @article.slug
+    end
+    
+    should "maintain sequence" do
+      @existing_article = Article.create!(:headline => 'world cup')
+      @article.headline = "world cup"
+      @article.reset_slug
+      assert_equal 'world-cup-1', @article.slug
+    end
+  
+  end
+  
   
   context "slug normalization" do
     setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slug
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Ben Koski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency