habaki 0.5.4 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07aac3ef018685ae5ba014eae5369fffc0e74d3a0f4219d7caa005f7d359d14b
-  data.tar.gz: 51b5777e6cc9d2b6ead583aa259965d1c78ccfac535214cb058328263b83d2d3
+  metadata.gz: 0fd0e2139182ac5010a3b35babbcae6c6d72f44ed202073409f18fb176697f6b
+  data.tar.gz: 8f4c8f57cc5e63a989485a82523c424902179b4717d3df89fd86934afda4ae6f
 SHA512:
-  metadata.gz: 8099f0147a9acf50cea501484328e0b4d737a02daf6c6cce6547b9eb94071fe4e98d4b06c8571c0b635244378531bddf43343ad48d30cbb320876feb77f9552b
-  data.tar.gz: 1fad3480648acc3247ffd822d1136dbfa20120c3f402c346200027c21da0bd4868a0f8a4b0e6a6233ae125dc9ac4e1328078e14c2d43e3ea701ab4bd7a83f824
+  metadata.gz: 5432b604be85936b38b166b240b29c1779ffd6ae4ebd3a29376df4b543bca6b66bc9dfa98b0afeb1ceabeed64c612538bf4db23ceb4bf6dbf9046727d3a5574b
+  data.tar.gz: 7e6487154a87046b8ce1c9cd2e38f7da4dcc909faf8e1930e0264bb1c7606f9de10baefde686ca347061ed2798ad5177bb741cb262d7098b2d56071a913ea62c

data/ext/katana/rb_katana.c

@@ -165,7 +165,7 @@ VALUE rb_error_message(VALUE self)
 {
   KatanaError *c_err;
   Data_Get_Struct(self, KatanaError, c_err);
-  return rb_str_new2(c_err->message);
+  return UTF8_STR_NEW(c_err->message);
 }
 
 /*

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:
@@ -336,7 +335,7 @@ VALUE rb_value_function_name(VALUE self)
     KatanaValueFunction *c_val;
     Data_Get_Struct(self, KatanaValueFunction, c_val);
     if (c_val->name)
-        return rb_str_new2(c_val->name);
+        return UTF8_STR_NEW(c_val->name);
     else
         return Qnil;
 }

data/ext/katana/rb_katana_rule.c

@@ -104,7 +104,7 @@ VALUE rb_namespace_rule_prefix(VALUE self)
   KatanaNamespaceRule *c_rule;
   Data_Get_Struct(self, KatanaNamespaceRule, c_rule);
   if (c_rule->prefix)
-    return rb_str_new2(c_rule->prefix);
+    return UTF8_STR_NEW(c_rule->prefix);
   else
     return Qnil;
 }
@@ -117,7 +117,7 @@ VALUE rb_namespace_rule_uri(VALUE self)
   KatanaNamespaceRule *c_rule;
   Data_Get_Struct(self, KatanaNamespaceRule, c_rule);
   if (c_rule->prefix)
-    return rb_str_new2(c_rule->uri);
+    return UTF8_STR_NEW(c_rule->uri);
   else
     return Qnil;
 }

data/ext/katana/rb_katana_selector.c

@@ -13,7 +13,7 @@ VALUE rb_name_local(VALUE self)
   KatanaQualifiedName *c_name;
   Data_Get_Struct(self, KatanaQualifiedName, c_name);
   if (c_name->local)
-    return rb_str_new2(c_name->local);
+    return UTF8_STR_NEW(c_name->local);
   else
     return Qnil;
 }
@@ -26,7 +26,7 @@ VALUE rb_name_prefix(VALUE self)
   KatanaQualifiedName *c_name;
   Data_Get_Struct(self, KatanaQualifiedName, c_name);
   if (c_name->prefix)
-    return rb_str_new2(c_name->prefix);
+    return UTF8_STR_NEW(c_name->prefix);
   else
     return Qnil;
 }
@@ -39,7 +39,7 @@ VALUE rb_name_uri(VALUE self)
   KatanaQualifiedName *c_name;
   Data_Get_Struct(self, KatanaQualifiedName, c_name);
   if (c_name->uri)
-    return rb_str_new2(c_name->uri);
+    return UTF8_STR_NEW(c_name->uri);
   else
     return Qnil;
 }
@@ -475,10 +475,7 @@ VALUE rb_selector_data_value(VALUE self)
   KatanaSelectorRareData *c_sel;
   Data_Get_Struct(self, KatanaSelectorRareData, c_sel);
   if (c_sel->value)
-  {
-    // force UTF-8
     return UTF8_STR_NEW(c_sel->value);
-  }
   else
     return Qnil;
 }
@@ -504,7 +501,7 @@ VALUE rb_selector_data_argument(VALUE self)
   KatanaSelectorRareData *c_sel;
   Data_Get_Struct(self, KatanaSelectorRareData, c_sel);
   if (c_sel->argument)
-    return rb_str_new2(c_sel->argument);
+    return UTF8_STR_NEW(c_sel->argument);
   else
     return Qnil;
 }

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

metadata

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