mumuki-html-runner 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bef45a937249aac3b6f295ba3aa9c6ead134902e3dff6fd9f3ab09b33127f20
-  data.tar.gz: b3862c3908414db153d931e0806aab02d64defef6d19118a7c395cfb5677e825
+  metadata.gz: bcbdb041cc4373fe9b76efa16bed98e2f3e33a772e7dadbd40eb8ef8ae385e01
+  data.tar.gz: 48b4976b8acb6a024e82f2f2d39317368a38d778a7743b4f59af63060a059a3c
 SHA512:
-  metadata.gz: 18a1ce2ca358b0ae6fffb4611012d4b94b69e80147b33f26f86af6cd298ce9938c6e34f7b8705fbc99d08722b7e84deed0b46df3d386e09a82d05c3c284f1555
-  data.tar.gz: '0833cd3ea0fca23e100be82e9b988a6db5a3b763c97fa261238f8f1beb6db71c746ce8a110a3a808f7a897b79f0909ae1b30fb00a7ea03c5304c44a301d9c90a'
+  metadata.gz: d0f32a90864e368d36a550b0c05a96a7f1016d76ade32c2651546b4cdf7adb28d104009c89e6de844cbae2e34c4d6260026543b24fc82e638678c1d5283ded75
+  data.tar.gz: bd526ba79d842c06f62ea014a5cf8704fdbfffd44918de58ef1d46e2c5883984a41f87a23e18384aa15557c44ff91335c8feeddaf48647a1cc6ec330f7651a4b

data/lib/checker/css.rb

@@ -1,18 +1,46 @@
 class CssParser::Parser
   def dig(*keys)
-    to_h['all'].dig(*keys.map(&:to_s)) rescue {}
+    media = parse_media(keys)
+    selectors = get_selectors(keys)
+    selectors.unshift(media)
+    to_h(media).dig(*selectors) rescue {}
+  end
+
+  def parse_media(keys)
+    media = keys.map { |k| k.get_string_between_markers('@media_start', '@media_end') }
+    media.first || 'all'
+  end
+
+  def get_selectors(keys)
+    keys.map { |k| k.remove_string_between_markers('@media_start', '@media_end:') }
   end
 end
 
 class String
   # Avoids properties like rgb(5, 10, 15) to be split
   def css_values
-    scan /[^\s]+\(\s*\g<0>\s*(?:,\s*\g<0>)*\)|[^\s]+/
+    scan(/[^\s]+\(\s*\g<0>\s*(?:,\s*\g<0>)*\)|[^\s]+/).map(&:normalize_rgb_css_value)
+  end
+
+  def normalize_rgb_css_value
+    if starts_with?("rgb(")
+      gsub(" ", "")
+    else
+      self
+    end
   end
 
   def comma_separated_words
     split(',').map(&:strip)
   end
+
+  def get_string_between_markers(starter, ender)
+    self[/#{Regexp.escape(starter)}(.*?)#{Regexp.escape(ender)}/m, 1]
+  end
+
+  def remove_string_between_markers(starter, ender)
+    gsub(/#{starter}.*#{ender}/, '')
+  end
 end
 
 module Checker
@@ -57,7 +85,7 @@ module Checker
       if inspection_value =~ COMMA_SEPARATED_INSPECTION_REGEX
         comma_separated_values_match? inspection_value, actual_value
       else
-        actual_value.css_values.include? inspection_value
+        actual_value.css_values.include? inspection_value.normalize_rgb_css_value
       end
     end
 
@@ -68,5 +96,6 @@ module Checker
     def self.comma_separated_values_match?(inspection_value, actual_value)
       inspection_value.comma_separated_words == actual_value.comma_separated_words
     end
+
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module HtmlVersionHook
-  VERSION = '1.14.0'
+  VERSION = '1.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-html-runner
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit