baptist 1.1.0 → 1.1.1

data/README.md

@@ -43,7 +43,7 @@ Options
 
 * <code>:space</code> - Space character (default: '-')
 * <code>:separator</code> - Separator character (default: '/')
-* <code>:modifier</code> - Will add a modifier string in paranteses at the end of the generated URI
+* <code>:modifier</code> - Will add a modifier string in parentheses at the end of the generated URI
 * <code>:multiplier</code> - The object to multiply with to find a unique URI (default: 1)
 * <code>:encoding</code> - Force this encoding (default: 'UTF-8')
 

data/lib/baptist/version.rb

@@ -1,3 +1,3 @@
 module Baptist
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/baptist.rb

@@ -40,7 +40,7 @@ module Baptist
   #
   #   :space - Space character (default: '-')
   #   :separator - Separator character (default: '/')
-  #   :modifier - Will add a modifier string in paranteses at the end of the generated URI
+  #   :modifier - Will add a modifier string in parentheses at the end of the generated URI
   #   :multiplier - The object to multiply with to find a unique URI (default: 1)
   #   :encoding - Force this encoding (default: 'UTF-8')
   #
@@ -60,6 +60,7 @@ module Baptist
       (options[:modifier] ? "#{options[:space]}(#{escape(options[:modifier], options)})" : '')
 
     if block_given?
+      return uri if yield(uri)
       (1..100).each do |i|
         s = uri + options[:space] + (options[:multiplier] * i).to_s
         if yield(s)

data/test/baptist_test.rb

@@ -26,6 +26,7 @@ class BaptistTest < Test::Unit::TestCase
   end
 
   def test_unique
+    assert_equal 'John-Doe', Baptist.generate('John Doe') {|uri| true }
     assert_equal 'John-Doe-3', Baptist.generate('John Doe') {|uri| uri == 'John-Doe-3' }
     assert_equal 'John-Doe-1000', Baptist.generate('John Doe', :multiplier => 10) {|uri| uri == 'John-Doe-1000' }
     assert_equal 'John-Doe-***', Baptist.generate('John Doe', :multiplier => '*') {|uri| uri == 'John-Doe-***' }

metadata

@@ -2,7 +2,7 @@
 name: baptist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Niklas Holmgren
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: []
 
 description: Baptist creates well-formed relative URIs from a set of strings.