mumuki-sqlite-runner 3.3.0 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3734b0af25cc1a8f563c7bfda8e13a7891f78421fbcda0710553bc3c5140ee8e
-  data.tar.gz: 78b63bfb30f4f4ef26742db5e5b1f98deb80a9b89ff64d1eeddc2b0111b7ceb9
+  metadata.gz: fd53507ebff39f0daa4369c29adbc3b7fa0650eccc2f3ef7abd6de296ffbbe00
+  data.tar.gz: ec8829a963f3cbb38b2d18b904a60aff7d54c10ba269fa19333121a89d5b5b52
 SHA512:
-  metadata.gz: eb05abd4833c0f3f7ab3a3d6125bbbfd6a1fceea140b9dead9be60a37c4030b562a2c0548614854b0afc1a3f4e2c4db9b42cca954fa8e81c48de5f6c73fa354b
-  data.tar.gz: 30cd885678391688ff8fe2b0d3cea9a34cc51a4bf31d5bae8eee956102a7986b2f646f8db194ac4ef00bf3d883ded8418f77e4eaa4c2ca1749cdfac06fc52c82
+  metadata.gz: 6283b043775cc86885562d72c8d81430d4b395945f124d9e79d27f542f9737f476eaef3c3aab389e616f9df942219285df8d028ae72d9ae5ccc0b1814d2861be
+  data.tar.gz: 69843d6ede2fdf6be2213afecadc4f2b171c816bd32003c60f03e21c61656fada03cb3ab645eb01f5d3ee1bcfe325c27f35cebd56f68f2451c28a4d87cb16d74

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

@@ -16,5 +16,8 @@ module Sqlite
       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,9 +1,15 @@
 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'

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,9 +1,15 @@
 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'

data/lib/parsers/{general_parser.rb → base_parser.rb}

@@ -26,6 +26,14 @@ module Sqlite
       ''
     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

data/lib/parsers/final_dataset_parser.rb

@@ -11,6 +11,10 @@ module Sqlite
       }
     end
 
+    def show_query?
+      true
+    end
+
     def get_final_query
       has?(:final) ? get(:final) : get(:query)
     end

data/lib/sqlite_runner.rb

@@ -16,7 +16,7 @@ require_relative './version_hook'
 require_relative './metadata_hook'
 require_relative './html_renderer'
 require_relative './multiple_executions_runner'
-require_relative './parsers/general_parser'
+require_relative './parsers/base_parser'
 require_relative './parsers/query_parser'
 require_relative './parsers/display_parser'
 require_relative './parsers/datasets_parser'

data/lib/test_hook.rb

@@ -19,9 +19,10 @@ class SqliteTestHook < Mumukit::Templates::FileHook
   # Transform Mumuki Request into Docker file style
   def compile_file_content(request)
     parse_tests request.test
+    student_code = parse_student_code "#{request.content&.strip}#{get_final_query}"
     {
         init:    "#{request.extra&.strip}",
-        student: "#{request.content&.strip}#{get_final_query}",
+        student: student_code,
         tests:   get_tests
     }.to_json
   end
@@ -48,13 +49,24 @@ class SqliteTestHook < Mumukit::Templates::FileHook
     expected.map!.with_index do |expect, i|
       @tests[i].choose_solution expect
     end
+    student = normalize_headers(student)
+    expected = normalize_headers(expected)
     diff(expected, student)
   end
 
+  def normalize_headers(results)
+    results.map do |result|
+      headers, *rows = result.split("\n")
+
+      headers.downcase!
+      [headers, *rows].join("\n")
+    end
+  end
+
   # 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 }
@@ -66,22 +78,38 @@ 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 = collect_tests(tests).map do |test|

data/lib/validation_hook.rb

@@ -29,8 +29,4 @@ class SqliteValidationHook < Mumukit::Hook
       fail! "message.failure.tests.fields.#{test.type}" unless parser.test_has_valid_fields? test
     end
   end
-
-  def fail!(*args)
-    raise Mumukit::RequestValidationError, I18n.t(*args)
-  end
 end

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module SqliteVersionHook
-  VERSION = '3.3.0'
+  VERSION = '3.3.4'
 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.3.0
+  version: 3.3.4
 platform: ruby
 authors:
 - Leandro Di Lorenzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2021-11-25 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,13 +177,14 @@ 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/base_parser.rb
 - lib/parsers/datasets_parser.rb
 - lib/parsers/display_parser.rb
 - lib/parsers/final_dataset_parser.rb
-- lib/parsers/general_parser.rb
 - lib/parsers/query_parser.rb
 - lib/sqlite_runner.rb
 - lib/test_hook.rb
@@ -210,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: SQLite Runner for Mumuki