mumukit 2.34.1 → 2.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecf5dad926913985cd2067a888f7e14233c66a70a887ee287d60093fd3d33faf
-  data.tar.gz: 8e36f9461737a850f6c8a691b0e6524bbe58dbd7276e92b5c5e40f6ad4c407d4
+  metadata.gz: b3876e1a398e3f2e0cf33f7aa1a4df85979cca7ffef37b4070d5344c2072e952
+  data.tar.gz: 9dcde120df168b2898461e08cb08ca26c219fdaf0791bc38a133891a7dba51ad
 SHA512:
-  metadata.gz: 6fbd065df141368fee19ddfbc7c9eb03df473ff1a0cf92cc2b4ab407dc35688ce7ac119cd778e63ad6a87a880f41fbe7c027645e652b959e13eb2355070618f6
-  data.tar.gz: 7ea9f24a7635aec967c1c3ceb3df3458a533aacdd644596beb58bbb91fffa15ef62bbe785d9d5a984bafc80faa48bc75adb279da4765e2559381226227f829df
+  metadata.gz: 6863a908811d9df5f390827c8c3fdea11d0c3de67b07435658d037d8b5ba9ae9d9c13cb92236bbab0e29bf942d7d668468112295ca1ce9f6cda2312cc1e0c328
+  data.tar.gz: 2ab1f2822e74a9b7c0a628f4661749a6e1d87e2c69c833844a34cc434ba626e61026a7f61e554a8dfccd9dc60e414b1836ad143fbfeafcbc2199e3b01801e63c

data/lib/locales/es-CL.yml

@@ -0,0 +1,17 @@
+es-CL:
+  mumukit:
+    memory_exceeded: Limite de memoria excedido. ¿Tu programa está alocando demasiada memoria?
+    time_exceeded: Limite de tiempo de ejecución de %{limit}s excedido. ¿Tu programa tiene recursión o bucle infinito?
+    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 %{regex}"
+      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_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"

data/lib/locales/es.yml

@@ -1,7 +1,7 @@
 es:
   mumukit:
     memory_exceeded: Limite de memoria excedido. ¿Tu programa está alocando demasiada memoria?
-    time_exceeded:  Limite de tiempo de ejecución de %{limit}s excedido. ¿Tu programa tiene recursión o bucle infinito?
+    time_exceeded: Limite de tiempo de ejecución de %{limit}s excedido. ¿Tu programa tiene recursión o bucle infinito?
     masked_tempfile_basename: solucion
     interactive:
       check_last_query_equals: "La consulta debería ser '%{expected}' pero fue '%{actual}'"
@@ -14,4 +14,4 @@ es:
       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"
+      goal_passed: "El objetivo se cumplió exitosamente"

data/lib/mumukit/explainer.rb

@@ -1,11 +1,17 @@
 class Mumukit::Explainer
+  include Mumukit::WithContentType
+
   def explain(content, test_results)
+    content_type.enumerate(explanations(content, test_results))
+  end
+
+  private
+
+  def explanations(content, test_results)
     explain_methods
         .map { |selector, key| eval_explain(selector, key, content, test_results) }
         .compact
         .map { |explain| I18n.t(explain[:key], explain[:binding]) }
-        .map { |it| "* #{it}" }
-        .join("\n")
   end
 
   def eval_explain(selector, key, content, test_results)

data/lib/mumukit/metatest.rb

@@ -3,6 +3,7 @@ end
 
 require_relative './metatest/errors'
 require_relative './metatest/checker'
+require_relative './metatest/test_result_builder'
 require_relative './metatest/interactive_checker'
 require_relative './metatest/framework'
-require_relative './metatest/identity_runner'
+require_relative './metatest/identity_runner'

data/lib/mumukit/metatest/checker.rb

@@ -24,10 +24,12 @@ module Mumukit::Metatest
     ## }
     ##
     def check(input, example)
+      builder = Mumukit::Metatest::TestResultBuilder.new
+
       check_assertions input, postconditions_for(example), example
-      [example[:name], :passed, render_success_output(input)]
+      build_passed_test_result builder, example, input
     rescue => e
-      [example[:name], :failed, render_error_output(input, e.message)]
+      build_failed_test_result builder, example, input, e
     end
 
     ## If no postconditions are included in the example,
@@ -36,12 +38,34 @@ module Mumukit::Metatest
       example[:postconditions] || example.except(:name)
     end
 
-    def render_success_output(value)
+    # Implementors may override this method instead of `build_success_output`
+    # if they don't want to handle error details.
+    #
+    # This method is only for backward compatibility. New code
+    # should use `build_success_output`.
+    def render_success_output(_input)
       nil
     end
 
-    def render_error_output(value, error)
-      error
+    # Implementors may override this method instead of `build_error_output`
+    # if they don't want to handle error details.
+    #
+    # This method is only for backward compatibility. New code
+    # should use `build_error_output`.
+    def render_error_output(_input, error_message)
+      error_message
+    end
+
+    # Implementors should override this method if they want access to
+    # the error details and produce more complex test results
+    def build_success_output(builder, _example, input)
+      builder.result = render_success_output input
+    end
+
+    # Implementors should override this method if they want access to
+    # the error details and produce more complex test results
+    def build_error_output(builder, _example, input, error)
+      builder.result = render_error_output input, error.message
     end
 
     def check_assertions(input, assertions_hash, example)
@@ -54,16 +78,30 @@ module Mumukit::Metatest
       send "check_#{assertion_name}", input, assertion_config
     end
 
-    def fail(message)
-      raise Mumukit::Metatest::Failed, message
+    def fail(message, details: nil)
+      raise Mumukit::Metatest::Failed.new(message, details)
+    end
+
+    def abort(message, details: nil)
+      raise Mumukit::Metatest::Aborted.new(message, details)
+    end
+
+    def error(message, details: nil)
+      raise Mumukit::Metatest::Errored.new(message, details)
     end
 
-    def abort(message)
-      raise Mumukit::Metatest::Aborted, message
+    def build_passed_test_result(builder, example, input)
+      builder.title = example[:name]
+      builder.status = :passed
+      build_success_output builder, example, input
+      builder.build
     end
 
-    def error(message)
-      raise Mumukit::Metatest::Errored, message
+    def build_failed_test_result(builder, example, input, e)
+      builder.title = example[:name]
+      builder.status = :failed
+      build_error_output builder, example, input, e
+      builder.build
     end
   end
 end

data/lib/mumukit/metatest/errors.rb

@@ -1,10 +1,17 @@
 module Mumukit::Metatest
-  class Aborted < StandardError
+  class BaseError < StandardError
+    attr_reader :details
+    def initialize(message = "", details = nil)
+      super(message)
+      @details = details
+    end
+  end
+  class Aborted < BaseError
   end
 
-  class Errored < StandardError
+  class Errored < BaseError
   end
 
-  class Failed < StandardError
+  class Failed < BaseError
   end
-end
+end

data/lib/mumukit/metatest/test_result_builder.rb

@@ -0,0 +1,20 @@
+module Mumukit::Metatest
+  class TestResultBuilder
+    attr_accessor :title, :status, :result, :summary_type, :summary_message
+
+    def summary
+      {type: summary_type.presence, message: summary_message.presence}.compact
+    end
+
+    def build
+      raise 'missing status' unless status
+      raise "invalid #{status}" unless status.passed? || status.failed?
+
+      if summary_message.present? || summary_type.present?
+        [title, status, result, summary]
+      else
+        [title, status, result]
+      end
+    end
+  end
+end

data/lib/mumukit/server/response_builder.rb

@@ -58,10 +58,16 @@ class Mumukit::Server::ResponseBuilder
   end
 
   def structured_base_response(test_results)
-    {testResults: test_results[0].map { |title, status, result|
-      {title: title,
-       status: status,
-       result: result} }}
+    {
+      testResults: test_results[0].map do |title, status, result, summary|
+        { summary: summary&.compact.presence }
+          .compact
+          .merge(
+            title: title,
+            status: status,
+            result: result)
+      end
+    }
   end
 
   def unstructured_base_response(test_results)

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -2,12 +2,12 @@ require 'mulang'
 
 module Mumukit
   class Templates::MulangExpectationsHook < Mumukit::Templates::ExpectationsHook
-    LOGIC_SMELLS = %w(UsesCut UsesFail UsesUnificationOperator HasRedundantReduction)
-    FUNCTIONAL_SMELLS = %w(HasRedundantParameter HasRedundantGuards)
-    OBJECT_ORIENTED_SMELLS = %w(DoesNullTest ReturnsNull)
-    IMPERATIVE_SMELLS = %w(HasRedundantLocalVariableReturn HasAssignmentReturn)
-    EXPRESSIVENESS_SMELLS = %w(HasTooShortIdentifiers HasWrongCaseIdentifiers HasMisspelledIdentifiers)
-    GENERIC_SMELLS = %w(IsLongCode HasCodeDuplication HasRedundantLambda HasRedundantIf DoesTypeTest HasRedundantBooleanComparison HasEmptyIfBranches)
+    LOGIC_SMELLS = Mulang::Expectation::LOGIC_SMELLS
+    FUNCTIONAL_SMELLS = Mulang::Expectation::FUNCTIONAL_SMELLS
+    OBJECT_ORIENTED_SMELLS = Mulang::Expectation::OBJECT_ORIENTED_SMELLS
+    IMPERATIVE_SMELLS = Mulang::Expectation::IMPERATIVE_SMELLS
+    EXPRESSIVENESS_SMELLS = Mulang::Expectation::EXPRESSIVENESS_SMELLS
+    GENERIC_SMELLS = Mulang::Expectation::GENERIC_SMELLS
 
     required :language, 'You have to provide a Mulang-compatible language in order to use this hook'
 
@@ -16,14 +16,15 @@ module Mumukit
     end
 
     def compile_mulang_analysis(request, expectations)
-      mulang_code(request).analysis(
+      mulang_code(request).analysis({
         expectations: expectations[:ast],
         customExpectations: expectations[:custom],
         smellsSet: {
           tag: 'AllSmells',
           exclude: (expectations[:exceptions] + default_smell_exceptions)
         },
-        domainLanguage: domain_language)
+        domainLanguage: domain_language
+      }.merge({normalizationOptions: normalization_options(request).presence}.compact))
     end
 
     def run_mulang_analysis(analysis)
@@ -41,6 +42,10 @@ module Mumukit
       }
     end
 
+    def normalization_options(request)
+      request.dig(:settings, :normalization_options) || {}
+    end
+
     def default_smell_exceptions
       []
     end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.34.1'
+  VERSION = '2.38.0'
 end

metadata

@@ -1,63 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.34.1
+  version: 2.38.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.71'
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
@@ -218,28 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mumukit-inspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
@@ -272,22 +266,16 @@ dependencies:
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.10'
 description: Helpers for building a Mumuki Test Server
 email:
 - flbulgarelli@yahoo.com.ar
@@ -297,6 +285,7 @@ extra_rdoc_files: []
 files:
 - bin/limit
 - lib/locales/en.yml
+- lib/locales/es-CL.yml
 - lib/locales/es.yml
 - lib/locales/pt.yml
 - lib/mumukit.rb
@@ -323,6 +312,7 @@ files:
 - lib/mumukit/metatest/framework.rb
 - lib/mumukit/metatest/identity_runner.rb
 - lib/mumukit/metatest/interactive_checker.rb
+- lib/mumukit/metatest/test_result_builder.rb
 - lib/mumukit/request_validation_error.rb
 - lib/mumukit/runner.rb
 - lib/mumukit/runtime.rb
@@ -379,8 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit