mumuki-html-runner 1.4.1 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c0771033573571fffde2c2d2da99b208dfacbb1e88ad309cf9876a305d9914a
-  data.tar.gz: 9083f8440c43f84e15f11b4f2b38592e3febde3717307da9c5f51a1d630d07c6
+  metadata.gz: eb9f720963e478e84f41e49be031589ca06af4684380c9f7573e65a87884af86
+  data.tar.gz: 575ee6e54a3350ad148ec38c36afaa0c8c6467f88ff558049d19a8d7343b4349
 SHA512:
-  metadata.gz: 6cebf7fe755a947f300a8881ef2b6079bf89857ef2ad78b0885397623081ba3de3836ef8c3599bacca7e7f5f5ebdcb0839dbbe1f31528c3170a71a69586eeebf
-  data.tar.gz: 0209fb23e352863f542842972464852f761a04f2f3c88687595e81b15c6dfcc85981b1dfb5f7342dfd0a036694bf3e8685897134ecfd2d67a11e4bcf0f03800a
+  metadata.gz: d26a4aeb0fc1c77b9566a04299f04029f56976509ceff1b80ae589e21cd36b9670a15e4d4bbf7872c6d599415ada17f23fc48250b046490a68b24fa020b2532c
+  data.tar.gz: fafac3a131ad24d4c00d3a332c63737df6f0738b1c6f535915edddb1c631f6ed53982c983039ed4b1c0306bf14dddbbffaf529a553cee6f8efe509767d56ce0d

data/lib/checker/css.rb

@@ -0,0 +1,46 @@
+class CssParser::Parser
+  def tree
+    to_h['all'].with_indifferent_access
+  end
+end
+
+class String
+  def words
+    split(' ')
+  end
+end
+
+module Checker
+  class CSS
+    def self.run(document, expectation, binding)
+      content = document.xpath('//style').text.presence || document.text
+      inspection = expectation.inspection
+      parser = CssParser::Parser.new
+      parser.load_string! content
+      raise "Unsopported inspection #{inspection.type}" unless ['DeclaresStyle', 'DeclaresStyle:'].include? inspection.type
+      case inspection.target.to_s.split(':').size
+        when 0 then inspect_selector(parser, inspection, binding)
+        when 1 then inspect_property(parser, inspection, binding)
+        when 2 then inspect_property_and_value(parser, inspection, binding)
+        else raise "Malformed target value."
+      end
+    end
+
+    def self.inspect_selector(parser, inspection, binding)
+      parser.tree[binding.to_s].present?
+    end
+
+    def self.inspect_property(parser, inspection, binding)
+      property, value = parse_target(inspection.target)
+      parser.tree[binding.to_s][property].present?
+    end
+    def self.inspect_property_and_value(parser, inspection, binding)
+      property, value = parse_target(inspection.target)
+      parser.tree[binding.to_s][property].words.include? value
+    end
+
+    def self.parse_target(target)
+     target.to_s.split(':')
+    end
+  end
+end

data/lib/checker/html.rb

@@ -0,0 +1,22 @@
+module Checker
+  class HTML
+    def self.run(document, expectation, binding)
+      document.xpath "#{compile_scope binding}//#{compile_html_target expectation.inspection}"
+    end
+
+    def self.compile_html_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 self.compile_scope(binding)
+      "//#{binding == '*' ? '' : binding}"
+    end
+  end
+end

data/lib/checker.rb

@@ -0,0 +1,2 @@
+require_relative 'checker/html.rb'
+require_relative 'checker/css.rb'

data/lib/expectations_hook.rb

@@ -7,28 +7,15 @@ class HtmlExpectationsHook < Mumukit::Hook
     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}"
+      binding = expectation.binding.gsub(/(css:)|(html:)/, '')
+      lang = expectation.binding.starts_with?('css:')? 'CSS' : 'HTML'
+      matches = "Checker::#{lang}".constantize.run document, expectation, binding
       {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

data/lib/html_runner.rb

@@ -2,6 +2,7 @@ require 'mumukit'
 require 'yaml'
 require 'nokogiri'
 require 'hexp'
+require 'css_parser'
 
 I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
@@ -12,4 +13,5 @@ end
 
 require_relative './metadata_hook'
 require_relative './test_hook'
+require_relative './checker'
 require_relative './expectations_hook'

data/lib/test_hook.rb

@@ -13,7 +13,7 @@ class HtmlTestHook < Mumukit::Hook
 
   def run!(request)
     expected = request[:test]
-    actual = request[:content]
+    actual = request[:extra] || request[:content]
 
     if contents_match?(expected, actual)
       [render_html(actual), :passed]

data/lib/version.rb

@@ -1,3 +1,3 @@
 module HtmlVersionHook
-  VERSION = '1.4.1'
+  VERSION = '1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-html-runner
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: '1.5'
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: mumukit-content-type
+  name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
+        version: '1.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 description: 
 email:
 - franco@mumuki.org
@@ -143,6 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/checker.rb
+- lib/checker/css.rb
+- lib/checker/html.rb
 - lib/expectations_hook.rb
 - lib/html_runner.rb
 - lib/locales/en.yml
@@ -170,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: HTML Runner for Mumuki