mumukit 2.43.0 → 2.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e040afd28d4d12898e0c213d39b5f5404c7ba05cda3f05875700fb418fc33ddd
-  data.tar.gz: be2b5fe4e2240b8056dbb7147a2a6def7a7dfaf7c8d2a0b2b23475f4a5fed83e
+  metadata.gz: 4c4daef670d7b72e6a88cea099905e870f6534ba9d7da574323efc941e8e991e
+  data.tar.gz: 7293bd7160ff5249f5c06f45f34c4bfb87df2ee24128aefda1dbf421ad6be9cd
 SHA512:
-  metadata.gz: 5fe277900418f475fdfebd7eb9481503bf2f0c5cd83caa8ee6386eacca9d8321810aba13a1ae4eb48cc128a91712fe82abdac244e1b52864680008b6039769ef
-  data.tar.gz: 5b3d7125b58decee7c8e74304444191153545f17dce74dfd190f6669aa6016ecca64df515b2ec072693e14f8aed9732b7f68c6c95a2526b82cc8a60bd0482e99
+  metadata.gz: 723eff33716d123138cc159cb3724e554e714bf8da1024afec1372033778488cb0f0c9ea9f3a555aa14a02610375ca4f674de79089d45ebfe8e3c8cbb234391f
+  data.tar.gz: b214cfcc02b1a24f81c4f34ed2d39865fe79d6a56a7fd73c79ef6902cb7218ad29b90deed1a408d58164f1d202fe088f35831a70ceb32bf6f235aaacb9a1821c

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_equal: "All the required queries must be executed"

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_equal: "Se deben realizar todas las consultas 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"
+      check_queries_equal: "Se deben realizar todas las consultas 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_equal: "Todas as consultas solicitadas devem ser feitas"
       goal_passed: "O objetivo foi alcançado com sucesso"

data/lib/mumukit/explainer.rb

@@ -8,15 +8,19 @@ class Mumukit::Explainer
   private
 
   def explanations(content, test_results)
+    eval_explain_methods(content, test_results)
+        .map { |explain| I18n.t(explain[:key], **explain[:binding]) }
+  end
+
+  def eval_explain_methods(content, test_results)
     explain_methods
         .map { |selector, key| eval_explain(selector, key, content, test_results) }
         .compact
-        .map { |explain| I18n.t(explain[:key], explain[:binding]) }
   end
 
   def eval_explain(selector, key, content, test_results)
     send(selector, content, test_results).try do |it|
-      {key: key, binding: it}
+      {key: key, binding: it.is_a?(Hash) ? it : {}}
     end
   end
 

data/lib/mumukit/hook.rb

@@ -7,8 +7,8 @@ class Mumukit::Hook
     @config = (config||{}).with_indifferent_access
   end
 
-  def t(*args)
-    I18n.t(*args)
+  def t(*args, **kwargs)
+    I18n.t(*args, **kwargs)
   end
 
   def method_missing(name, *args, &block)

data/lib/mumukit/metatest/interactive_checker.rb

@@ -14,15 +14,22 @@ 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)
+      fail_t :check_queries_equal unless goal[:values].all? do |regexp|
+        queries.any? { |query| query == regexp }
+      end
     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
@@ -47,7 +54,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)
@@ -68,8 +76,8 @@ module Mumukit::Metatest
       I18n.t locale(:goal_passed)
     end
 
-    def fail_t(sym, *args)
-      fail I18n.t locale(sym), *args
+    def fail_t(sym, **kwargs)
+      fail I18n.t(locale(sym), **kwargs)
     end
 
     def locale(sym)
@@ -83,8 +91,30 @@ module Mumukit::Metatest
     private
 
     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.43.0'
+  VERSION = '2.45.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.43.0
+  version: 2.45.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,22 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -246,28 +252,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: mumukit-directives
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
@@ -368,14 +374,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit