mumukit 2.25.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b81867a9a5abeffe235e31ab9112621032cd9aabe70331164cd04ef9fa9690d
-  data.tar.gz: 8a2a5ee8b78adccd927ae4cf6eeb2485500aa97b5a29289a77ae6ff067c767c4
+  metadata.gz: b3ff9be27328e92ddbb2839b5516184611a2bc7668fc12104543c42e652fa1ad
+  data.tar.gz: a65d361bd7ca62cceb96c2612b2fb329ab3cf162a20465f90c43c607ef701fba
 SHA512:
-  metadata.gz: 259531cd39aabca42051d6e5e43f2e1a20034aaffb66275073b2554a7f9cb4644bbf9df865b29ef9e1523a566995e85ed3452401e1d7dc0c202682a4a3f4c296
-  data.tar.gz: 3fa8093b04df63cbf313d7204fb710a7a566d2ac7a369750d359294c7ef93c1b6c87e4ada07da72adffd88bd0b9f07b10f2d0d431212d00453b208174a954c85
+  metadata.gz: bfcd703a70856249f859ce1f9b5a1e422a791558d2b0c3532d5a8b577043cdc09e7e67a4835c0ef76f0485dc6c112ebaa36ae8e0e6a1c5ebf54949564fa96102
+  data.tar.gz: daf555d8f5bd48540354e9b80b5554e4bcfa600b51aa7c6227513bb7310845de1d74833076854d91491bb7b1335b47964d4454a1a17c1c7cbca16d2f21f78763

data/lib/mumukit/metatest/interactive_checker.rb

@@ -7,7 +7,7 @@ module Mumukit::Metatest
 
     def check_last_query_equals(_result, goal)
       expected = goal[:value]
-      actual = @request.query
+      actual = @request.query.strip
       fail_t :check_last_query_equals, expected: expected, actual: actual unless expected == actual
     end
 

data/lib/mumukit/templates.rb

@@ -16,5 +16,6 @@ require_relative './templates/with_cookie'
 
 require_relative './templates/file_hook'
 require_relative './templates/try_hook'
+require_relative './templates/expectations_hook'
 require_relative './templates/mulang_expectations_hook'
-require_relative './templates/multi_file_precompile_hook'
+require_relative './templates/multi_file_precompile_hook'

data/lib/mumukit/templates/expectations_hook.rb

@@ -0,0 +1,81 @@
+require 'mumukit/inspection'
+
+module Mumukit
+  class Templates::ExpectationsHook < Mumukit::Hook
+    SOURCE_EXPECTATION_EVALUATORS = {
+      'SourceRepeats' => lambda { |source, target| source.scan(target).count > 1 },
+      'SourceContains' => lambda { |source, target| source.include? target },
+      'SourceEquals' => lambda { |source, target| source == target },
+      'SourceEqualsIgnoreSpaces' => lambda { |source, target| source.delete(' ') == target.delete(' ') }
+    }
+    SOURCE_EXPECTATIONS = SOURCE_EXPECTATION_EVALUATORS.keys.flat_map { |it| [it, "Not:#{it}"] }
+
+    def compile(request)
+      { request: request, expectations: compile_expectations(request) }
+    end
+
+    def run!(spec)
+      spec[:expectations][:source].map { |it| it.evaluate spec[:request][:content] }
+    end
+
+    private
+
+    def compile_expectations(request)
+      expectations = {ast: [], source: [], exceptions: []}
+      request[:expectations].each do |it|
+        fill_expectations it.deep_symbolize_keys, expectations
+      end
+      expectations
+    end
+
+    def fill_expectations(expectation, expectations)
+      inspection = expectation[:inspection]
+      if inspection&.start_with? 'Except:'
+        expectations[:exceptions] << inspection[7..-1]
+      elsif SOURCE_EXPECTATIONS.any? { |it| inspection.starts_with? it  }
+        expectations[:source] << compile_source_expectation(expectation)
+      else
+        expectations[:ast] << compile_expectation(expectation)
+      end
+    end
+
+    def compile_expectation(expectation)
+      Mumukit::Inspection::Expectation.parse(expectation).as_v2.to_h
+    end
+
+    def compile_source_expectation(expectation)
+      SourceExpectation.parse(expectation)
+    end
+
+    class SourceExpectation
+      def initialize(expectation, evaluator)
+        @expectation = expectation
+        @evaluator = evaluator
+      end
+
+      def evaluate(content)
+        { result: evaluate_inspection(content), expectation: @expectation.to_h }
+      end
+
+      def inspection
+        @expectation.inspection
+      end
+
+      def self.parse(expectation)
+        parsed = Mumukit::Inspection::Expectation.parse(expectation)
+        evaluator = parse_evaluator(parsed.inspection)
+        new parsed, evaluator
+      end
+
+      private
+
+      def evaluate_inspection(content)
+        inspection.negated? ^ @evaluator.call(content, inspection.target.value)
+      end
+
+      def self.parse_evaluator(inspection)
+        SOURCE_EXPECTATION_EVALUATORS[inspection.type]
+      end
+    end
+  end
+end

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -1,8 +1,7 @@
-require 'mumukit/inspection'
 require 'mulang'
 
 module Mumukit
-  class Templates::MulangExpectationsHook < Mumukit::Hook
+  class Templates::MulangExpectationsHook < Mumukit::Templates::ExpectationsHook
     LOGIC_SMELLS = %w(UsesCut UsesFail UsesUnificationOperator HasRedundantReduction)
     FUNCTIONAL_SMELLS = %w(HasRedundantParameter HasRedundantGuards)
     OBJECT_ORIENTED_SMELLS = %w(DoesNullTest ReturnsNull)
@@ -12,18 +11,21 @@ module Mumukit
 
     required :language, 'You have to provide a Mulang-compatible language in order to use this hook'
 
-    def compile(request)
-      expectations, exceptions = compile_expectations_and_exceptions request
+    def run!(spec)
+      super(spec) + run_mulang_analysis(compile_mulang_analysis(spec[:request], spec[:expectations]))
+    end
+
+    def compile_mulang_analysis(request, expectations)
       mulang_code(request).analysis(
-        expectations: expectations,
+        expectations: expectations[:ast],
         smellsSet: {
           tag: 'AllSmells',
-          exclude: (exceptions + default_smell_exceptions)
+          exclude: (expectations[:exceptions] + default_smell_exceptions)
         },
         domainLanguage: domain_language)
     end
 
-    def run!(analysis)
+    def run_mulang_analysis(analysis)
       parse_response Mulang.analyse(analysis)
     rescue JSON::ParserError
       raise Mumukit::CompilationError, "Can not handle mulang results for analysis #{analysis}"
@@ -50,32 +52,10 @@ module Mumukit
       language == 'Mulang' ? Mulang::Language::External.new :  Mulang::Language::Native.new(language)
     end
 
-    def compile_expectations_and_exceptions(request)
-      expectations = []
-      exceptions = []
-      request[:expectations].each do |it|
-        fill_expectations_and_excetions it.deep_symbolize_keys, expectations, exceptions
-      end
-      [expectations, exceptions]
-    end
-
-    def fill_expectations_and_excetions(expectation, expectations, exceptions)
-      inspection = expectation[:inspection]
-      if inspection&.start_with? 'Except:'
-        exceptions << inspection[7..-1]
-      else
-        expectations << compile_expectation(expectation)
-      end
-    end
-
     def compile_content(content)
       content
     end
 
-    def compile_expectation(expectation)
-      Mumukit::Inspection::Expectation.parse(expectation).as_v2.to_h
-    end
-
     def parse_response(response)
       if response['tag'] == 'AnalysisFailed'
         raise Mumukit::CompilationError, response['reason']

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.25.0'
+  VERSION = '2.26.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -301,6 +301,7 @@ files:
 - lib/mumukit/server/test_pipeline.rb
 - lib/mumukit/server/test_server.rb
 - lib/mumukit/templates.rb
+- lib/mumukit/templates/expectations_hook.rb
 - lib/mumukit/templates/file_hook.rb
 - lib/mumukit/templates/mulang_expectations_hook.rb
 - lib/mumukit/templates/multi_file_precompile_hook.rb