mumukit 2.18.1 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659899e2dc58610a3f7e719e40d37cec27036e9fac9efcb9faee18fbc6ea50c0
-  data.tar.gz: ccf516286aac773ca9dc6d5bd606f02df3a9defa01831c0024393254a243ff94
+  metadata.gz: 95ed79f89e4fde9393a7d6399f76ec3121454fe95b12f3b985356e6639531c16
+  data.tar.gz: c4d389a3719496b384e18d537b9bec25620f3600ed6d1685de9250588e8ccabe
 SHA512:
-  metadata.gz: 884a8ff595db7f16443537c457c11a160747ba3002687fbe30d1292b0cec3d237385d7c328111d423097696a040dc36ef8e330e50f5e8c9c92e7f5f80922ffa1
-  data.tar.gz: 026858365c740fe5175791e1c7555ec249f7d8aa782b270b1590217809c2b6622bf309f7e7a1cad4bf1503e2a9c438f27aa3745968903ec027539444e1f2196e
+  metadata.gz: 9b326efa5b3b4583b5973aaf502b0cfc9b1279c1544df7fd1340fa1eb4d44b7ea6788ec34bc2a15ec4dd2c3160b845dc6bbe2227a10ede34e7f24d92acf9ee1e
+  data.tar.gz: c2f2f53456a181f928a3bfa2dd5575d5b414477d9ac6b0bf4f6e35739f52bb927469647e56c11bbc3270d63c75d9ab2c8e809874662ea42f9d8df41833efa24e

data/lib/locales/en.yml

@@ -8,6 +8,8 @@ en:
       check_last_query_fails: "query should fail but it passed"
       check_last_query_matches: "query does not match regex %{regex}"
       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_query_fails: "query '%{query}' should fail but it passed"
       check_query_outputs: "query '%{query}' output should be '%{expected}' but was '%{actual}'"

data/lib/locales/es.yml

@@ -8,6 +8,8 @@ es:
       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}'"

data/lib/mumukit/defaults.rb

@@ -9,5 +9,6 @@ require_relative './defaults/default_query_hook'
 require_relative './defaults/default_feedback_hook'
 require_relative './defaults/default_validation_hook'
 require_relative './defaults/default_test_hook'
+require_relative './defaults/default_precompile_hook'
 require_relative './defaults/default_try_hook'
-require_relative './defaults/default_metadata_hook'
+require_relative './defaults/default_metadata_hook'

data/lib/mumukit/defaults/default_precompile_hook.rb

@@ -0,0 +1,5 @@
+class Mumukit::Defaults::PrecompileHook < Mumukit::Hook
+  def compile(request)
+    request
+  end
+end

data/lib/mumukit/metatest/interactive_checker.rb

@@ -21,9 +21,21 @@ module Mumukit::Metatest
     end
 
     def check_last_query_outputs(result, goal)
+      compare_last_query_by(:check_last_query_outputs, result, goal) { |expected, actual| expected == actual }
+    end
+
+    def check_last_query_output_includes(result, goal)
+      compare_last_query_by(:check_last_query_output_includes, result, goal) { |expected, actual| actual.include? expected }
+    end
+
+    def check_last_query_output_like(result, goal)
+      compare_last_query_by(:check_last_query_output_like, result, goal) { |expected, actual| normalize(expected) == normalize(actual) }
+    end
+
+    def compare_last_query_by(sym, result, goal, &condition)
       expected = goal[:output]
       actual = result[:query][:result]
-      fail_t :check_last_query_outputs, expected: expected, actual: actual unless expected == actual
+      fail_t sym, expected: expected, actual: actual unless condition.call expected, actual
     end
 
     def check_last_query_passes(result, _goal)
@@ -55,5 +67,10 @@ module Mumukit::Metatest
     def locale(sym)
       'mumukit.interactive.' + sym.to_s
     end
+
+    def normalize(a_string)
+      a_string.delete(" \t\r\n").downcase
+    end
+
   end
 end

data/lib/mumukit/runtime/info.rb

@@ -10,6 +10,7 @@ module Mumukit::RuntimeInfo
         output_content_type: Mumukit.config.content_type,
         comment_type: Mumukit.config.comment_type,
         features: {
+            precompile: precompile_hook?,
             query: query_hook?,
             try: try_hook?,
             expectations: expectations_hook?,

data/lib/mumukit/server/test_server.rb

@@ -91,7 +91,7 @@ class Mumukit::Server::TestServer
   end
 
   def preprocess(request)
-    Mumukit.directives_pipeline.transform(request)
+    runtime.precompile_hook.compile Mumukit.directives_pipeline.transform(request)
   end
 
   def validate_request!(request)

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -8,7 +8,7 @@ module Mumukit
     OBJECT_ORIENTED_SMELLS = %w(DoesNullTest ReturnsNull)
     IMPERATIVE_SMELLS = %w(HasRedundantLocalVariableReturn HasAssignmentReturn)
     EXPRESSIVENESS_SMELLS = %w(HasTooShortBindings HasWrongCaseBindings HasMisspelledBindings)
-    GENERIC_SMELLS = %w(IsLongCode HasCodeDuplication HasRedundantLambda HasRedundantIf DoesTypeTest HasRedundantBooleanComparison)
+    GENERIC_SMELLS = %w(IsLongCode HasCodeDuplication HasRedundantLambda HasRedundantIf DoesTypeTest HasRedundantBooleanComparison HasEmptyIfBranches)
 
     required :language, 'You have to provide a Mulang-compatible language in order to use this hook'
 

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.18.1'
+  VERSION = '2.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.18.1
+  version: 2.19.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -263,6 +263,7 @@ files:
 - lib/mumukit/defaults/default_expectations_hook.rb
 - lib/mumukit/defaults/default_feedback_hook.rb
 - lib/mumukit/defaults/default_metadata_hook.rb
+- lib/mumukit/defaults/default_precompile_hook.rb
 - lib/mumukit/defaults/default_query_hook.rb
 - lib/mumukit/defaults/default_test_hook.rb
 - lib/mumukit/defaults/default_try_hook.rb
@@ -328,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit