mumuki-html-runner 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 300794e63c7cac26dd6c8f769f2e36002c7e867f779cf860c17b64479ed02848
-  data.tar.gz: 9ffb85ae1c11f1f541e73181cd41e04e77bc2fa88ecfb69bd16e857e4ae01ae6
+  metadata.gz: fad781ed2ab0caedcb4dabf843978a196ab21e0180ff65a5bde3c949489bafb2
+  data.tar.gz: 54da7156d0c48c408fef086dcbb3ce09af5ff50298143acae7644c9615d60790
 SHA512:
-  metadata.gz: b6a24b9db3a79f97793dec247313eb79961c6890e614767bbe5a0150fbc007701c8a305c0740a4d29d98a35ec18bafd3c7bf613fbb18062ff8281d931c82bce2
-  data.tar.gz: 1012c8f4c91dbf9ab91616288df728a7ddee93ad904cf3efc9ab77e08998a3ee284c6fc23a8ae767690ced81a2e3cfe1169e0f0c123dad655a26d827c9abf0a2
+  metadata.gz: 1f8c4ed76589390f2d5627bf3afb2645762f647ff3f329b1d8852713bb313062dcc79b34d05ab9e2817856836aa04f7839f957557eea1d6086b64d1dea71b5ff
+  data.tar.gz: 5dc0746e3fe8ea912c5c90bc0a36f37c05441d869e418c705c95b1e048e038791c78f8cfd0a66f9763dbd38bace2e835d5d10ef7abd650a2773ef421cbc3202e

data/lib/expectations_hook.rb

@@ -24,11 +24,11 @@ class HtmlExpectationsHook < Mumukit::Hook
     "Checker::#{lang}".constantize
   end
 
-  def compile_content(request)
-    request.content.presence || request.extra
-  end
-
   def negate(expectation, matches)
     expectation.inspection.negated? ? matches.blank? : matches.present?
   end
+
+  def compile_content(request)
+    request.content.presence || request.extra
+  end
 end

data/lib/extensions/string.rb

@@ -0,0 +1,9 @@
+class String
+  def escape_html
+    ERB::Util.html_escape self
+  end
+
+  def get_extension
+    self.split('.').last
+  end
+end

data/lib/html_runner.rb

@@ -11,9 +11,12 @@ Mumukit.configure do |config|
   config.content_type = 'html'
   config.process_expectations_on_empty_content = true
   config.run_test_hook_on_empty_test = true
+  config.multifile = true
 end
 
+require_relative './extensions/string'
 require_relative './metadata_hook'
+require_relative './precompile_hook'
 require_relative './test_hook'
 require_relative './checker'
 require_relative './expectations_hook'

data/lib/precompile_hook.rb

@@ -0,0 +1,53 @@
+class HtmlPrecompileHook < Mumukit::Templates::MultiFilePrecompileHook
+  VALID_EXTENSIONS = ['.html', '.js', '.css']
+
+  def main_file
+    'index.html'
+  end
+
+  def consolidate(main_content, files)
+    files_by_extension = files.group_by { |file_name, _| file_name.get_extension }
+    files_by_extension.each { |extension, values| files_by_extension[extension] = values.to_h }
+
+    document = Nokogiri::HTML(main_content)
+    merge_script_tags! document, files_by_extension
+    merge_style_tags! document, files_by_extension
+
+    document.to_html
+      .gsub(/<!DOCTYPE[^>]+>/, '')
+      .gsub(/<meta[^>]+>/, '')
+  end
+
+  def files_of(request)
+    super(request).select { |file_name, _| valid_extension? file_name }
+  end
+
+  private
+
+  def valid_extension?(file_name)
+    VALID_EXTENSIONS.any? { |extension| file_name.end_with? extension }
+  end
+
+  def merge_script_tags!(document, files_by_extension)
+    document.xpath("//script").each { |tag| replace_script_tag! tag, files_by_extension }
+  end
+
+  def replace_script_tag!(tag, files_by_extension)
+    src = tag.get_attribute 'src'
+    file = files_by_extension.dig('js', src)
+    tag.replace("<script>#{file}</script>") if file.present?
+  end
+
+  def merge_style_tags!(document, files_by_extension)
+    document.xpath("//link").each { |tag| replace_style_tag! tag, files_by_extension }
+  end
+
+  def replace_style_tag!(tag, files_by_extension)
+    rel = tag.get_attribute 'rel'
+    return if rel != 'stylesheet'
+
+    href = tag.get_attribute 'href'
+    file = files_by_extension.dig('css', href)
+    tag.replace("<style>#{file}</style>") if file.present?
+  end
+end

data/lib/test_hook.rb

@@ -1,19 +1,11 @@
-require 'mumukit/hook'
-
-class String
-  def escape_html
-    ERB::Util.html_escape self
-  end
-end
-
 class HtmlTestHook < Mumukit::Hook
   def compile(request)
     request
   end
 
   def run!(request)
-    expected = request[:test]
-    actual = request[:extra].presence || request[:content]
+    expected = request.test
+    actual = compile_content request
     if expected.blank? || contents_match?(expected, actual)
       [render_html(actual), :passed]
     else
@@ -21,6 +13,8 @@ class HtmlTestHook < Mumukit::Hook
     end
   end
 
+  private
+
   def contents_match?(expected, actual)
     hexp_without_blanks(expected) == hexp_without_blanks(actual)
   rescue
@@ -28,7 +22,7 @@ class HtmlTestHook < Mumukit::Hook
   end
 
   def hexp_without_blanks(content)
-    hexp ["\r", "\n", "\t"]
+    hexp %W(\r \n \t)
            .reduce(content.strip) { |c, it| c.gsub(it, ' ') }
            .squeeze(' ')
   end
@@ -71,4 +65,7 @@ html
 html
   end
 
+  def compile_content(request)
+    request.extra.presence || request.content
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module HtmlVersionHook
-    VERSION = '1.6.2'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-html-runner
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.23'
+        version: '2.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.23'
+        version: '2.24'
 - !ruby/object:Gem::Dependency
   name: hexp
   requirement: !ruby/object:Gem::Requirement
@@ -147,10 +147,12 @@ files:
 - lib/checker/css.rb
 - lib/checker/html.rb
 - lib/expectations_hook.rb
+- lib/extensions/string.rb
 - lib/html_runner.rb
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/metadata_hook.rb
+- lib/precompile_hook.rb
 - lib/test_hook.rb
 - lib/version.rb
 homepage: http://github.com/mumuki/mumuki-html-server