passphrase 0.0.2 → 0.0.3

data/bin/passphrase

@@ -4,9 +4,8 @@ require 'passphrase/generator'
 
 p = Passphrase::Generator.new(ARGV)
 p.run
-if p.odd_char
-  puts "unmixed phrase => #{p.unmixed_phrase}" 
-  puts "odd character  => #{p.odd_char}"
+if p.mix?
+  puts "unmixed phrase => #{p.unmixed_phrase}"
   puts "passphrase     => #{p.phrase}"
 else
   puts "passphrase => #{p.phrase}"

data/lib/passphrase/generator.rb

@@ -7,46 +7,74 @@ require File.join(File.dirname(__FILE__), 'random')
 module Passphrase
   class Generator
 
-    attr_reader :num_words
-    attr_reader :odd_char
+    NON_ALPHANUM_REGEX = /[~!#\$%\^&\*\(\)\-=\+\[\]\\\{\}:;"'<>\?\/]/
+    NON_ALPHANUM_ARRAY = %w( ~ ! # $ % ^ & * \( \) - = + [ ] \\ { } : ; " ' < > ? / )
+    
     attr_reader :phrase
     attr_reader :unmixed_phrase
-    attr_reader :words
 
     def initialize(argv)
       @options = Options.new(argv)
-      @num_words = @options.num_words
       @words = []
     end
 
     def run
+      num_words = @options.num_words
       word_list = WordList.create
-      list_selector = Random.new(@num_words, 0, word_list.length - 1).rand_array
-      @num_words.times do |iword|
-        word_hash = Random.new(5, 1, 6).rand_array.join.to_sym
+      list_selector = Random.new(num_words, 0, word_list.length - 1).to_array
+      num_words.times do |iword|
+        word_hash = Random.new(5, 1, 6).to_array.join.to_sym
         @words << word_list[list_selector[iword]][word_hash]
       end
-      @phrase = @unmixed_phrase = @words.join(' ')
-      mix_odd_char if @options.mix
+      @unmixed_phrase = @words.join(" ")
+      @phrase = @unmixed_phrase.clone
+      mix_phrase if mix?
+    end
+    
+    def mix?
+      @options.mix
     end
 
     private
 
-    def mix_odd_char
-      odd = 
-        %w( ~  &  +  :  ?  4 ) +
-        %w( !  *  [  ;  /  5 ) +
-        %w( # \(  ]  "  0  6 ) +
-        %w( $ \) \\  '  1  7 ) +
-        %w( %  -  {  <  2  8 ) +
-        %w( ^  =  }  >  3  9 )
-      odd_char_index = Random.new(1, 0, odd.length - 1).rand_array.shift
-      word_index = Random.new(1, 0, @num_words - 1).rand_array.shift
-      word_length = @words[word_index].length
-      char_index = Random.new(1, 0, word_length - 1).rand_array.shift unless word_length.zero?
-      char_index ||= 0
-      @words[word_index][char_index] = @odd_char = odd[odd_char_index]
-      @phrase = @words.join(' ')
+    def mix_phrase
+      mixin_capital     unless @phrase =~ /[A-Z]/
+      mixin_number      unless @phrase =~ /\d/
+      mixin_nonalphanum unless @phrase =~ NON_ALPHANUM_REGEX
+    end
+    
+    def mixin_capital
+      index, character = make_character_selection
+      @phrase[index] = character.upcase
+    end
+    
+    def mixin_number
+      index, character = make_character_selection
+      numbers = ("0".."9").to_a
+      number = numbers[one_random_number(numbers.length - 1)]
+      @phrase[index] = number
+    end
+    
+    def mixin_nonalphanum
+      index, character = make_character_selection
+      len = NON_ALPHANUM_ARRAY.length
+      non_alphanum = NON_ALPHANUM_ARRAY[one_random_number(len - 1)]
+      @phrase[index] = non_alphanum
+    end
+    
+    def make_character_selection
+      return [] unless @phrase =~ /[a-z]/
+      index = one_random_number(@phrase.length - 1)
+      character = @phrase.slice(index, 1)
+      until character =~ /[a-z]/
+        index = index.succ.modulo(@phrase.length)
+        character = @phrase.slice(index, 1)
+      end
+      [index, character]
+    end
+    
+    def one_random_number(max)
+      Random.new(1, 0, max).to_array.shift
     end
   end
 end

data/lib/passphrase/options.rb

@@ -29,14 +29,14 @@ module Passphrase
                 "Desired number of words (#{NUM_WORDS_RANGE.to_s}), default #{DEFAULT_NUM_WORDS}") do |num|
           @num_words = num
         end
-        opts.on("-x", "--[no-]mix", "Mix in odd character, default mix") do |m|
+        opts.on("-x", "--[no-]mix", "Mix in cap, num, non-alphanum, default mix") do |m|
           @mix = m
         end
-        opts.on_tail("-h", "--help", "Show this message") do
+        opts.on_tail("-h", "--help", "Show this message and exit") do
           puts opts
           exit
         end
-        opts.on_tail("-v", "--version", "Show version") do
+        opts.on_tail("-v", "--version", "Show version and exit") do
           puts "#{File.basename($PROGRAM_NAME)}, version #{Passphrase::Version::STRING}"
           exit
         end

data/lib/passphrase/random.rb

@@ -6,35 +6,35 @@ require 'securerandom'
 module Passphrase
   class Random
 
-    RANDOM_ORG = "www.random.org"
-
-    attr_reader :num
-    attr_reader :min
-    attr_reader :max
-    attr_reader :via_random_org
-    attr_reader :rand_array
-
     def initialize(num, min, max)
       @num, @min, @max = num, min, max
-      @rand_array = []
-      generate_rand_array
+      @array_of_rands = []
+      generate_array_of_rands
+    end
+    
+    def via_random_org?
+      @via_random_org
+    end
+    
+    def to_array
+      @array_of_rands
     end
 
     private
 
-    def generate_rand_array
+    def generate_array_of_rands
       query = "/integers/?col=1&base=10&format=plain&rnd=new" + 
         "&num=#{@num}&min=#{@min}&max=#{@max}"
-      site = Net::HTTP.new(RANDOM_ORG)
+      site = Net::HTTP.new("www.random.org")
       response, data = site.get(query)
       raise unless response.code == "200"
-      @rand_array = data.split.collect {|num| num.to_i}
+      @array_of_rands = data.split.collect {|num| num.to_i}
       @via_random_org = true
     rescue
       max = @max - @min + 1
       offset = @min
       @num.times do
-        @rand_array << (SecureRandom.random_number(max) + offset)
+        @array_of_rands << (SecureRandom.random_number(max) + offset)
       end
       @via_random_org = false
     end

data/lib/passphrase/version.rb

@@ -7,7 +7,7 @@ module Passphrase
     # http://docs.rubygems.org/read/chapter/7
     MAJOR = 0
     MINOR = 0
-    BUILD = 2
+    BUILD = 3
 
     STRING = [MAJOR, MINOR, BUILD].compact.join('.')
   end

metadata

@@ -2,7 +2,7 @@
 name: passphrase
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
   - Edmund Sumbar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -07:00
+date: 2011-03-12 00:00:00 -07:00
 default_executable: passphrase
 dependencies: 
   - !ruby/object:Gem::Dependency