mumukit 2.36.0 → 2.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe34db4bf2fe3ea13c66a83ad0783b868bf12ff315073ee44d3802b74888722f
-  data.tar.gz: 1943fa82dc1cfb03c956a9222e5dc7244278d0064bbdd627153273f41129fd3b
+  metadata.gz: 7df39585e9af97eafeaa33f6189749ed29458e5a55ab37cf3339ae4200fc3f97
+  data.tar.gz: 0d272a7e75b9cd754314cdaafac2e3158b3b80374e88099be3633066d0098ef0
 SHA512:
-  metadata.gz: a3022b139dccd0a786edc7c02fad38e1c31978f397683e80c2c1f91ae6276084a7d82229022a1be2dc0c85421e1bd0b57853f24433ffa28aefd5f05300ba1f6e
-  data.tar.gz: 1790b05e1f0361b501e89bba0c3fdd9cdd07971d41905cb24f1e503bb60f0a18625e4a196bd240251703dca3454db524a6fa43cf19bdb6b0eeffbb38f0f57604
+  metadata.gz: 7d7868073a960f5c0476bb8dd09aa84bb3d3aa1427ea1fef0700c4d664778cb40c60a18f6db212fc641e784839913e17ba23863788c393535b186764e2f44cdb
+  data.tar.gz: ca71c3f73c932143b403e4758e110f1e2f209f15cca3ada46365f95bc4974bef8042939e558ac5e11ef6e280b239dbd5abc48aa836fd8206b6098904b3473141

data/lib/mumukit/error_pattern.rb

@@ -1,15 +1,17 @@
 module Mumukit
   class ErrorPattern
-    def initialize(regexp)
+    def initialize(regexp, status: :failed, replace: '')
       @regexp = regexp
+      @status = status
+      @replacement = replace
     end
 
-    def matches?(result)
-      @regexp.matches? result
+    def matches?(result, status)
+      @status.like?(status) && @regexp.matches?(result)
     end
 
     def sanitize(result)
-      result.gsub(@regexp, '').strip
+      result.gsub(@regexp, @replacement).strip
     end
 
     def transform(result, status)

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/checker.rb

@@ -64,7 +64,7 @@ module Mumukit::Metatest
 
     # Implementors should override this method if they want access to
     # the error details and produce more complex test results
-    def build_error_output(builder, input, _example, error)
+    def build_error_output(builder, _example, input, error)
       builder.result = render_error_output input, error.message
     end
 

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,19 @@ 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({
+        originalLanguage: original_language,
+        autocorrectionRules: autocorrection_rules.try { |it| positive_and_negative it }.presence,
+        normalizationOptions: normalization_options(request).presence
+      }.compact))
     end
 
     def run_mulang_analysis(analysis)
@@ -32,7 +37,6 @@ module Mumukit
       raise Mumukit::CompilationError, "Can not handle mulang results for analysis #{analysis}"
     end
 
-
     def domain_language
       {
         caseStyle: "CamelCase",
@@ -41,6 +45,17 @@ module Mumukit
       }
     end
 
+    def normalization_options(request)
+      request.dig(:settings, :normalization_options) || {}
+    end
+
+    def autocorrection_rules
+      {}
+    end
+
+    def original_language
+    end
+
     def default_smell_exceptions
       []
     end
@@ -76,5 +91,11 @@ module Mumukit
         include Mumukit::Templates::WithCodeSmells
       end
     end
+
+    private
+
+    def positive_and_negative(rules)
+      rules.flat_map { |k, v| [[k, v], ["Not:#{k}", "Not:#{v}"]] }.to_h
+    end
   end
 end

data/lib/mumukit/templates/with_error_patterns.rb

@@ -1,8 +1,8 @@
 module Mumukit::Templates
   module WithErrorPatterns
     def post_process_file(_file, result, status)
-      error_patterns.each { |it| return it.transform(result, status) if it.matches? result } if status.failed?
-      super
+      pattern = error_patterns.find { |it| it.matches? result, status }
+      pattern ? pattern.transform(result, status) : super
     end
 
     def error_patterns

data/lib/mumukit/templates/with_structured_results.rb

@@ -7,7 +7,7 @@ module Mumukit::Templates::WithStructuredResults
       post_process_unstructured_result(file, result, status)
     end
   rescue JSON::ParserError
-    [result, :errored]
+    post_process_unstructured_result(file, result, :errored)
   end
 
   def post_process_unstructured_result(_file, result, status)

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.36.0'
+  VERSION = '2.40.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.36.0
+  version: 2.40.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,28 +212,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.4
 - !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
@@ -266,22 +272,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
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit