mumuki-sqlite-runner 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c247a76a413469d5e8c749ee216bf4d406429c560e50c69dd62ff119125d9004
-  data.tar.gz: b02f32da0c03682efbe31da8e906b9a21e52a0e6f99af670ef6fa4f1ec588011
+  metadata.gz: 4b25152c9fd36bed95d9ca16275446be2051c19cdf3c82dd4a3947bdcb8d1374
+  data.tar.gz: e38baeeeb4df27d0d61afc08edf59f8dbb7b391f0d30f2e72abc36d459649b06
 SHA512:
-  metadata.gz: bfdbc18de9b34c2b219aa222a499a91650a61b2dc213f2ac480a17be3de1d894f8b99739257b6a645d32f6f62472c63e0e4bb2b37cd3fe96ad67d608827998a5
-  data.tar.gz: 94addefc89c3405e2b649e1c5a49bfd38538e25290b70891c0859d8756036a4dc6efdc8f187e425c9eba28574cf6e15a1c8d90e0d13d3e14ba4ed6a39d2d759c
+  metadata.gz: b108d2e67211448a23b53a67c17f0c13479d9ab4b7cea0fa744762a03d4760fea5e155fade026957bf1e9e446055bf9b1292df20fd78f5fca7356604eeb8cf41
+  data.tar.gz: 60a3a18d2959835184fcee8713b8d529da138ef20c57ab006186541487ccb50d01caac4c2f93965683d0cf9e230f669fbb52f41d2288d42a20c3752fc17422c2

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.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
@@ -84,11 +85,20 @@ class SqliteTestHook < Mumukit::Templates::FileHook
     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.1'
+  VERSION = '3.3.2'
 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.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Leandro Di Lorenzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -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
@@ -180,10 +180,10 @@ files:
 - 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
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: SQLite Runner for Mumuki