i76-has_slug 0.1.2 → 0.1.3

data/lib/has_slug.rb

@@ -46,7 +46,8 @@ module HasSlug
         extend SluggableClassMethods
         include SluggableInstanceMethods
         
-        before_save :set_slug, :if => :new_slug_needed?
+        before_save :set_slug,
+                    :if => :new_slug_needed?
       else
         require 'has_slug/not_sluggable_class_methods'
         require 'has_slug/not_sluggable_instance_methods'

data/lib/has_slug/sluggable_class_methods.rb

@@ -7,6 +7,22 @@ module HasSlug::SluggableClassMethods
     end
   end
   
+  def slug_scope_attribute
+    return @@slug_scope_attribute if defined?(@@slug_scope_attribute)
+
+    if scope = has_slug_options[:scope]
+      if columns.any? { |c| c.name == scope }
+        @@slug_scope_attribute = scope.to_sym
+      elsif columns.any? { |c| c.name == "#{scope}_id" }
+        @@slug_scope_attribute = "#{scope}_id".to_sym
+      else
+        raise Exception, "has_slug's scope '#{scope}' does not exist in the model '#{self.class.to_s}'"
+      end
+    end
+    
+    @@slug_scope_attribute
+  end
+  
   # Find a single record that has the same slug as the given record's slug
   def find_one_with_same_slug(object)
     slug_column = has_slug_options[:slug_column]
@@ -16,11 +32,8 @@ module HasSlug::SluggableClassMethods
                                      end
 
     if scope = has_slug_options[:scope]
-      scope_attribute = "#{scope}_id" if !columns.any? { |c| c.name == scope } &&
-                                          columns.any? { |c| c.name == "#{scope}_id" }
-
-      result = send("find_by_#{slug_column}_and_#{scope_attribute}",
-                 object.slug, object.send(scope), options)
+      result = send("find_by_#{slug_column}_and_#{slug_scope_attribute}",
+                    object.slug, object.send(scope), options)
     else
       result = send("find_by_#{slug_column}", object.slug, options)
     end

data/lib/has_slug/sluggable_instance_methods.rb

@@ -22,8 +22,15 @@ module HasSlug::SluggableInstanceMethods
   end
   
   def new_slug_needed?
-    !self.send("#{self.class.has_slug_options[:slug_column]}_changed?") &&
-    (self.new_record? || self.send("#{self.class.has_slug_options[:attribute]}_changed?"))
+    slug_changed      = self.send("#{self.class.has_slug_options[:slug_column]}_changed?")
+    sluggable_changed = self.send("#{self.class.has_slug_options[:attribute]}_changed?")
+
+    scope_changed     = if self.class.has_slug_options[:scope] then self.send("#{self.class.slug_scope_attribute}_changed?")
+                                                               else false
+                                                               end
+    
+    (!slug_changed && (self.new_record? || sluggable_changed)) || scope_changed
+    
   end
   
   def to_param

data/test/unit/has_slug_test.rb

@@ -60,7 +60,7 @@ class HasSlugTest < Test::Unit::TestCase
     context 'with a slug column' do
       setup do
         @new_york      = Factory(:city, :name => 'New York')
-        @san_Francisco = Factory(:city, :name => 'San Francisco')
+        @san_francisco = Factory(:city, :name => 'San Francisco')
       end
       
       context 'and a custom slug' do
@@ -88,20 +88,29 @@ 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_Francisco)
+                                             :city => @san_francisco)
           
           assert_equal @da_marco_2.slug, @da_marco.slug
         end
+        
+        should 'not create duplicate slugs' do
+          @da_marco_2 = Factory(:restaurant, :name => 'Da Marco',
+                                             :city => @new_york)          
+          assert_not_equal @da_marco_2.slug, @da_marco.slug
+          
+          @da_marco_2.update_attributes(:city => @san_fransisco)          
+          assert_equal @da_marco_2.slug, @da_marco.slug    
+        end
       end
       
       should 'set the slug' do
         assert_equal 'new-york',      @new_york.slug
-        assert_equal 'san-francisco', @san_Francisco.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_Francisco.slug, @san_Francisco.to_param
+        assert_equal @san_francisco.slug, @san_francisco.to_param
       end
       
       should 'not create duplicate slugs' do
@@ -125,21 +134,21 @@ class HasSlugTest < Test::Unit::TestCase
       end
       
       should 'still find some by id' do
-        cities = City.find([@new_york.id, @san_Francisco.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_Francisco.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_Francisco.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.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tom-Eric Gerritsen