habaki 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fd0e2139182ac5010a3b35babbcae6c6d72f44ed202073409f18fb176697f6b
-  data.tar.gz: 8f4c8f57cc5e63a989485a82523c424902179b4717d3df89fd86934afda4ae6f
+  metadata.gz: 4369c0894ef6356caa3fbd8121b49f1bb767e7e7cad4b4401f578d7ba2ca8cba
+  data.tar.gz: 854420541b988775b68aafed3834359bd9c71881d5b47fc18e4e72683e7470e9
 SHA512:
-  metadata.gz: 5432b604be85936b38b166b240b29c1779ffd6ae4ebd3a29376df4b543bca6b66bc9dfa98b0afeb1ceabeed64c612538bf4db23ceb4bf6dbf9046727d3a5574b
-  data.tar.gz: 7e6487154a87046b8ce1c9cd2e38f7da4dcc909faf8e1930e0264bb1c7606f9de10baefde686ca347061ed2798ad5177bb741cb262d7098b2d56071a913ea62c
+  metadata.gz: 1a3f29bd8d7253b88eaf8e1afc48887c69945a73911180e12537590d6430fbb866d87b2e0d081b9700f32e290cd58841d489adf5369da711c2cb2e2eb0810261
+  data.tar.gz: 53f3ac7bdce3aa488db1d21f17c04f78881bae5fb45d5342bae44020044ec7d8459278d7b10dd8bdd0b592761b07f951dbcb6fd4f93eb3c229113b71846cbedf

data/lib/habaki/rules.rb

@@ -34,20 +34,25 @@ module Habaki
     end
 
     def lookup_rules(args, tag_name, class_name, id_name, &block)
-      class_or_id = nil
-      class_or_id = ".#{class_name}" if class_name
-      class_or_id = "##{id_name}" if id_name
-
       @hash_tree[args].dig(tag_name, nil)&.each do |rule|
         block.call rule
       end
 
-      @hash_tree[args].dig("*", class_or_id)&.each do |rule|
-        block.call rule
-      end
+      classes_names = [nil]
+      classes_names = class_name.split(" ") if class_name
 
-      @hash_tree[args].dig(tag_name, class_or_id)&.each do |rule|
-        block.call rule
+      classes_names.each do |p_class_name|
+        class_or_id = nil
+        class_or_id = ".#{p_class_name}" if p_class_name
+        class_or_id = "##{id_name}" if id_name
+
+        @hash_tree[args].dig("*", class_or_id)&.each do |rule|
+          block.call rule
+        end
+
+        @hash_tree[args].dig(tag_name, class_or_id)&.each do |rule|
+          block.call rule
+        end
       end
     end
 

data/lib/habaki/selector.rb

@@ -47,7 +47,7 @@ module Habaki
             end
             return false unless sub_match
           else
-            # STDERR.puts "unknown relation #{current_sub_selector.relation}"
+            # STDERR.puts "Habaki: unknown relation #{current_sub_selector.relation}"
             return false
           end
         else

data/lib/habaki/sub_selector.rb

@@ -12,12 +12,12 @@ module Habaki
   class SubSelector < Node
     # @return [Symbol]
     attr_accessor :match
-    # @return [String]
+    # @return [QualifiedName]
     attr_accessor :tag
     # @return [Symbol]
     attr_accessor :pseudo
 
-    # @return [String]
+    # @return [QualifiedName]
     attr_accessor :attribute
     # @return [String]
     attr_accessor :value
@@ -44,7 +44,7 @@ module Habaki
       when :tag
         tag_match?(element.tag_name, specificity)
       when :class
-        class_match?(element.class_name, specificity)
+        element.class_names.any?{|p_class_name| class_match?(p_class_name, specificity)}
       when :id
         id_match?(element.id_name, specificity)
       when :pseudo_class
@@ -151,7 +151,8 @@ module Habaki
         when :not_parsed, :unknown
           true
         else
-          # STDERR.puts "unsupported pseudo #{sub_sel.pseudo}"
+          # TODO
+          # STDERR.puts "Habaki: unsupported pseudo #{@pseudo}"
           false
         end, specificity, 10)
     end

data/lib/habaki/visitor/element.rb

@@ -12,6 +12,12 @@ module Habaki
       def class_name
       end
 
+      # element class names array
+      # @return [Array<String>]
+      def class_names
+        []
+      end
+
       # element id name
       # @return [String]
       def id_name

data/lib/habaki/visitor/nokogiri_element.rb

@@ -15,6 +15,10 @@ module Habaki
         @element["class"]
       end
 
+      def class_names
+        @element.classes
+      end
+
       def id_name
         @element["id"]
       end
@@ -37,13 +41,13 @@ module Habaki
 
       def children
         @element.children.map do |child|
-          child.is_a?(Nokogiri::XML::Element) ? Visitor::NokogiriElement.new(child) : nil
+          child.element? ? Visitor::NokogiriElement.new(child) : nil
         end.compact
       end
 
       def traverse &block
         @element.traverse do |el|
-          next unless el.is_a?(Nokogiri::XML::Element)
+          next unless el.element?
           block.call Visitor::NokogiriElement.new(el)
         end
       end

metadata

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