mumuki-html-runner 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90318399001a50de2298a98ff8a52935e82a5b1036ea4287f91c0ec8b0231dc3
-  data.tar.gz: bb6818f459cd4b032909257a53cfc88d62792bfc90b3d8447b08bb8d8194ae1a
+  metadata.gz: 381f811961e7943923bb0e7ea097983cb3df09bdca4bf42c810d16a11fab1668
+  data.tar.gz: b71db3c7a3c2faebacd8d94f1ed36ea2fe200b87487cc51a42cf2b29913d581e
 SHA512:
-  metadata.gz: a6953c20bd10aeadad5d11e7e09eb5af71669cc4a1c8ebb9b89b8fe97dd9d9c1c13c0c71f8f5865797b2160cae5e19d15af1e8dc290f1ce281568e2fd3ec7c18
-  data.tar.gz: a22084ffc2fafb1447e6283f7eb6f33fe732146e7fc828ac6a5d4b111f04226c5430d7be3203ce366b862923f152c419ede1c8fd7fac6a57e0e763d48a5d8e89
+  metadata.gz: 21699d887c9949bb73179cb98eb16baa4514e60e73762af17bb3aea17c7ef5c45aa8c56c1d307b4dd3aa53b4aebf69ab7a0f1474b3deb9198cb3115954731b85
+  data.tar.gz: 1d8c939636302e7558f810955a292337a6bfe0ce3eda0af424a39db3564f6b81f3f7341e0d7a0b0992eeb57d6601c5d67c0c77cf4914b0826211a82c7a400390

data/lib/expectations_hook.rb

@@ -0,0 +1,35 @@
+class HtmlExpectationsHook < Mumukit::Hook
+  def compile(request)
+    request
+  end
+
+  def run!(request)
+    document = Nokogiri::HTML(request.content)
+    request.expectations.map do |raw|
+      expectation = Mumukit::Inspection::Expectation.parse(raw.with_indifferent_access)
+      matches = document.xpath "#{compile_scope expectation}//#{compile_target expectation.inspection}"
+      {expectation: raw, result: negate(expectation, matches)}
+    end
+  end
+
+  private
+
+  def compile_target(inspection)
+    target = inspection.target
+    raise 'Target is required' if target.blank?
+
+    case inspection.type
+      when 'DeclaresTag'       then target.value
+      when 'DeclaresAttribute' then "@#{target.value}"
+      else raise "Unsupported inspection #{inspection.type}"
+    end
+  end
+
+  def compile_scope(expectation)
+    "//#{expectation.binding == '*' ? '' : expectation.binding}"
+  end
+
+  def negate(expectation, matches)
+    expectation.inspection.negated? ? matches.blank? : matches.present?
+  end
+end

data/lib/html_runner.rb

@@ -1,5 +1,7 @@
 require 'mumukit'
 require 'yaml'
+require 'nokogiri'
+require 'hexp'
 
 I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
@@ -10,3 +12,4 @@ end
 
 require_relative './metadata_hook'
 require_relative './test_hook'
+require_relative './expectations_hook'

data/lib/test_hook.rb

@@ -15,13 +15,24 @@ class HtmlTestHook < Mumukit::Hook
     expected = request[:test]
     actual = request[:content]
 
-    if expected.visible_chars == actual.visible_chars
+    if contents_match?(expected, actual)
       [render_html(actual), :passed]
     else
       [render_fail_html(actual, expected), :failed]
     end
   end
 
+  def contents_match?(expected, actual)
+    hexp(expected) == hexp(actual)
+  rescue
+    expected == actual
+  end
+
+  def hexp(content)
+    squeezed_content = [' ', "\n", "\t"].reduce(content, :squeeze)
+    Hexp::Node.new(:html, Hexp.parse(squeezed_content))
+  end
+
   def render_html(actual)
     build_iframe actual
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module HtmlVersionHook
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-html-runner
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.18'
+- !ruby/object:Gem::Dependency
+  name: hexp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/expectations_hook.rb
 - lib/html_runner.rb
 - lib/locales/en.yml
 - lib/locales/es.yml