rsl-stringex 1.0.2 → 1.0.3

data/Rakefile

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'

data/lib/lucky_sneaks/acts_as_url.rb

@@ -30,6 +30,7 @@ module LuckySneaks
         cattr_accessor :scope_for_url
         cattr_accessor :url_attribute # The attribute on the DB
         cattr_accessor :only_when_blank
+        cattr_accessor :duplicate_count_separator
         
         if options[:sync_url]
           before_validation :ensure_unique_url
@@ -41,6 +42,7 @@ module LuckySneaks
         self.scope_for_url = options[:scope]
         self.url_attribute = options[:url_attribute] || "url"
         self.only_when_blank = options[:only_when_blank] || false
+        self.duplicate_count_separator = options[:duplicate_count_separator] || "-"
       end
 
       # Initialize the url fields for the records that need it. Designed for people who add
@@ -61,6 +63,7 @@ module LuckySneaks
   private
     def ensure_unique_url
       url_attribute = self.class.url_attribute
+      separator = self.class.duplicate_count_separator
       base_url = self.send(url_attribute)
       base_url = self.send(self.class.attribute_to_urlify).to_s.to_url if base_url.blank? || !self.only_when_blank
       conditions = ["#{url_attribute} LIKE ?", base_url+'%']
@@ -76,10 +79,10 @@ module LuckySneaks
       write_attribute url_attribute, base_url
       if url_owners.any?{|owner| owner.send(url_attribute) == base_url}
         n = 1
-        while url_owners.any?{|owner| owner.send(url_attribute) == "#{base_url}-#{n}"}
+        while url_owners.any?{|owner| owner.send(url_attribute) == "#{base_url}#{separator}#{n}"}
           n = n.succ
         end
-        write_attribute url_attribute, "#{base_url}-#{n}"
+        write_attribute url_attribute, "#{base_url}#{separator}#{n}"
       end
     end
   end

data/stringex.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stringex}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russell Norris"]
-  s.date = %q{2009-08-19}
+  s.date = %q{2009-08-20}
   s.description = %q{Some [hopefully] useful extensions to Ruby’s String class. Stringex is made up of three libraries: ActsAsUrl [permalink solution with better character translation], Unidecoder [Unicode to Ascii transliteration], and StringExtensions [miscellaneous helper methods for the String class].}
   s.email = %q{rsl@luckysneaks.com}
   s.extra_rdoc_files = [

data/test/acts_as_url_test.rb

@@ -40,6 +40,10 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :blankuments, :force => true do |t|
     t.string :title, :url, :other
   end
+
+  create_table :duplicateuments, :force => true do |t|
+    t.string :title, :url, :other
+  end
 end
 ActiveRecord::Migration.verbose = true
 
@@ -71,6 +75,10 @@ class Blankument < ActiveRecord::Base
   acts_as_url :title, :only_when_blank => true
 end
 
+class Duplicateument < ActiveRecord::Base
+  acts_as_url :title, :duplicate_count_separator => "---"
+end
+
 class ActsAsUrlTest < Test::Unit::TestCase
   def test_should_create_url
     @doc = Document.create(:title => "Let's Make a Test Title, <em>Okay</em>?")
@@ -188,4 +196,11 @@ class ActsAsUrlTest < Test::Unit::TestCase
     @doc = Procument.create!(:title => "Title String")
     assert_equal "title-string-got-massaged", @doc.url
   end
+
+  def test_should_create_unique_with_custom_duplicate_count_separator
+    @doc = Duplicateument.create!(:title => "Unique")
+    @other_doc = Duplicateument.create!(:title => "Unique")
+    assert_equal "unique", @doc.url
+    assert_equal "unique---1", @other_doc.url
+  end
 end

data/test/string_extensions_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require "test/unit"
 
 $: << File.join(File.dirname(__FILE__), '../lib')
@@ -155,4 +157,4 @@ class StringExtensionsTest < Test::Unit::TestCase
     
     assert_equal "now-with-hyphens", "----now---------with-hyphens--------".collapse("-")
   end
-end
+end

data/test/unidecoder_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require "test/unit"
 
 $: << File.join(File.dirname(__FILE__), '../lib')
@@ -87,4 +89,4 @@ class UnidecoderTest < Test::Unit::TestCase
       assert_equal output, LuckySneaks::Unidecoder.in_yaml_file(character)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsl-stringex
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Russell Norris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: []