baptist 1.0.0 → 1.1.0

data/README.md

@@ -1,11 +1,20 @@
 Generates a well-formed and unique URI from an array of strings.
 
+Setup
+-----
+
+    $ gem install baptist
+
+Or add it to your Gemfile.
+
 Usage
 -----
 
-    Baptist.generate('Arthur Russell')                             => 'Arthur-Russell'
-    Baptist.generate('Arthur Russell', :space => '_')              => 'Arthur_Russell'
-    Baptist.generate(['Arthur Russell', 'Calling Out of Context']) => 'Arthur-Russell/Calling-Out-of-Context'
+    Baptist.generate                                               # => 'hMAkUyhyqdPkSDWHaUtptQ'
+    Baptist.generate('Arthur Russell')                             # => 'Arthur-Russell'
+    Baptist.generate('Arthur Russell', :space => '_')              # => 'Arthur_Russell'
+    Baptist.generate(['Arthur Russell', 'Calling Out of Context']) # => 'Arthur-Russell/Calling-Out-of-Context'
+    Baptist.generate(['Rihanna', 'Loud'], :modifier => 'Explicit') # => 'Rihanna/Loud-(Explicit)'
 
 Percent encoding
 ----------------
@@ -34,6 +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>: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.rb

@@ -1,4 +1,6 @@
 require "baptist/version"
+require "base64"
+require "digest/md5"
 
 # A tool for generating unique and well-formed URIs.
 module Baptist
@@ -12,9 +14,11 @@ module Baptist
   #
   # === Usage
   #
+  #   Baptist.generate                                               # => 'hMAkUyhyqdPkSDWHaUtptQ'
   #   Baptist.generate('Arthur Russell')                             # => 'Arthur-Russell'
   #   Baptist.generate('Arthur Russell', :space => '_')              # => 'Arthur_Russell'
   #   Baptist.generate(['Arthur Russell', 'Calling Out of Context']) # => 'Arthur-Russell/Calling-Out-of-Context'
+  #   Baptist.generate(['Rihanna', 'Loud'], :modifier => 'Explicit') # => 'Rihanna/Loud-(Explicit)'
   #
   # === Uniqueness
   #
@@ -36,16 +40,18 @@ 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
   #   :multiplier - The object to multiply with to find a unique URI (default: 1)
   #   :encoding - Force this encoding (default: 'UTF-8')
   #
-  def generate(names, options = {})
+  def generate(names = [], options = {})
     options = { :space => SPACE,
                 :separator => SEPARATOR,
                 :multiplier => MULTIPLIER,
                 :encoding => ENCODING }.merge(options)
 
-    names = names.is_a?(Array) ? names : [names]
+    names = (names.is_a?(Array) ? names : [names]).compact
+    names = [generate_name] if names.empty?
     names = names.map do |name|
       escape(name, options)
     end
@@ -68,6 +74,13 @@ module Baptist
 
 protected
 
+  def generate_name
+    Base64.encode64(
+      Digest::MD5.digest("#{Time.now}-#{(0...50).map{ ('a'..'z').to_a[rand(26)] }.join}")
+    ).gsub('/','x').gsub('+','y').gsub('=','').strip
+  end
+  module_function :generate_name
+
   def escape(s, options = {})
     s = encode(s, options[:encoding])
     regexp = case

data/lib/baptist/version.rb

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

data/test/baptist_test.rb

@@ -14,6 +14,7 @@ class BaptistTest < Test::Unit::TestCase
   def test_multiple_names
     assert_equal 'Arthur-Russell/Calling-Out-of-Context', Baptist.generate(['Arthur Russell', 'Calling Out of Context'])
     assert_equal 'Arthur-Russell|Calling-Out-of-Context', Baptist.generate(['Arthur Russell', 'Calling Out of Context'], :separator => '|')
+    assert_equal 'Arthur-Russell/Calling-Out-of-Context', Baptist.generate(['Arthur Russell', nil, 'Calling Out of Context'])
   end
 
   def test_strange_characters
@@ -30,4 +31,9 @@ class BaptistTest < Test::Unit::TestCase
     assert_equal 'John-Doe-***', Baptist.generate('John Doe', :multiplier => '*') {|uri| uri == 'John-Doe-***' }
   end
 
+  def test_generate_name
+    assert_equal 22, Baptist.generate.size
+    assert Baptist.generate != Baptist.generate
+  end
+
 end

metadata

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