habaki 0.5.8 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53fe14ebdd6dd692db34dc3a59a3dbe2fc9761d085cd1bcd756080e06483e4c0
-  data.tar.gz: 6481a5a4591a6e6ebbea3eb6e241eac1baa48ca9812541d8cef184e10f2800a4
+  metadata.gz: 5b752847b2b1e6ed4c15611eb4708b178e5ee694349c817b05c732881d98ac10
+  data.tar.gz: 1e528a6e2154bb1d19baea93e8a34fc2e796441374859142a109b652f54132ea
 SHA512:
-  metadata.gz: ce923e584db6917510237761e67f3bdc9ac3153f220ace405a2a9ab2eb7940321239e844d9f7ded97290961780e79aa005cbd7c3962bf68c6f294651d514b73e
-  data.tar.gz: d3befa18c61f461d0f568a859e93d465248990938d9ecf7bd13109887debeb1b3a753a7fe8ee5ad5cdc9ea9dba3062f1d6dd3ab01b2c7181c9b3f906b8f3111e
+  metadata.gz: 1fa028e795d97f0da9d6ad16b45a2613943c278beed4009e3f7aac7ddc830c190519efdc89544f3373c5d2254c523ed7c5193a71e7d7071cc96f305968c66dcc
+  data.tar.gz: c50e2538f949bc17cf2716be6d3c9f603f67d89724f3d721f9286a6f07de3156a097dec9b699d98e32f905dfdeac902276aab673b4a86042204e929221466db0

data/lib/habaki/rules.rb

@@ -26,9 +26,9 @@ module Habaki
           class_or_id = ".#{class_name}" if class_name
           class_or_id = "##{id_name}" if id_name
 
-          @hash_tree[args][tag_name||"*"] ||= {}
-          @hash_tree[args][tag_name||"*"][class_or_id] ||= Set.new
-          @hash_tree[args][tag_name||"*"][class_or_id] << rule
+          @hash_tree[args][tag_name || "*"] ||= {}
+          @hash_tree[args][tag_name || "*"][class_or_id] ||= Set.new
+          @hash_tree[args][tag_name || "*"][class_or_id] << rule
         end
       end
     end
@@ -42,9 +42,21 @@ module Habaki
       classes_names = class_name.split(" ") if class_name
 
       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
+        if p_class_name
+          class_or_id = ".#{p_class_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
+
+      if id_name
+        class_or_id = "##{id_name}"
 
         @hash_tree[args].dig("*", class_or_id)&.each do |rule|
           block.call rule

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,8 +44,7 @@ module Habaki
       when :tag
         tag_match?(element.tag_name, specificity)
       when :class
-        classes_names = element.class_name ? element.class_name.split(" ") : [nil]
-        classes_names.map{|p_class_name| class_match?(p_class_name, specificity)}.any?
+        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,8 +150,13 @@ module Habaki
           !@selectors.element_match?(element)
         when :not_parsed, :unknown
           true
+        when :link
+          # All a elements that have an href attribute must match one of :link and :visited.
+          # for now, always match :link
+          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.8
+  version: 0.5.10
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri