mumuki-sqlite-runner 3.2.0 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2ae7f324d12e24d38f8ac0fbf573406453c0cece8e1853800314feb3ba9b2b8
-  data.tar.gz: c0619a88e63b5df94d0dc9c715a7539dddc6a9b82d38bf7b89461a6b080c8326
+  metadata.gz: d47ec94e08c7d9c855d17bfedc35b1a7709d5d0e22682a2b129ad5425e14d17e
+  data.tar.gz: 4ffe138556f5a890a71e3cdcd816fdf596917a40527472a07d15907013abac6c
 SHA512:
-  metadata.gz: b971e4cc0cac4b5f9d71067bd06e4e9ace57b31c14184fadfb269d35471a101f0a4fda7d35f6148db7c6c4fe417db5d559edf23db2188ef64aaf6d9443544f45
-  data.tar.gz: 6d1fb79de256ba8903fe326da8beef481c28e7b04a26b094f872fe48992bfd273e55c366e03f6c87dfba099a6206b5774be44d01371fafc7e5d44ada0e4b80d7
+  metadata.gz: 558a62973b1078fc23e3ad1ddeb668cc1738d5560229b3c76c2d8b775a659df22192dd8534054a3ad7db50a49d208b5075b3f610c1b41459e5cc34a8041717e2
+  data.tar.gz: '0187ab08320aa59793522521a3063f7aeb75ea18cc41684782d847249c11771d7aa28c452131b4562e3efbdef991c13ae07bc98088e2b84c1cb5d435782f91b1'

data/lib/dataset.rb

@@ -35,7 +35,7 @@ module Sqlite
     end
 
     def same_header(other_header)
-      @header.eql? other_header
+      @header.map(&:downcase).eql? other_header.map(&:downcase)
     end
 
     def same_rows(other_rows)

data/lib/helpers.rb

@@ -1,21 +1,23 @@
 module Sqlite
   module TestHelper
 
-    def set_test_parsers_hash
-      @test_parsers = {
-          query: Sqlite::QueryTestParser,
-          display: Sqlite::DisplayTestParser,
-          datasets: Sqlite::DatasetTestParser,
-          final_dataset: Sqlite::FinalDatasetTestParser,
+    def parsers
+      @parsers ||= {
+          query: Sqlite::QueryParser,
+          display: Sqlite::DisplayParser,
+          datasets: Sqlite::DatasetsParser,
+          final_dataset: Sqlite::FinalDatasetParser,
       }
-      @test_parsers.default = Sqlite::InvalidTestParser
     end
 
-    def load_tests(test)
+    def collect_tests(test)
       tests = YAML.load test
       tests = [tests] unless tests.kind_of? Array
       tests.map(&:to_struct)
     end
 
+    def fail!(*args)
+      raise Mumukit::RequestValidationError, I18n.t(*args)
+    end
   end
 end

data/lib/html_renderer.rb

@@ -5,26 +5,30 @@ module Sqlite
 
     def render_success(result, message)
       @message = message
-      @header  = result[:dataset].header
-      @rows    = result[:dataset].rows
+      @table_name = result[:table_name]
+      @header = result[:dataset].header
+      @rows = result[:dataset].rows
+      @extra_message = extra_message result
       template_file_success.result binding
     end
 
     def render_error(result, solution, error)
       @error = error
+      @table_name = result[:table_name]
       @result = parse_dataset(result[:dataset].header, result[:dataset].rows)
       @solution = parse_dataset(solution[:dataset].header, solution[:dataset].rows)
-
+      @expected_message = expected_message result
+      @obtained_message = I18n.t 'obtained'
       template_file_error.result binding
     end
 
     protected
 
     def parse_dataset(header, rows)
-      header_sign = header.shift
+      header_sign = first_column(header)
       rows = rows.map do |row|
         {
-            sign: row.shift,
+            sign: first_column(row),
             row: row
         }
       end
@@ -37,7 +41,7 @@ module Sqlite
           },
           rows: rows.map do |row|
             {
-                sign:row[:sign],
+                sign: row[:sign],
                 class: diff_class_of(row[:sign]),
                 fields: row[:row]
             }
@@ -46,6 +50,10 @@ module Sqlite
 
     end
 
+    def first_column(row)
+      row.first.present? && row.first =~ /^[+-]$/ ? row.shift : '✓'
+    end
+
     def diff_class_of(value)
       case value
         when '+'
@@ -57,6 +65,18 @@ module Sqlite
       end
     end
 
+    def extra_message(result)
+      result[:show_query] ? I18n.t('message.success.show_query', query: result[:query]) : ''
+    end
+
+    def expected_message(result)
+      if result[:show_query]
+        I18n.t('message.failure.show_query', query: result[:query])
+      else
+        I18n.t 'expected'
+      end
+    end
+
     def template_file_success
       ERB.new File.read("#{__dir__}/view/rows_success.html.erb")
     end

data/lib/locales/en.yml

@@ -1,12 +1,24 @@
 en:
   dataset: "Dataset %{number}"
+  default_table_name: 'Result'
+  expected: 'It was expected:'
+  obtained: 'It was obtained:'
   message:
     success:
       query: 'Correct Query!'
+      show_query: 'The query `%{query}` returns:'
     failure:
+      show_query: 'The query `%{query}` should return:'
+      semicolon_ending: 'You should finish each SQL statement with a semicolon (;)'
       columns: 'Columns do not match'
       rows:    'Rows do not match'
       query:   'Queries do not match'
       tests:
         lint: "Invalid tests, It should be a valid YAML format. Try with this validator http://www.yamllint.com/"
+        type: "You need to declare field type:"
         types: "Unsupported test type '%{type}'. Use one of these: datasets, query, display, final_dataset"
+        fields:
+          query: "For type:query you should use ONLY these fields: type (required), seed (optional), expected (required)"
+          datasets: "For type:datasets you should use ONLY these fields: type (required), seed (optional), expected (required)"
+          final_dataset: "For type:final_dataset you should use ONLY these fields: type (required), seed (optional), final (required), expected (required)"
+          display: "For type:display you should use ONLY these fields: type (required), seed (optional), query (required)"

data/lib/locales/es-CL.yml

@@ -0,0 +1,24 @@
+es:
+  dataset: "Set de datos %{number}"
+  default_table_name: 'Resultado'
+  expected: 'Se esperaba:'
+  obtained: 'Se obtuvo:'
+  message:
+    success:
+      query: '¡Consulta correcta!'
+      show_query: 'La consulta `%{query}` devolvió:'
+    failure:
+      show_query: 'Se esperaba que la consulta `%{query}` devolviera:'
+      semicolon_ending: 'Tienes que terminar cada sentencia SQL con punto y coma (;)'
+      columns: 'Las columnas no coinciden'
+      rows:    'Las filas no coinciden'
+      query:   'Las consultas no coinciden'
+    tests:
+      lint: "¡Tests inválidos! No tienen el formato YAML correcto. Puedes probar en este validador http://www.yamllint.com/"
+      type: "tienes que declarar el campo type:"
+      types: "El test type '%{type}' no está soportado. Tienes que usar uno de éstos: datasets, query, display, final_dataset"
+      fields:
+        query: "Para el type:query deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), expected (requerido)"
+        datasets: "Para el type:datasets deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), expected (requerido)"
+        final_dataset: "Para el type:final_dataset, deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), final (requerido), expected (requerido)"
+        display: "Para el type:display deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), query (requerido)"

data/lib/locales/es.yml

@@ -1,12 +1,24 @@
 es:
   dataset: "Set de datos %{number}"
+  default_table_name: 'Resultado'
+  expected: 'Se esperaba:'
+  obtained: 'Se obtuvo:'
   message:
     success:
       query: '¡Consulta correcta!'
+      show_query: 'La consulta `%{query}` devolvió:'
     failure:
+      show_query: 'Se esperaba que la consulta `%{query}` devolviera:'
+      semicolon_ending: 'Tenés que terminar cada sentencia SQL con punto y coma (;)'
       columns: 'Las columnas no coinciden'
       rows:    'Las filas no coinciden'
       query:   'Las consultas no coinciden'
     tests:
       lint: "¡Tests inválidos! No tienen el formato YAML correcto. Podés probar en este validador http://www.yamllint.com/"
+      type: "Tenés que declarar el campo type:"
       types: "El test type '%{type}' no está soportado. Tenés que usar uno de éstos: datasets, query, display, final_dataset"
+      fields:
+        query: "Para el type:query deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), expected (requerido)"
+        datasets: "Para el type:datasets deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), expected (requerido)"
+        final_dataset: "Para el type:final_dataset, deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), final (requerido), expected (requerido)"
+        display: "Para el type:display deberías usar ÚNICAMENTE estos campos: type (requerido), seed (opcional), query (requerido)"

data/lib/parsers/base_parser.rb

@@ -0,0 +1,62 @@
+module Sqlite
+  class BaseParser
+
+    COMMENT = '-- NONE'
+    attr_reader :test_result
+
+    def parse_test(test)
+      @test = test
+      @test_result = transform_test
+    end
+
+    def test_has_valid_fields?(test)
+      required = @fields[:required].sort
+      optional = @fields[:optional]
+      keys = process_alias test.to_h.keys.map(&:to_sym).sort
+      (keys - optional).eql? required
+    end
+
+    # A Parser can choose it's own solution or just return which is passed.
+    # This is default choice
+    def choose_solution(solution)
+      solution
+    end
+
+    def get_final_query
+      ''
+    end
+
+    def show_query?
+      false
+    end
+
+    def table_name
+      has?(:result_alias) ? get(:result_alias) : I18n.t('default_table_name')
+    end
+
+    protected
+
+    def transform_test
+      {
+          seed: get_seed,
+          expected: get_expected
+      }
+    end
+
+    def has?(key)
+      !@test[key.to_sym].blank?
+    end
+
+    def get(key)
+      @test[key.to_sym]
+    end
+
+    def get_seed
+      has?(:seed) ? get(:seed).strip : ''
+    end
+
+    def process_alias(keys)
+      keys
+    end
+  end
+end

data/lib/parsers/datasets_parser.rb

@@ -0,0 +1,33 @@
+module Sqlite
+  class DatasetsParser < BaseParser
+
+    def initialize
+      @fields = {
+          required: [:type, :expected],
+          optional: [:seed]
+      }
+    end
+
+    def choose_solution(_solution)
+      @solutions
+    end
+
+    protected
+
+    def transform_test
+      @solutions = strip_lines get(:expected)
+      super
+    end
+
+    def get_expected
+      COMMENT
+    end
+
+    def strip_lines(array)
+      array.to_s
+          .split("\n")
+          .map(&:strip)
+          .join("\n")
+    end
+  end
+end

data/lib/parsers/display_parser.rb

@@ -0,0 +1,21 @@
+module Sqlite
+  class DisplayParser < BaseParser
+
+    def initialize
+      @fields = {
+        required: [:type, :query],
+        optional: [:seed]
+      }
+    end
+
+    def get_final_query
+      get(:query)
+    end
+
+    protected
+
+    def get_expected
+      get_final_query
+    end
+  end
+end

data/lib/parsers/final_dataset_parser.rb

@@ -0,0 +1,29 @@
+module Sqlite
+  class FinalDatasetParser < DatasetsParser
+
+    def initialize
+      @fields = {
+        required: [:type, :final, :expected],
+        optional: [:seed]
+      }
+      @alias = {
+          query: :final
+      }
+    end
+
+    def show_query?
+      true
+    end
+
+    def get_final_query
+      has?(:final) ? get(:final) : get(:query)
+    end
+
+    protected
+
+    def process_alias(keys)
+      keys.map { |item| @alias.include?(item) ? @alias[item] : item }
+    end
+
+  end
+end

data/lib/parsers/query_parser.rb

@@ -0,0 +1,17 @@
+module Sqlite
+  class QueryParser < BaseParser
+
+    def initialize
+      @fields = {
+        required: [:type, :expected],
+        optional: [:seed]
+      }
+    end
+
+    protected
+
+    def get_expected
+      get(:expected).strip
+    end
+  end
+end

data/lib/sqlite_runner.rb

@@ -16,12 +16,11 @@ require_relative './version_hook'
 require_relative './metadata_hook'
 require_relative './html_renderer'
 require_relative './multiple_executions_runner'
-require_relative './parsers/common_test_parser'
-require_relative './parsers/query_test_parser'
-require_relative './parsers/display_test_parser'
-require_relative './parsers/dataset_test_parser'
-require_relative './parsers/final_dataset_test_parser'
-require_relative './parsers/invalid_test_parser'
+require_relative './parsers/base_parser'
+require_relative './parsers/query_parser'
+require_relative './parsers/display_parser'
+require_relative './parsers/datasets_parser'
+require_relative './parsers/final_dataset_parser'
 require_relative './helpers'
 require_relative './test_hook'
 require_relative './validation_hook'

data/lib/test_hook.rb

@@ -8,11 +8,6 @@ class SqliteTestHook < Mumukit::Templates::FileHook
   isolated
   include Sqlite::TestHelper
 
-  def initialize(config = nil)
-    super(config)
-    set_test_parsers_hash
-  end
-
   def tempfile_extension
     '.json'
   end
@@ -23,12 +18,12 @@ class SqliteTestHook < Mumukit::Templates::FileHook
 
   # Transform Mumuki Request into Docker file style
   def compile_file_content(request)
-    tests = parse_tests request.test
-    final = get_final_query
+    parse_tests request.test
+    student_code = parse_student_code "#{request.content&.strip}#{get_final_query}"
     {
         init:    "#{request.extra&.strip}",
-        student: "#{request.content&.strip}#{final}",
-        tests:   tests
+        student: student_code,
+        tests:   get_tests
     }.to_json
   end
 
@@ -52,7 +47,7 @@ class SqliteTestHook < Mumukit::Templates::FileHook
     student  = output['student']
     expected = output['expected']
     expected.map!.with_index do |expect, i|
-      @tests[i].choose expect
+      @tests[i].choose_solution expect
     end
     diff(expected, student)
   end
@@ -60,7 +55,7 @@ class SqliteTestHook < Mumukit::Templates::FileHook
   # Make diff between expected and student dataset result and mark each line one according comparision
   def diff(expected, student)
     zipped = expected.zip(student).map do |expected_i, student_i|
-      diff = Diffy::SplitDiff.new student_i << "\n", expected_i << "\n"
+      diff = Diffy::SplitDiff.new expected_i << "\n", student_i << "\n"
       choose_left_right(diff, expected_i, student_i).map { |e| post_process_diff e }
     end
     zipped.transpose.map { |dataset| post_process_datasets dataset }
@@ -72,33 +67,53 @@ class SqliteTestHook < Mumukit::Templates::FileHook
     [expected, student]
   end
 
+  # split lines grouping by diff mark & data content
+  # then append mark as dataset column & re join
   def post_process_diff(data)
-    data.scan(/^(\s|-|\+)(.+)/)
-        .map { |mark, content| mark << '|' << content }
+    data.scan(/^(\s|-|\+)*(.+)/)
+        .map { |mark, content| "#{proper_mark(mark)}#{content}" }
         .join("\n")
   end
 
+  def proper_mark(mark)
+    mark = mark.to_s
+    "#{mark}|" unless mark.blank?
+  end
+
   # Transforms array datasets into hash with :id & :rows
   def post_process_datasets(datasets)
     datasets.map.with_index do |dataset, i|
       {
           id: i + 1,
-          dataset: Sqlite::Dataset.new(dataset)
+          dataset: Sqlite::Dataset.new(dataset),
+          table_name: @tests[i].table_name,
+          show_query: @tests[i].show_query?,
+          query: @tests[i].get_final_query
       }
     end
   end
 
+  def parse_student_code(code)
+    code = code&.strip
+    fail! 'message.failure.semicolon_ending' unless code&.end_with? ';'
+    code
+  end
+
   # This method receives a list of test cases and transforms each one according it parser
   def parse_tests(tests)
-    @tests = load_tests(tests).map do | test |
-      @test_parsers[test.type.to_sym].new test
+    @tests = collect_tests(tests).map do |test|
+      parser = parsers[test.type.to_sym].new
+      parser.parse_test test
+      parser
     end
-    @tests.map(&:result)
+  end
+
+  def get_tests
+    @tests.map(&:test_result)
   end
 
   def get_final_query
-    tests = @tests.select { |test| test.has_final? }
-    tests.empty? ? '' : tests.first.get_final
+    @tests.map{ |t| t.get_final_query.to_s }.reject(&:empty?).join
   end
 
   # Initialize Metatest Framework with Checker & Runner

data/lib/validation_hook.rb

@@ -2,30 +2,31 @@ class SqliteValidationHook < Mumukit::Hook
 
   include Sqlite::TestHelper
 
-  def initialize(config = nil)
-    super(config)
-    set_test_parsers_hash
-  end
-
   def validate!(request)
     lint_tests request.test
     types_tests request.test
+    fields_of_test_types request.test
   end
 
   def lint_tests(tests)
-    begin
-      YAML.load tests
-    rescue
-      raise Mumukit::RequestValidationError, I18n.t('message.failure.tests.lint')
-    end
+    YAML.load tests
+  rescue
+    fail! 'message.failure.tests.lint'
   end
 
   def types_tests(tests)
-    # Assumes that pass lint_tests
-    load_tests(tests).each do |test|
-      valid = @test_parsers.has_key? test.type.to_sym
-      raise Mumukit::RequestValidationError, I18n.t('message.failure.tests.types', type: test.type) unless valid
+    # Assumes pass lint_tests
+    collect_tests(tests).each do |test|
+      fail! 'message.failure.tests.type' if test.type.blank?
+      fail!('message.failure.tests.types', type: test.type) unless parsers.has_key? test.type.to_sym
     end
   end
 
+  def fields_of_test_types(tests)
+    # Assumes pass types_tests
+    collect_tests(tests).each do |test|
+      parser = parsers[test.type.to_sym].new
+      fail! "message.failure.tests.fields.#{test.type}" unless parser.test_has_valid_fields? test
+    end
+  end
 end

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module SqliteVersionHook
-  VERSION = '3.2.0'
+  VERSION = '3.3.3'
 end

data/lib/view/rows_error.html.erb

@@ -1,29 +1,4 @@
 <style>
-  table.sqlite_error {
-    width: auto;
-  }
-  table.sqlite_result {
-    border: none;
-  }
-  table.sqlite_solution {
-    border: none;
-  }
-  table.sqlite_error tr:nth-child(even) {
-    background-color: #EEEEEE;
-  }
-  table.sqlite_error tr:nth-child(odd) {
-    background-color: #FFFFFF;
-  }
-  table.sqlite_error th {
-    color: white;
-    font-weight: bold;
-    background-color: #2E2F30;
-  }
-  table.sqlite_error td {
-    width: auto;
-    text-align: left;
-  }
-
   .required {
     color: #5cb85c;
     font-style: italic;
@@ -32,25 +7,6 @@
     color: #d9534f;
     font-style: italic;
   }
-
-  .required :first-child,
-  .errored :first-child,
-  .nothing :first-child {
-    font-style: normal;
-    padding-left: 2px;
-    padding-right: 2px;
-    background-color: white;
-    border-left: none;
-    border-bottom: 1px solid white;
-  }
-  .required :first-child {
-    color: white;
-    background-color: #5cb85c;
-  }
-  .errored :first-child {
-    color: white;
-    background-color: #d9534f;
-  }
 </style>
 
 <h5><%= @error %></h5>
@@ -59,55 +15,61 @@
 
   <!-- Result -->
   <div class="col-md-6">
-    <h6>Se esperaba:</h6>
-    <table class="table table-bordered sqlite_error sqlite_result">
-      <thead>
-      <tr class="<%= @result[:header][:class] %>">
-        <th><%= @result[:header][:sign] %></th>
-        <% @result[:header][:fields].each do |field| %>
-            <th><%= field %></th>
+    <h6><%= @expected_message %></h6>
+
+    <div class="mu-sql-table-rendered">
+      <header><%= @table_name %></header>
+      <table>
+        <thead>
+        <tr class="<%= @result[:header][:class] %>">
+          <th><%= @result[:header][:sign] %></th>
+          <% @result[:header][:fields].each do |field| %>
+              <th><%= field %></th>
+          <% end %>
+        </tr>
+        </thead>
+        <tbody>
+        <% @result[:rows].each do |row| %>
+            <tr class="<%= row[:class] %>">
+              <td><%= row[:sign] %></td>
+              <% row[:fields].each do |field| %>
+                  <td><%= field %></td>
+              <% end %>
+            </tr>
         <% end %>
-      </tr>
-      </thead>
+        </tbody>
+      </table>
+    </div>
+
 
-      <tbody>
-      <% @result[:rows].each do |row| %>
-          <tr class="<%= row[:class] %>">
-            <td><%= row[:sign] %></td>
-            <% row[:fields].each do |field| %>
-                <td><%= field %></td>
-            <% end %>
-          </tr>
-      <% end %>
-      </tbody>
-    </table>
   </div>
 
   <!-- Solution -->
   <div class="col-md-6">
-    <h6>Se obtuvo:</h6>
-    <table class="table table-bordered sqlite_error sqlite_solution">
-      <thead>
-      <tr class="<%= @result[:header][:class] %>">
-        <th><%= @result[:header][:sign] %></th>
-        <% @solution[:header][:fields].each do |field| %>
-            <th><%= field %></th>
+    <h6><%= @obtained_message %></h6>
+    
+    <div class="mu-sql-table-rendered">
+      <header><%= @table_name %></header>
+      <table>
+        <thead>
+        <tr class="<%= @result[:header][:class] %>">
+          <th><%= @result[:header][:sign] %></th>
+          <% @solution[:header][:fields].each do |field| %>
+              <th><%= field %></th>
+          <% end %>
+        </tr>
+        </thead>
+        <tbody>
+        <% @solution[:rows].each do |row| %>
+            <tr class="<%= row[:class] %>">
+              <td><%= row[:sign] %></td>
+              <% row[:fields].each do |field| %>
+                  <td><%= field %></td>
+              <% end %>
+            </tr>
         <% end %>
-      </tr>
-      </thead>
-
-      <tbody>
-      <% @solution[:rows].each do |row| %>
-          <tr class="<%= row[:class] %>">
-            <td><%= row[:sign] %></td>
-            <% row[:fields].each do |field| %>
-                <td><%= field %></td>
-            <% end %>
-          </tr>
-      <% end %>
-      </tbody>
-    </table>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
-
-

data/lib/view/rows_success.html.erb

@@ -1,42 +1,26 @@
-<style>
-  table.sqlite_success {
-    width: auto;
-    border: none;
-  }
-  table.sqlite_success tr:nth-child(even) {
-    background-color: #DDDDDD;
-  }
-  table.sqlite_success tr:nth-child(odd) {
-    background-color: #FFFFFF;
-  }
-  table.sqlite_success th {
-    color: white;
-    font-weight: bold;
-    background-color: #BBBBBB;
-  }
-  table.sqlite_success td {
-    width: auto;
-    text-align: left;
-  }
-</style>
-
 <h5><%= message %></h5>
-<table class="table table-bordered sqlite_success">
-  <thead>
-  <tr>
-  <% @header.each do |field| %>
-    <th><%= field %></th>
-  <% end %>
-  </tr>
-  </thead>
+<% if @extra_message %>
+  <h6><%= @extra_message %></h6>
+<% end %>
 
-  <tbody>
-  <% @rows.each do |row| %>
-      <tr>
-      <% row.each do |field| %>
-        <td><%= field %></td>
+<div class="mu-sql-table-rendered">
+  <header><%= @table_name %></header>
+  <table>
+    <thead>
+    <tr>
+      <% @header.each do |field| %>
+          <th><%= field %></th>
       <% end %>
-      </tr>
-  <% end %>
-  </tbody>
-</table>
+    </tr>
+    </thead>
+    <tbody>
+    <% @rows.each do |row| %>
+        <tr>
+          <% row.each do |field| %>
+              <td><%= field %></td>
+          <% end %>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-sqlite-runner
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.3
 platform: ruby
 authors:
 - Leandro Di Lorenzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
 description: 
 email:
 - leandro.jdl@gmail.com
@@ -177,15 +177,15 @@ files:
 - lib/helpers.rb
 - lib/html_renderer.rb
 - lib/locales/en.yml
+- lib/locales/es-CL.yml
 - lib/locales/es.yml
 - lib/metadata_hook.rb
 - lib/multiple_executions_runner.rb
-- lib/parsers/common_test_parser.rb
-- lib/parsers/dataset_test_parser.rb
-- lib/parsers/display_test_parser.rb
-- lib/parsers/final_dataset_test_parser.rb
-- lib/parsers/invalid_test_parser.rb
-- lib/parsers/query_test_parser.rb
+- lib/parsers/base_parser.rb
+- lib/parsers/datasets_parser.rb
+- lib/parsers/display_parser.rb
+- lib/parsers/final_dataset_parser.rb
+- lib/parsers/query_parser.rb
 - lib/sqlite_runner.rb
 - lib/test_hook.rb
 - lib/validation_hook.rb
@@ -211,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: SQLite Runner for Mumuki

data/lib/parsers/common_test_parser.rb

@@ -1,45 +0,0 @@
-module Sqlite
-  module CommonTestParser
-
-    COMMENT = '-- NONE'
-    attr_reader :result, :final
-    required :parse, 'You need to implement parse method when use CommonTestParse mixin!'
-
-    def initialize(test)
-      @test = test
-      @result = parse test
-    end
-
-    def choose(solution)
-      solution
-    end
-
-    def has?(key)
-      !@test[key.to_sym].blank?
-    end
-
-    def get(key)
-      @test[key.to_sym]
-    end
-
-    def has_final?
-      # Only FinalDataset should have final query
-      false
-    end
-
-    def get_final
-      ''
-    end
-
-    protected
-
-    def final_parse(test, override = {})
-      seed = test[:seed].blank? ? '' : test[:seed].strip
-      {
-          seed:     override[:seed]     || seed,
-          expected: override[:expected] || test[:expected].strip
-      }
-    end
-
-  end
-end

data/lib/parsers/dataset_test_parser.rb

@@ -1,29 +0,0 @@
-module Sqlite
-  class DatasetTestParser
-
-    include Sqlite::CommonTestParser
-
-    # test = {
-    #   type: dataset,
-    #   seed: INSERT INTO ...,
-    #   expected: |
-    #     id|field
-    #     1|row 1
-    #     ...
-    # }
-    #
-    # return {
-    #   seed: INSERT INTO ...,
-    #   expected: -- NONE
-    # }
-    def parse(test)
-      @solutions = test[:expected].to_s.split("\n").map(&:strip).join("\n")
-      final_parse test, {expected: '-- NONE'}
-    end
-
-    def choose(_solution)
-      @solutions
-    end
-
-  end
-end

data/lib/parsers/display_test_parser.rb

@@ -1,18 +0,0 @@
-module Sqlite
-  class DisplayTestParser
-    include Sqlite::CommonTestParser
-
-    def has_final?
-      has?(:query)
-    end
-
-    def get_final
-      # Assume has_final? is true
-      get(:query)
-    end
-
-    def parse(test)
-      final_parse test, { expected: get_final }
-    end
-  end
-end

data/lib/parsers/final_dataset_test_parser.rb

@@ -1,14 +0,0 @@
-module Sqlite
-  class FinalDatasetTestParser < DatasetTestParser
-
-    def has_final?
-      has?(:final) || has?(:query)
-    end
-
-    def get_final
-      # Assume has_final? is true
-      has?(:final) ? get(:final) : get(:query)
-    end
-
-  end
-end

data/lib/parsers/invalid_test_parser.rb

@@ -1,10 +0,0 @@
-module Sqlite
-  class InvalidTestParser
-
-    include Sqlite::CommonTestParser
-
-    def parse(test)
-      raise I18n.t('message.failure.tests.types', type: test.type)
-    end
-  end
-end

data/lib/parsers/query_test_parser.rb

@@ -1,21 +0,0 @@
-module Sqlite
-  class QueryTestParser
-
-    include Sqlite::CommonTestParser
-
-    # test = {
-    #   type: query,
-    #   seed: INSERT INTO ...,
-    #   expected: SELECT * FROM ...
-    # }
-    #
-    # return {
-    #   seed: INSERT INTO ...,
-    #   expected: SELECT * FROM ...
-    # }
-    def parse(test)
-      final_parse test
-    end
-
-  end
-end