micromicro 0.1.0 → 1.0.0

data/lib/micro_micro/parsers/plain_text_property_parser.rb

@@ -1,38 +1,29 @@
 module MicroMicro
   module Parsers
     class PlainTextPropertyParser < BasePropertyParser
-      # @see microformats2 Parsing Specification section 1.3.1
-      # @see http://microformats.org/wiki/microformats2-parsing#parsing_a_p-_property
       HTML_ATTRIBUTES_MAP = {
         'title' => %w[abbr link],
         'value' => %w[data input],
         'alt'   => %w[area img]
       }.freeze
 
+      # @see http://microformats.org/wiki/microformats2-parsing#parsing_a_p-_property
+      #
       # @return [String]
       def value
-        @value ||= begin
-          return value_class_pattern_parser.value if value_class_pattern_parser.value?
-          return attribute_values.first if attribute_values.any?
-
-          super
-        end
+        @value ||= value_class_pattern_value || attribute_value || super
       end
 
       private
 
-      # @return [Array<String>]
-      def attribute_values
-        @attribute_values ||= begin
-          HTML_ATTRIBUTES_MAP.map do |attribute, names|
-            node[attribute] if names.include?(node.name) && node[attribute]
-          end.compact
-        end
+      # @return [String, nil]
+      def attribute_value
+        self.class.attribute_value_from(node, HTML_ATTRIBUTES_MAP)
       end
 
-      # @return [MicroMicro::Parsers::ValueClassPatternParser]
-      def value_class_pattern_parser
-        @value_class_pattern_parser ||= ValueClassPatternParser.new(node)
+      # @return [String, nil]
+      def value_class_pattern_value
+        ValueClassPatternParser.new(node).value
       end
     end
   end

data/lib/micro_micro/parsers/url_property_parser.rb

@@ -1,8 +1,6 @@
 module MicroMicro
   module Parsers
     class UrlPropertyParser < BasePropertyParser
-      # @see microformats2 Parsing Specification section 1.3.2
-      # @see http://microformats.org/wiki/microformats2-parsing#parsing_a_u-_property
       HTML_ATTRIBUTES_MAP = {
         'href'   => %w[a area link],
         'src'    => %w[audio iframe img source video],
@@ -10,14 +8,12 @@ module MicroMicro
         'data'   => %w[object]
       }.freeze
 
-      # @see microformats2 Parsing Specification section 1.3.2
-      # @see http://microformats.org/wiki/microformats2-parsing#parsing_a_u-_property
       EXTENDED_HTML_ATTRIBUTES_MAP = {
         'title' => %w[abbr],
         'value' => %w[data input]
       }.freeze
 
-      # @see microformats2 Parsing Specification section 1.5
+      # @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
       #
       # @return [String, Hash{Symbol => String}]
@@ -34,20 +30,14 @@ module MicroMicro
 
       private
 
-      def attribute_values
-        @attribute_values ||= begin
-          HTML_ATTRIBUTES_MAP.map do |attribute, names|
-            node[attribute] if names.include?(node.name) && node[attribute]
-          end.compact
-        end
+      # @return [String, nil]
+      def attribute_value
+        self.class.attribute_value_from(node, HTML_ATTRIBUTES_MAP)
       end
 
-      def extended_attribute_values
-        @extended_attribute_values ||= begin
-          EXTENDED_HTML_ATTRIBUTES_MAP.map do |attribute, names|
-            node[attribute] if names.include?(node.name) && node[attribute]
-          end
-        end.compact
+      # @return [String, nil]
+      def extended_attribute_value
+        self.class.attribute_value_from(node, EXTENDED_HTML_ATTRIBUTES_MAP)
       end
 
       # @return [String]
@@ -57,18 +47,12 @@ module MicroMicro
 
       # @return [String]
       def unresolved_value
-        @unresolved_value ||= begin
-          return attribute_values.first if attribute_values.any?
-          return value_class_pattern_parser.value if value_class_pattern_parser.value?
-          return extended_attribute_values.first if extended_attribute_values.any?
-
-          serialized_node.text
-        end
+        attribute_value || value_class_pattern_value || extended_attribute_value || Document.text_content_from(node)
       end
 
-      # @return [MicroMicro::Parsers::ValueClassPatternParser]
-      def value_class_pattern_parser
-        @value_class_pattern_parser ||= ValueClassPatternParser.new(node)
+      # @return [String, nil]
+      def value_class_pattern_value
+        ValueClassPatternParser.new(node).value
       end
     end
   end

data/lib/micro_micro/parsers/value_class_pattern_parser.rb

@@ -1,7 +1,6 @@
 module MicroMicro
   module Parsers
     class ValueClassPatternParser
-      # @see Value Class Pattern sections 3 and 4
       # @see http://microformats.org/wiki/value-class-pattern#Basic_Parsing
       # @see http://microformats.org/wiki/value-class-pattern#Date_and_time_values
       HTML_ATTRIBUTES_MAP = {
@@ -20,12 +19,7 @@ module MicroMicro
 
       # @return [String, nil]
       def value
-        @value ||= values.join(separator).strip if values?
-      end
-
-      # @return [Boolean]
-      def value?
-        value.present?
+        @value ||= values.join(separator).strip if values.any?
       end
 
       # @return [Array<String>]
@@ -33,11 +27,6 @@ module MicroMicro
         @values ||= value_nodes.map { |value_node| self.class.value_from(value_node) }.select(&:present?)
       end
 
-      # @return [Boolean]
-      def values?
-        values.any?
-      end
-
       # @param context [Nokogiri::XML::NodeSet, Nokogiri::XML::Element]
       # @param node_set [Nokogiri::XML::NodeSet]
       # @return [Nokogiri::XML::NodeSet]

data/lib/micro_micro/property.rb

@@ -7,7 +7,8 @@ module MicroMicro
       'u'  => Parsers::UrlPropertyParser
     }.freeze
 
-    attr_accessor :collection
+    include Collectible
+
     attr_reader :name, :node, :prefix
 
     # @param node [Nokogiri::XML::Element]
@@ -29,19 +30,29 @@ module MicroMicro
       format(%(#<#{self.class.name}:%#0x name: #{name.inspect}, prefix: #{prefix.inspect}, value: #{value.inspect}>), object_id)
     end
 
+    # @return [MicroMicro::Item, nil]
+    def item
+      @item ||= Item.new(node) if item_node?
+    end
+
     # @return [Boolean]
     def item_node?
       @item_node ||= Item.item_node?(node)
     end
 
-    # @return [String, Hash, MicroMicro::Item]
+    # @return [String, Hash]
     def value
       @value ||= begin
         return parser.value unless item_node?
 
-        item.value = item_value
+        hash = item.to_h
+
+        return hash.merge(parser.value) if prefix == 'e'
 
-        item
+        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
     end
 
@@ -86,29 +97,11 @@ module MicroMicro
     #   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
+      node.classes.select { |token| token.match?(/^(?:dt|e|p|u)(?:-[0-9a-z]+)?(?:-[a-z]+)+$/) }.map { |token| token.split(/-/, 2) }.uniq
     end
 
     private
 
-    # @return [MicroMicro::Item, nil]
-    def item
-      @item ||= Item.new(node) if item_node?
-    end
-
-    # @reutrn [String, nil]
-    def item_value
-      return unless item_node?
-
-      obj_by_prefix = case prefix
-                      when 'e' then item
-                      when 'p' then item.properties.find { |property| property.name == 'name' }
-                      when 'u' then item.properties.find { |property| property.name == 'url' }
-                      end
-
-      (obj_by_prefix || parser).value
-    end
-
     def parser
       @parser ||= PROPERTY_PARSERS_MAP[prefix].new(self)
     end

data/lib/micro_micro/{relation.rb → relationship.rb}

@@ -1,5 +1,7 @@
 module MicroMicro
-  class Relation
+  class Relationship
+    include Collectible
+
     # @param node [Nokogiri::XML::Element]
     def initialize(node)
       @node = node
@@ -7,7 +9,7 @@ module MicroMicro
 
     # @return [String]
     def href
-      @href ||= Absolutely.to_abs(base: node.document.url, relative: node['href'].strip)
+      @href ||= node['href']
     end
 
     # @return [String, nil]
@@ -18,7 +20,6 @@ module MicroMicro
     # @return [String]
     def inspect
       format(%(#<#{self.class.name}:%#0x href: #{href.inspect}, rels: #{rels.inspect}>), object_id)
-      # format(%(#<#{self.class.name}:%#0x rels: #{rels}>), object_id)
     end
 
     # @return [String, nil]
@@ -66,8 +67,8 @@ module MicroMicro
     end
 
     # @param context [Nokogiri::HTML::Document, Nokogiri::XML::Element]
-    # @return [Array<MicroMicro::Relation>]
-    def self.relations_from(context)
+    # @return [Array<MicroMicro::Relationship>]
+    def self.relationships_from(context)
       nodes_from(context).map { |node| new(node) }
     end
 

data/lib/micro_micro/version.rb

@@ -1,3 +1,3 @@
 module MicroMicro
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/micromicro.rb

@@ -1,13 +1,15 @@
+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/module/delegation'
 require 'active_support/core_ext/object/blank'
 require 'nokogiri'
 
 require 'micro_micro/version'
+require 'micro_micro/collectible'
 
 require 'micro_micro/parsers/date_time_parser'
 require 'micro_micro/parsers/value_class_pattern_parser'
@@ -25,14 +27,22 @@ require 'micro_micro/document'
 require 'micro_micro/item'
 require 'micro_micro/property'
 require 'micro_micro/implied_property'
-require 'micro_micro/relation'
+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/relations_collection'
+require 'micro_micro/collections/relationships_collection'
 
 module MicroMicro
+  # Parse a string of HTML for microformats2-encoded data.
+  # Convenience method for MicroMicro::Document.new.
+  #
+  #   MicroMicro.parse('<a href="/" class="h-card" rel="me">Jason Garber</a>', 'https://sixtwothree.org')
+  #
+  # @param markup [String] The HTML to parse for microformats2-encoded data.
+  # @param base_url [String] The URL associated with markup. Used for relative URL resolution.
+  # @return [MicroMicro::Document]
   def self.parse(markup, base_url)
     Document.new(markup, base_url)
   end

data/micromicro.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
   spec.metadata['changelog_uri']   = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md"
 
-  spec.add_runtime_dependency 'absolutely', '~> 3.1'
+  spec.add_runtime_dependency 'absolutely', '~> 5.0'
   spec.add_runtime_dependency 'activesupport', '~> 6.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micromicro
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jason Garber
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: absolutely
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -75,10 +75,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/micro_micro/collectible.rb
 - lib/micro_micro/collections/base_collection.rb
 - lib/micro_micro/collections/items_collection.rb
 - lib/micro_micro/collections/properties_collection.rb
-- lib/micro_micro/collections/relations_collection.rb
+- lib/micro_micro/collections/relationships_collection.rb
 - lib/micro_micro/document.rb
 - lib/micro_micro/implied_property.rb
 - lib/micro_micro/item.rb
@@ -93,7 +94,7 @@ files:
 - lib/micro_micro/parsers/url_property_parser.rb
 - lib/micro_micro/parsers/value_class_pattern_parser.rb
 - lib/micro_micro/property.rb
-- lib/micro_micro/relation.rb
+- lib/micro_micro/relationship.rb
 - lib/micro_micro/version.rb
 - lib/micromicro.rb
 - micromicro.gemspec
@@ -102,8 +103,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/jgarber623/micromicro/issues
-  changelog_uri: https://github.com/jgarber623/micromicro/blob/v0.1.0/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/jgarber623/micromicro/blob/v1.0.0/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Extract microformats2-encoded data from HTML documents.
 test_files: []