lib/trocla/util.rb in trocla-0.0.12 vs lib/trocla/util.rb in trocla-0.1.0

@@ -2,11 +2,10 @@
 class Trocla
   class Util
     class << self
       def random_str(length=12, charset='default')
         _charsets = charsets[charset] || charsets['default']
-        _charsets_size = _charsets_size
         (1..length).collect{|a| _charsets[SecureRandom.random_number(_charsets.size)] }.join.to_s
       end
 
       def salt(length=8)
         alphanumeric_size = alphanumeric.size
@@ -18,26 +17,33 @@
       def charsets
         @charsets ||= {
           'default'       => chars,
           'alphanumeric'  => alphanumeric,
           'shellsafe'     => shellsafe,
+          'windowssafe'   => windowssafe,
         }
       end
 
       def chars
         @chars ||= shellsafe + special_chars
       end
       def shellsafe
         @shellsafe ||= alphanumeric + shellsafe_chars
       end
+      def windowssafe
+        @windowssafe ||= alphanumeric + windowssafe_chars
+      end
       def alphanumeric
         @alphanumeric ||= ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
       end
       def special_chars
         @special_chars ||= "*()&![]{}-".split(//)
       end
       def shellsafe_chars
         @shellsafe_chars ||= "+%/@=?_.,:".split(//)
+      end
+      def windowssafe_chars
+        @windowssafe_chars ||= "+%/@=?_.,".split(//)
       end
     end
   end
 end