cw 0.2.4 → 0.3.0

data/lib/cw/sentence.rb

@@ -1,98 +1,105 @@
 # encoding: utf-8
 
-class Sentence
-
-  attr_accessor :index #todo
-
-  def text              ; @text ||= String.new   ; end
-  def all               ; @sentences             ; end
-  def next              ; @next = true           ; end
-  def next?             ; @next                  ; end
-#todo  def forward           ; @index += 1            ; end
-  def forward           ; @index                 ; end
-  def previous?         ; @previous              ; end
-  def repeat?           ; @repeat                ; end
-  def change?           ; next? || previous?     ; end
-  def change_or_repeat? ; change? || repeat?     ; end
-  def current           ; @sentences[@index]     ; end
-  def next_sentence     ; @sentences[@index + 1] ; end
-
-  def change
-    forward if next?
-    rewind if previous?
-  end
+module CWG
+
+  class Sentence
+
+    attr_accessor :index #todo
+
+    def text              ; @text ||= String.new   ; end
+    def all               ; @sentences             ; end
+    def next              ; @next = true           ; end
+    def next?             ; @next                  ; end
+    #todo  def forward           ; @index += 1            ; end
+    def forward           ; @index                 ; end
+    def previous?         ; @previous              ; end
+    def repeat?           ; @repeat                ; end
+    def change?           ; next? || previous?     ; end
+    def change_or_repeat? ; change? || repeat?     ; end
+    def current           ; @sentences[@index]     ; end
+    def next_sentence     ; @sentences[@index + 1] ; end
+
+    def change
+      forward if next?
+      rewind if previous?
+    end
 
-  def rewind
-    @index = @index <= 1 ? 0 : @index - 1
-  end
+    def rewind
+      @index = @index <= 1 ? 0 : @index - 1
+    end
 
-  def create_progress_maybe progress_file
-    unless File.exists? progress_file
-      reset_progress progress_file
+    def create_progress_maybe progress_file
+      unless File.exists? progress_file
+        reset_progress progress_file
+      end
     end
-  end
 
-  def reset_progress progress_file
-    @index = 0
-    write_progress progress_file
-  end
+    def reset_progress progress_file
+      @index = 0
+      write_progress progress_file
+    end
 
-  def check_end_of_book progress_file
-    if @index >= @sentences.size
-      reset_progress progress_file
+    def check_end_of_book progress_file
+      if @index >= @sentences.size
+        reset_progress progress_file
+      end
     end
-  end
 
-  def read_progress progress_file
-    create_progress_maybe progress_file
-    File.open(progress_file, 'r') {|f| @index = f.readline.to_i}
-    check_end_of_book progress_file
-  end
+    def read_progress progress_file
+      create_progress_maybe progress_file
+      File.open(progress_file, 'r') {|f| @index = f.readline.to_i}
+      unless(@index && @index.class == Fixnum)
+        reset_progress progress_file
+      end
+      check_end_of_book progress_file
+    end
 
-  def write_progress progress_file
-     File.open(progress_file, 'w') {|f| f.puts @index.to_s}
-  end
+    def write_progress progress_file
+      File.open(progress_file, 'w') {|f| f.puts @index.to_s}
+    end
 
-  def read_book book
-    File.open(book, 'r') { |f| text.replace f.readlines(' ').join}
-  end
+    def read_book book
+      File.open(book, 'r') { |f| text.replace f.readlines(' ').join}
+    end
 
-  def cw_chars chr
-    chr.tr('^a-z0-9\,\=\!\/\?\.', '')
-  end
+    def cw_chars chr
+      chr.tr('^a-z0-9\,\=\!\/\?\.', '')
+    end
 
-  def exclude_non_cw_chars word
-    cw_chars(word)
-  end
+    def exclude_non_cw_chars word
+      cw_chars(word)
+    end
 
-  def find_all
-    @sentences = []
-    @text.gsub!(/\s+/, ' ').downcase!
-    loop do
-      sentence_end = @text.index('. ')
-      unless sentence_end
-        break
+    def find_all
+      @sentences = []
+      @text.gsub!(/\s+/, ' ').downcase!
+      loop do
+        sentence_end = @text.index('. ')
+        unless sentence_end
+          break
+        end
+        line = @text[0..sentence_end]
+        line = line.split.collect{|word| exclude_non_cw_chars word}.join(' ')
+        @sentences << line
+        @text.replace @text[sentence_end + 2..-1]
       end
-      line = @text[0..sentence_end]
-      line = line.split.collect{|word| exclude_non_cw_chars word}.join(' ')
-      @sentences << line
-      @text.replace @text[sentence_end + 2..-1]
     end
-  end
 
-  def check_sentence_navigation chr
-    @next     = true if(chr == ']')
-    @previous = true if(chr == '[')
-    @repeat   = true if(chr == '-')
-  end
+    def check_sentence_navigation chr
+      @next     = true if(chr == ']')
+      @previous = true if(chr == '[')
+      @repeat   = true if(chr == '-')
+    end
 
-  def reset_flags
-    @next = @previous = @repeat = nil
-  end
+    def reset_flags
+      @next = @previous = @repeat = nil
+    end
+
+    def to_array
+      array = @sentences[@index].split(' ')
+      array.collect {|x| x + ' '}
+    end
 
-  def to_array
-    array = @sentences[@index].split(' ')
-    array.collect {|x| x + ' '}
   end
 
 end

data/lib/cw/speak.rb

@@ -1,11 +1,15 @@
 # encoding: utf-8
 
-#class Numbers provides the Number Testing functionality
+module CWG
 
-class Spoken
+  #class Numbers provides the Number Testing functionality
+
+  class Spoken
+
+    def initialize(options = {})
+      @options = options
+    end
 
-  def initialize(options = {})
-    @options = options
   end
 
 end

data/lib/cw/spoken.rb

@@ -1,11 +1,15 @@
 # encoding: utf-8
 
-#class Numbers provides the Number Testing functionality
+module CWG
 
-class Spoken
+  #class Numbers provides the Number Testing functionality
+
+  class Spoken
+
+    def initialize(options = {})
+      @options = options
+    end
 
-  def initialize(options = {})
-    @options = options
   end
 
 end

data/lib/cw/str.rb

@@ -1,42 +1,74 @@
 # encoding: utf-8
 
-#class Str
+module CWG
 
-class Str
+  #class Str
 
-  include TextHelpers
+  class Str
 
-  def initialize
-    @seperator = ', '
-  end
+    include TextHelpers
 
-  def to_s
-    delim  = Params.delim_str
-    [
-      Params.name + "\n",
-      delim,
-      Params.wpm_str,
-      Params.shuffle_str,
-      Params.word_count_str,
-      Params.word_size_str,
-      beginning_str,
-      ending_str,
-      delim
-    ].collect{ |prm| prm.to_s }.join
-  end
+    def initialize
+      @seperator = ', '
+    end
 
-  def stringify ary
-    ary.join(@seperator)
-  end
+    def to_s
+      delim  = delim_str
+      [
+        ("#{Cfg.config["name"]}\n" if(Cfg.config["name"])),
+        delim,
+        wpm_str,
+        word_count_str,
+        word_size_str,
+        beginning_str,
+        ending_str,
+        including_str,
+        containing_str,
+        delim
+      ].collect{ |prm| prm.to_s }.join
+    end
 
-  def beginning_str
-    beginning = Params.begin
-    beginning ? "Beginning:  #{stringify beginning}\n" : nil
-  end
+    def stringify ary
+      ary.join(@seperator)
+    end
+
+    def word_count_str
+      "Word count: #{Cfg.config["word_count"]}\n"
+    end
+
+    def wpm_str
+      "WPM:        #{Cfg.config["wpm"]}\n"
+    end
+
+    def word_size_str
+      Cfg.config["size"] ? "Word size:  #{Cfg.config["size"]}\n" : nil
+    end
+
+    def delim_str
+      size = Cfg.config["name"] ? Cfg.config["name"].size : 8
+      "#{'=' * size}\n"
+    end
+
+    def beginning_str
+      beginning = Cfg.config["begin"]
+      beginning ? "Beginning:  #{stringify beginning}\n" : nil
+    end
+
+    def ending_str
+      ending = Cfg.config["end"]
+      ending ? "Ending:     #{stringify ending}\n" : nil
+    end
+
+    def including_str
+      including = Cfg.config["including"]
+      including ? "Including:  #{stringify including}\n" : nil
+    end
+
+    def containing_str
+      containing = Cfg.config["containing"]
+      containing ? "Containing: #{stringify containing}\n" : nil
+    end
 
-  def ending_str
-    ending = Params.end
-    ending ? "Ending:     #{stringify ending}\n" : nil
   end
 
 end

data/lib/cw/test_letters.rb

@@ -1,38 +1,30 @@
 # encoding: utf-8
 
-class TestLetters < FileDetails
+module CWG
 
-  include Tester
+  class TestLetters < Tester
 
-  def initialize
-    @print_letters = Params.print_letters
-    super()
-#    print_test_advice
-  end
-
-  def print_test_advice ; print.print_advice('Test Letters') ; end
-
-  def process_input_word_maybe
-    if @word_to_process
-      stream.match_first_active_element @process_input_word # .strip
-      @process_input_word = @word_to_process = nil
+    def process_input_word_maybe
+      if @word_to_process
+        stream.match_first_active_element @process_input_word # .strip
+        @process_input_word = @word_to_process = nil
+      end
     end
-  end
 
-  def build_word_maybe
-    @input_word ||= empty_string
-    @input_word << key_chr if is_relevant_char?
-    move_word_to_process if is_relevant_char?
-  end
+    def build_word_maybe
+      @input_word ||= ''
+      @input_word << key_chr if is_relevant_char?
+      move_word_to_process if is_relevant_char?
+    end
 
-  def process_letter letr
-    letr.downcase!
-    sleep_char_delay letr
-  end
+    def process_letter letr
+      letr.downcase!
+      sleep_char_delay letr
+    end
 
-  def print_marked_maybe
-    @popped = stream.pop_next_marked
-    print.char_result(@popped) if(@popped && ! print_letters?)
+    def print_marked_maybe
+      @popped = stream.pop_next_marked
+      print.char_result(@popped) if(@popped && ! print_letters?)
+    end
   end
-
 end

data/lib/cw/test_words.rb

@@ -1,46 +1,40 @@
 # encoding: utf-8
 
-class TestWords < FileDetails
+module CWG
 
-  include Tester
+  class TestWords < Tester
 
-  def initialize
-    @print_letters = Params.print_letters
+    def print_test_advice    ; print.print_advice('Test Words')    ; end
 
-    super()
-
-#    print_test_advice
-  end
-
-  def print_test_advice    ; print.print_advice('Test Words')    ; end
+    def print_failed_exit_words
+      until stream.stream_empty?
+        print.fail stream.pop[:value] + ' '
+      end
+    end
 
-  def print_failed_exit_words
-    until stream.stream_empty?
-      print.fail stream.pop[:value] + ' '
+    def process_input_word_maybe
+      if @word_to_process
+        stream.match_last_active_element @process_input_word.strip
+        @process_input_word = @word_to_process = nil
+      end
     end
-  end
 
-  def process_input_word_maybe
-    if @word_to_process
-      stream.match_last_active_element @process_input_word.strip
-      @process_input_word = @word_to_process = nil
+    def build_word_maybe
+      @input_word ||= ''
+      @input_word << key_chr if is_relevant_char?
+      move_word_to_process if complete_word?
     end
-  end
 
-  def build_word_maybe
-    @input_word ||= empty_string
-    @input_word << key_chr if is_relevant_char?
-    move_word_to_process if complete_word?
-  end
+    def process_letter letr
+      current_word.process_letter letr
+      sleep_char_delay letr
+    end
 
-  def process_letter letr
-    current_word.process_letter letr
-    sleep_char_delay letr
-  end
+    def print_marked_maybe
+      @popped = stream.pop_next_marked
+      print.results(@popped) if(@popped && ! print_letters?)
+    end
 
-  def print_marked_maybe
-    @popped = stream.pop_next_marked
-    print.results(@popped) if(@popped && ! print_letters?)
   end
 
 end