username_suggester 0.2.1 → 0.2.2

data/lib/username_suggester/suggestions_for.rb

@@ -19,18 +19,20 @@ module UsernameSuggester
       # <tt>:last_name_attribute</tt>:: The attribute which stores the last name. Default is <tt>:last_name</tt>
       # <tt>:num_suggestions</tt>:: Maximum suggestions generated. Default is <tt>10</tt>
       # <tt>:validate</tt>: An Proc object which takes in an username and return true if this is an validate username
+      # <tt>:exclusion</tt>: An array of strings that should not be suggested
       #
       def suggestions_for(attribute = :username, options = {})        
         first_name_attribute = options[:first_name_attribute] || :first_name
         last_name_attribute = options[:last_name_attribute] || :last_name
         num_suggestions = options[:num_suggestions] || 10
+        exclusion = options[:exclusion] || []
         
         send :define_method, "#{attribute}_suggestions".to_sym do
           suggester = Suggester.new(send(first_name_attribute), send(last_name_attribute), options)
           name_combinations_with_regex = suggester.name_combinations.map { |s| "^#{s}[0-9]*$" }
           sql_conditions = Array.new(name_combinations_with_regex.size, "#{attribute} RLIKE ?").join(" OR ")
-          unavailable_choices = self.class.all(:select => attribute, 
-            :conditions => [sql_conditions].concat(name_combinations_with_regex)).map{ |c| c.send(attribute) }
+          unavailable_choices = exclusion.concat(self.class.all(:select => attribute, 
+            :conditions => [sql_conditions].concat(name_combinations_with_regex)).map{ |c| c.send(attribute) })
           suggester.suggest(num_suggestions, unavailable_choices)
         end
       end

data/spec/suggestions_for_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 class User < ActiveRecord::Base
   attr_accessible :first_name, :last_name, :username
-  suggestions_for :username
+  suggestions_for :username, :exclusion => ['luk']
 end
 
 describe UsernameSuggester::UsernameSuggestions do
@@ -28,4 +28,13 @@ describe UsernameSuggester::UsernameSuggestions do
     suggestions.should_not include "jerry"
     suggestions.should include "jerry11"
   end
+  
+  it "should not suggest usernames in the exclusion list" do
+    UsernameSuggester::Suggester.send(:define_method, :rand) { 1 }
+
+    suggestions = @user.username_suggestions
+    suggestions.should_not be_blank
+    suggestions.should_not include "luk"
+  end
+  
 end

data/username_suggester.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{username_suggester}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jerryluk"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: username_suggester
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - jerryluk