mumukit 2.44.0 → 2.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 027a4f91a42c7b90c17b418228e73956f751f707e51d6ded4c4802126f25d1c4
-  data.tar.gz: e6fe7203e99fecf139597da9b5c833717b49af81a1cd5402d05fd6d752f9e7f3
+  metadata.gz: 4373e0933cc618f5296133f601a28fc2a32497f072ebcef924bdb54757d54d5c
+  data.tar.gz: b31b3f50fa6e859b7815fc75d7da804b72146eceb35c3dff7c5b7558c5c61c23
 SHA512:
-  metadata.gz: cc83fce40d4e6c02abbdc0fb05dbc481d8eab5538d4cd7109646a853cc2b4f88e168569857eafe02be21c7a76fb2e3214d7a048b49f170563c5c07f6a2eaecc8
-  data.tar.gz: 67ab25ad98d772145044d999bcc6af135d314c5102293b3604fcfb4c50dc0e34ef4d1fe6d9ddde428999a73fadd40a5942fd5a2f0905be59f3266b5543544ede
+  metadata.gz: e58de2ec660e81837568e02e13a1b2f7cb86f9fde5b607a761a130354df7bb7fa5acf364bb14a8819edc69c349f6a3c70a5e1ee98e627563d193935d7a7ff756
+  data.tar.gz: 8536f6834bc8c8d643084701c1cc509772b35780a9a3a89ea7c69ba57e23021a5961cf01fb9b13fd90bbcab0f105a6f6484b60ba18646916cbab63421f68da26

data/lib/locales/en.yml

@@ -5,14 +5,15 @@ en:
     masked_tempfile_basename: solution
     interactive:
       check_last_query_equals: "query should be '%{expected}' but was '%{actual}'"
-      check_last_query_fails: "query should fail but it passed"
-      check_last_query_matches: "query does not match regexp %{regexp}"
+      check_last_query_fails: "query should fail but it was '%{actual}' and passed"
+      check_last_query_matches: "query should match regexp %{regexp}, but was '%{actual}'"
       check_last_query_outputs: "query output should be '%{expected}' but was '%{actual}'"
-      check_last_query_includes: "query output should include '%{expected}' but was '%{actual}'"
-      check_last_query_like: "query output should be like '%{expected}' but was '%{actual}'"
-      check_last_query_passes: "query should pass but it failed"
+      check_last_query_output_includes: "query output should include '%{expected}' but was '%{actual}'"
+      check_last_query_output_like: "query output should be like '%{expected}' but was '%{actual}'"
+      check_last_query_passes: "query should pass but it was '%{actual}' and failed"
       check_query_fails: "query '%{query}' should fail but it passed"
       check_query_outputs: "query '%{query}' output should be '%{expected}' but was '%{actual}'"
       check_query_passes: "query '%{query}' should pass but it failed"
       goal_passed: "goal was met successfully"
-      check_queries_match: "All the required queries must be executed"
+      check_queries_match: "All the required queries must be executed. Executed %{all} but only %{matches} match the expectations"
+      check_queries_equal: "All the required queries must be executed. Executed %{all} but only %{matches} match the expectations"

data/lib/locales/es-CL.yml

@@ -5,14 +5,15 @@ es-CL:
     masked_tempfile_basename: solucion
     interactive:
       check_last_query_equals: "La consulta debería ser '%{expected}' pero fue '%{actual}'"
-      check_last_query_fails: "La consulta debería fallar pero pasó"
-      check_last_query_matches: "La consulta no cumple con la expresión regular %{regexp}"
+      check_last_query_fails: "La consulta debería fallar pero fue '%{actual}' y pasó"
+      check_last_query_matches: "La consulta debería cumplir con la expresión regular '%{regexp}' pero fue '%{actual}'"
       check_last_query_outputs: "La consulta debería devolver '%{expected}' pero devolvió '%{actual}'"
-      check_last_query_includes: "La consulta debería incluir '%{expected}' pero devolvió '%{actual}'"
-      check_last_query_like: "La consulta debería ser como '%{expected}' pero devolvió '%{actual}'"
-      check_last_query_passes: "La consulta debería pasar pero falló"
+      check_last_query_output_includes: "El retorno de la consulta debería incluir '%{expected}' pero devolvió '%{actual}'"
+      check_last_query_output_like: "El retorno de la consulta debería ser como '%{expected}' pero devolvió '%{actual}'"
+      check_last_query_passes: "La consulta debería pasar pero fue '%{actual}' y falló"
       check_query_fails: "La consulta '%{query}' debería fallar pero pasó"
       check_query_outputs: "La consulta '%{query}' debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_query_passes: "La consulta '%{query}' debería pasar pero falló"
       goal_passed: "El objetivo se cumplió exitosamente"
-      check_queries_match: "Se deben realizar todas las consultas solicitadas"
+      check_queries_match: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"
+      check_queries_equal: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"

data/lib/locales/es.yml

@@ -5,14 +5,15 @@ es:
     masked_tempfile_basename: solucion
     interactive:
       check_last_query_equals: "La consulta debería ser '%{expected}' pero fue '%{actual}'"
-      check_last_query_fails: "La consulta debería fallar pero pasó"
-      check_last_query_matches: "La consulta no cumple con la expresión regular %{regexp}"
+      check_last_query_fails: "La consulta debería fallar pero fue '%{actual}' y pasó"
+      check_last_query_matches: "La consulta debería cumplir con la expresión regular '%{regexp}' pero fue '%{actual}'"
       check_last_query_outputs: "La consulta debería devolver '%{expected}' pero devolvió '%{actual}'"
-      check_last_query_includes: "La consulta debería incluir '%{expected}' pero devolvió '%{actual}'"
-      check_last_query_like: "La consulta debería ser como '%{expected}' pero devolvió '%{actual}'"
-      check_last_query_passes: "La consulta debería pasar pero falló"
+      check_last_query_output_includes: "El retorno de la consulta debería incluir '%{expected}' pero devolvió '%{actual}'"
+      check_last_query_output_like: "El retorno de la consulta debería ser como '%{expected}' pero devolvió '%{actual}'"
+      check_last_query_passes: "La consulta debería pasar pero fue '%{actual}' y falló"
       check_query_fails: "La consulta '%{query}' debería fallar pero pasó"
       check_query_outputs: "La consulta '%{query}' debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_query_passes: "La consulta '%{query}' debería pasar pero falló"
-      check_queries_match: "Se deben realizar todas las consultas solicitadas"
       goal_passed: "El objetivo se cumplió exitosamente"
+      check_queries_match: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"
+      check_queries_equal: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"

data/lib/locales/pt.yml

@@ -5,14 +5,15 @@ pt:
     masked_tempfile_basename: solução
     interactive:
       check_last_query_equals: "a consulta deve ser '%{expected}' mas foi '%{actual}'"
-      check_last_query_fails: "a consulta deve falhar, mas passou"
-      check_last_query_matches: "A consulta não corresponde a regex %{regexp}"
+      check_last_query_fails: "a consulta deve falhar, mas foi '%{actual}' e passou"
+      check_last_query_matches: "A consulta deve corresponder a regex %{regexp} mas foi '%{actual}'"
       check_last_query_outputs: "O resultado da consulta deve ser '%{expected}', mas foi '%{actual}'"
-      check_last_query_includes: "O resultado da consulta deve incluir '%{expected}', mas foi '%{actual}'"
-      check_last_query_like: "O resultado da consulta deve ser como '%{expected}', mas foi '%{actual}'"
-      check_last_query_passes: "A consulta deve passar, mas falhou"
+      check_last_query_output_includes: "O resultado da consulta deve incluir '%{expected}', mas foi '%{actual}'"
+      check_last_query_output_like: "O resultado da consulta deve ser como '%{expected}', mas foi '%{actual}'"
+      check_last_query_passes: "A consulta deve passar, mas foi '%{actual}' e falhou"
       check_query_fails: "a consulta '%{query}' deve falhar, mas passou"
       check_query_outputs: "a consulta '%{query}' deve ser '%{expected}', mas foi '%{actual}'"
       check_query_passes: "a consulta '%{query}' deve passar, mas falhou"
-      check_queries_match: "Todas as consultas solicitadas devem ser feitas"
+      check_queries_match: "Todas as consultas solicitadas devem ser feitas. %{all} foram feitas mas só %{matches} correspondem com as solicitadas"
+      check_queries_equal: "Todas as consultas solicitadas devem ser feitas. %{all} foram feitas mas só %{matches} correspondem com as solicitadas"
       goal_passed: "O objetivo foi alcançado com sucesso"

data/lib/mumukit/metatest/interactive_checker.rb

@@ -14,18 +14,27 @@ module Mumukit::Metatest
 
     def check_last_query_matches(_result, goal)
       regexp = goal[:regexp]
-      fail_t :check_last_query_matches, regexp: regexp.inspect unless query.match?(regexp)
+      actual = query
+      fail_t :check_last_query_matches, regexp: regexp.inspect, actual: actual unless query.match?(regexp)
     end
 
     def check_last_query_fails(result, _goal)
-      fail_t :check_last_query_fails unless result[:query][:status].failed?
+      actual = query
+      fail_t :check_last_query_fails, actual: actual unless result[:query][:status].failed?
+    end
+
+    def check_queries_equal(result, goal)
+      matches = goal[:values].map do |value|
+        queries.find { |query| query == value }
+      end.compact
+      fail_queries_t :check_queries_equal, queries, matches, goal[:values]
     end
 
     def check_queries_match(result, goal)
-      queries = [query] + @request.cookie.to_a
-      fail_t :check_queries_match unless goal[:regexps].all? do |regexp|
-        queries.any? { |query| query.match? regexp }
-      end
+      matches = goal[:regexps].map do |regexp|
+        queries.find { |query| query.match? regexp }
+      end.compact
+      fail_queries_t :check_queries_match, queries, matches, goal[:regexps]
     end
 
     def check_last_query_outputs(result, goal)
@@ -47,7 +56,8 @@ module Mumukit::Metatest
     end
 
     def check_last_query_passes(result, _goal)
-      fail_t :check_last_query_passes unless result[:query][:status].passed?
+      actual = query
+      fail_t :check_last_query_passes, actual: actual unless result[:query][:status].passed?
     end
 
     def check_query_passes(result, goal)
@@ -82,9 +92,39 @@ module Mumukit::Metatest
 
     private
 
+    def join_queries(queries)
+      queries.map { |it| "`#{it}`" }.join(", ").presence || '**∅**'
+    end
+
+    def fail_queries_t(key, queries, matches, expectations)
+      fail_t key, all: join_queries(queries), matches: join_queries(matches) unless matches.size == expectations.size
+    end
+
     def query
-      query_s = @request.query.to_s
-      @strip_mode == :right_only ? query_s.rstrip : query_s.strip
+      strip @request.query.to_s
+    end
+
+    def cookie
+      @request.cookie.to_a.map { |it| strip it }
+    end
+
+    def strip(string)
+      case strip_mode
+      when :strict then string
+      when :right_only then string.rstrip
+      when :right_and_internal then string.rstrip.squeeze(' ')
+      when :left_and_right then string.strip
+      when :left_right_and_internal then string.strip.squeeze(' ')
+      else raise "Unsupported strip mode #{@strip_mode}"
+      end
+    end
+
+    def queries
+      @queries ||= [query] + cookie
+    end
+
+    def strip_mode
+      @request.dig(:settings, :interactive_strip_mode) || @strip_mode
     end
   end
 end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.44.0'
+  VERSION = '2.46.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.44.0
+  version: 2.46.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler