habaki 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a0d86e6c6dc0b69d2d83a359986c92875c4139e8df27897ffb44ad05d6d2fa
-  data.tar.gz: 8c83b1a623518634131e6786b69128588ced9b1e0093f94d9ac6a972d1b1f3b5
+  metadata.gz: 07aac3ef018685ae5ba014eae5369fffc0e74d3a0f4219d7caa005f7d359d14b
+  data.tar.gz: 51b5777e6cc9d2b6ead583aa259965d1c78ccfac535214cb058328263b83d2d3
 SHA512:
-  metadata.gz: d8488e134dbe6ff0c370c94bee15b423c0efe7f1b29d789d3f333777469a9c36e9fca192380c48d8962ce3a2cfb6b0f116f20198cec98558ea5a5ede51153283
-  data.tar.gz: 4cb0de2c9ad929bafd4218f1d46cd888a0180b0102d70526e896d905eb807ad42d3e369b25b3d5759fe636c61fff32de7b42472e688f0ed031d0554ede3f9883
+  metadata.gz: 8099f0147a9acf50cea501484328e0b4d737a02daf6c6cce6547b9eb94071fe4e98d4b06c8571c0b635244378531bddf43343ad48d30cbb320876feb77f9552b
+  data.tar.gz: 1fad3480648acc3247ffd822d1136dbfa20120c3f402c346200027c21da0bd4868a0f8a4b0e6a6233ae125dc9ac4e1328078e14c2d43e3ea701ab4bd7a83f824

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);
@@ -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_selector.c

@@ -477,7 +477,7 @@ VALUE rb_selector_data_value(VALUE self)
   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;

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/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.4
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri