habaki 0.5.5 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9308e4a60c00b0a7fa4eefd07b3d90a10c31d4331d0b6d30f4ddfbbb50f956bb
-  data.tar.gz: 4ae3a2400c1c6a76dffe30f69e548bf518d8a6d1997951261ec4f99be9494c59
+  metadata.gz: 53fe14ebdd6dd692db34dc3a59a3dbe2fc9761d085cd1bcd756080e06483e4c0
+  data.tar.gz: 6481a5a4591a6e6ebbea3eb6e241eac1baa48ca9812541d8cef184e10f2800a4
 SHA512:
-  metadata.gz: c197ef464e17297a07070d620fd934948f315a75e1047b3cc620f6e9b74a880758bdaa185dd61c2b1c6b60f7d527b42e61830d6d91bfeef000ab6fbdd8909c4f
-  data.tar.gz: a800968b456fb15162cfa1d1180b2b063cd5821bcc59d14206869484ea633b0d305731bbc976143fa4069f5aa47488859de80a0b8e2ec48124da81090b80bdeb
+  metadata.gz: ce923e584db6917510237761e67f3bdc9ac3153f220ace405a2a9ab2eb7940321239e844d9f7ded97290961780e79aa005cbd7c3962bf68c6f294651d514b73e
+  data.tar.gz: d3befa18c61f461d0f568a859e93d465248990938d9ecf7bd13109887debeb1b3a753a7fe8ee5ad5cdc9ea9dba3062f1d6dd3ab01b2c7181c9b3f906b8f3111e

data/ext/katana/rb_katana_declaration.c

@@ -281,8 +281,7 @@ VALUE rb_value_value(VALUE self)
     case KATANA_VALUE_VH:
     case KATANA_VALUE_VMIN:
     case KATANA_VALUE_VMAX:
-        // printf("KATANA: %s %d %f\n", c_val->raw, c_val->iValue, c_val->fValue);
-        // val = rb_str_new2(c_val->raw);
+    case KATANA_VALUE_FR:
         val = rb_float_new(c_val->fValue);
         break;
     case KATANA_VALUE_IDENT:

data/ext/katana/src/katana.tab.c

@@ -742,14 +742,14 @@ static const yytype_int16 yyrline[] =
     1548,  1549,  1555,  1556,  1558,  1559,  1560,  1561,  1562,  1563,
     1569,  1570,  1571,  1575,  1579,  1580,  1581,  1582,  1583,  1584,
     1585,  1586,  1587,  1588,  1589,  1590,  1591,  1592,  1593,  1594,
-    1595,  1596,  1597,  1598,  1599,  1602,  1603,  1604,  1605,  1606,
-    1607,  1608,  1609,  1610,  1614,  1617,  1620,  1626,  1627,  1631,
-    1634,  1637,  1640,  1645,  1647,  1651,  1657,  1663,  1667,  1672,
-    1677,  1681,  1684,  1691,  1692,  1696,  1700,  1706,  1707,  1711,
-    1712,  1713,  1714,  1715,  1719,  1722,  1723,  1724,  1731,  1734,
-    1735,  1736,  1740,  1743,  1744,  1748,  1754,  1760,  1764,  1767,
-    1767,  1767,  1767,  1767,  1767,  1767,  1767,  1770,  1775,  1780,
-    1782,  1783,  1784,  1785,  1788,  1790,  1791,  1792
+    1595,  1596,  1597,  1598,  1599,  1600,  1601,  1602,  1603,  1604,
+    1605,  1606,  1607,  1608,  1612,  1615,  1618,  1624,  1625,  1629,
+    1632,  1635,  1638,  1643,  1645,  1649,  1655,  1661,  1665,  1670,
+    1675,  1679,  1682,  1689,  1690,  1694,  1698,  1704,  1705,  1709,
+    1710,  1711,  1712,  1713,  1717,  1720,  1721,  1722,  1729,  1732,
+    1733,  1734,  1738,  1741,  1742,  1746,  1752,  1758,  1762,  1765,
+    1765,  1765,  1765,  1765,  1765,  1765,  1765,  1768,  1773,  1778,
+    1780,  1781,  1782,  1783,  1786,  1788,  1789,  1790
 };
 #endif
 
@@ -3982,9 +3982,7 @@ yyreduce:
     break;
 
   case 304:
-                    {
-      (yyval.value) = katana_new_dimension_value(parser, &(yyvsp[0].number), KATANA_VALUE_REMS);
-  }
+                    { (yyval.value) = katana_new_dimension_value(parser, &(yyvsp[0].number), KATANA_VALUE_REMS); }
     break;
 
   case 305:

data/ext/katana/src/parser.c

@@ -1516,6 +1516,7 @@ static const char* katana_stringify_value(KatanaParser* parser, KatanaValue* val
         case KATANA_VALUE_VH:
         case KATANA_VALUE_VMIN:
         case KATANA_VALUE_VMAX:
+        case KATANA_VALUE_FR:
             snprintf(str, sizeof(str), "%s", value->raw);
             break;
         case KATANA_VALUE_IDENT:

data/ext/katana/src/tokenizer.c

@@ -146,6 +146,7 @@ int katana_tokenize(KATANASTYPE* lval , KATANALTYPE* loc, yyscan_t scanner, Kata
         case KATANA_CSS_VH:
         case KATANA_CSS_VMIN:
         case KATANA_CSS_VMAX:
+        case KATANA_CSS_FR:
             length--;
         case KATANA_CSS_SECS:
         case KATANA_CSS_PERCENTAGE:

data/lib/habaki/declarations.rb

@@ -46,7 +46,8 @@ module Habaki
         when 4
           values = declaration.values
         else
-          raise ArgumentError, "Cannot parse #{declaration.values}"
+          # "Habaki error: Cannot parse #{property}: #{declaration.values} (#{declaration.values.length} values)"
+          next
         end
 
         replacement = [top, right, bottom, left].zip(values).to_h

data/lib/habaki/rules.rb

@@ -34,20 +34,25 @@ module Habaki
     end
 
     def lookup_rules(args, tag_name, class_name, id_name, &block)
-      class_or_id = nil
-      class_or_id = ".#{class_name}" if class_name
-      class_or_id = "##{id_name}" if id_name
-
       @hash_tree[args].dig(tag_name, nil)&.each do |rule|
         block.call rule
       end
 
-      @hash_tree[args].dig("*", class_or_id)&.each do |rule|
-        block.call rule
-      end
+      classes_names = [nil]
+      classes_names = class_name.split(" ") if class_name
 
-      @hash_tree[args].dig(tag_name, class_or_id)&.each do |rule|
-        block.call rule
+      classes_names.each do |p_class_name|
+        class_or_id = nil
+        class_or_id = ".#{p_class_name}" if p_class_name
+        class_or_id = "##{id_name}" if id_name
+
+        @hash_tree[args].dig("*", class_or_id)&.each do |rule|
+          block.call rule
+        end
+
+        @hash_tree[args].dig(tag_name, class_or_id)&.each do |rule|
+          block.call rule
+        end
       end
     end
 

data/lib/habaki/sub_selector.rb

@@ -44,7 +44,8 @@ module Habaki
       when :tag
         tag_match?(element.tag_name, specificity)
       when :class
-        class_match?(element.class_name, specificity)
+        classes_names = element.class_name ? element.class_name.split(" ") : [nil]
+        classes_names.map{|p_class_name| class_match?(p_class_name, specificity)}.any?
       when :id
         id_match?(element.id_name, specificity)
       when :pseudo_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: habaki
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.8
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri