mumuki-html-runner 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 08c96b4d60cea964b43ffb8bde5cc0fdfdfac145e96e9c6efe9ce8561be306ec
-  data.tar.gz: 8bc74778d1079957c5f1988f2fee4e77966817422c3bf3006246a5fcbb57028d
+  metadata.gz: 300794e63c7cac26dd6c8f769f2e36002c7e867f779cf860c17b64479ed02848
+  data.tar.gz: 9ffb85ae1c11f1f541e73181cd41e04e77bc2fa88ecfb69bd16e857e4ae01ae6
 SHA512:
-  metadata.gz: 4568cfca7e92895d4d41dbed6fa9f989248463181acc2bd8425662b868dadca0105f3f6b96b6a630bfdd105b097ed9d1c363fed470b3195f7e6b0c9e73f772b9
-  data.tar.gz: e0ff4ddae4c7f62bfc639b4538a02736a9115633da409feebb86bfae0490820e1da9d4a5752d97bde21e63340fb61c5b3678d2b2244641de013762b1d64ac01d
+  metadata.gz: b6a24b9db3a79f97793dec247313eb79961c6890e614767bbe5a0150fbc007701c8a305c0740a4d29d98a35ec18bafd3c7bf613fbb18062ff8281d931c82bce2
+  data.tar.gz: 1012c8f4c91dbf9ab91616288df728a7ddee93ad904cf3efc9ab77e08998a3ee284c6fc23a8ae767690ced81a2e3cfe1169e0f0c123dad655a26d827c9abf0a2

data/lib/checker/css.rb

@@ -1,6 +1,6 @@
 class CssParser::Parser
-  def tree
-    to_h['all'].with_indifferent_access
+  def dig(*keys)
+    to_h['all'].dig(*keys.map(&:to_s)) rescue {}
   end
 end
 
@@ -17,7 +17,11 @@ module Checker
       inspection = expectation.inspection
       parser = CssParser::Parser.new
       parser.load_string! content
-      raise "Unsopported inspection #{inspection.type}" unless ['DeclaresStyle', 'DeclaresStyle:'].include? inspection.type
+      raise "Unsupported inspection #{inspection.type}" unless ['DeclaresStyle', 'DeclaresStyle:'].include? inspection.type
+      inspect parser, inspection, binding
+    end
+
+    def self.inspect(parser, inspection, binding)
       case inspection.target.to_s.split(':').size
         when 0 then inspect_selector(parser, inspection, binding)
         when 1 then inspect_property(parser, inspection, binding)
@@ -27,16 +31,17 @@ module Checker
     end
 
     def self.inspect_selector(parser, inspection, binding)
-      parser.tree[binding.to_s].present?
+      parser.dig(binding).present?
     end
 
     def self.inspect_property(parser, inspection, binding)
       property, value = parse_target(inspection.target)
-      parser.tree[binding.to_s][property].present?
+      parser.dig(binding, 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
+      parser.dig(binding, property)&.words&.include? value
     end
 
     def self.parse_target(target)

data/lib/expectations_hook.rb

@@ -6,16 +6,24 @@ class HtmlExpectationsHook < Mumukit::Hook
   def run!(request)
     document = Nokogiri::HTML(compile_content(request))
     request.expectations.map do |raw|
-      expectation = Mumukit::Inspection::Expectation.parse(raw.with_indifferent_access)
-      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)}
+      evaluate_expectation raw, document
     end
   end
 
   private
 
+  def evaluate_expectation(raw, document)
+    expectation = Mumukit::Inspection::Expectation.parse(raw.with_indifferent_access)
+    binding = expectation.binding.gsub(/(css:)|(html:)/, '')
+    matches = checker_for(expectation).run document, expectation, binding
+    {expectation: raw, result: negate(expectation, matches)}
+  end
+
+  def checker_for(expectation)
+    lang = expectation.binding.starts_with?('css:')? 'CSS' : 'HTML'
+    "Checker::#{lang}".constantize
+  end
+
   def compile_content(request)
     request.content.presence || request.extra
   end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-html-runner
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: HTML Runner for Mumuki