cw 0.3.3 → 0.4.0

data/lib/cw/reveal.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class Reveal < Tester
 
     def initialize
@@ -42,7 +41,5 @@ module CWG
         @reveal_buf += @popped[:value] + ' '
       end
     end
-
   end
-
 end

data/lib/cw/rss.rb

@@ -4,7 +4,7 @@ require 'oga'
 require 'httpclient'
 require "htmlentities"
 
-module CWG
+module CW
 
   #class Rss
 
@@ -40,8 +40,8 @@ module CWG
         unless(title.include?('VIDEO:') ||
                title.include?('In pictures:') ||
                title.include?('Morning business round-up'))
-          clean_title = CWG::RSSClean.new(title).scrub
-          clean_desc = CWG::RSSClean.new(description).scrub
+          clean_title = CW::RSSClean.new(title).scrub
+          clean_desc = CW::RSSClean.new(description).scrub
 #          @rss_articles << Sanitize.clean(coder.decode(title)) + '. ' +
           #                           Sanitize.clean(coder.decode(description))
           @rss_articles << clean_title + '. ' + clean_desc

data/lib/cw/rss_clean.rb

@@ -1,6 +1,6 @@
 require 'oga'
 
-module CWG
+module CW
   class RSSClean
     def initialize(html_fragment)
       @html_fragment = html_fragment

data/lib/cw/sentence.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class Sentence
 
     attr_accessor :index #todo
@@ -48,7 +47,7 @@ module CWG
     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)
+      unless(@index && @index.class == 1.class)
         reset_progress progress_file
       end
       check_end_of_book progress_file

data/lib/cw/speak.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Numbers provides the Number Testing functionality
 
@@ -9,7 +9,5 @@ module CWG
     def initialize(options = {})
       @options = options
     end
-
   end
-
 end

data/lib/cw/spoken.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Numbers provides the Number Testing functionality
 
@@ -9,7 +9,5 @@ module CWG
     def initialize(options = {})
       @options = options
     end
-
   end
-
 end

data/lib/cw/str.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Str
 
@@ -68,7 +68,5 @@ module CWG
       containing = Cfg.config["containing"]
       containing ? "Containing: #{stringify containing}\n" : nil
     end
-
   end
-
 end

data/lib/cw/{cw_stream.rb → stream.rb}

@@ -1,8 +1,7 @@
 # encoding: utf-8
 
-module CWG
-
-  class CwStream
+module CW
+  class Stream
 
     include Element
 
@@ -105,7 +104,5 @@ module CWG
         end
       end
     end
-
   end
-
 end

data/lib/cw/test_letters.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class TestLetters < Tester
 
     def process_input_word_maybe

data/lib/cw/test_words.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class TestWords < Tester
 
     def print_test_advice    ; print.print_advice('Test Words')    ; end
@@ -34,7 +33,5 @@ module CWG
       @popped = stream.pop_next_marked
       print.results(@popped) if(@popped && ! print_letters?)
     end
-
   end
-
 end

data/lib/cw/tester.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class Tester
 
     def quit                 ; Cfg.config.params["quit"] = true  ; end
@@ -18,7 +17,7 @@ module CWG
     def key_chr              ; key_input.char                    ; end
     def key_input            ; @key_input ||= KeyInput.new       ; end
     def is_relevant_char?    ; key_input.is_relevant_char?       ; end
-    def stream               ; @stream ||= CwStream.new          ; end
+    def stream               ; @stream ||= Stream.new            ; end
     def reset_stdin          ; key_input.reset_stdin             ; end
     def current_word         ; @current_word ||= CurrentWord.new ; end
     def init_char_timer      ; timing.init_char_timer            ; end
@@ -228,7 +227,7 @@ module CWG
     end
 
     def cw_threads
-      @cw_threads ||= CWThreads.new(self, thread_processes)
+      @cw_threads ||= Threads.new(self, thread_processes)
     end
 
 

data/lib/cw/text_helpers.rb

@@ -1,15 +1,14 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   module TextHelpers
 
     def letter_group
-      (97..122).to_a
+      (97..122).collect {|e| e.chr}
     end
 
     def number_group
-      (48..57).to_a
+      (48..57).collect {|e| e.chr}
     end
 
     def cw_chars chr
@@ -23,7 +22,5 @@ module CWG
       end
       temp
     end
-
   end
-
 end

data/lib/cw/{cw_threads.rb → threads.rb}

@@ -1,8 +1,7 @@
 # encoding: utf-8
 
-module CWG
-
-  class CWThreads
+module CW
+  class Threads
 
     attr_reader :threads
 
@@ -170,7 +169,5 @@ module CWG
       system("stty -raw echo")
       puts "\r"
     end
-
   end
-
 end

data/lib/cw/timing.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-module CWG
-
+module CW
   class Timing
 
     attr_accessor :delay_time
@@ -9,7 +8,7 @@ module CWG
 
     def initialize
       @delay_time = 0.0
-      @cw_encoding = CwEncoding.new
+      @cw_encoding = Encoding.new
     end
 
     def cw_encoding enc
@@ -82,7 +81,5 @@ module CWG
     def append_char_delay letr, wpm, ewpm
       @delay_time += char_delay(letr, wpm, ewpm)
     end
-
   end
-
 end

data/lib/cw/tone_generator.rb

@@ -2,8 +2,7 @@
 
 require 'wavefile'
 
-module CWG
-
+module CW
   class ToneGenerator
 
     MUTE = false
@@ -62,7 +61,7 @@ module CWG
     end
 
     def cw_encoding
-      @encoding ||= CwEncoding.new
+      @encoding ||= Encoding.new
     end
 
     def progress

data/lib/cw/tone_helpers.rb

@@ -1,7 +1,6 @@
 # Module ToneHelpers provides helper methods for ToneGenerator
 
-module CWG
-
+module CW
   module ToneHelpers
 
     TWO_PI = 2 * Math::PI

data/lib/cw/tx.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-module CWG
 
+module CW
   class Tx < Tester
 
     include ToneHelpers
@@ -374,7 +374,7 @@ module CWG
     end
 
     def cw_encoding
-      @encoding ||= CwEncoding.new
+      @encoding ||= Encoding.new
     end
 
     def space_or_espace
@@ -455,7 +455,7 @@ module CWG
     end
 
     def cw_threads
-      @cw_threads ||= CWThreads.new(self, thread_processes)
+      @cw_threads ||= Threads.new(self, thread_processes)
     end
 
     def tx string

data/lib/cw/voice.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Speak speaks with a voice
 
@@ -14,7 +14,5 @@ module CWG
       system("say #{words} -ospoken.wave -r#{rate} -v#{voice}")
       system("afplay spoken.wave")
     end
-
   end
-
 end

data/lib/cw/winkey.rb

@@ -1,7 +1,6 @@
 require 'rubyserial'
 
-module CWG
-
+module CW
   class Winkey
 
     def initialize

data/lib/cw/words.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module CWG
+module CW
 
   #class Words deals with words
 
@@ -139,7 +139,7 @@ module CWG
 
     def collect_words
       @words.each{ |word| ' ' + word }.
-        collect{|wrd| wrd}.join(' ')
+        collect{ |wrd| wrd }.join(' ')
     end
 
     def reverse
@@ -147,7 +147,7 @@ module CWG
     end
 
     def letters_numbers
-      letter_group.push( * number_group)
+      @words = letter_group.push( * number_group)
     end
 
     def random_letters(options = {})
@@ -171,9 +171,6 @@ module CWG
     end
 
     def numbers_spoken()
-
     end
-
   end
-
 end

data/run_script_tests.rb

@@ -27,16 +27,16 @@ class RunScriptTests
     DB.create_table :test_runs do
       primary_key :id
       DateTime :date_time
-      Fixnum :total_secs
+      Integer :total_secs
       String :result
     end
 
     DB.create_table :tests do
       primary_key :id
-      Fixnum :test_run_id, :null => false
-      Fixnum :script_id, :null => false
-      Fixnum :wpm, :null => false
-      Fixnum :ewpm, :null => false
+      Integer :test_run_id, :null => false
+      Integer :script_id, :null => false
+      Integer :wpm, :null => false
+      Integer :ewpm, :null => false
       String :duration
     end
   end

data/test/test_common_words.rb

@@ -11,7 +11,7 @@ class TestCommonWords < MiniTest::Test
   ROOT = File.expand_path File.dirname(__FILE__) + '/../'
 
   def setup
-    @words = CWG::CommonWords.new
+    @words = CW::CommonWords.new
   end
 
   def teardown

data/test/test_config.rb

@@ -19,60 +19,60 @@ class TestConfig < MiniTest::Test
   ]
 
   def setup
-    CWG::Cfg.reset
+    CW::Cfg.reset
   end
 
   def test_params_rewrite
-    CWG::Cfg::CONFIG_METHODS.each_with_index do |label,idx|
-      CWG::Cfg.config.params[label] = idx
+    CW::Cfg::CONFIG_METHODS.each_with_index do |label,idx|
+      CW::Cfg.config.params[label] = idx
     end
-    0.upto CWG::Cfg::CONFIG_METHODS.size - 1 do |idx|
-      assert_equal(idx, CWG::Cfg.config.params[CWG::Cfg::CONFIG_METHODS[idx]])
+    0.upto CW::Cfg::CONFIG_METHODS.size - 1 do |idx|
+      assert_equal(idx, CW::Cfg.config.params[CW::Cfg::CONFIG_METHODS[idx]])
     end
   end
 
   def test_wpm_default
-    assert_equal "25", CWG::Cfg.config["wpm"]
+    assert_equal "25", CW::Cfg.config["wpm"]
   end
 
   def test_success_colour_default
-    assert_equal "green", CWG::Cfg.config["success_colour"]
+    assert_equal "green", CW::Cfg.config["success_colour"]
   end
 
   def test_fail_colour_default
-    assert_equal "red", CWG::Cfg.config["fail_colour"]
+    assert_equal "red", CW::Cfg.config["fail_colour"]
   end
 
   def test_list_colour_default
-    assert_equal "default", CWG::Cfg.config["list_colour"]
+    assert_equal "default", CW::Cfg.config["list_colour"]
   end
 
   def test_ebook2cw_path_default
-    assert_equal "/usr/bin/ebook2cw", CWG::Cfg.config["ebook2cw_path"]
+    assert_equal "/usr/bin/ebook2cw", CW::Cfg.config["ebook2cw_path"]
   end
 
   def test_run_default_default
-    assert_equal "test_letters", CWG::Cfg.config["run_default"]
+    assert_equal "test_letters", CW::Cfg.config["run_default"]
   end
 
   def test_accessing_unknown_method_returns_nil
-    refute CWG::Cfg.config["unknown"]
+    refute CW::Cfg.config["unknown"]
   end
 
   def test_setting_unknown_method_returns_nil
-    CWG::Cfg.config.params["unknown"] = "something"
-    assert_equal "something", CWG::Cfg.config["unknown"]
+    CW::Cfg.config.params["unknown"] = "something"
+    assert_equal "something", CW::Cfg.config["unknown"]
   end
 
   def test_an_existing_setting_works
-    refute CWG::Cfg.config["exit"]
-    CWG::Cfg.config.params["exit"] = true
-    assert CWG::Cfg.config["exit"]
+    refute CW::Cfg.config["exit"]
+    CW::Cfg.config.params["exit"] = true
+    assert CW::Cfg.config["exit"]
   end
 
   def test_frequency
-    CWG::Cfg.config.params["frequency"] = 400
-    assert_equal 400, CWG::Cfg.config["frequency"]
+    CW::Cfg.config.params["frequency"] = 400
+    assert_equal 400, CW::Cfg.config["frequency"]
   end
 end