cw 0.2.0 → 0.2.2

data/lib/cw/rss.rb

@@ -4,11 +4,13 @@
 
 class Rss
 
+  include TextHelpers
+
   def sources
     {
-      bbc:        'http://feeds.bbci.co.uk/news/rss.xml',
-      reuters:    'http://feeds.reuters.com/Reuters/worldNews?format=xml',
-      guardian:   'http://www.theguardian.com/world/rss',
+      bbc:       'http://feeds.bbci.co.uk/news/rss.xml',
+      reuters:   'http://feeds.reuters.com/Reuters/worldNews?format=xml',
+      guardian:  'http://www.theguardian.com/world/rss',
       quotation: 'http://feeds.feedburner.com/quotationspage/qotd'
     }
   end
@@ -49,18 +51,6 @@ class Rss
     @article_index || @article_index = 0
   end
 
-  def cw_chars chr
-    chr.tr('^a-z0-9\.\,+', '')
-  end
-
-  def exclude_non_cw_chars word
-    temp = ''
-    word.split.each do |chr|
-      temp += chr if letter(chr)
-    end
-    temp
-  end
-
   def next_article
     temp = @rss_articles[article_index]
     return unless temp

data/lib/cw/str.rb

@@ -4,19 +4,21 @@
 
 class Str
 
+  include TextHelpers
+
   def initialize
     @seperator = ', '
   end
 
   def to_s
-    delim  = delim_std_str
+    delim  = Params.delim_str
     [
-      "#{Params.name}\n",
-      "#{delim}",
-      "#{wpm_str}",
-      shuffle_str,
-      word_count_str,
-      word_size_str,
+      Params.name + "\n",
+      delim,
+      Params.wpm_str,
+      Params.shuffle_str,
+      Params.word_count_str,
+      Params.word_size_str,
       beginning_str,
       ending_str,
       delim
@@ -27,30 +29,6 @@ class Str
     ary.join(@seperator)
   end
 
-  def delim_str size
-    "#{'=' * size}\n"
-  end
-
-  def delim_std_str
-    tempsize = Params.name.size
-    delim_str tempsize
-  end
-
-  def shuffle_str
-    shuffle =  Params.shuffle
-    shuffle ? "Shuffle:    #{shuffle ? 'yes' : 'no'}\n" : nil
-  end
-
-  def word_count_str
-    wc = Params.word_count
-    wc ? "Word count: #{wc}\n" : nil
-  end
-
-  def word_size_str
-    size = Params.size
-    size ? "Word size:  #{size}\n" : nil
-  end
-
   def beginning_str
     beginning = Params.begin
     beginning ? "Beginning:  #{stringify beginning}\n" : nil
@@ -61,8 +39,4 @@ class Str
     ending ? "Ending:     #{stringify ending}\n" : nil
   end
 
-  def wpm_str
-    "WPM:        #{Params.wpm}\n"
-  end
-
 end

data/lib/cw/tester.rb

@@ -51,22 +51,47 @@ module Tester
     end
   end
 
-  def print_words words
-#    puts "self.class = #{self.class}"
-    timing.init_char_timer
-    (words.to_s + space).each_char do |letr|
-      process_letter letr
-      stream.add_char(letr) if(self.class == TestLetters)
-      loop do
+  def do_events
+    sleep 0.005
+  end
+
+  def process_letters letr
+    loop do
+      do_events
+      if self.class == Book
+        process_space_maybe(letr) unless @book_details.args[:output] == :letter
+        process_word_maybe
+        break if change_repeat_or_quit?
+        break if timing.char_delay_timeout?
+      else
         process_space_maybe(letr) if(self.class == TestWords)
         process_word_maybe
         break if timing.char_delay_timeout?
       end
+    end
+  end
+
+  def process_words words
+    book_class = (self.class == Book)
+    (words.to_s + space).each_char do |letr|
+      process_letter letr
+      if book_class
+        stream.add_char(letr) if @book_details.args[:output] == :letter
+      else
+      stream.add_char(letr) if(self.class == TestLetters)
+      end
+      process_letters letr
       print.prn letr if print_letters?
-      break if quit?
+      break if(book_class && change_repeat_or_quit?)
+      break if ((! book_class) && quit?)
     end
   end
 
+  def print_words words
+    timing.init_char_timer
+    process_words words
+  end
+
   def process_word_maybe
     print_marked_maybe
     process_input_word_maybe

data/lib/cw/text_helpers.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+module TextHelpers
+
+  def letter_group
+    (97..122).to_a
+  end
+
+  def number_group
+    (48..57).to_a
+  end
+
+  def cw_chars chr
+    chr.tr('^a-z0-9\.\,+', '')
+  end
+
+  def exclude_non_cw_chars word
+    temp = ''
+    word.split.each do |chr|
+      temp += chr if letter(chr)
+    end
+    temp
+  end
+
+end

data/lib/cw/tone_generator.rb

@@ -4,12 +4,7 @@ require 'wavefile'
 
 class ToneGenerator
 
-  HERE             = File.dirname(__FILE__) + '/../../'
-  DOT_FILENAME     = HERE + "audio/dot.wav"
-  DASH_FILENAME    = HERE + "audio/dash.wav"
-  SPACE_FILENAME   = HERE + "audio/space.wav"
-  E_SPACE_FILENAME = HERE + "audio/e_space.wav"
-  TWO_PI           = 2 * Math::PI
+  include ToneHelpers
 
   def initialize
     @max_amplitude = 0.5
@@ -24,10 +19,6 @@ class ToneGenerator
     @encoding ||= CwEncoding.new
   end
 
-  def convert_words wrds
-    wrds.to_array.collect{ |wrd| wrd.delete("\n")}
-  end
-
   def progress
     @progress ||= Progress.new('Compiling')
   end
@@ -40,10 +31,6 @@ class ToneGenerator
     write_word_parts
   end
 
-  def play_filename
-    HERE + "audio/#{Params.audio_filename}"
-  end
-
   def play
     cmd = play_command + ' ' + play_filename
     @pid = ! @dry_run ? Process.spawn(cmd) : cmd
@@ -63,10 +50,6 @@ class ToneGenerator
                    :spb => (@sample_rate * 1.2 / @effective_wpm).to_i }}
   end
 
-  def generate_space number_of_samples
-    [].fill(0.0, 0, number_of_samples)
-  end
-
   def filter_maybe(size, count)
     ramp = 0.05
     ramp_point =  @max_amplitude / ramp
@@ -110,10 +93,6 @@ class ToneGenerator
     end
   end
 
-  def space_sample? ele
-    ele == :space || ele == :e_space
-  end
-
   def generate_samples ele
     return generate_space(data[ele][:spb]) if space_sample? ele
     generate_tone(data[ele][:spb])  unless    space_sample? ele
@@ -132,10 +111,6 @@ class ToneGenerator
     (@effective_wpm == @wpm) ? space : e_space
   end
 
-  def last_element? idx, chr
-    idx == chr.size - 1
-  end
-
   def push_enc chr
     arry = []
     chr.each_with_index do |c,idx|

data/lib/cw/tone_helpers.rb

@@ -0,0 +1,33 @@
+# Module ToneHelpers provides helper methods for ToneGenerator
+
+module ToneHelpers
+
+  TWO_PI           = 2 * Math::PI
+  HERE             = File.dirname(__FILE__) + '/../../'
+  DOT_FILENAME     = HERE + "audio/dot.wav"
+  DASH_FILENAME    = HERE + "audio/dash.wav"
+  SPACE_FILENAME   = HERE + "audio/space.wav"
+  E_SPACE_FILENAME = HERE + "audio/e_space.wav"
+
+# :reek: exclude from UtilityFunction
+  def play_filename
+    HERE + "audio/#{Params.audio_filename}"
+  end
+
+  def convert_words wrds
+    wrds.to_array.collect{ |wrd| wrd.delete("\n")}
+  end
+
+  def generate_space number_of_samples
+    [].fill(0.0, 0, number_of_samples)
+  end
+
+  def space_sample? ele
+    ele == :space || ele == :e_space
+  end
+
+  def last_element? idx, chr
+    idx == chr.size - 1
+  end
+
+end

data/lib/cw/words.rb

@@ -1,55 +1,11 @@
 # encoding: utf-8
 
-class CurrentWord
-
-  def initialize
-    @current_word = ''
-  end
-
-  def current_word
-    @current_word ||= String.new
-  end
-
-  def push_letter letr
-    @current_word += letr
-  end
-
-  def to_s
-    @current_word
-  end
-
-  def clear
-    @current_word.clear
-    @current_word = ''
-  end
-
-  def strip
-    @current_word.strip!
-  end
-
-  def process_letter letr
-    letr.downcase!
-    push_letter letr
-  end
-
-  def cw_chars chr
-    chr.tr('^a-z0-9\.\,+', '')
-  end
-
-  def exclude_non_cw_chars word
-    temp = ''
-    word.split.each do |chr|
-      temp += chr if letter(chr)
-    end
-    temp
-  end
-
-end
-
 #class Words deals with words
 
 class Words
 
+  include TextHelpers
+
   def load(filename)
     File.open(filename, 'r') do |file|
       @words = file.read.split
@@ -144,14 +100,6 @@ class Words
     @words.reverse!
   end
 
-  def letter_group
-    (97..122).to_a
-  end
-
-  def number_group
-    (48..57).to_a
-  end
-
   def letters_numbers
     letter_group.push( * number_group)
   end

data/test/test_cw.rb

@@ -1,4 +1,5 @@
 require 'simplecov'
+$VERBOSE = nil #FIXME
 SimpleCov.start
 
 require 'minitest/autorun'
@@ -10,10 +11,8 @@ class TestCW < MiniTest::Test
   ROOT = File.expand_path File.dirname(__FILE__) + '/../'
 
   def setup
-    @cw = CW.new do
-      words = 'one two three'
-      pause
-    end
+    @cw = CW.new
+    @cw.pause
   end
 
   def teardown
@@ -287,7 +286,9 @@ Ending:     x
 
   def test_random_letters_returns_random_letters
     @cw.random_letters
-    @cw.words.each { |w| assert_match /^(?=.*\D)[-\w]+$/, w }
+    @cw.words.each { |w|
+      assert_match(/^(?=.*\D)[-\w]+$/, w)
+    }
   end
 
   def test_random_numbers_can_take_size_and_count_option
@@ -298,24 +299,30 @@ Ending:     x
 
   def test_random_numbers_returns_random_numbers
     @cw.random_numbers
-    @cw.words.each { |w| assert_match /\A[-+]?\d+\z/ , w }
+    @cw.words.each { |w|
+      assert_match(/\A[-+]?\d+\z/ , w)
+    }
   end
 
   def test_random_letters_numbers_can_take_size_and_count_option
     @cw.random_letters_numbers(count: 3, size: 4)
     assert_equal 3, @cw.words.size
-    @cw.words.each { |w| assert_equal 4, w.length}
+    @cw.words.each { |w|
+      assert_equal 4, w.length
+    }
   end
 
   def test_random_letters_numbers_includes_letter
     @cw.random_letters_numbers
-    @cw.words.each { |w| assert_match /[a-zA-Z]+/, w}
+    @cw.words.each { |w|
+      assert_match( /[a-zA-Z]+/, w)
+    }
   end
 
   def test_random_letters_numbers_includes_number
     @cw.random_letters_numbers
     @cw.words.each do |w|
-      assert_match /[0-9]+/, w
+      assert_match(/[0-9]+/, w)
     end
   end
 
@@ -341,7 +348,7 @@ Ending:     x
     assert_equal 'tsal neht tsrif', @cw.words
   end
 
-  #todo
+  #FIXME
   #      def test_convert_generates_correct_command_for_default
   #        @cw.dry_run = true
   #        @cw.words = "some words"
@@ -388,7 +395,7 @@ Ending:     x
     assert @cw.method(:words_no_shorter_than), @cw.method(:no_shorter_than)
     assert @cw.method(:random_alphanumeric),   @cw.method(:random_letters_numbers)
     assert @cw.method(:comment),               @cw.method(:name)
-    assert @cw.method(:no_run),                @cw.method(:pause) 
+    assert @cw.method(:no_run),                @cw.method(:pause)
   end
 
   def test_set_wpm_param

data/test/test_stream.rb

@@ -3,7 +3,8 @@ SimpleCov.start
 
 require 'minitest/autorun'
 require 'minitest/pride'
-require_relative '../lib/cw/stream'
+require_relative '../lib/cw/element'
+require_relative '../lib/cw/cw_stream'
 
 #  class TestStreamMatching < MiniTest::Test
 #    def setup
@@ -145,35 +146,39 @@ class TestCwStream < MiniTest::Test
     @stream = CwStream.new
   end
 
+  def teardown
+    @stream = nil
+  end
+
   def test_assert
     assert true
   end
 
-  def test_add_adds_to_the_stream
-    @stream.add 'a'
+  def test_add_word_adds_to_the_stream
+    @stream.add_word 'a'
     assert_equal({0 => 'a'}, @stream.stream)
-    @stream.add 'tree'
+    @stream.add_word 'tree'
     assert_equal({0 => 'a', 1 => 'tree'}, @stream.stream)
   end
 
   def test_count
-    @stream.add 'a'
+    @stream.add_word 'a'
     assert_equal 1, @stream.count
-    @stream.add 'tree'
+    @stream.add_word 'tree'
     assert_equal 2, @stream.count
     assert_equal({0 => 'a', 1 => 'tree'}, @stream.stream)
   end
 
   def test_stream_element_can_be_marked_a_success
-    @stream.add 'a'
+    @stream.add_word 'a'
     @stream.mark_success(0)
     assert_equal({0 => true}, @stream.instance_variable_get(:@success))
   end
 
   def test_stream_element_can_be_marked_a_fail
-    @stream.add 'a'
+    @stream.add_word 'a'
     @stream.mark_success(0)
-    @stream.add 'b'
+    @stream.add_word 'b'
     @stream.mark_fail(1)
     assert_equal({0 => true, 1 => false}, @stream.instance_variable_get(:@success))
   end
@@ -184,24 +189,24 @@ class TestCwStream < MiniTest::Test
   end
 
   def test_mark_inactive_region_fail_fails_unmarked_inactive_elements
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.active_region = 2
     @stream.fail_unmarked_inactive_elements
     assert_equal({0 => false, 1 => false, 2 => nil, 3 => nil}, @stream.instance_variable_get(:@success))
   end
 
   def test_mark_inactive_region_fail_doesnt_fail_successes
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.instance_variable_set(:@success, {0 => true, 1 => false})
     @stream.active_region = 2
     @stream.fail_unmarked_inactive_elements
-  assert_equal({0 => true, 1 => false}, @stream.instance_variable_get(:@success))
+    assert_equal({0 => true, 1 => false}, @stream.instance_variable_get(:@success))
   end
 
   def test_mark_inactive_region_fail_doesnt_fail_when_no_stream
@@ -210,147 +215,148 @@ class TestCwStream < MiniTest::Test
   end
 
   def test_first_returns_first_element_in_stream
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     assert_equal 'a', @stream.first
   end
 
   def test_pop_returns_first_element_in_stream_and_removes_element
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
-    assert_equal({'a' => false}, @stream.pop)
-    assert_equal({1 => 'b', 2 => 'c', 3 => 'd'}, @stream.stream)
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
+    assert_equal({:value => 'a', :success => false}, @stream.pop)
+    refute(@stream.pop[:success])
+    assert_equal({2 => 'c', 3 => 'd'}, @stream.stream)
 
     @stream.empty
-    @stream.add 'a'
-    assert_equal({'a' => false}, @stream.pop)
-    @stream.add 'b'
-    assert_equal({'b' => false}, @stream.pop)
-    @stream.add 'c'
-    assert_equal({'c' => false}, @stream.pop)
-    @stream.add 'd'
-    assert_equal({'d' => false}, @stream.pop)
+    @stream.add_word 'a'
+    refute(@stream.pop[:success])
+    @stream.add_word 'b'
+    refute(@stream.pop[:success])
+    @stream.add_word 'c'
+    refute(@stream.pop[:success])
+    @stream.add_word 'd'
+    refute(@stream.pop[:success])
     assert_nil @stream.pop
     assert_equal({}, @stream.stream)
   end
 
   def test_match_last_active_element_marks_correct_element
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.match_last_active_element('c')
     assert_equal({0 => false, 1 => false, 2 => true, 3 => nil}, @stream.instance_variable_get(:@success))
-    end
+  end
 
   def test_match_last_active_element_doesnt_unmark_correct_element
     @stream.active_region = 2
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.match_last_active_element('c')
     @stream.match_last_active_element('d')
-    assert_equal({0 => nil, 1 => nil, 2 => true, 3 => true}, @stream.instance_variable_get(:@success))
-    end
+    assert_equal({0 => nil, 1 => false, 2 => true, 3 => true}, @stream.instance_variable_get(:@success))
+  end
 
   def test_match_last_active_element_doesnt_unmark_failed_element
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.match_last_active_element('d')
     @stream.match_last_active_element('c')
-    assert_equal({0 => false, 1 => false, 2 => false, 3 => true}, @stream.instance_variable_get(:@success))
+    assert_equal({0 => false, 1 => false, 2 => true, 3 => true}, @stream.instance_variable_get(:@success))
   end
 
-#    def test_pop_marked_returns_nil_for_empty_stream
-#      assert_equal(nil, @stream.pop_marked)
-#      assert_equal(nil, @stream.pop_marked)
-#    end
-#
-#    def test_pop_marked_returns_up_to_marked_first_element
-#      @stream.add 'a'
-#      @stream.add 'b'
-#      @stream.add 'c'
-#      @stream.add 'd'
-#      @stream.match_last_active_element('a')
-#      assert_equal({0 => {'a' => true}}, @stream.pop_marked)
-#      assert_equal(nil, @stream.pop_marked)
-#    end
-#
-#    def test_pop_marked_returns_up_to_marked_second_element
-#      @stream.add 'a'
-#      @stream.add 'b'
-#      @stream.add 'c'
-#      @stream.add 'd'
-#      @stream.match_last_active_element('b')
-#      assert_equal({0 => {'a' => false}, 1 => {'b' => true}}, @stream.pop_marked)
-#      assert_equal(nil, @stream.pop_marked)
-#    end
-#
-#    def test_pop_marked_returns_up_to_marked_first_and_third_element
-#      @stream.add 'a'
-#      @stream.add 'b'
-#      @stream.add 'c'
-#      @stream.add 'd'
-#      @stream.match_last_active_element('a')
-#      @stream.match_last_active_element('c')
-#      assert_equal({0 => {'a' => true}, 1 => {'b' => false}, 2 => {'c' => true}}, @stream.pop_marked)
-#      assert_equal(nil, @stream.pop_marked)
-#      @stream.match_last_active_element('d')
-#      assert_equal({3 => {'d' => true}}, @stream.pop_marked)
-#    end
-#
-#    def test_pop_marked_returns_inactive_unmarked_elements
-#      @stream.add 'a'
-#      @stream.add 'b'
-#      @stream.add 'c'
-#      @stream.add 'd'
-#      @stream.active_region = 2
-#      assert_equal({0 => {'a' => false}, 1 => {'b' => false}}, @stream.pop_marked)
-#      assert_equal(nil, @stream.pop_marked)
-#      @stream.match_last_active_element('d')
-#      assert_equal({2 => {'c' => false}, 3 => {'d' => true}}, @stream.pop_marked)
-#    end
-#
-#    def test_pop_marked_returns_mix_of_active_and_inactive
-#      @stream.active_region = 2
-#      @stream.add 'a'
-#      @stream.add 'b'
-#      @stream.add 'c'
-#      @stream.add 'd'
-#      @stream.match_last_active_element('d')
-#      assert_equal({0 => {'a' => false}, 1 => {'b' => false}, 2 => {'c' => false}, 3 => {'d' => true}}, @stream.pop_marked)
-#      assert_equal(nil, @stream.pop_marked)
-#    end
+  #    def test_pop_marked_returns_nil_for_empty_stream
+  #      assert_equal(nil, @stream.pop_marked)
+  #      assert_equal(nil, @stream.pop_marked)
+  #    end
+  #
+  #    def test_pop_marked_returns_up_to_marked_first_element
+  #      @stream.add_word 'a'
+  #      @stream.add_word 'b'
+  #      @stream.add_word 'c'
+  #      @stream.add_word 'd'
+  #      @stream.match_last_active_element('a')
+  #      assert_equal({0 => {'a' => true}}, @stream.pop_marked)
+  #      assert_equal(nil, @stream.pop_marked)
+  #    end
+  #
+  #    def test_pop_marked_returns_up_to_marked_second_element
+  #      @stream.add_word 'a'
+  #      @stream.add_word 'b'
+  #      @stream.add_word 'c'
+  #      @stream.add_word 'd'
+  #      @stream.match_last_active_element('b')
+  #      assert_equal({0 => {'a' => false}, 1 => {'b' => true}}, @stream.pop_marked)
+  #      assert_equal(nil, @stream.pop_marked)
+  #    end
+  #
+  #    def test_pop_marked_returns_up_to_marked_first_and_third_element
+  #      @stream.add_word 'a'
+  #      @stream.add_word 'b'
+  #      @stream.add_word 'c'
+  #      @stream.add_word 'd'
+  #      @stream.match_last_active_element('a')
+  #      @stream.match_last_active_element('c')
+  #      assert_equal({0 => {'a' => true}, 1 => {'b' => false}, 2 => {'c' => true}}, @stream.pop_marked)
+  #      assert_equal(nil, @stream.pop_marked)
+  #      @stream.match_last_active_element('d')
+  #      assert_equal({3 => {'d' => true}}, @stream.pop_marked)
+  #    end
+  #
+  #    def test_pop_marked_returns_inactive_unmarked_elements
+  #      @stream.add_word 'a'
+  #      @stream.add_word 'b'
+  #      @stream.add_word 'c'
+  #      @stream.add_word 'd'
+  #      @stream.active_region = 2
+  #      assert_equal({0 => {'a' => false}, 1 => {'b' => false}}, @stream.pop_marked)
+  #      assert_equal(nil, @stream.pop_marked)
+  #      @stream.match_last_active_element('d')
+  #      assert_equal({2 => {'c' => false}, 3 => {'d' => true}}, @stream.pop_marked)
+  #    end
+  #
+  #    def test_pop_marked_returns_mix_of_active_and_inactive
+  #      @stream.active_region = 2
+  #      @stream.add_word 'a'
+  #      @stream.add_word 'b'
+  #      @stream.add_word 'c'
+  #      @stream.add_word 'd'
+  #      @stream.match_last_active_element('d')
+  #      assert_equal({0 => {'a' => false}, 1 => {'b' => false}, 2 => {'c' => false}, 3 => {'d' => true}}, @stream.pop_marked)
+  #      assert_equal(nil, @stream.pop_marked)
+  #    end
 
   def test_pop_next_marked_returns_correct_elements_where_last_only_matched
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.match_last_active_element('d')
-    assert_equal({'a' => false}, @stream.pop_next_marked)
-    assert_equal({'b' => false}, @stream.pop_next_marked)
-    assert_equal({'c' => false}, @stream.pop_next_marked)
-    assert_equal({'d' => true}, @stream.pop_next_marked)
+    refute(@stream.pop_next_marked[:success])
+    refute(@stream.pop_next_marked[:success])
+    refute(@stream.pop_next_marked[:success])
+    assert(@stream.pop_next_marked[:success])
     assert_equal(nil, @stream.pop_next_marked)
   end
 
   def test_pop_next_marked_returns_correct_elements_where_penultimate_element_matched
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.match_last_active_element('c')
-    assert_equal({'a' => false}, @stream.pop_next_marked)
-    assert_equal({'b' => false}, @stream.pop_next_marked)
-    assert_equal({'c' => true}, @stream.pop_next_marked)
+    assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'c', :success => true}, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
   end
@@ -358,43 +364,43 @@ class TestCwStream < MiniTest::Test
   def test_pop_next_marked_considers_active_region
 
     @stream.active_region = 2
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
-    assert_equal({'a' => false}, @stream.pop_next_marked)
-    assert_equal({'b' => false}, @stream.pop_next_marked)
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
+    assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
 
     @stream.empty
     @stream.active_region = 1
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
-    assert_equal({'a' => false}, @stream.pop_next_marked)
-    assert_equal({'b' => false}, @stream.pop_next_marked)
-    assert_equal({'c' => false}, @stream.pop_next_marked)
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
+    assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'c', :success => false}, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
 
 
     @stream.empty
     @stream.active_region = 2
-    @stream.add 'a'
-    @stream.add 'b'
-    @stream.add 'c'
-    @stream.add 'd'
+    @stream.add_word 'a'
+    @stream.add_word 'b'
+    @stream.add_word 'c'
+    @stream.add_word 'd'
     @stream.match_last_active_element('c')
-    assert_equal({'a' => false}, @stream.pop_next_marked)
-    assert_equal({'b' => false}, @stream.pop_next_marked)
-    assert_equal({'c' => true}, @stream.pop_next_marked)
+    assert_equal({:value => 'a', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'b', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'c', :success => true}, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
-    @stream.add 'e'
-    @stream.add 'f'
+    @stream.add_word 'e'
+    @stream.add_word 'f'
     @stream.match_last_active_element('e')
-    assert_equal({'d' => false}, @stream.pop_next_marked)
-    assert_equal({'e' => true}, @stream.pop_next_marked)
+    assert_equal({:value => 'd', :success => false}, @stream.pop_next_marked)
+    assert_equal({:value => 'e', :success => true}, @stream.pop_next_marked)
     assert_equal(nil, @stream.pop_next_marked)
     assert_equal({5 => 'f'}, @stream.stream)
   end