cw 0.2.4 → 0.3.0

data/test/test_timing.rb

@@ -0,0 +1,212 @@
+require 'simplecov'
+$VERBOSE = nil #FIXME
+SimpleCov.start
+
+require 'minitest/autorun'
+require 'minitest/pride'
+require_relative '../lib/cw'
+
+class TestTiming < MiniTest::Test
+
+  ROOT = File.expand_path File.dirname(__FILE__) + '/../'
+
+  def setup
+    @timing = CWG::Timing.new
+  end
+
+  def teardown
+    @timing = nil
+  end
+
+  def test_attr_accessor_delay_time
+    @timing.delay_time = 10
+    assert_equal 10, @timing.delay_time
+    @timing.delay_time = '10'
+    assert_equal '10', @timing.delay_time
+  end
+
+  def test_attr_accessor_start_time
+    @timing.start_time = 20
+    assert_equal 20, @timing.start_time
+    @timing.start_time = "text"
+    assert_equal "text", @timing.start_time
+  end
+
+  def test_initialize_initializes_delay_time
+    assert_equal 0.0, @timing.delay_time
+  end
+
+  def test_initialize_initializes_instance_of_CwEncoding
+    assert_equal CWG::CwEncoding, @timing.instance_variable_get(:@cw_encoding).class
+  end
+
+  def test_cw_encoding_returns_an_encoding
+    assert_equal [:dot, :dash], @timing.cw_encoding('a')
+    assert_equal [:dash,:dash,:dot,:dot], @timing.cw_encoding('z')
+  end
+
+  def test_dot_returns_correct_wpm_timing_for_a_dot
+    assert_equal 0.06, @timing.dot(20)
+  end
+
+  def test_dot_ms_returns_correct_ms_for_wpm
+    @timing.instance_variable_set(:@wpm, 20)
+    assert_equal 0.06, @timing.dot_ms
+  end
+
+  def test_init_print_words_timeout_sets_start_print_time
+    time_now = Time.now
+    @timing.init_print_words_timeout
+    start_time = @timing.instance_variable_get(:@start_print_time)
+    assert_in_delta time_now.to_i, start_time.to_i, 1
+  end
+
+  def test_init_print_words_timeout_sets_delay_print_time
+    @timing.init_print_words_timeout
+    assert_equal 2.0, @timing.instance_variable_get(:@delay_print_time)
+  end
+
+  def test_print_words_timeout
+    @timing.instance_variable_set(:@start_print_time, Time.now)
+    @timing.instance_variable_set(:@delay_print_time, 2.0)
+    assert_equal false, @timing.print_words_timeout?
+    @timing.instance_variable_set(:@start_print_time, Time.now - 3)
+    @timing.instance_variable_set(:@delay_print_time, 2.0)
+    assert_equal true, @timing.print_words_timeout?
+  end
+
+  #todo
+#  def test_play_words_timeout
+#    @timing.instance_variable_set(:@start_play_time, Time.now)
+#    @timing.instance_variable_set(:@delay_play_time, 1)
+#    assert_equal false, @timing.play_words_timeout?
+#    @timing.instance_variable_set(:@start_play_time, Time.now - 2)
+#    @timing.instance_variable_set(:@delay_play_time, 1)
+#    assert_equal true, @timing.play_words_timeout?
+#  end
+
+  def test_effective_dot_ms
+    @timing.instance_variable_set(:@effective_wpm, 20)
+    assert_equal 0.06, @timing.effective_dot_ms
+  end
+
+  def test_init_char_timer
+  end
+
+  def test_init_char_timer_sets_start_time
+    time_now = Time.now
+    @timing.init_char_timer
+    assert_in_delta time_now.to_i, @timing.start_time.to_i, 1
+  end
+
+  def test_init_char_timer_sets_delay_time
+    @timing.init_char_timer
+    assert_equal 0.0, @timing.delay_time
+  end
+
+  def test_char_delay_timeout
+    @timing.start_time = Time.now
+    @timing.delay_time = - 1.0
+    assert_equal true, @timing.char_delay_timeout?
+  end
+
+  def test_char_delay_timeout_2
+    @timing.start_time = Time.now
+    @timing.delay_time = + 1.0
+    assert_equal false, @timing.char_delay_timeout?
+  end
+
+  def test_char_timing_for_dot
+    @timing.instance_variable_set(:@wpm, 20)
+    assert_equal 0.06 + (0.06 * 3), @timing.char_timing([:dot])
+  end
+
+  def test_char_timing_for_dash
+    @timing.instance_variable_set(:@wpm, 20)
+    assert_equal 0.18 + (0.06 * 3), @timing.char_timing([:dash])
+  end
+
+  def test_char_timing_for_dash_dot
+    @timing.instance_variable_set(:@wpm, 120)
+    assert_equal 0.03 + 0.01 + (0.01 * 3) + (0.01 * 1), @timing.char_timing([:dash, :dot])
+  end
+
+  def test_code_space_timing_with_no_ewpm
+    @timing.instance_variable_set(:@wpm, 20)
+    assert_equal (0.06 * 3), @timing.code_space_timing
+  end
+
+  def test_code_space_timing_with_ewpm
+    @timing.instance_variable_set(:@wpm, 20)
+    @timing.instance_variable_set(:@effective_wpm, 10)
+    assert_equal (0.12 * 3), @timing.code_space_timing
+  end
+
+  def test_space_timing_with_no_wpm
+    @timing.instance_variable_set(:@wpm, 20)
+    assert_equal (0.06 * 4), @timing.space_timing
+  end
+
+  def test_space_timing_with_wpm
+    @timing.instance_variable_set(:@wpm, 20)
+    @timing.instance_variable_set(:@effective_wpm, 10)
+    assert_equal (0.12 * 4), @timing.space_timing
+  end
+
+  def test_char_delay_for_letter_e
+    assert_equal(0.06 + (3 * 0.06), @timing.char_delay('e', 20, nil))
+  end
+
+  def test_char_delay_for_letter_t
+    assert_equal((0.06 * 3) + (3 * 0.06), @timing.char_delay('t', 20, nil))
+  end
+
+  def test_char_delay_for_letter_i
+    assert_equal( (( 2 * 0.06)) + (4 * 0.06), @timing.char_delay('i', 20, nil))
+  end
+
+  def test_char_delay_for_letter_m
+    assert_equal( (( 2 * 0.18)) + (4 * 0.06), @timing.char_delay('m', 20, nil))
+  end
+
+  def test_char_delay_for_number_5
+    assert_equal( (( 5 * 0.06)) + (7 * 0.06), @timing.char_delay('5', 20, nil))
+  end
+
+  def test_char_delay_for_number_0
+    assert_equal( (( 5 * 0.18)) + (7 * 0.06), @timing.char_delay('0', 20, nil))
+  end
+
+  def test_char_delay_for_letter_e_with_ewpm
+    assert_equal(0.06 + (3 * 0.12), @timing.char_delay('e', 20, 10))
+  end
+
+  def test_char_delay_for_letter_t_with_ewpm
+    assert_equal((3 * 0.06) + (3 * 0.12), @timing.char_delay('t', 20, 10))
+  end
+
+  def test_char_delay_for_number_5_with_ewpm
+    assert_equal( ((5 * 0.06) + (4 * 0.06)) + (3 * 0.12), @timing.char_delay('5', 20, 10))
+  end
+
+  def test_char_delay_for_number_0_with_ewpm
+    assert_equal( ((5 * 0.18) + (4 * 0.06)) + (3 * 0.12), @timing.char_delay('0', 20, 10))
+  end
+
+  def test_append_char_delay_no_ewpm
+    assert_equal(0, @timing.delay_time)
+    @timing.append_char_delay('m', 20, nil)
+    assert_equal( (( 2 * 0.18)) + (4 * 0.06), @timing.delay_time)
+  end
+
+  def test_append_char_delay_for_i_with_ewpm
+    @timing.append_char_delay('i', 20, 10)
+    assert_equal(( 2 * 0.06) + (1 * 0.06) + (3 * 0.12), @timing.delay_time)
+  end
+
+  def test_append_char_delay_for_m_with_ewpm
+    @timing.append_char_delay('m', 20, 10)
+    assert_equal((2 * 0.18) + (1 * 0.06) + (3 * 0.12), @timing.delay_time)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cw
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Martyn Jago
@@ -84,16 +84,16 @@ dependencies:
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: wavefile
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: parseconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: version
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ruby library to help learn and practice morse code
 email:
 - martyn.jago@btinternet.com
@@ -159,24 +229,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".cw_config"
 - ".gitignore"
 - ".travis.yml"
-- ".yardoc/checksums"
-- ".yardoc/object_types"
-- ".yardoc/objects/root.dat"
 - ".yardoc/proxy_types"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
+- Vagrantfile
 - audio/.gitkeep
 - bin/cw
 - cw.gemspec
 - data/text/abbreviations.txt
 - data/text/book.txt
+- data/text/book_to_read.txt
 - data/text/common_words.txt
 - data/text/cw_conversation.txt
+- data/text/english.txt
 - data/text/most_common_words.txt
 - data/text/q_codes.txt
 - example.rb
@@ -186,7 +257,8 @@ files:
 - lib/cw/book.rb
 - lib/cw/book_details.rb
 - lib/cw/cl.rb
-- lib/cw/config_file.rb
+- lib/cw/common_words.rb
+- lib/cw/config.rb
 - lib/cw/current_word.rb
 - lib/cw/cw_dsl.rb
 - lib/cw/cw_encoding.rb
@@ -195,9 +267,9 @@ files:
 - lib/cw/element.rb
 - lib/cw/file_details.rb
 - lib/cw/key_input.rb
-- lib/cw/monitor_keys.rb
 - lib/cw/numbers.rb
-- lib/cw/params.rb
+- lib/cw/os.rb
+- lib/cw/play.rb
 - lib/cw/print.rb
 - lib/cw/process.rb
 - lib/cw/progress.rb
@@ -218,9 +290,19 @@ files:
 - lib/cw/tone_helpers.rb
 - lib/cw/voice.rb
 - lib/cw/words.rb
+- run_script_tests.rb
+- test/my_words.txt
+- test/test_common_words.rb
+- test/test_config.rb
+- test/test_current_word.rb
 - test/test_cw.rb
+- test/test_cw_threads.rb
+- test/test_filtering.rb
+- test/test_params.rb
+- test/test_play.rb
 - test/test_stream.rb
 - test/test_tester.rb
+- test/test_timing.rb
 homepage: http://martynjago.co.uk/CW/
 licenses:
 - MIT
@@ -244,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: CW tutor / exerciser

data/lib/cw/config_file.rb

@@ -1,69 +0,0 @@
-class ConfigFile
-
-  CONFIG  = ".cw_config"
-  HERE    = File.dirname(__FILE__) + '/'
-  CONFIGS = ['wpm', 'book_name', 'book_dir',
-            'play_command', 'success_colour', 'fail_colour',
-            'list_colour', 'ebook2cw_path']
-
-  attr_reader :config
-
-  def config
-    @config ||= Hash.new
-  end
-
-  def readlines f
-    f.readlines
-  end
-
-  def write_config(cfg, line)
-    config[cfg.to_sym] = line.gsub(cfg + ':', '').strip
-  end
-
-  def match_config?(line, cfg)
-    if line
-      tmp = line.strip()[0, cfg.length]
-      return true if(tmp == cfg)
-    end
-    false
-  end
-
-  def extract_config line
-    CONFIGS.each do |cfg|
-      if match_config?(line, cfg + ':')
-        write_config(cfg, line)
-        return
-      end
-    end
-  end
-
-  def read_config
-    File.open(CONFIG,'r') do |f|
-      lines = readlines(f)
-      lines.each do |line|
-        extract_config line
-      end
-    end
-  end
-
-  def read_config_maybe
-    if File.exist?(CONFIG)
-      puts 'Loading config.'
-      read_config
-      config
-    end
-  end
-
-  def apply_config(sf)
-    cfg = read_config_maybe
-    if cfg
-      cfg.each_pair do |method, arg|
-        begin
-          sf.send("#{method}", arg)
-        rescue
-        end
-        Params.send("#{method}=", arg)
-      end
-    end
-  end
-end