habaki 0.5.3 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a0d86e6c6dc0b69d2d83a359986c92875c4139e8df27897ffb44ad05d6d2fa
-  data.tar.gz: 8c83b1a623518634131e6786b69128588ced9b1e0093f94d9ac6a972d1b1f3b5
+  metadata.gz: a83ac7e15a1048a46ffe3f813ebbd7b6b148b6bcb38740c77c0a8a51192211c1
+  data.tar.gz: 2f0e6b79c7d2b2c845f7133c802e4c73761dda99b03048da244e068946540f14
 SHA512:
-  metadata.gz: d8488e134dbe6ff0c370c94bee15b423c0efe7f1b29d789d3f333777469a9c36e9fca192380c48d8962ce3a2cfb6b0f116f20198cec98558ea5a5ede51153283
-  data.tar.gz: 4cb0de2c9ad929bafd4218f1d46cd888a0180b0102d70526e896d905eb807ad42d3e369b25b3d5759fe636c61fff32de7b42472e688f0ed031d0554ede3f9883
+  metadata.gz: 2115de373c13a3b52e7c8b1cb8da6c5336047c0c2e6dc87e6b6e02d968070e73f5b4de39f1386783dd573b66120244062053c7dffd1feb5da7ca09c17e2a9ce5
+  data.tar.gz: 3ebae27ad8bba15883250e5e119cc10aa6c92d970f59b1edba25ea43bd4f9b89eaeecfe1f8b07956b275a6f43e98eb12c3070a12e7809f7e304aa832ec0be8d1

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.h

@@ -16,6 +16,8 @@
 #include "src/katana.h"
 #include "src/selector.h"
 
+#define UTF8_STR_NEW(val) rb_enc_associate_index(rb_str_new2(val), rb_enc_find_index("UTF-8"))
+
 /* Array */
 
 VALUE rb_array_length(VALUE array);

data/ext/katana/rb_katana_declaration.c

@@ -13,7 +13,7 @@ VALUE rb_declaration_prop(VALUE self)
     KatanaDeclaration *c_decl;
     Data_Get_Struct(self, KatanaDeclaration, c_decl);
     if (c_decl->property)
-        return rb_str_new2(c_decl->property);
+        return UTF8_STR_NEW(c_decl->property);
     else
         Qnil;
 }
@@ -286,10 +286,10 @@ VALUE rb_value_value(VALUE self)
         val = rb_float_new(c_val->fValue);
         break;
     case KATANA_VALUE_IDENT:
-        val = rb_str_new2(c_val->string);
+        val = UTF8_STR_NEW(c_val->string);
         break;
     case KATANA_VALUE_STRING:
-        val = rb_str_new2(c_val->string);
+        val = UTF8_STR_NEW(c_val->string);
         break;
     case KATANA_VALUE_PARSER_FUNCTION:
     {
@@ -304,19 +304,19 @@ VALUE rb_value_value(VALUE self)
         // return katana_stringify_value_list(parser, value->list);
         break;
     case KATANA_VALUE_PARSER_HEXCOLOR:
-        val = rb_str_new2(c_val->string);
+        val = UTF8_STR_NEW(c_val->string);
         break;
     case KATANA_VALUE_URI:
-        val = rb_str_new2(c_val->string);
+        val = UTF8_STR_NEW(c_val->string);
         break;
     case KATANA_VALUE_UNICODE_RANGE:
-        val = rb_str_new2(c_val->string);
+        val = UTF8_STR_NEW(c_val->string);
         break;
     case KATANA_VALUE_DIMENSION:
-        val = rb_str_new2(c_val->string);
+        val = UTF8_STR_NEW(c_val->string);
         break;
     case KATANA_VALUE_UNKNOWN:
-        val = rb_str_new2(c_val->string);
+        val = UTF8_STR_NEW(c_val->string);
         break;
     default:
         fprintf(stderr, "KATANA: unsupported value unit %d (%s)\n", c_val->unit, c_val->string);
@@ -336,7 +336,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;
 }
@@ -371,12 +371,6 @@ void init_katana_declaration()
 
     rb_define_method(rb_Declaration, "position", rb_declaration_position, 0);
 
-    // Declaration
-    rb_Declaration = rb_define_class_under(rb_Katana, "Declaration", rb_cObject);
-    rb_define_method(rb_Declaration, "property", rb_declaration_prop, 0);
-    rb_define_method(rb_Declaration, "important", rb_declaration_important, 0);
-    rb_define_method(rb_Declaration, "values", rb_declaration_values, 0);
-
     // Value
     rb_Value = rb_define_class_under(rb_Katana, "Value", rb_cObject);
     rb_define_method(rb_Value, "value", rb_value_value, 0);

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 rb_enc_associate_index(rb_str_new2(c_sel->value), rb_enc_find_index("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/lib/habaki/charset_rule.rb

@@ -6,7 +6,7 @@ module Habaki
 
     # @param [String] encoding
     def initialize(encoding = nil)
-      @encoding
+      @encoding = encoding
     end
 
     # @param [Formatter::Base] format

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/formal_syntax.rb

@@ -28,7 +28,7 @@ module Habaki
       def traverse(&block)
         block.call self
         @children.each do |child|
-          child.traverse &block
+          child.traverse(&block)
         end
       end
 
@@ -111,7 +111,7 @@ module Habaki
         data.each do |k, v|
           begin
             @properties[k] = Tree.parse(v)
-          rescue FormalSyntaxError => e
+          rescue FormalSyntaxError #=> e
             #STDERR.puts("#{k}: #{e}")
           end
         end

data/lib/habaki/rules.rb

@@ -179,7 +179,7 @@ module Habaki
     end
 
     def each_rule(&block)
-      each &block
+      each(&block)
     end
 
     # @param [Formatter::Base] format

data/lib/habaki/sub_selectors.rb

@@ -4,6 +4,12 @@ module Habaki
     # @return [Symbol]
     attr_accessor :relation
 
+    def initialize(*args)
+      super(*args)
+
+      @relation = nil
+    end
+
     # does every sub selectors match {Visitor::Element} ?
     # @param [Visitor::Element] element
     # @param [Specificity, nil] specificity

metadata

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