micromicro 1.1.0 → 2.0.0

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.1.0'.freeze
+  VERSION = '2.0.0'
 end

data/lib/micromicro.rb

@@ -1,38 +1,43 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
-require 'addressable/uri'
 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', '< 4')
+  spec.required_ruby_version = '>= 2.7', '< 4'
 
   spec.name          = 'micromicro'
   spec.version       = MicroMicro::VERSION
@@ -19,10 +21,13 @@ Gem::Specification.new do |spec|
 
   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 'addressable', '~> 2.7'
-  spec.add_runtime_dependency 'activesupport', '~> 6.1'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.11'
+  spec.add_runtime_dependency 'activesupport', '~> 7.0'
+  spec.add_runtime_dependency 'nokogiri', '>= 1.13'
+  spec.add_runtime_dependency 'nokogiri-html-ext', '~> 0.2.0'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: micromicro
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jason Garber
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nokogiri-html-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 0.2.0
 description: Extract microformats2-encoded data from HTML documents.
 email:
 - jason@sixtwothree.org
@@ -69,8 +69,10 @@ files:
 - lib/micro_micro/collections/properties_collection.rb
 - lib/micro_micro/collections/relationships_collection.rb
 - lib/micro_micro/document.rb
+- lib/micro_micro/helpers.rb
 - lib/micro_micro/implied_property.rb
 - lib/micro_micro/item.rb
+- lib/micro_micro/parsers/base_implied_property_parser.rb
 - lib/micro_micro/parsers/base_property_parser.rb
 - lib/micro_micro/parsers/date_time_parser.rb
 - lib/micro_micro/parsers/date_time_property_parser.rb
@@ -91,8 +93,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/jgarber623/micromicro/issues
-  changelog_uri: https://github.com/jgarber623/micromicro/blob/v1.1.0/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://github.com/jgarber623/micromicro/blob/v2.0.0/CHANGELOG.md
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -100,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -110,8 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key:
+rubygems_version: 3.3.16
+signing_key: 
 specification_version: 4
 summary: Extract microformats2-encoded data from HTML documents.
 test_files: []