habaki 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb31379da24aff32519428d320bfd20e20445f009c8912cdbbf940822a64a35c
-  data.tar.gz: ea74632fd8cb95ac348fcfc95463b8aa2cb1ee452f224fdc0b5c4774d276d669
+  metadata.gz: 0ee20d465ea2f474b8f107ecf41a360004ce2af899e743cd86670ed782627702
+  data.tar.gz: 59fb98647b7107ace1fbbc80e92d91520c06fa5853abdb1ef25cf65f28c78a73
 SHA512:
-  metadata.gz: 116dbb8a23a4ec449e2544e9c9f63ce894b80d5e2c3dc5b3393fa6792baf3b616407817f0169cad20409e107942d90b699a79ce3dfa3a3f4e32d0bf4600877d4
-  data.tar.gz: 844e6cf9e458d98a7458688a3335d4ccecd6b23cd73b798b755b575feda5ba6f1b853ac2abdd5d1cf4145f6e75c41e2ddf69f1794543b32020169d2ae6d6859a
+  metadata.gz: e0e5593ac13b7eff2064fb75a51a26e829fda0658fdb3b2d1491f1bdd6212299e00516f6776a0436f9f43939f9739f875f8c73d77dd5e88e05bb5755cc789b21
+  data.tar.gz: e660626ccaee9bec98a5392bc57cc3dc2ede8526437e4056f6fd2c771a1b4e1c14eabcec6e5b9817fb71fc80a247b3678d1f87b8d73f78db0767255432a22a11

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

@@ -67,7 +67,7 @@ module Habaki
         when :token
           str += @value
         when :ref
-          str += "'#{@value}'"
+          str += "<'#{@value}'>"
         when :type
           str += "<#{@value}>"
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: habaki
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-14 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