0
@@ -1,15 +1,9 @@
0
-#!/opt/local/bin/ruby
0
+#!/usr/bin/env ruby
0
 
0
-%w( rubygems active_support optparse ostruct ).each {|l| require l}
0
+%w( rubygems optparse ).each &method(:require)
0
 
0
-module Enumerable
0
-  def shuffle
0
-    sort_by { rand }
0
-  end
0
-end
0
-
0
 class PassGrid
0
-  ALPHANUMERIC = ('A'..'Z').to_a + (0..9).to_a.map(&:to_s)
0
+  ALPHANUMERIC = ('A'..'Z').to_a + (0..9).to_a.map {|i| i.to_s }
0
   EXTENDED     = ALPHANUMERIC + %w( + - = _ ! / < > @ # $ % ^ & * \ ; : . , )
0
 
0
   def initialize(width, height, extended_charset = false, label = nil)
0
0
@@ -34,12 +28,12 @@
0
     def populate
0
       @height.times do
0
         @rows << []
0
-        @width.times { @rows.last << characters.shuffle.last.gsub(/\s+/, "") }
0
+        @width.times { @rows.last << characters.sort_by { rand }.last.gsub(/\s+/, "") }
0
       end
0
     end
0
     def characters=(charset)
0
       @charset = ALPHANUMERIC
0
-      return if charset.blank?
0
+      return if charset.nil? || charset.empty?
0
 
0
       @charset += case charset
0
         when String then charset.split("").uniq