slug 0.5.2 → 0.5.3

data/VERSION.yml

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

data/lib/slug/slug.rb

@@ -20,8 +20,9 @@ module Slug
       
       self.slug_column = opts.has_key?(:column) ? opts[:column] : :slug
       
-      validates_presence_of self.slug_column, :message => "#{self.slug_column} cannot be blank. Is #{self.slug_source} sluggable?"
-      validates_uniqueness_of self.slug_column
+      validates_presence_of     self.slug_column, :message => "#{self.slug_column} cannot be blank. Is #{self.slug_source} sluggable?"
+      validates_uniqueness_of   self.slug_column
+      validates_format_of       self.slug_column, :with => /^[a-z0-9-]+/, :message => "#{self.slug_column} contains invalid characters. Only downcase letters, numbers, and '-' are allowed."
       before_validation_on_create :set_slug 
     end
   end
@@ -54,7 +55,7 @@ module Slug
       raise ArgumentError, "Source column '#{self.slug_source}' does not exist!" if !self.respond_to?(self.slug_source)
       raise ArgumentError, "Slug column '#{self.slug_column}' does not exist!"   if !self.respond_to?("#{self.slug_column}=")
     end
-  
+    
     # Takes the slug, downcases it and replaces non-word characters with a -.
     # Feel free to override this method if you'd like different slug formatting.
     def normalize_slug
@@ -62,9 +63,10 @@ module Slug
       s = ActiveSupport::Multibyte.proxy_class.new(self[self.slug_column]).normalize(:kc)
       s.downcase!
       s.strip!
-      s.gsub!(/[\W]/u, ' ') # Remove non-word characters
-      s.gsub!(/\s+/u, '-') # Convert whitespaces to dashes
-      s.gsub!(/-\z/u, '') # Remove trailing dashes
+      s.gsub!(/[^\w\s-]/u, '') # Remove non-word characters
+      s.gsub!(/\s+/u, '-')    # Convert whitespaces to dashes
+      s.gsub!(/-\z/u, '')     # Remove trailing dashes
+      s.gsub!(/-+/, '-')      # get rid of double-dashes
       self[self.slug_column] = s.to_s
     end
   
@@ -83,7 +85,6 @@ module Slug
         a
       end
       s = s.pack('U*')
-      s.gsub!(/[^a-z0-9]+/i, ' ')
       self[self.slug_column] = s.to_s
     end
   

data/slug.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{slug}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Koski"]
-  s.date = %q{2009-12-07}
+  s.date = %q{2010-03-29}
   s.description = %q{Simple, straightforward slugs for your ActiveRecord models.}
   s.email = %q{ben.koski@gmail.com}
   s.extra_rdoc_files = [
@@ -59,4 +59,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 0"])
   end
 end
-

data/test/test_slug.rb

@@ -45,15 +45,12 @@ class TestSlug < Test::Unit::TestCase
     article = Article.create
     assert !article.valid?
     require 'ruby-debug'
-    debugger if article.errors.count > 1
-    assert_equal 1, article.errors.count
     assert article.errors.on(:slug)
   end
   
   should "set validation error if normalization makes source value empty" do
-    article = Article.create(:headline => '---')
+    article = Article.create(:headline => '$$$')
     assert !article.valid?
-    assert_equal 1, article.errors.count
     assert article.errors.on(:slug)
   end
   
@@ -63,6 +60,14 @@ class TestSlug < Test::Unit::TestCase
     assert_equal 'test-headline', article.slug
   end
 
+  should "validate slug format on save" do
+    article = Article.create!(:headline => 'Test Headline')
+    article.slug = 'A BAD $LUG.'
+
+    assert !article.valid?
+    assert article.errors[:slug].present?
+  end
+
   context "slug normalization" do
     setup do
       @article = Article.new
@@ -127,6 +132,24 @@ class TestSlug < Test::Unit::TestCase
       @article.save!
       assert_match 'a-b-c-d', @article.slug
     end
+    
+    should "not insert dashes for periods in acronyms, regardless of where they appear in string" do
+      @article.headline = "N.Y.P.D. vs. N.S.A. vs. F.B.I."
+      @article.save!
+      assert_match 'nypd-vs-nsa-vs-fbi', @article.slug
+    end
+    
+    should "not insert dashes for apostrophes" do
+      @article.headline = "Thomas Jefferson's Papers"
+      @article.save!
+      assert_match 'thomas-jeffersons-papers', @article.slug
+    end
+    
+    should "preserve numbers in slug" do
+      @article.headline = "2010 Election"
+      @article.save!
+      assert_match '2010-election', @article.slug
+    end
   end
   
   context "diacritics handling" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slug
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ben Koski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -05:00
+date: 2010-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency