trackler 2.1.0.1 → 2.1.0.2

data/tracks/ruby/lib/run_length_encoding_cases.rb

@@ -1,9 +1,6 @@
 require 'exercise_cases'
 
-class RunLengthEncodingCase < OpenStruct
-  def name
-    'test_%s' % cleaned_description
-  end
+class RunLengthEncodingCase < ExerciseCase
 
   def assign_input
     "input = '#{input}'"
@@ -14,30 +11,12 @@ class RunLengthEncodingCase < OpenStruct
   end
 
   def assertion
-    case description
-    when /decode.+encode/
+    if property == 'consistency'
       'assert_equal output,
                  RunLengthEncoding.decode(RunLengthEncoding.encode(input))'
-    when /encode/
-      'assert_equal output, RunLengthEncoding.encode(input)'
-    when /decode/
-      'assert_equal output, RunLengthEncoding.decode(input)'
+    else
+      "assert_equal output, RunLengthEncoding.#{property}(input)"
     end
   end
 
-  def skipped?
-    index > 0
-  end
-
-  # internal
-
-  def cleaned_description
-    description.gsub(/\W+/, '_').squeeze('_')
-  end
-end
-
-RunLengthEncodingCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    RunLengthEncodingCase.new(row.merge('index' => i))
-  end
 end

data/tracks/ruby/lib/say_cases.rb

@@ -1,7 +1,6 @@
-class SayCase < OpenStruct
-  def test_name
-    'test_%s' % description.tr(' ,-', '_').downcase
-  end
+require 'exercise_cases'
+
+class SayCase < ExerciseCase
 
   def workload
     [
@@ -10,10 +9,6 @@ class SayCase < OpenStruct
     ].join("\n")
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
   private
 
   def indent(size, lines)
@@ -38,9 +33,3 @@ class SayCase < OpenStruct
     number.to_s.reverse.gsub(/...(?=.)/, '\&_').reverse
   end
 end
-
-SayCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    SayCase.new(row.merge(index: i))
-  end
-end

data/tracks/ruby/lib/sieve_cases.rb

@@ -1,15 +1,11 @@
 require 'exercise_cases'
 
-class SieveCase < OpenStruct
+class SieveCase < ExerciseCase
   OPEN_ARRAY = "[\n\s\s\s\s\s\s".freeze
   CLOSE_ARRAY = "\n\s\s\s\s]".freeze
   NEW_ARRAY_ROW = ",\n\s\s\s\s\s\s".freeze
   ARRAY_ELEMENTS_PER_ROW = 17.freeze
 
-  def name
-    'test_%s' % description.tr(' ', '_')
-  end
-
   def expected_string
     return expected unless needs_indentation?
 
@@ -17,19 +13,9 @@ class SieveCase < OpenStruct
     "#{OPEN_ARRAY}#{array_rows.join(NEW_ARRAY_ROW)}#{CLOSE_ARRAY}"
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
   private
 
   def needs_indentation?
     expected.size > ARRAY_ELEMENTS_PER_ROW
   end
 end
-
-SieveCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    SieveCase.new(row.merge('index' => i))
-  end
-end

data/tracks/ruby/lib/tournament_cases.rb

@@ -1,13 +1,6 @@
 require 'exercise_cases'
 
-class TournamentCase < OpenStruct
-  def test_name
-    "test_#{description.tr(' ', '_').tr('()', '')}"
-  end
-
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
+class TournamentCase < ExerciseCase
 
   def workload
     'Tournament.tally(input)'
@@ -39,9 +32,3 @@ class TournamentCase < OpenStruct
     ' ' * indent * 2 + line
   end
 end
-
-TournamentCases = proc do |data|
-  JSON.parse(data)['valid_inputs']['cases'].map.with_index do |row, i|
-    TournamentCase.new(row.merge('index' => i))
-  end
-end

data/tracks/ruby/lib/transpose_cases.rb

@@ -1,13 +1,6 @@
 require 'exercise_cases'
 
-class TransposeCase < OpenStruct
-  def test_name
-    "test_#{description.tr(' ', '_')}"
-  end
-
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
+class TransposeCase < ExerciseCase
 
   def workload
     'Transpose.transpose(input)'
@@ -39,9 +32,3 @@ class TransposeCase < OpenStruct
     ' ' * indent * 2 + line
   end
 end
-
-TransposeCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    TransposeCase.new(row.merge('index' => i))
-  end
-end

data/tracks/ruby/lib/triangle_cases.rb

@@ -1,11 +1,11 @@
 require 'exercise_cases'
 
-class TriangleCase < OpenStruct
-  def test_name
+class TriangleCase < ExerciseCase
+  def name
     initial = description.downcase
     replaced = initial.gsub(/(true|false)/, expected_type)
-    if initial.eql?(replaced) && !initial.include?(triangle)
-      replaced = triangle + ' triangle ' + initial
+    if initial.eql?(replaced) && !initial.include?(property)
+      replaced = property + ' triangle ' + initial
     end
     'test_%s' % replaced.tr_s(', -', '_')
   end
@@ -13,41 +13,22 @@ class TriangleCase < OpenStruct
   def workload
     [
       "triangle = Triangle.new(#{sides})",
-      indent("#{assert_or_refute} triangle.#{triangle}?, #{failure_message}")
+      indent("#{assert} triangle.#{property}?, #{failure_message}")
     ].join("\n")
   end
 
+  private
+
   def indent(line)
     ' ' * 4 + line
   end
 
-  def assert_or_refute
-    expected ? 'assert' : 'refute'
-  end
-
   def failure_message
     %Q("Expected '#{expected}', #{expected_type}.")
   end
 
   def expected_type
-    "triangle is #{expected ? '' : 'not '}#{triangle}"
-  end
-
-  def skipped
-    index.zero? ? '# skip' : 'skip'
+    "triangle is #{expected ? '' : 'not '}#{property}"
   end
-end
 
-TriangleCases = proc do |data|
-  i = 0
-  cases = []
-  data = JSON.parse(data).select { |key, value| key.to_s.match(/[^#]+/) }
-  data.keys.each do |triangle|
-    data[triangle]['cases'].each do |row|
-      row = row.merge(row.merge('index' => i, 'triangle' => triangle))
-      cases << TriangleCase.new(row)
-      i += 1
-    end
-  end
-  cases
 end

data/tracks/ruby/lib/two_bucket_cases.rb

@@ -1,30 +1,20 @@
 require 'exercise_cases'
 
-class TwoBucketCase < OpenStruct
-  def test_name
-    "test_bucket_one_#{bucket_one}_bucket_two_"\
-    "#{bucket_two}_goal_#{goal}_starting_#{start_bucket}"
+class TwoBucketCase < ExerciseCase
+  def name
+    "test_bucket_one_size_#{bucket_one}_bucket_two_"\
+    "size_#{bucket_two}_goal_#{goal}_start_with_bucket_#{start_bucket}"
   end
 
-  def do
-    "TwoBucket.new(#{bucket_one}, #{bucket_two}, #{goal}, '#{start_bucket}')"
-  end
-
-  def test_body
+  def workload
     "two_bucket = #{self.do}
     assert_equal #{expected['moves']}, two_bucket.moves
     assert_equal '#{expected['goal_bucket']}', two_bucket.goal_bucket
     assert_equal #{expected['other_bucket']}, two_bucket.other_bucket"
   end
 
-  def skipped?
-    index > 0
+  def do
+    "TwoBucket.new(#{bucket_one}, #{bucket_two}, #{goal}, '#{start_bucket}')"
   end
-end
 
-TwoBucketCases = proc do |data|
-  JSON.parse(data)['two_bucket']['cases'].map.with_index do |row, i|
-    row = row.merge('index' => i)
-    TwoBucketCase.new(row)
-  end
 end

data/tracks/ruby/lib/word_count_cases.rb

@@ -1,21 +1,9 @@
 require 'exercise_cases'
 
-class WordCountCase < OpenStruct
-  def name
-    'test_%s' % description.tr(' ', '_')
-  end
+class WordCountCase < ExerciseCase
 
   def object_under_test
     %Q(Phrase.new(#{input.inspect}))
   end
 
-  def skipped?
-    index.nonzero?
-  end
-end
-
-WordCountCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    WordCountCase.new(row.merge('index' => i))
-  end
 end

data/tracks/ruby/lib/wordy_cases.rb

@@ -1,9 +1,6 @@
 require 'exercise_cases'
 
-class WordyCase < OpenStruct
-  def test_name
-    'test_%s' % description.downcase.tr(' ', '_')
-  end
+class WordyCase < ExerciseCase
 
   def workload
     [
@@ -12,10 +9,6 @@ class WordyCase < OpenStruct
     ].join("\n")
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
   private
 
   def indent(size, lines)
@@ -44,26 +37,10 @@ class WordyCase < OpenStruct
       "assert_equal(#{expected}, answer, message)",
     ].join("\n")
   end
-end
-
-class WordyCase::PreProcessor
-  class << self
-    def call(row)
-      row.merge('message' => message_for(row))
-    end
 
-    private
-
-    def message_for(row)
-      return unless row['input'] == 'What is -3 plus 7 multiplied by -2?'
-
-      'You should ignore order of precedence. -3 + 7 * -2 = -8, not %s'
-    end
-  end
-end
+  def message
+    return unless input == 'What is -3 plus 7 multiplied by -2?'
 
-WordyCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    WordyCase.new(WordyCase::PreProcessor.call(row).merge(index: i))
+    'You should ignore order of precedence. -3 + 7 * -2 = -8, not %s'
   end
 end

data/tracks/ruby/test/fixtures/metadata/exercises/complex/canonical-data.json

@@ -0,0 +1,45 @@
+{
+  "exercise": "beer-song",
+  "version": "1.0.0",
+  "cases": [
+    {
+      "description": "verse",
+      "cases": [
+        {
+          "description": "single verse",
+          "cases": [
+            {
+              "description": "first generic verse",
+              "property": "verse",
+              "number": 99,
+              "expected": "99 bottles of beer on the wall, YAAAR"
+            },
+            {
+              "description": "last generic verse",
+              "property": "verse",
+              "number": 3,
+              "expected": "3 bottles of beer on the wall, YAAAR"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "lyrics",
+      "cases": [
+        {
+          "description": "multiple verses",
+          "cases": [
+            {
+              "description": "first two verses",
+              "property": "verses",
+              "beginning": 99,
+              "end": 98,
+              "expected": "99 bottles of beer on the wall, YAR, PIRATES CAN'T COUNT"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

data/tracks/ruby/test/fixtures/xruby/lib/beta_cases.rb

@@ -0,0 +1,7 @@
+require 'exercise_cases'
+
+class BetaCase < ExerciseCase
+  def workload
+    assert_equal { "Beta.call('#{input}')" }
+  end
+end

data/tracks/ruby/test/generator/case_values_test.rb

@@ -0,0 +1,30 @@
+require_relative '../test_helper'
+
+class ComplexCase < ExerciseCase
+  def workload
+    assert { Complex.foo(bar) }
+  end
+end
+
+module Generator
+  module CaseValues
+    class ExtractorTest < Minitest::Test
+      def test_multi_level_auto_extraction
+        canonical_data = File.read('test/fixtures/metadata/exercises/complex/canonical-data.json')
+        cases = Extractor.new(
+          case_class: ComplexCase,
+        ).cases(canonical_data)
+
+        expected = [
+          ComplexCase.new(description: 'first generic verse', property: 'verse', number: 99,
+                          expected: '99 bottles of beer on the wall, YAAAR', index: 0),
+          ComplexCase.new(description: 'last generic verse', property: 'verse', number: 3,
+                          expected: '3 bottles of beer on the wall, YAAAR', index: 1),
+          ComplexCase.new(description: 'first two verses', property: 'verses', beginning: 99, end: 98,
+                          expected: "99 bottles of beer on the wall, YAR, PIRATES CAN'T COUNT", index: 2)
+        ]
+        assert_equal expected, cases
+      end
+    end
+  end
+end

data/tracks/ruby/test/generator/files/track_files_test.rb

@@ -25,9 +25,8 @@ module Generator
         assert_equal 'two_parter_cases', GeneratorCases.filename(exercise_name)
       end
 
-      def test_proc_name
-        exercise_name = 'two-parter'
-        assert_equal 'TwoParterCases', GeneratorCases.proc_name(exercise_name)
+      def test_class_name
+        assert_equal 'TwoParterCase', GeneratorCases.class_name('two-parter')
       end
     end
 

data/tracks/ruby/test/generator/template_values_test.rb

@@ -43,17 +43,58 @@ module Generator
         mock_canonical_data
       end
 
+      def paths
+        mock_paths = Minitest::Mock.new
+        mock_paths.expect :track, 'test/fixtures/xruby'
+        mock_paths
+      end
+
       include TemplateValuesFactory
     end
 
-    def test_template_values
-      $LOAD_PATH.unshift 'test/fixtures/xruby/lib'
+    class ClassBasedTestTemplateValuesFactory
+      def exercise_name
+        'beta'
+      end
+
+      def version
+        2
+      end
+
+      def canonical_data
+        mock_canonical_data = Minitest::Mock.new
+        mock_canonical_data.expect :abbreviated_commit_hash, nil
+        mock_canonical_data.expect :to_s, '{"cases":[]}'
+        mock_canonical_data
+      end
+
+      def paths
+        mock_paths = Minitest::Mock.new
+        mock_paths.expect :track, 'test/fixtures/xruby'
+        mock_paths
+      end
+
+      include TemplateValuesFactory
+    end
+
+    def test_template_values_from_class
+      subject = ClassBasedTestTemplateValuesFactory.new
+      assert_instance_of TemplateValues, subject.template_values
+    end
+
+    def test_template_values_loads_problem_case_classes
       subject = TestTemplateValuesFactory.new
       assert_instance_of TemplateValues, subject.template_values
+      assert Object.const_defined?(:AlphaCase)
+      assert Object.const_defined?(:AlphaCases)
     end
 
     def teardown
-      $LOAD_PATH.delete 'test/fixtures/xruby/lib'
+      [:AlphaCase, :AlphaCases].each do |classname|
+        if Object.const_defined?(classname)
+          Object.send(:remove_const, classname)
+        end
+      end
     end
   end
 end