micromicro 1.0.0 → 2.0.1

data/lib/micro_micro/parsers/implied_url_property_parser.rb

@@ -1,50 +1,31 @@
+# frozen_string_literal: true
+
 module MicroMicro
   module Parsers
-    class ImpliedUrlPropertyParser < BasePropertyParser
+    class ImpliedUrlPropertyParser < BaseImpliedPropertyParser
+      CSS_SELECTORS_ARRAY = ['> a[href]:only-of-type', '> area[href]:only-of-type'].freeze
+
       HTML_ELEMENTS_MAP = {
         'a'    => 'href',
         'area' => 'href'
       }.freeze
 
-      # @see http://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
+      # @see https://microformats.org/wiki/microformats2-parsing#parsing_for_implied_properties
       #
       # @return [String, nil]
       def value
-        @value ||= value_node[HTML_ELEMENTS_MAP[value_node.name]] if value_node
+        @value ||= attribute_value
       end
 
       private
 
-      # @return [Array<String>]
-      def attribute_values
-        @attribute_values ||= begin
-          HTML_ELEMENTS_MAP.map do |element, attribute|
-            node if node.matches?("#{element}[#{attribute}]")
-          end.compact
-        end
-      end
-
-      # @return [Nokogiri::XML::Element, nil]
-      def value_node
-        @value_node ||= begin
-          return attribute_values.first if attribute_values.any?
-
-          HTML_ELEMENTS_MAP.each do |element, attribute|
-            child_node = node.at_css("> #{element}[#{attribute}]:only-of-type")
-
-            return child_node if child_node && !Item.item_node?(child_node) && element == child_node.name && child_node[attribute]
-          end
-
-          if node.element_children.one? && !Item.item_node?(node.first_element_child)
-            HTML_ELEMENTS_MAP.each do |element, attribute|
-              child_node = node.first_element_child.at_css("> #{element}[#{attribute}]:only-of-type")
+      # @return [Array]
+      def child_nodes
+        nodes = [node.at_css(*CSS_SELECTORS_ARRAY)]
 
-              return child_node if child_node && !Item.item_node?(child_node) && element == child_node.name && child_node[attribute]
-            end
-          end
+        nodes << node.first_element_child.at_css(*CSS_SELECTORS_ARRAY) if node.element_children.one?
 
-          nil
-        end
+        nodes.compact.reject { |child_node| Helpers.item_node?(child_node) }
       end
     end
   end

data/lib/micro_micro/parsers/plain_text_property_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MicroMicro
   module Parsers
     class PlainTextPropertyParser < BasePropertyParser
@@ -7,7 +9,7 @@ module MicroMicro
         'alt'   => %w[area img]
       }.freeze
 
-      # @see http://microformats.org/wiki/microformats2-parsing#parsing_a_p-_property
+      # @see https://microformats.org/wiki/microformats2-parsing#parsing_a_p-_property
       #
       # @return [String]
       def value
@@ -18,7 +20,7 @@ module MicroMicro
 
       # @return [String, nil]
       def attribute_value
-        self.class.attribute_value_from(node, HTML_ATTRIBUTES_MAP)
+        Helpers.attribute_value_from(node, HTML_ATTRIBUTES_MAP)
       end
 
       # @return [String, nil]

data/lib/micro_micro/parsers/url_property_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MicroMicro
   module Parsers
     class UrlPropertyParser < BasePropertyParser
@@ -13,41 +15,47 @@ module MicroMicro
         'value' => %w[data input]
       }.freeze
 
-      # @see http://microformats.org/wiki/microformats2-parsing#parsing_a_u-_property
-      # @see http://microformats.org/wiki/microformats2-parsing#parse_an_img_element_for_src_and_alt
+      # @see https://microformats.org/wiki/microformats2-parsing#parsing_a_u-_property
+      # @see https://microformats.org/wiki/microformats2-parsing#parse_an_img_element_for_src_and_alt
       #
       # @return [String, Hash{Symbol => String}]
       def value
-        @value ||= begin
-          return resolved_value unless node.matches?('img[alt]')
-
-          {
-            value: resolved_value,
-            alt: node['alt'].strip
-          }
-        end
+        @value ||=
+          if node.matches?('img[alt]')
+            {
+              value: resolved_value,
+              alt: node['alt'].strip
+            }
+          else
+            resolved_value
+          end
       end
 
       private
 
       # @return [String, nil]
       def attribute_value
-        self.class.attribute_value_from(node, HTML_ATTRIBUTES_MAP)
+        Helpers.attribute_value_from(node, HTML_ATTRIBUTES_MAP)
       end
 
       # @return [String, nil]
       def extended_attribute_value
-        self.class.attribute_value_from(node, EXTENDED_HTML_ATTRIBUTES_MAP)
+        Helpers.attribute_value_from(node, EXTENDED_HTML_ATTRIBUTES_MAP)
       end
 
       # @return [String]
       def resolved_value
-        @resolved_value ||= Absolutely.to_abs(base: node.document.url, relative: unresolved_value.strip)
+        @resolved_value ||= node.document.resolve_relative_url(unresolved_value.strip)
+      end
+
+      # @return [String]
+      def text_content
+        Helpers.text_content_from(node)
       end
 
       # @return [String]
       def unresolved_value
-        attribute_value || value_class_pattern_value || extended_attribute_value || Document.text_content_from(node)
+        attribute_value || value_class_pattern_value || extended_attribute_value || text_content
       end
 
       # @return [String, nil]

data/lib/micro_micro/parsers/value_class_pattern_parser.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module MicroMicro
   module Parsers
     class ValueClassPatternParser
-      # @see http://microformats.org/wiki/value-class-pattern#Basic_Parsing
-      # @see http://microformats.org/wiki/value-class-pattern#Date_and_time_values
+      # @see https://microformats.org/wiki/value-class-pattern#Basic_Parsing
+      # @see https://microformats.org/wiki/value-class-pattern#Date_and_time_values
       HTML_ATTRIBUTES_MAP = {
         'alt'      => %w[area img],
         'value'    => %w[data],
@@ -10,72 +12,55 @@ module MicroMicro
         'datetime' => %w[del ins time]
       }.freeze
 
-      # @param context [Nokogiri::XML::Element]
-      # @param separator [String]
-      def initialize(node, separator = '')
-        @node = node
-        @separator = separator
-      end
-
-      # @return [String, nil]
-      def value
-        @value ||= values.join(separator).strip if values.any?
-      end
-
-      # @return [Array<String>]
-      def values
-        @values ||= value_nodes.map { |value_node| self.class.value_from(value_node) }.select(&:present?)
-      end
-
       # @param context [Nokogiri::XML::NodeSet, Nokogiri::XML::Element]
       # @param node_set [Nokogiri::XML::NodeSet]
       # @return [Nokogiri::XML::NodeSet]
-      def self.nodes_from(context, node_set = Nokogiri::XML::NodeSet.new(context.document, []))
-        context.each { |node| nodes_from(node, node_set) } if context.is_a?(Nokogiri::XML::NodeSet)
+      def self.node_set_from(context, node_set = Nokogiri::XML::NodeSet.new(context.document, []))
+        context.each { |node| node_set_from(node, node_set) } if context.is_a?(Nokogiri::XML::NodeSet)
 
-        if context.is_a?(Nokogiri::XML::Element) && !Document.ignore_node?(context)
-          if value_class_node?(context) || value_title_node?(context)
+        if context.is_a?(Nokogiri::XML::Element) && !Helpers.ignore_node?(context)
+          if Helpers.value_class_node?(context) || Helpers.value_title_node?(context)
             node_set << context
           else
-            nodes_from(context.element_children, node_set)
+            node_set_from(context.element_children, node_set)
           end
         end
 
         node_set
       end
 
-      # @param node [Nokogiri::XML::Element]
-      # @return [Boolean]
-      def self.value_class_node?(node)
-        node.classes.include?('value')
-      end
-
       # @param node [Nokogiri::XML::Element]
       # @return [String, nil]
       def self.value_from(node)
-        return node['title'] if value_title_node?(node)
+        return node['title'] if Helpers.value_title_node?(node)
 
-        HTML_ATTRIBUTES_MAP.each do |attribute, names|
-          return node[attribute] if names.include?(node.name) && node[attribute]
-        end
+        Helpers.attribute_value_from(node, HTML_ATTRIBUTES_MAP) || node.text
+      end
 
-        node.text
+      # @param context [Nokogiri::XML::Element]
+      # @param separator [String]
+      def initialize(node, separator = '')
+        @node = node
+        @separator = separator
       end
 
-      # @param node [Nokogiri::XML::Element]
-      # @return [Boolean]
-      def self.value_title_node?(node)
-        node.classes.include?('value-title')
+      # @return [String, nil]
+      def value
+        @value ||= values.join(separator).strip if values.any?
+      end
+
+      # @return [Array<String>]
+      def values
+        @values ||=
+          self.class
+              .node_set_from(node)
+              .map { |value_node| self.class.value_from(value_node) }
+              .select(&:present?)
       end
 
       private
 
       attr_reader :node, :separator
-
-      # @return [Nokogiri::XML::NodeSet]
-      def value_nodes
-        @value_nodes ||= self.class.nodes_from(node)
-      end
     end
   end
 end

data/lib/micro_micro/property.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module MicroMicro
   class Property
+    include Collectible
+
     PROPERTY_PARSERS_MAP = {
       'dt' => Parsers::DateTimePropertyParser,
       'e'  => Parsers::EmbeddedMarkupPropertyParser,
@@ -7,17 +11,46 @@ module MicroMicro
       'u'  => Parsers::UrlPropertyParser
     }.freeze
 
-    include Collectible
-
     attr_reader :name, :node, :prefix
 
+    # @param context [Nokogiri::XML::NodeSet, Nokogiri::XML::Element]
+    # @return [Array<MicroMicro::Property>]
+    def self.from_context(context)
+      node_set_from(context).flat_map do |node|
+        Helpers.property_class_names_from(node).map { |token| new(node, token) }
+      end
+    end
+
+    # @param context [Nokogiri::XML::NodeSet, Nokogiri::XML::Element]
+    # @param node_set [Nokogiri::XML::NodeSet]
+    # @return [Nokogiri::XML::NodeSet]
+    def self.node_set_from(context, node_set = Nokogiri::XML::NodeSet.new(context.document, []))
+      context.each { |node| node_set_from(node, node_set) } if context.is_a?(Nokogiri::XML::NodeSet)
+
+      if context.is_a?(Nokogiri::XML::Element) && !Helpers.ignore_node?(context)
+        node_set << context if Helpers.property_node?(context)
+
+        node_set_from(context.element_children, node_set) unless Helpers.item_node?(context)
+      end
+
+      node_set
+    end
+
     # @param node [Nokogiri::XML::Element]
-    # @param name [String]
-    # @param prefix [String<dt, e, p, u>]
-    def initialize(node, name:, prefix:)
+    # @param token [String]
+    def initialize(node, token)
       @node = node
-      @name = name
-      @prefix = prefix
+      @prefix, @name = token.split(/-/, 2)
+    end
+
+    # @return [Boolean]
+    def date_time_property?
+      prefix == 'dt'
+    end
+
+    # @return [Boolean]
+    def embedded_markup_property?
+      prefix == 'e'
     end
 
     # @return [Boolean]
@@ -25,10 +58,15 @@ module MicroMicro
       false
     end
 
+    # :nocov:
     # @return [String]
     def inspect
-      format(%(#<#{self.class.name}:%#0x name: #{name.inspect}, prefix: #{prefix.inspect}, value: #{value.inspect}>), object_id)
+      "#<#{self.class}:#{format('%#0x', object_id)} " \
+        "name: #{name.inspect}, " \
+        "prefix: #{prefix.inspect}, " \
+        "value: #{value.inspect}>"
     end
+    # :nocov:
 
     # @return [MicroMicro::Item, nil]
     def item
@@ -37,67 +75,41 @@ module MicroMicro
 
     # @return [Boolean]
     def item_node?
-      @item_node ||= Item.item_node?(node)
+      @item_node ||= Helpers.item_node?(node)
     end
 
-    # @return [String, Hash]
-    def value
-      @value ||= begin
-        return parser.value unless item_node?
-
-        hash = item.to_h
-
-        return hash.merge(parser.value) if prefix == 'e'
-
-        p_property = item.properties.find { |property| property.name == 'name' } if prefix == 'p'
-        u_property = item.properties.find { |property| property.name == 'url' } if prefix == 'u'
-
-        hash.merge(value: (p_property || u_property || parser).value)
-      end
+    # @return [Boolean]
+    def plain_text_property?
+      prefix == 'p'
     end
 
     # @return [Boolean]
-    def value?
-      value.present?
+    def url_property?
+      prefix == 'u'
     end
 
-    # @param context [Nokogiri::XML::NodeSet, Nokogiri::XML::Element]
-    # @param node_set [Nokogiri::XML::NodeSet]
-    # @return [Nokogiri::XML::NodeSet]
-    def self.nodes_from(context, node_set = Nokogiri::XML::NodeSet.new(context.document, []))
-      context.each { |node| nodes_from(node, node_set) } if context.is_a?(Nokogiri::XML::NodeSet)
-
-      if context.is_a?(Nokogiri::XML::Element) && !Document.ignore_node?(context)
-        node_set << context if property_node?(context)
+    # @return [String, Hash]
+    # rubocop:disable Metrics
+    def value
+      @value ||=
+        if item_node?
+          hash = item.to_h
 
-        nodes_from(context.element_children, node_set) unless Item.item_node?(context)
-      end
+          return hash.merge(parser.value) if embedded_markup_property?
 
-      node_set
-    end
+          p_property = item.properties.find { |property| property.name == 'name' } if plain_text_property?
+          u_property = item.properties.find { |property| property.name == 'url' } if url_property?
 
-    # @param context [Nokogiri::XML::NodeSet, Nokogiri::XML::Element]
-    # @return [Array<MicroMicro::Property>]
-    def self.properties_from(context)
-      nodes_from(context).map do |node|
-        types_from(node).map { |prefix, name| new(node, name: name, prefix: prefix) }
-      end.flatten
+          hash.merge(value: (p_property || u_property || parser).value)
+        else
+          parser.value
+        end
     end
+    # rubocop:enable Metrics
 
-    # @param node [Nokogiri::XML::Element]
     # @return [Boolean]
-    def self.property_node?(node)
-      types_from(node).any?
-    end
-
-    # @param node [Nokogiri::XML::Element]
-    # @return [Array<Array(String, String)>]
-    #
-    # @example
-    #   node = Nokogiri::HTML('<a href="https://sixtwothree.org" class="p-name u-url">Jason Garber</a>').at_css('a')
-    #   MicroMicro::Property.types_from(node) #=> [['p', 'name'], ['u', 'url']]
-    def self.types_from(node)
-      node.classes.select { |token| token.match?(/^(?:dt|e|p|u)(?:-[0-9a-z]+)?(?:-[a-z]+)+$/) }.map { |token| token.split(/-/, 2) }.uniq
+    def value?
+      value.present?
     end
 
     private

data/lib/micro_micro/relationship.rb

@@ -1,7 +1,17 @@
+# frozen_string_literal: true
+
 module MicroMicro
   class Relationship
     include Collectible
 
+    # @param context [Nokogiri::HTML::Document, Nokogiri::XML::Element]
+    # @return [Array<MicroMicro::Relationship>]
+    def self.relationships_from(context)
+      context.css('[href][rel]:not([rel=""])')
+             .reject { |node| Helpers.ignore_nodes?(node.ancestors) }
+             .map { |node| new(node) }
+    end
+
     # @param node [Nokogiri::XML::Element]
     def initialize(node)
       @node = node
@@ -17,10 +27,14 @@ module MicroMicro
       @hreflang ||= node['hreflang']&.strip
     end
 
+    # :nocov:
     # @return [String]
     def inspect
-      format(%(#<#{self.class.name}:%#0x href: #{href.inspect}, rels: #{rels.inspect}>), object_id)
+      "#<#{self.class}:#{format('%#0x', object_id)} " \
+        "href: #{href.inspect}, " \
+        "rels: #{rels.inspect}>"
     end
+    # :nocov:
 
     # @return [String, nil]
     def media
@@ -60,18 +74,6 @@ module MicroMicro
       @type ||= node['type']&.strip
     end
 
-    # @param context [Nokogiri::HTML::Document, Nokogiri::XML::Element]
-    # @return [Nokogiri::XML::NodeSet]
-    def self.nodes_from(context)
-      context.css('[href][rel]:not([rel=""])').reject { |node| (node.ancestors.map(&:name) & Document.ignored_node_names).any? }
-    end
-
-    # @param context [Nokogiri::HTML::Document, Nokogiri::XML::Element]
-    # @return [Array<MicroMicro::Relationship>]
-    def self.relationships_from(context)
-      nodes_from(context).map { |node| new(node) }
-    end
-
     private
 
     attr_reader :node

data/lib/micro_micro/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MicroMicro
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.1'
 end

data/lib/micromicro.rb

@@ -1,38 +1,43 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
-require 'absolutely'
 require 'active_support/core_ext/array/grouping'
 require 'active_support/core_ext/hash/deep_transform_values'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/object/blank'
 require 'nokogiri'
+require 'nokogiri/html-ext'
+
+require_relative 'micro_micro/version'
+require_relative 'micro_micro/collectible'
+require_relative 'micro_micro/helpers'
+
+require_relative 'micro_micro/parsers/date_time_parser'
+require_relative 'micro_micro/parsers/value_class_pattern_parser'
+
+require_relative 'micro_micro/parsers/base_property_parser'
+require_relative 'micro_micro/parsers/date_time_property_parser'
+require_relative 'micro_micro/parsers/embedded_markup_property_parser'
+require_relative 'micro_micro/parsers/plain_text_property_parser'
+require_relative 'micro_micro/parsers/url_property_parser'
+
+require_relative 'micro_micro/parsers/base_implied_property_parser'
+require_relative 'micro_micro/parsers/implied_name_property_parser'
+require_relative 'micro_micro/parsers/implied_photo_property_parser'
+require_relative 'micro_micro/parsers/implied_url_property_parser'
+
+require_relative 'micro_micro/document'
+require_relative 'micro_micro/item'
+require_relative 'micro_micro/property'
+require_relative 'micro_micro/implied_property'
+require_relative 'micro_micro/relationship'
 
-require 'micro_micro/version'
-require 'micro_micro/collectible'
-
-require 'micro_micro/parsers/date_time_parser'
-require 'micro_micro/parsers/value_class_pattern_parser'
-
-require 'micro_micro/parsers/base_property_parser'
-require 'micro_micro/parsers/date_time_property_parser'
-require 'micro_micro/parsers/embedded_markup_property_parser'
-require 'micro_micro/parsers/implied_name_property_parser'
-require 'micro_micro/parsers/implied_photo_property_parser'
-require 'micro_micro/parsers/implied_url_property_parser'
-require 'micro_micro/parsers/plain_text_property_parser'
-require 'micro_micro/parsers/url_property_parser'
-
-require 'micro_micro/document'
-require 'micro_micro/item'
-require 'micro_micro/property'
-require 'micro_micro/implied_property'
-require 'micro_micro/relationship'
-
-require 'micro_micro/collections/base_collection'
-require 'micro_micro/collections/items_collection'
-require 'micro_micro/collections/properties_collection'
-require 'micro_micro/collections/relationships_collection'
+require_relative 'micro_micro/collections/base_collection'
+require_relative 'micro_micro/collections/items_collection'
+require_relative 'micro_micro/collections/properties_collection'
+require_relative 'micro_micro/collections/relationships_collection'
 
 module MicroMicro
   # Parse a string of HTML for microformats2-encoded data.

data/micromicro.gemspec

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require_relative 'lib/micro_micro/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 2.8')
+  spec.required_ruby_version = '>= 2.7', '< 4'
 
   spec.name          = 'micromicro'
   spec.version       = MicroMicro::VERSION
@@ -13,16 +15,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/jgarber623/micromicro'
   spec.license       = 'MIT'
 
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|spec)/}) }
-  end
+  spec.files         = Dir['lib/**/*'].reject { |f| File.directory?(f) }
+  spec.files        += %w[LICENSE CHANGELOG.md CONTRIBUTING.md README.md]
+  spec.files        += %w[micromicro.gemspec]
 
   spec.require_paths = ['lib']
 
-  spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
-  spec.metadata['changelog_uri']   = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md"
+  spec.metadata = {
+    'bug_tracker_uri'       => "#{spec.homepage}/issues",
+    'changelog_uri'         => "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md",
+    'rubygems_mfa_required' => 'true'
+  }
 
-  spec.add_runtime_dependency 'absolutely', '~> 5.0'
-  spec.add_runtime_dependency 'activesupport', '~> 6.0'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.10'
+  spec.add_runtime_dependency 'activesupport', '~> 7.0'
+  spec.add_runtime_dependency 'nokogiri', '>= 1.13'
+  spec.add_runtime_dependency 'nokogiri-html-ext', '~> 0.2.2'
 end