i76-has_slug 0.1.1 → 0.1.2

data/lib/has_slug/sluggable_instance_methods.rb

@@ -22,7 +22,8 @@ module HasSlug::SluggableInstanceMethods
   end
   
   def new_slug_needed?
-    self.new_record? || self.sluggable.to_slug != self.slug
+    !self.send("#{self.class.has_slug_options[:slug_column]}_changed?") &&
+    (self.new_record? || self.send("#{self.class.has_slug_options[:attribute]}_changed?"))
   end
   
   def to_param

data/test/unit/has_slug_test.rb

@@ -60,7 +60,24 @@ class HasSlugTest < Test::Unit::TestCase
     context 'with a slug column' do
       setup do
         @new_york      = Factory(:city, :name => 'New York')
-        @san_fransisco = Factory(:city, :name => 'San Fransisco')
+        @san_Francisco = Factory(:city, :name => 'San Francisco')
+      end
+      
+      context 'and a custom slug' do
+        setup do
+          @custom = Factory(:city, :name => 'Las Vegas', :slug => 'lv')
+        end
+        
+        should 'not update the slug unless sluggable_column changed' do
+          @custom.save
+          assert_equal 'lv', @custom.slug
+        end
+        
+        should 'update the slug if sluggable_column changed' do
+          @custom.update_attributes(:name => 'Los Angeles')
+
+          assert_equal 'los-angeles', @custom.slug
+        end
       end
       
       context 'and a scope' do
@@ -71,7 +88,7 @@ class HasSlugTest < Test::Unit::TestCase
         
         should 'create the same slug in a different scope' do
           @da_marco_2 = Factory(:restaurant, :name => 'Da Marco',
-                                             :city => @san_fransisco)
+                                             :city => @san_Francisco)
           
           assert_equal @da_marco_2.slug, @da_marco.slug
         end
@@ -79,12 +96,12 @@ class HasSlugTest < Test::Unit::TestCase
       
       should 'set the slug' do
         assert_equal 'new-york',      @new_york.slug
-        assert_equal 'san-fransisco', @san_fransisco.slug
+        assert_equal 'san-francisco', @san_Francisco.slug
       end
       
       should 'return the slug on call to #to_param' do
         assert_equal @new_york.slug,      @new_york.to_param
-        assert_equal @san_fransisco.slug, @san_fransisco.to_param
+        assert_equal @san_Francisco.slug, @san_Francisco.to_param
       end
       
       should 'not create duplicate slugs' do
@@ -108,21 +125,21 @@ class HasSlugTest < Test::Unit::TestCase
       end
       
       should 'still find some by id' do
-        cities = City.find([@new_york.id, @san_fransisco.id])
+        cities = City.find([@new_york.id, @san_Francisco.id])
         
         assert_equal 2, cities.length
         assert !cities.any?(&:found_by_slug?)
       end
       
       should 'find some by slug' do
-        cities = City.find([@new_york.slug, @san_fransisco.slug])
+        cities = City.find([@new_york.slug, @san_Francisco.slug])
         
         assert_equal 2, cities.length
         assert cities.all?(&:found_by_slug?)
       end
       
       should 'find some by id or slug' do
-        cities = City.find([@new_york.id, @san_fransisco.slug])
+        cities = City.find([@new_york.id, @san_Francisco.slug])
         
         assert_equal 2, cities.length
         assert !cities[0].found_by_slug?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: i76-has_slug
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tom-Eric Gerritsen