habaki 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb31379da24aff32519428d320bfd20e20445f009c8912cdbbf940822a64a35c
-  data.tar.gz: ea74632fd8cb95ac348fcfc95463b8aa2cb1ee452f224fdc0b5c4774d276d669
+  metadata.gz: 07aac3ef018685ae5ba014eae5369fffc0e74d3a0f4219d7caa005f7d359d14b
+  data.tar.gz: 51b5777e6cc9d2b6ead583aa259965d1c78ccfac535214cb058328263b83d2d3
 SHA512:
-  metadata.gz: 116dbb8a23a4ec449e2544e9c9f63ce894b80d5e2c3dc5b3393fa6792baf3b616407817f0169cad20409e107942d90b699a79ce3dfa3a3f4e32d0bf4600877d4
-  data.tar.gz: 844e6cf9e458d98a7458688a3335d4ccecd6b23cd73b798b755b575feda5ba6f1b853ac2abdd5d1cf4145f6e75c41e2ddf69f1794543b32020169d2ae6d6859a
+  metadata.gz: 8099f0147a9acf50cea501484328e0b4d737a02daf6c6cce6547b9eb94071fe4e98d4b06c8571c0b635244378531bddf43343ad48d30cbb320876feb77f9552b
+  data.tar.gz: 1fad3480648acc3247ffd822d1136dbfa20120c3f402c346200027c21da0bd4868a0f8a4b0e6a6233ae125dc9ac4e1328078e14c2d43e3ea701ab4bd7a83f824

data/ext/katana/extconf.rb

@@ -10,7 +10,7 @@ src/katana-parser/parser.c src/katana-parser/selector.c src/katana-parser/tokeni
 src/rb_katana_array.c src/rb_katana_selector.c src/rb_katana_declaration.c src/rb_katana_rule.c src/rb_katana.c
 }
 
-$INCFLAGS << " -I$(srcdir)/src"
+$INCFLAGS << " -std=c99 -I$(srcdir)/src"
 
 # add folder, where compiler can search source files
 $VPATH << "$(srcdir)/src"

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

@@ -98,8 +98,8 @@ module Habaki
         props[match.reference] << match.value
       end
 
-      props.each do |k, v|
-        new_decl = add_by_property(k, Values.new([v].flatten))
+      props.each do |prop, values|
+        new_decl = add_by_property(prop, values)
         new_decl.position = declaration.position
       end
 
@@ -122,10 +122,10 @@ module Habaki
       border_style_properties = %w[border-width border-style border-color]
 
       border_style_properties.each do |prop|
-        create_shorthand_properties! prop unless find_by_property(prop)
+        create_shorthand_properties! prop unless has_property?(prop)
       end
 
-      create_shorthand_properties! 'border' if border_style_properties.map{|prop| find_by_property(prop)}.all?
+      create_shorthand_properties! 'border' if border_style_properties.map{|prop| has_property?(prop)}.all?
     end
 
     # Looks for long format CSS background properties (e.g. <tt>background-color</tt>) and
@@ -159,15 +159,37 @@ module Habaki
       create_shorthand_properties! 'list-style'
     end
 
+    def self.shorthand_properties(shorthand_property)
+      nodes = []
+      FormalSyntax::Tree.tree.property("--shorthand-"+shorthand_property).traverse do |node|
+        nodes << {type: node.type, value: node.value, next_value: node.parent&.children&.last&.value} if [:ref, :token].include?(node.type)
+      end
+      nodes
+    end
+
+    PRECOMPUTED_SHORTHAND_PROPS = {
+      "background" => shorthand_properties("background"),
+      "font" => shorthand_properties("font"),
+      "list-style" => shorthand_properties("list-style"),
+      "border" => shorthand_properties("border"),
+      "border-top" => shorthand_properties("border-top"),
+      "border-bottom" => shorthand_properties("border-bottom"),
+      "border-left" => shorthand_properties("border-left"),
+      "border-right" => shorthand_properties("border-right"),
+      "border-width" => shorthand_properties("border-width"),
+      "border-style" => shorthand_properties("border-style"),
+      "border-color" => shorthand_properties("border-color"),
+    }
+
     # Combine several properties into a shorthand one
     def create_shorthand_properties!(shorthand_property, need_all = false)
       properties_to_delete = []
-
       new_values = []
-      FormalSyntax::Tree.tree.property("--shorthand-"+shorthand_property).traverse do |node|
-        case node.type
+
+      PRECOMPUTED_SHORTHAND_PROPS[shorthand_property].each do |node|
+        case node[:type]
         when :ref
-          decl = find_by_property(node.value)
+          decl = find_by_property(node[:value])
           if decl
             properties_to_delete << decl.property
             new_values += decl.values
@@ -176,7 +198,7 @@ module Habaki
           end
         when :token
           # only if next node property is present (line-height, background-size)
-          new_values << Operator.new(node.value) if node.parent&.children&.last&.value && find_by_property(node.parent.children.last.value)
+          new_values << Operator.new(node[:value]) if node[:next_value] && has_property?(node[:next_value])
         end
       end
 
@@ -251,11 +273,6 @@ module Habaki
       decls
     end
 
-    def push_declaration(decl)
-      @hash[decl.property] = decl
-      push decl
-    end
-
     # Parse inline declarations and append to current declarations
     # @param [String] data
     # @return [void]
@@ -268,6 +285,12 @@ module Habaki
       end
     end
 
+    # Does declaration with property present ?
+    # @return [Boolean]
+    def has_property?(property)
+      @hash.has_key?(property)
+    end
+
     # Find declaration with property
     # @param [String] property
     # @return [Declaration]
@@ -342,5 +365,13 @@ module Habaki
         push_declaration Declaration.read_from_katana(decl)
       end
     end
+
+    private
+
+    def push_declaration(decl)
+      @hash[decl.property] = decl
+      push decl
+    end
+
   end
 end

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
 
@@ -67,7 +67,7 @@ module Habaki
         when :token
           str += @value
         when :ref
-          str += "'#{@value}'"
+          str += "<'#{@value}'>"
         when :type
           str += "<#{@value}>"
         else
@@ -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.1
+  version: 0.5.4
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement