trackler 2.1.0.1 → 2.1.0.2

data/tracks/ruby/exercises/word-count/example.tt

@@ -4,18 +4,20 @@ require 'minitest/autorun'
 require_relative 'word_count'
 
 # Common test data version: <%= abbreviated_commit_hash %>
-class PhraseTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %><% if test_case.skipped? %>
-    skip<% end %>
+class PhraseTest < Minitest::Test
+<% test_cases.each do |test_case| %>
+  def <%= test_case.name %>
+    <%= test_case.skipped %>
     phrase = <%= test_case.object_under_test %>
     counts = <%= test_case.expected %>
     assert_equal counts, phrase.word_count
   end
+
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+
   def test_bookkeeping
     skip
     assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
-

data/tracks/ruby/exercises/word-count/word_count_test.rb

@@ -3,10 +3,10 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'word_count'
 
-# Test data version:
-# 5b5e807
+# Common test data version: cd26d49
 class PhraseTest < Minitest::Test
   def test_count_one_word
+    # skip
     phrase = Phrase.new("word")
     counts = {"word"=>1}
     assert_equal counts, phrase.word_count
@@ -97,4 +97,3 @@ class PhraseTest < Minitest::Test
     assert_equal 1, BookKeeping::VERSION
   end
 end
-

data/tracks/ruby/exercises/wordy/example.tt

@@ -2,14 +2,16 @@ require 'minitest/autorun'
 require_relative 'wordy'
 
 # Common test data version: <%= abbreviated_commit_hash %>
-class WordyTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.test_name %>
+class WordyTest < Minitest::Test
+<% test_cases.each do |test_case| %>
+  def <%= test_case.name %>
     <%= test_case.skipped %>
     <%= test_case.workload %>
   end
-<% end %>
 
+<% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+
   def test_bookkeeping
     skip
     assert_equal <%= version %>, BookKeeping::VERSION

data/tracks/ruby/exercises/wordy/wordy_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'wordy'
 
-# Test data version: aa12f2e
+# Common test data version: 5b8ad58
 class WordyTest < Minitest::Test
   def test_addition
     # skip
@@ -121,6 +121,7 @@ class WordyTest < Minitest::Test
   #
   # If you are curious, read more about constants on RubyDoc:
   # http://ruby-doc.org/docs/ruby-doc-bundle/UsersGuide/rg/constants.html
+
   def test_bookkeeping
     skip
     assert_equal 1, BookKeeping::VERSION

data/tracks/ruby/lib/acronym_cases.rb

@@ -1,21 +1,9 @@
 require 'exercise_cases'
 
-class AcronymCase < OpenStruct
-  def name
-    'test_%s' % description.tr(' ', '_')
-  end
+class AcronymCase < ExerciseCase
 
-  def assertion
-    "Acronym.abbreviate('#{phrase}')"
+  def workload
+    assert_equal { "Acronym.abbreviate('#{phrase}')" }
   end
 
-  def skipped?
-    index > 0
-  end
-end
-
-AcronymCases = proc do |data|
-  JSON.parse(data)['abbreviate']['cases'].map.with_index do |row, i|
-    AcronymCase.new(row.merge('index' => i))
-  end
 end

data/tracks/ruby/lib/all_your_base_cases.rb

@@ -1,18 +1,11 @@
 require 'exercise_cases'
 
-class AllYourBaseCase < OpenStruct
-  def test_name
-    'test_%s' % description.downcase.tr(' -', '_')
-  end
+class AllYourBaseCase < ExerciseCase
 
   def workload
     indent(4, (assignments + assertion).join("\n")) + "\n"
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
   private
 
   def indent(size, text)
@@ -30,10 +23,10 @@ class AllYourBaseCase < OpenStruct
   end
 
   def assertion
-    return error_assertion unless expected
+    return error_assertion unless expected_value
 
     [
-      "expected = #{expected}",
+      "expected = #{expected_value}",
       "",
       "converted = BaseConverter.convert(input_base, digits, output_base)",
       "",
@@ -55,57 +48,32 @@ class AllYourBaseCase < OpenStruct
     %q("Input base: #{input_base}, output base #{output_base}. " \\) \
       "\n" + %q("Expected #{expected} but got #{converted}.")
   end
-end
-
-class AllYourBaseCase::PreProcessor
-  class << self
-    attr_reader :row
-
-    def call(row)
-      @row = row
-
-      row.merge('expected' => expected_value)
-    end
-
-    private :row
-    private
 
-    def expected_value
-      return row['expected'] if row['expected']
+  def expected_value
+    return expected if expected
 
-      if invalid_input_digits? || invalid_bases?
-        nil
-      elsif row['input_digits'].empty?
-        []
-      elsif input_of_zero?
-        [0]
-      else
-        handle_special_cases
-      end
-    end
-
-    def invalid_input_digits?
-      row['input_digits'].any? { |x| x < 0 || x >= row['input_base'] }
+    case
+    when invalid_input_digits? || invalid_bases? then nil
+    when input_digits.empty? then []
+    when input_of_zero? then [0]
+    else
+      handle_special_cases
     end
+  end
 
-    def invalid_bases?
-      row['input_base'] <= 1 || row['output_base'] <= 1
-    end
+  def invalid_input_digits?
+    input_digits.any? { |x| x < 0 || x >= input_base }
+  end
 
-    def input_of_zero?
-      row['input_digits'].all? { |x| x == 0 }
-    end
+  def invalid_bases?
+    input_base <= 1 || output_base <= 1
+  end
 
-    def handle_special_cases
-      [4, 2] if row['input_digits'] == [0, 6, 0]
-    end
+  def input_of_zero?
+    input_digits.all? { |x| x == 0 }
   end
-end
 
-AllYourBaseCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    AllYourBaseCase.new(
-      AllYourBaseCase::PreProcessor.call(row).merge(index: i),
-    )
+  def handle_special_cases
+    [4, 2] if input_digits == [0, 6, 0]
   end
 end

data/tracks/ruby/lib/alphametics_cases.rb

@@ -1,24 +1,8 @@
 require 'exercise_cases'
 
-class AlphameticsCase < OpenStruct
-  def test_name
-    "test_#{description.tr(' ', '_')}"
-  end
-
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
-  def input
-    "'#{puzzle}'"
-  end
-
-  def expect
-    expected.nil? ? {} : expected_values
-  end
-
+class AlphameticsCase < ExerciseCase
   def workload
-    body = 
+    body =
       "input = %s\n" % input,
       "expected = %s\n" % expect,
       "assert_equal expected, Alphametics.solve(input)"
@@ -27,7 +11,7 @@ class AlphameticsCase < OpenStruct
 
   def runtime_comment
     if slow?
-      comments = 
+      comments =
         '',
         "# The obvious algorithm can take a long time to solve this puzzle,\n",
         "# but an optimised solution can solve it fairly quickly.\n",
@@ -38,8 +22,16 @@ class AlphameticsCase < OpenStruct
 
   private
 
+  def input
+    "'#{puzzle}'"
+  end
+
+  def expect
+    expected.nil? ? {} : expected_values
+  end
+
   def slow?
-    (expected||{}).size > 7 
+    (expected||{}).size > 7
   end
 
   def expected_values
@@ -64,10 +56,3 @@ class AlphameticsCase < OpenStruct
   end
 
 end
-
-AlphameticsCases = proc do |data|
-  JSON.parse(data)['solve']['cases'].map.with_index do |row, i|
-    row = row.merge('index' => i)
-    AlphameticsCase.new(row)
-  end
-end

data/tracks/ruby/lib/anagram_cases.rb

@@ -1,16 +1,9 @@
 require 'exercise_cases'
 
-class AnagramCase < OpenStruct
-  def test_name
-    'test_%s' % description.gsub(/[ -]/, '_')
-  end
+class AnagramCase < ExerciseCase
 
   def workload
-    indent_lines([show_comment, detector, anagram, assert].compact)
-  end
-
-  def skipped
-    index.zero? ? '# skip' : 'skip'
+    indent_lines([show_comment, detector, anagram, wanted, assert].compact)
   end
 
   private
@@ -31,14 +24,13 @@ class AnagramCase < OpenStruct
     "anagrams = detector.match(#{candidates})"
   end
 
+  def wanted
+    "expected = #{expected.sort}"
+  end
+
   def assert
     actual = expected.size > 1 ? 'anagrams.sort' : 'anagrams'
-    "assert_equal #{expected.sort}, #{actual}"
+    "assert_equal expected, #{actual}"
   end
-end
 
-AnagramCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    AnagramCase.new(row.merge('index' => i))
-  end
 end

data/tracks/ruby/lib/beer_song_cases.rb

@@ -1,25 +1,22 @@
 require 'exercise_cases'
 
-class BeerSongCase < OpenStruct
-  def test_name
-    'test_%s' % description.tr(' ', '_')
-  end
+class BeerSongCase < ExerciseCase
 
   def workload
-    "BeerSong.new.%s(%s)" % [property, workload_arguments]
+    "assert_equal expected, #{beer_song}"
   end
 
   def expected
     self["expected"].gsub('\n', '"\n" \\')
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
   private
 
-  def workload_arguments
+  def beer_song
+    "BeerSong.new.%s(%s)" % [property, beer_song_arguments]
+  end
+
+  def beer_song_arguments
     if property == 'verse'
       number
     else
@@ -27,17 +24,3 @@ class BeerSongCase < OpenStruct
     end
   end
 end
-
-BeerSongCases = proc do |data|
-  i = 0
-  cases = []
-  JSON.parse(data)["cases"].each do |section|
-    section["cases"].each do |tests|
-      tests["cases"].each do |test|
-        cases << BeerSongCase.new(test.merge('index' => i))
-        i += 1
-      end
-    end
-  end
-  cases
-end

data/tracks/ruby/lib/binary_cases.rb

@@ -1,29 +1,22 @@
 require 'exercise_cases'
 
-class BinaryCase < OpenStruct
-  def name
-    'test_%s' % description.gsub(/[ -]/, '_')
-  end
+class BinaryCase < ExerciseCase
 
-  def assertion
+  def workload
     raises_error? ? error_assertion : equality_assertion
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
   private
 
   def error_assertion
-    "assert_raises(ArgumentError) { #{workload} }"
+    "assert_raises(ArgumentError) { #{test_case} }"
   end
 
   def equality_assertion
-    "assert_equal #{expected}, #{workload}"
+    "assert_equal #{expected}, #{test_case}"
   end
 
-  def workload
+  def test_case
     "Binary.to_decimal('#{binary}')"
   end
 
@@ -31,9 +24,3 @@ class BinaryCase < OpenStruct
     expected.nil?
   end
 end
-
-BinaryCases = proc do |data|
-  JSON.parse(data)['decimal'].map.with_index do |row, i|
-    BinaryCase.new(row.merge('index' => i))
-  end
-end

data/tracks/ruby/lib/bowling_cases.rb

@@ -1,13 +1,6 @@
 require 'exercise_cases'
 
-class BowlingCase < OpenStruct
-  def test_name
-    "test_#{description.downcase.tr(' ', '_')}"
-  end
-
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
+class BowlingCase < ExerciseCase
 
   def workload
     indent_lines(assert)
@@ -15,34 +8,41 @@ class BowlingCase < OpenStruct
 
   private
 
-  def roll
-    "roll(#{rolls})"
+  def roll_previous
+    "record(#{previous_rolls})"
   end
 
   def assert
     if assert_error?
-      [
-        'assert_raises Game::BowlingError do',
-        "  #{roll}",
-        '  @game.score',
-        'end'
-      ]
+      property == 'score' ? score_raises : roll_raises
     else
-      [roll, "assert_equal #{expected}, @game.score"]
+      [roll_previous, "assert_equal #{expected}, @game.score"]
     end
   end
 
+  def roll_raises
+    [
+      roll_previous,
+      'assert_raises Game::BowlingError do',
+      '  @game.roll(' + roll.to_s + ')',
+      'end'
+    ]
+  end
+
+  def score_raises
+    [
+      roll_previous,
+      'assert_raises Game::BowlingError do',
+      '  @game.score',
+      'end'
+    ]
+  end
+
   def assert_error?
-    expected == -1
+    expected.respond_to?(:key?) && expected.key?('error')
   end
 
   def indent_lines(code)
     code.join("\n" + ' ' * 4)
   end
 end
-
-BowlingCases = proc do |data|
-  JSON.parse(data)['score']['cases'].map.with_index do |row, i|
-    BowlingCase.new(row.merge('index' => i))
-  end
-end