micromicro 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6734c4d9cbd071d3288a5f8c72de07095fc6db2915224f97684a0577362bcdb0
-  data.tar.gz: 9225043ef91161f2a92fa338bc874771dc55d9e81ffe969fe7b005c9dbc28403
+  metadata.gz: 75bb9eaa673828648bc3f0a78d9822f434ae99317ae9499998f984c661c0771b
+  data.tar.gz: 2ab7a2896a8498507cb57f7e1c5a10c1e5dff8091328370a10e645420374ec12
 SHA512:
-  metadata.gz: 58824c1699a2aff5e22d906cbb449f95f55a665d7374ba62e26ddfa3fd6986ae952e22965446e4bbe973d2e17a1f05cba32e74f7d30e1e327fbc262ebce7b1f1
-  data.tar.gz: aa9db8c15e10ecc08fa65db0cf6964914681ef72b552a300c4b95899b4a837835c1c69baff9b8e48586df34eefb7bb4156e55a5c81582deda4a9948554224f48
+  metadata.gz: a24f38005e975861d4e5ce1c3b728ea4535d7a094cae2515a8b6e7f0e7bb7abe7558eec44651a7e833d0120d397bcb45687022c374a039f5d755d46798264e8c
+  data.tar.gz: 58f27f493e1255ef7b4ea1904cb643c1392f62dacea645708142f153eccfba2ed0a9ed52e33f76f4ec4eae5012b9dce159ec963c216a5506969b4a47be4e2042

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## v3.0.0 / 2022-08-28
+## 3.1.0 / 2022-09-24
+
+- **New feature:** parse `img[srcset]` (microformats/microformats2-parsing#7) (cdda328)
+- Improve usage of activesupport extensions (5ed120c)
+
+## 3.0.0 / 2022-08-28
 
 - Improved YARD documentation
 - New `Item` instance methods (8105d6f):

data/README.md

@@ -48,7 +48,7 @@ doc.to_h
 #=> { :items => [{ :type => ["h-card"], :properties => { :name => ["Jason Garber"] } }], :rels => {}, :"rel-urls" => {} }
 ```
 
-See [USAGE.md](https://github.com/jgarber623/micromicro/blob/main/USAGE.md) for detailed examples of MicroMicro's features.
+See [USAGE.md](https://github.com/jgarber623/micromicro/blob/main/USAGE.md) for detailed examples of MicroMicro's features. Additional structured documentation is available on [RubyDoc.info](https://rubydoc.info/gems/micromicro).
 
 ## Contributing
 

data/lib/micro_micro/collections/properties_collection.rb

@@ -64,7 +64,7 @@ module MicroMicro
       #
       # @return [Hash{Symbol => Array<String, Hash>}]
       def to_h
-        group_by(&:name).symbolize_keys.deep_transform_values(&:value)
+        group_by(&:name).transform_keys(&:to_sym).deep_transform_values(&:value)
       end
 
       # A collection of url {MicroMicro::Property}s parsed from the node.

data/lib/micro_micro/collections/relationships_collection.rb

@@ -38,9 +38,9 @@ module MicroMicro
       #
       # @return [Hash{Symbol => Array<String>}]
       def group_by_rel
-        each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |member, hash|
-          member.rels.each { |rel| hash[rel] << member.href }
-        end.symbolize_keys.transform_values(&:uniq)
+        each_with_object(Hash.new { |hash, key| hash[key] = Set.new }) do |member, hash|
+          member.rels.each { |rel| hash[rel.to_sym] << member.href }
+        end.transform_values(&:to_a)
       end
 
       # Return a Hash of this collection's {MicroMicro::Relationship}s grouped
@@ -51,7 +51,7 @@ module MicroMicro
       #
       # @return [Hash{Symbol => Hash{Symbol => Array, String}}]
       def group_by_url
-        group_by(&:href).symbolize_keys.transform_values { |relationships| relationships.first.to_h.slice!(:href) }
+        group_by(&:href).to_h { |k, v| [k.to_sym, v.first.to_h.except(:href)] }
       end
 
       # Retrieve an Array of this collection's unique {MicroMicro::Relationship}

data/lib/micro_micro/parsers/date_time_parser.rb

@@ -90,17 +90,14 @@ module MicroMicro
 
       # @return [String, nil]
       def value
-        @value ||=
-          if normalized_date || normalized_time || normalized_timezone
-            "#{normalized_date} #{normalized_time}#{normalized_timezone}".strip
-          end
+        @value ||= "#{normalized_date} #{normalized_time}#{normalized_timezone}".strip.presence
       end
 
       # @return [Hash{Symbol => String, nil}]
       def values
         @values ||=
           if string.match?(DATE_TIME_TIMEZONE_REGEXP)
-            string.match(DATE_TIME_TIMEZONE_REGEXP).named_captures.symbolize_keys
+            string.match(DATE_TIME_TIMEZONE_REGEXP).named_captures.transform_keys(&:to_sym)
           else
             {}
           end

data/lib/micro_micro/parsers/image_element_parser.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module MicroMicro
+  module Parsers
+    class ImageElementParser
+      # @return [String]
+      attr_reader :value
+
+      # @param node [Nokogiri::XML::Element]
+      # @param value [String]
+      def initialize(node, value)
+        @node = node
+        @value = value
+      end
+
+      # @return [String, nil]
+      def alt
+        @alt ||= node['alt']&.strip
+      end
+
+      # @return [Boolean]
+      def alt?
+        !alt.nil?
+      end
+
+      # @return [Hash{Symbol => String}, nil]
+      def srcset
+        @srcset ||= image_candidates if node['srcset']
+      end
+
+      # @return [Boolean]
+      def srcset?
+        srcset.present?
+      end
+
+      # @return [Hash{Symbol => String, Hash{Symbol => String}}]
+      def to_h
+        hash = { value: value }
+
+        hash[:srcset] = srcset if srcset?
+        hash[:alt] = alt if alt?
+
+        hash
+      end
+
+      private
+
+      # @return [Nokogiri::XML::Element]
+      attr_reader :node
+
+      # @return [Hash{Symbol => String}]
+      #
+      # rubocop:disable Style/PerlBackrefs
+      def image_candidates
+        node['srcset']
+          .split(',')
+          .each_with_object({}) do |candidate, hash|
+            candidate.strip.match(/^(.+?)(\s+.+)?$/) do
+              key = ($2 || '1x').strip.to_sym
+
+              hash[key] = $1 unless hash[key]
+            end
+          end
+      end
+      # rubocop:enable Style/PerlBackrefs
+    end
+  end
+end

data/lib/micro_micro/parsers/implied_photo_property_parser.rb

@@ -19,12 +19,11 @@ module MicroMicro
       def value
         @value ||=
           if attribute_value
-            return attribute_value unless candidate_node.matches?('img[alt]')
-
-            {
-              value: attribute_value,
-              alt: candidate_node['alt'].strip
-            }
+            if candidate_node.matches?('img[alt], img[srcset]')
+              ImageElementParser.new(candidate_node, attribute_value).to_h
+            else
+              attribute_value
+            end
           end
       end
 

data/lib/micro_micro/parsers/url_property_parser.rb

@@ -23,11 +23,8 @@ module MicroMicro
       # @return [String, Hash{Symbol => String}]
       def value
         @value ||=
-          if node.matches?('img[alt]')
-            {
-              value: resolved_value,
-              alt: node['alt'].strip
-            }
+          if node.matches?('img[alt], img[srcset]')
+            ImageElementParser.new(node, resolved_value).to_h
           else
             resolved_value
           end

data/lib/micro_micro/parsers/value_class_pattern_parser.rb

@@ -57,7 +57,7 @@ module MicroMicro
           self.class
               .node_set_from(node)
               .map { |value_node| self.class.value_from(value_node) }
-              .select(&:present?)
+              .compact_blank!
       end
 
       private

data/lib/micro_micro/property.rb

@@ -152,8 +152,8 @@ module MicroMicro
 
           return hash.merge(parser.value) if embedded_markup_property?
 
-          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?
+          p_property = item.properties.find_by(name: 'name') if plain_text_property?
+          u_property = item.properties.find_by(name: 'url') if url_property?
 
           hash.merge(value: (p_property || u_property || parser).value)
         else

data/lib/micro_micro/relationship.rb

@@ -65,7 +65,7 @@ module MicroMicro
         title: title,
         type: type,
         text: text
-      }.select { |_, value| value.present? }
+      }.compact_blank!
     end
 
     # An Array of unique values from node's +rel+ attribute.

data/lib/micro_micro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicroMicro
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/lib/micromicro.rb

@@ -3,9 +3,9 @@
 require 'forwardable'
 
 require 'active_support/core_ext/array/grouping'
+require 'active_support/core_ext/enumerable'
 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/hash/except'
 require 'active_support/core_ext/object/blank'
 require 'nokogiri'
 require 'nokogiri/html-ext'
@@ -15,6 +15,7 @@ require_relative 'micro_micro/collectible'
 require_relative 'micro_micro/helpers'
 
 require_relative 'micro_micro/parsers/date_time_parser'
+require_relative 'micro_micro/parsers/image_element_parser'
 require_relative 'micro_micro/parsers/value_class_pattern_parser'
 
 require_relative 'micro_micro/parsers/base_property_parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micromicro
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jason Garber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,6 +77,7 @@ files:
 - lib/micro_micro/parsers/date_time_parser.rb
 - lib/micro_micro/parsers/date_time_property_parser.rb
 - lib/micro_micro/parsers/embedded_markup_property_parser.rb
+- lib/micro_micro/parsers/image_element_parser.rb
 - lib/micro_micro/parsers/implied_name_property_parser.rb
 - lib/micro_micro/parsers/implied_photo_property_parser.rb
 - lib/micro_micro/parsers/implied_url_property_parser.rb
@@ -93,7 +94,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/jgarber623/micromicro/issues
-  changelog_uri: https://github.com/jgarber623/micromicro/blob/v3.0.0/CHANGELOG.md
+  changelog_uri: https://github.com/jgarber623/micromicro/blob/v3.1.0/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []