trackler 2.1.0.1 → 2.1.0.2

data/tracks/ruby/lib/bracket_push_cases.rb

@@ -1,43 +1,28 @@
 require 'exercise_cases'
 
-class BracketPushCase < OpenStruct
-  def name
-    'test_%s' % description.gsub(/[ -]/, '_')
-  end
-
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
+class BracketPushCase < ExerciseCase
 
-  def test_body
+  def workload
     long_input? ? split_test : simple_test
   end
 
+  private
+
   def long_input?
     input.length > 80
   end
 
   def simple_test
-    "#{assert_or_refute} Brackets.paired?('#{input}')"
+    "#{assert} Brackets.paired?('#{input}')"
   end
 
   def split_test
     "str = '#{split_input[0]}'\\
           '#{split_input[1]}'
-    #{assert_or_refute} Brackets.paired?(str)"
-  end
-
-  def assert_or_refute
-    expected ? 'assert' : 'refute'
+    #{assert} Brackets.paired?(str)"
   end
 
   def split_input
     @split_input ||= input.scan(/.{1,#{input.length / 2}}/)
   end
 end
-
-BracketPushCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    BracketPushCase.new(row.merge('index' => i))
-  end
-end

data/tracks/ruby/lib/clock_cases.rb

@@ -1,6 +1,6 @@
 require 'exercise_cases'
 
-class ClockCase < OpenStruct
+class ClockCase < ExerciseCase
   def name
     'test_%s' % description
                 .gsub(/[() -]/, '_')
@@ -8,14 +8,16 @@ class ClockCase < OpenStruct
                 .chomp('_')
   end
 
-  def test_body
-    section == 'equal' ? compare_clocks : simple_test
+  def workload
+    property == 'equal' ? compare_clocks : simple_test
   end
 
+  private
+
   def compare_clocks
     "clock1 = Clock.at(#{clock1['hour']}, #{clock1['minute']})
     clock2 = Clock.at(#{clock2['hour']}, #{clock2['minute']})
-    #{assert_or_refute} clock1 == clock2"
+    #{assert} clock1 == clock2"
   end
 
   def simple_test
@@ -26,29 +28,8 @@ class ClockCase < OpenStruct
     ].join
   end
 
-  def assert_or_refute
-    expected ? 'assert' : 'refute'
-  end
-
   def add_to_clock
     " + #{add}" if add
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-end
-
-ClockCases = proc do |data|
-  i = 0
-  json = JSON.parse(data)
-  cases = []
-  %w(create add equal).each do |section|
-    json[section]['cases'].each do |row|
-      row = row.merge(row.merge('index' => i, 'section' => section))
-      cases << ClockCase.new(row)
-      i += 1
-    end
-  end
-  cases
 end

data/tracks/ruby/lib/connect_cases.rb

@@ -1,12 +1,6 @@
 require 'exercise_cases'
 
-class ConnectCase < OpenStruct
-  def name
-    'test_%s' % description
-                .gsub(/[() -]/, '_')
-                .chomp('_')
-                .downcase
-  end
+class ConnectCase < ExerciseCase
 
   def test_body
     [
@@ -19,9 +13,7 @@ class ConnectCase < OpenStruct
     ]
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
+  private
 
   def single_quote(string)
     string.inspect.tr('"', "'")
@@ -31,13 +23,3 @@ class ConnectCase < OpenStruct
     "# rubocop:disable MethodLength\n  " if board.length > 8
   end
 end
-
-ConnectCases = proc do |data|
-  json = JSON.parse(data)
-  cases = []
-  json['cases'].each_with_index do |row, i|
-    row['index'] = i
-    cases << ConnectCase.new(row)
-  end
-  cases
-end

data/tracks/ruby/lib/custom_set_cases.rb

@@ -1,88 +1,67 @@
 require 'exercise_cases'
 
-class CustomSetCase < OpenStruct
-  def name
-    'test_%s' % description.gsub(/ |-/, '_')
-  end
+class CustomSetCase < ExerciseCase
 
-  def test_body
-    send section
+  def workload
+    send property
   end
 
+  private
+
   def union
     "set1 = CustomSet.new #{set1}
     set2 = CustomSet.new #{set2}
     expected = CustomSet.new #{expected}
-    #{assert_or_refute}_equal expected, set1.union(set2)"
+    #{assert}_equal expected, set1.union(set2)"
   end
 
   def difference
     "set1 = CustomSet.new #{set1}
     set2 = CustomSet.new #{set2}
     expected = CustomSet.new #{expected}
-    #{assert_or_refute}_equal expected, set1.difference(set2)"
+    #{assert}_equal expected, set1.difference(set2)"
   end
 
   def intersection
     "set1 = CustomSet.new #{set1}
     set2 = CustomSet.new #{set2}
     expected = CustomSet.new #{expected}
-    #{assert_or_refute}_equal expected, set2.intersection(set1)"
+    #{assert}_equal expected, set2.intersection(set1)"
   end
 
   def add
     "set = CustomSet.new #{set}
     expected = CustomSet.new #{expected}
-    #{assert_or_refute}_equal expected, set.add(#{element})"
+    #{assert}_equal expected, set.add(#{element})"
   end
 
   def equal
     "set1 = CustomSet.new #{set1}
     set2 = CustomSet.new #{set2}
-    #{assert_or_refute}_equal set1, set2"
+    #{assert}_equal set1, set2"
   end
 
   def disjoint
     "set1 = CustomSet.new #{set1}
     set2 = CustomSet.new #{set2}
-    #{assert_or_refute} set1.disjoint? set2"
+    #{assert} set1.disjoint? set2"
   end
 
   def subset
     "set1 = CustomSet.new #{set1}
     set2 = CustomSet.new #{set2}
-    #{assert_or_refute} set1.subset? set2"
+    #{assert} set1.subset? set2"
   end
 
   def empty
     "set = CustomSet.new #{set}
-    #{assert_or_refute}_empty set"
+    #{assert}_empty set"
   end
 
   def contains
     "set = CustomSet.new #{set}
     element = #{element}
-    #{assert_or_refute} set.member? element"
-  end
-
-  def assert_or_refute
-    expected ? 'assert' : 'refute'
+    #{assert} set.member? element"
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-end
-
-CustomSetCases = proc do |data|
-  json = JSON.parse(data)
-  cases = []
-  i = 0
-  (json.keys - ['#']).each do |section|
-    json[section]['cases'].each do |row|
-      cases << CustomSetCase.new(row.merge('index' => i, 'section' => section))
-      i += 1
-    end
-  end
-  cases
 end

data/tracks/ruby/lib/difference_of_squares_cases.rb

@@ -1,38 +1,17 @@
 require 'exercise_cases'
 
-class DifferenceOfSquaresCase < OpenStruct
-  def test_name
-    'test_%s' % description.gsub(/[ -]/, '_')
-  end
+class DifferenceOfSquaresCase < ExerciseCase
 
-  def do
-    "Squares.new(#{number}).#{action}"
+  def workload
+    %Q(assert_equal #{expected_formatted}, Squares.new(#{number}).#{action})
   end
 
   def action
-    return 'difference' if section == 'difference_of_squares'
-    section
-  end
-
-  def skipped?
-    index > 0
+    return 'difference' if property == 'differenceOfSquares'
+    property.gsub(/([OS])/) {|cap| "_#{$1.downcase}" }
   end
 
   def expected_formatted
     expected.to_s.reverse.scan(/\d{1,3}/).join('_').reverse
   end
 end
-
-DifferenceOfSquaresCases = proc do |data|
-  i = 0
-  json = JSON.parse(data)
-  cases = []
-  %w(square_of_sum sum_of_squares difference_of_squares).each do |section|
-    json[section]['cases'].each do |row|
-      row = row.merge(row.merge('index' => i, 'section' => section))
-      cases << DifferenceOfSquaresCase.new(row)
-      i += 1
-    end
-  end
-  cases
-end

data/tracks/ruby/lib/dominoes_cases.rb

@@ -1,7 +1,7 @@
 require 'exercise_cases'
 
-class DominoesCase < OpenStruct
-  def test_name
+class DominoesCase < ExerciseCase
+  def name
     'test_%s' % description.gsub("can't", 'can not').gsub(/[= -]+/, '_')
   end
 
@@ -13,13 +13,4 @@ input_dominoes = #{input}
     WL
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-end
-
-DominoesCases = proc do |data|
-  JSON.parse(data)['cases'].map.with_index do |row, i|
-    DominoesCase.new(row.merge('index' => i))
-  end
 end

data/tracks/ruby/lib/generator/case_values.rb

@@ -0,0 +1,25 @@
+module Generator
+  module CaseValues
+    class Extractor
+      def initialize(case_class:)
+        @case_class = case_class
+      end
+
+      def cases(exercise_data)
+        extract_test_cases(
+          data: JSON.parse(exercise_data)['cases']
+        ).map.with_index do |test, index|
+          @case_class.new(test.merge('index' => index))
+        end
+      end
+
+      private
+
+      def extract_test_cases(data:)
+        data.flat_map do |entry|
+          entry.key?('cases') ? extract_test_cases(data: entry['cases']) : entry
+        end
+      end
+    end
+  end
+end

data/tracks/ruby/lib/generator/exercise_cases.rb

@@ -14,6 +14,17 @@ class ExerciseCase < OpenStruct
 
   protected
 
+  # used to indent multi line workloads, as
+  #   indent_lines(
+  #     [
+  #       "string = #{input.inspect}",
+  #       "#{assert} Isogram.is_isogram?(string)"
+  #     ], 4
+  #   )
+  def indent_lines(code, depth)
+    code.join("\n" + ' ' * depth)
+  end
+
   # used in workload, for example, as
   #   "#{assert} Luhn.valid?(#{input.inspect})"
   def assert

data/tracks/ruby/lib/generator/files/track_files.rb

@@ -14,13 +14,18 @@ module Generator
         "#{exercise_name.tr('-', '_')}_cases"
       end
 
-      def proc_name(exercise_name)
-        filename(exercise_name).split('_').map(&:capitalize).join
+      def class_name(exercise_name)
+        filename(exercise_name)[0..-2].split('_').map(&:capitalize).join
       end
 
       def exercise_name(filename)
         %r{([^/]*)_cases\.rb$}.match(filename).captures[0].tr('_', '-')
       end
+
+      def load_filename(track_path, exercise_name)
+        path = File.join(track_path, 'lib')
+        "%s/%s.rb" % [ path, filename(exercise_name) ]
+      end
     end
 
     module TrackFiles

data/tracks/ruby/lib/generator/template_values.rb

@@ -16,23 +16,28 @@ module Generator
 
   module TemplateValuesFactory
     def template_values
-      require cases_require_name
-
       TemplateValues.new(
         abbreviated_commit_hash: canonical_data.abbreviated_commit_hash,
         version: version,
-        test_cases: test_cases_proc.call(canonical_data.to_s)
+        test_cases: extract
       )
     end
 
     private
 
-    def cases_require_name
-      Files::GeneratorCases.filename(exercise_name)
+    def extract
+      load cases_load_name
+      extractor.cases(canonical_data.to_s)
+    end
+
+    def extractor
+        CaseValues::Extractor.new(
+          case_class: Object.const_get(Files::GeneratorCases.class_name(exercise_name))
+        )
     end
 
-    def test_cases_proc
-      Object.const_get(Files::GeneratorCases.proc_name(exercise_name))
+    def cases_load_name
+      Files::GeneratorCases.load_filename(paths.track, exercise_name)
     end
   end
 end

data/tracks/ruby/lib/gigasecond_cases.rb

@@ -1,15 +1,11 @@
-require 'exercise_cases'
-
 require 'time'
 
-class GigasecondCase < OpenStruct
-  def name
-    'test_%s' % description.gsub(/[ :-]/, '_')
+class GigasecondCase < ExerciseCase
+  def workload
+    %Q(assert_equal #{want}, Gigasecond.from(#{got}))
   end
 
-  def description
-    send(:'#') || input
-  end
+  private
 
   def got
     "Time.utc(#{start_values.join(', ')})"
@@ -28,14 +24,4 @@ class GigasecondCase < OpenStruct
     ts = Time.parse(expected)
     [ts.year, ts.month, ts.day, ts.hour, ts.min, ts.sec]
   end
-
-  def skipped?
-    index > 0
-  end
-end
-
-GigasecondCases = proc do |data|
-  JSON.parse(data)['add']['cases'].map.with_index do |row, i|
-    GigasecondCase.new(row.merge('index' => i))
-  end
 end