pretty_slugs 0.0.4 → 0.0.5

data/Guardfile

@@ -6,6 +6,7 @@ guard 'minitest' do
   watch(%r|^test/(.*)\/?test_(.*)\.rb|)
   watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
   watch(%r|^test/test_helper\.rb|)    { "test" }
+  watch(%r|^lib/pretty_slugs.rb|)     { "test/lib/pretty_slugs/test_pretty_slugs.rb" }
 
   # with Minitest::Spec
   # watch(%r|^spec/(.*)_spec\.rb|)

data/lib/pretty_slugs.rb

@@ -54,16 +54,31 @@ module PrettySlugs
     def slug=(val)
       # the function of to_slug(val) means that if I try to store a 
       # custom slug, it will make sure it is slug-worthy, lowercase, underscored, etc...
-      @slugstorage = to_slug(val) and return if self.new_record?
+
+      if self.new_record? && val != '' && !val.nil? 
+        @slugstorage = to_slug(val) and return 
+      end
+
+      if matches_existing_slug?(to_slug(val))
+        val = nil
+      end
       check_slug_existence
       if val != nil && val != ""
         slug = val
-        Slug.find_by_sluggable_id_and_sluggable_class(self.id, self.class.to_s).update_attribute(:slug, val)
+        slug_record.update_attribute(:slug, val)
         update_menu_elements(val)
       else
         # do nothing
       end
     end
+
+    def slug_record
+      Slug.find_by_sluggable_id_and_sluggable_class(self.id, self.class.to_s)
+    end
+
+    def matches_existing_slug?(val=nil)
+      !Slug.find_by_slug_and_sluggable_class(val, self.class.to_s).nil?
+    end
     
     def check_slug_existence
       if self.slug.nil?
@@ -73,30 +88,34 @@ module PrettySlugs
     
     def generate_slug
       inc = 1
-      slug = self.to_slug
-      while !Slug.find_by_slug_and_sluggable_class(slug, self.class.to_s).nil?
-        slug += "-#{inc}"
+      s_slug = self.to_slug
+      while matches_existing_slug?(s_slug)
+        s_slug += "-#{inc}"
         inc += 1
       end
 
       obj = Slug.create({
-        slug: slug,
+        slug: s_slug,
         sluggable_id: self.id,
         sluggable_class: self.class.to_s
       })
-      
-      update_menu_elements(slug)
-      slug
+      @slugstorage = nil
+      update_menu_elements(s_slug)
+      s_slug
     end
     
     def remove_slug
-      Slug.find_by_sluggable_id_and_sluggable_class(self.id, self.class.to_s).destroy rescue true
+      slug_record.destroy rescue true
     end
     
     def update_slug
-      Slug.find_by_sluggable_id_and_sluggable_class(self.id, self.class.to_s).update_attribute(slug: self.slug)
+      begin
+        slug_record.update_attribute(slug: self.slug)
+      rescue
+        generate_slug
+      end
     end
-    
+     
     def update_menu_elements(url=nil)
       if self.respond_to?("menu_elements") && self.class.to_s == "Page"
         self.menu_elements.each{|me| me.update_attribute(:url, ("/pages/" + (url.nil? || url.empty? ? self.slug : url)))}
@@ -104,7 +123,7 @@ module PrettySlugs
     end
     
     def to_slug(val=nil)
-      return @slugstorage if @slugstorage 
+      return @slugstorage if @slugstorage
       word = self[self.respond_to?("name") ? "name" : "title"] rescue self["id"]
       word = self["id"].to_s if word.nil?
 

data/lib/pretty_slugs/version.rb

@@ -1,3 +1,3 @@
 module PrettySlugs
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/lib/pretty_slugs/test_pretty_slugs.rb

@@ -88,4 +88,27 @@ describe PrettySlugs do
     @jont.slug.must_equal "jon-1"
   end
 
+
+  it "must not create Blank Slug entries" do
+    @rocky = Page.create(:name => "Rocky and Bulwinkle", :slug => '')
+    PrettySlugs::Slug.first.slug.must_equal 'rocky_and_bulwinkle'
+  end
+
+  it "must not allow duplicate slugs even after explicitly assigning the same slug" do
+    @g = Page.create(:name => "About")
+    @h = Page.create(:name => "About Us", :slug => "about")
+    PrettySlugs::Slug.first.slug.must_equal("about")
+    PrettySlugs::Slug.last.slug.must_equal("about-1")
+  end
+
+  it "must not allow duplicate slugs even after explicitly editing and assigning the same slug" do
+    @g = Page.create(:name => "About")
+    @h = Page.create(:name => "About")
+    PrettySlugs::Slug.first.slug.must_equal("about")
+    PrettySlugs::Slug.last.slug.must_equal("about-1")
+    @h.slug = "about"
+    @h.save
+    PrettySlugs::Slug.last.slug.must_equal("about-1")
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pretty_slugs
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies: []
 description: Pretty Slugs for Rails models
 email: