link-header-parser 0.1.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af19382d4d537959b66ca55c6fcfab4cc52cb552748e6cc9cbf7d18176491e1
-  data.tar.gz: f576800eaa08e75441edf34b65bac17302cbff52ad161ad84e5604fdd8a66890
+  metadata.gz: 49d324c80bd5c13900e144055a9a9470e77f2450ab08edc0b6579a918a7b9043
+  data.tar.gz: 38e3d233be9a7162b81f9300dce58c6f43e78b1cdf026d6bedd438ff650e347f
 SHA512:
-  metadata.gz: d0823f00fe68edffc867354972a4e3efa4f7f4ebe5cd4ba14ff0dbefe7a291531daca5b789f3392d0b53a9231edc1261f4ea01c094545a74119aed0c9c7f668d
-  data.tar.gz: 9bf55d725122524374d47024900768bb497239422e826a0d07f66052e091dc950f982e8df3d4275d75837d8e4b3e19bbaa92a8aa5f937299f2429b66e02ee215
+  metadata.gz: 57b0b8a602f4d85b3d151172f05fc428211800d66edf22725153b759b2bd6024f8af7dd2ddd693e663176626149073e5bd98e3745e588080a2e729dee33cd38e
+  data.tar.gz: 83f5739b85c3e96815eda70045ad39b34a7f01ba8e6cafc92a81a78b3ad500a46871baf1d93ef2d3c75ac663d9431e9abd0f9f38b7b8bf7728d931d38ff9cfcc

data/.reek.yml

@@ -1,9 +1,9 @@
 detectors:
   IrresponsibleModule:
     enabled: false
-  NilCheck:
+  NestedIterators:
     exclude:
-      - "LinkHeaderParser::ParsedHeader#relation_types"
+      - LinkHeaderParser::LinkHeadersCollection#group_by_relation_type
 
 exclude_paths:
   - vendor/

data/.rubocop.yml

@@ -2,12 +2,16 @@ require:
   - rubocop-performance
   - rubocop-rspec
 
-Layout/AlignHash:
-  EnforcedHashRocketStyle: table
+AllCops:
+  NewCops: enable
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
+Metrics/ModuleLength:
+  Exclude:
+    - spec/support/**/*.rb
+
 Naming/FileName:
   Exclude:
     - lib/link-header-parser.rb

data/.ruby-version

@@ -1 +1 @@
-2.4.6
+2.5.8

data/.simplecov

@@ -2,9 +2,11 @@ require 'simplecov-console'
 
 formatters = [SimpleCov::Formatter::HTMLFormatter]
 
+# rubocop:disable Style/IfUnlessModifier
 if RSpec.configuration.files_to_run.length > 1
   formatters << SimpleCov::Formatter::Console
 end
+# rubocop:enable Style/IfUnlessModifier
 
 SimpleCov.start do
   formatter SimpleCov::Formatter::MultiFormatter.new(formatters)

data/.travis.yml

@@ -1,13 +1,10 @@
+dist: bionic
 language: ruby
 rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-cache:
-  - bundler
-before_install:
-  - gem update --system
-  - gem install bundler
+  - 2.5
+  - 2.6
+  - 2.7
+cache: bundler
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
-0.1.0 / 2019-06-06
+## 2.1.0 / 2020-10-07
+
+- Update Absolutely dependency to 5.0 (62988c0)
+
+## 2.0.0 / 2020-05-21
+
+- **Breaking changes:** Rewrite gem code (5351010)
+	- `LinkHeaderParser.parse` returns `LinkHeadersCollection`
+	- New classes: `LinkHeadersCollection`, `LinkHeader`, and `LinkHeaderParameter`
+	- Renamed collection's `by_relation_type` method to `group_by_relation_type`
+- **Breaking change:** Update project Ruby version to 2.5.8 and minimum Ruby version to 2.5 (05b2e82)
+- Update inline documentation and refactor `ParsedHeader` and `ParsedHeaderCollection` classes (31ec43e)
+
+## 1.0.0 / 2020-05-14
+
+- Update Absolutely dependency to 4.0 (4b78347)
+- Update development Ruby version to 2.4.10 (8d26096)
+- Move development dependencies to `Gemfile` (3f6b5dd)
+
+## 0.3.0 / 2020-01-20
+
+- Expand supported Ruby versions to include 2.7 (c55624a)
+
+## 0.2.0 / 2019-07-02
+
+- Add support for the `anchor` parameter to `ParsedHeader` exposed via `context` and `context_uri` methods (d2dff52)
+
+## 0.1.0 / 2019-06-06
 
 - Initial release!

data/CONTRIBUTING.md

@@ -8,9 +8,9 @@ There are a couple ways you can help improve link-header-parser-ruby:
 
 ## Getting Started
 
-link-header-parser-ruby is developed using Ruby 2.4.6 and is additionally tested against Ruby 2.5.5 and 2.6.3 using [Travis CI](https://travis-ci.com/jgarber623/link-header-parser-ruby).
+link-header-parser-ruby is developed using Ruby 2.5.8 and is additionally tested against Ruby 2.6 and 2.7 using [Travis CI](https://travis-ci.com/jgarber623/link-header-parser-ruby).
 
-Before making changes to link-header-parser-ruby, you'll want to install Ruby 2.4.6. It's recommended that you use a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm). Once you've installed Ruby 2.4.6 using your method of choice, install the project's gems by running:
+Before making changes to link-header-parser-ruby, you'll want to install Ruby 2.5.8. It's recommended that you use a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm). Once you've installed Ruby 2.5.8 using your method of choice, install the project's gems by running:
 
 ```sh
 bundle install

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in link-header-parser.gemspec
 gemspec
+
+gem 'pry-byebug', '~> 3.9'
+gem 'rake', '~> 13.0'
+gem 'reek', '~> 6.0'
+gem 'rspec', '~> 3.9'
+gem 'rubocop', '~> 0.92.0'
+gem 'rubocop-performance', '~> 1.8'
+gem 'rubocop-rspec', '~> 1.43'
+gem 'simplecov', '~> 0.19.0'
+gem 'simplecov-console', '~> 0.7.2'

data/README.md

@@ -4,16 +4,16 @@
 
 [![Gem](https://img.shields.io/gem/v/link-header-parser.svg?style=for-the-badge)](https://rubygems.org/gems/link-header-parser)
 [![Downloads](https://img.shields.io/gem/dt/link-header-parser.svg?style=for-the-badge)](https://rubygems.org/gems/link-header-parser)
-[![Build](https://img.shields.io/travis/com/jgarber623/link-header-parser-ruby/master.svg?style=for-the-badge)](https://travis-ci.com/jgarber623/link-header-parser-ruby)
+[![Build](https://img.shields.io/travis/com/jgarber623/link-header-parser-ruby/main.svg?style=for-the-badge)](https://travis-ci.com/jgarber623/link-header-parser-ruby)
 [![Dependencies](https://img.shields.io/depfu/jgarber623/link-header-parser-ruby.svg?style=for-the-badge)](https://depfu.com/github/jgarber623/link-header-parser-ruby)
 [![Maintainability](https://img.shields.io/codeclimate/maintainability/jgarber623/link-header-parser-ruby.svg?style=for-the-badge)](https://codeclimate.com/github/jgarber623/link-header-parser-ruby)
 [![Coverage](https://img.shields.io/codeclimate/c/jgarber623/link-header-parser-ruby.svg?style=for-the-badge)](https://codeclimate.com/github/jgarber623/link-header-parser-ruby/code)
 
 ## Getting Started
 
-Before installing and using link-header-parser-ruby, you'll want to have [Ruby](https://www.ruby-lang.org) 2.4 (or newer) installed. It's recommended that you use a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm).
+Before installing and using link-header-parser-ruby, you'll want to have [Ruby](https://www.ruby-lang.org) 2.5 (or newer) installed. It's recommended that you use a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm).
 
-link-header-parser-ruby is developed using Ruby 2.4.6 and is additionally tested against Ruby 2.5.5 and 2.6.3 using [Travis CI](https://travis-ci.com/jgarber623/link-header-parser-ruby).
+link-header-parser-ruby is developed using Ruby 2.5.8 and is additionally tested against Ruby 2.6 and 2.7 using [Travis CI](https://travis-ci.com/jgarber623/link-header-parser-ruby).
 
 ## Installation
 
@@ -44,44 +44,108 @@ response = HTTP.get('https://sixtwothree.org')
 link_headers = response.headers.get('link')
 
 collection = LinkHeaderParser.parse(link_headers, base: response.uri.to_s)
+```
+
+The `parse` method accepts two arguments:
+
+1. an `Array` of strings representing HTTP Link headers (e.g. `['</>; rel="home"', '</chapters/1>; anchor="#copyright"; rel="license"']`)
+1. a `String` representing the absolute URL of the resource providing the HTTP Link headers
+
+In the example above, `collection` is an instance of `LinkHeadersCollection` which includes Ruby's [`Enumerable`](https://ruby-doc.org/core/Enumerable.html) mixin. This mixin allows for use of common methods like `each`, `first`/`last`, and `map`.
+
+For example, you could retrieve an array of `target_uri`s:
 
-puts collection.relation_types    # => ["preconnect", "webmention"]
-puts collection.map(&:target_uri) # => ["https://assets.sixtwothree.org/", "https://fonts.googleapis.com/", "https://fonts.gstatic.com/", "https://sixtwothree.org/webmentions"]
+```ruby
+puts collection.map(&:target_uri)
+#=> ["https://assets.sixtwothree.org/", "https://fonts.googleapis.com/", "https://fonts.gstatic.com/", "https://sixtwothree.org/webmentions"]
 ```
 
-In the example above, `collection` is an instance of `ParsedHeaderCollection` which includes Ruby's [Enumerable](https://ruby-doc.org/core/Enumerable.html) mixin. This mixin allows for use of common methods like `each`, `first`/`last`, and `map` (as demonstrated above).
+### Working with a `LinkHeadersCollection`
+
+In addition to the included `Enumerable` methods, the following methods may be used to interact with a `LinkHeadersCollection`:
 
-Additionally, `collection.by_relation_type` returns an `OpenStruct` with the following attributes:
+#### The `relation_types` Method
+
+```ruby
+puts collection.relation_types
+#=> ["preconnect", "webmention"]
+```
+
+#### The `group_by_relation_type` Method
+
+Using the `collection` from above, the `group_by_relation_type` method returns a `Hash`:
 
 ```ruby
 {
   preconnect: [
-    #<LinkHeaderParser::ParsedHeader @header="<https://assets.sixtwothree.org/>; rel=\"preconnect\"">,
-    #<LinkHeaderParser::ParsedHeader @header="<https://fonts.googleapis.com/>; rel=\"preconnect\"">,
-    #<LinkHeaderParser::ParsedHeader @header="<https://fonts.gstatic.com/>; rel=\"preconnect\"">
+    #<LinkHeaderParser::LinkHeader target_uri: "https://assets.sixtwothree.org/", relation_types: ["preconnect"]>,
+    #<LinkHeaderParser::LinkHeader target_uri: "https://fonts.googleapis.com/", relation_types: ["preconnect"]>,
+    #<LinkHeaderParser::LinkHeader target_uri: "https://fonts.gstatic.com/", relation_types: ["preconnect"]>
   ],
   webmention: [
-    #<LinkHeaderParser::ParsedHeader @header="<https://sixtwothree.org/webmentions>; rel=\"webmention\"">
+    #<LinkHeaderParser::LinkHeader target_uri: "https://sixtwothree.org/webmentions", relation_types: ["webmention"]>
   ]
 }
 ```
 
-Building on this example, you may interact with one or more `ParsedHeader`s in a `ParsedHeaderCollection`:
+### Working with a `LinkHeader`
+
+You may interact with one or more `LinkHeader`s in a `LinkHeadersCollection` using the methods outlined below. The naming conventions for these methods draws heavily on the terminology established in [RFC-5988](https://tools.ietf.org/html/rfc5988) and [RFC-8288](https://tools.ietf.org/html/rfc8288).
+
+#### Link Target ([§ 3.1](https://tools.ietf.org/html/rfc8288#section-3.1))
+
+```ruby
+link_header = LinkHeaderParser.parse('</index.html>; rel="home"', base: 'https://example.com/').first
+
+link_header.target_string
+#=> "/index.html"
+
+link_header.target_uri
+#=> "https://example.com/index.html"
+```
+
+The `target_string` method returns a string of the value between the opening and closing angle brackets at the beginning of the Link header. The `target_uri` method returns a string representing the resolved URL.
+
+#### Link Context ([§ 3.2](https://tools.ietf.org/html/rfc8288#section-3.2))
+
+```ruby
+link_header = LinkHeaderParser.parse('</chapters/1>; anchor="#copyright"; rel="license"', base: 'https://example.com/').first
+
+link_header.context_string
+#=> "#copyright"
+
+link_header.context_uri
+#=> "https://example.com/chapters/1#copyright"
+```
+
+The `anchor` parameter's value may be a fragment identifier (e.g. `#foo`), a relative URL (e.g. `/foo`), or an absolute URL (e.g. `https://context.example.com`). The `context_string` method returns the `anchor` parameter's value (when present) and defaults to the `target_string` value. The `context_uri` method returns a string representing the resolved URL.
+
+#### Relation Type ([§ 3.3](https://tools.ietf.org/html/rfc8288#section-3.3))
+
+```ruby
+link_header = LinkHeaderParser.parse('</chapters/1>; rel="prev start"', base: 'https://example.com/').first
+
+link_header.relations_string
+#=> "prev start"
+
+link_header.relation_types
+#=> ["prev", "start"]
+```
+
+#### Link Parameters ([Appendix B.3](https://tools.ietf.org/html/rfc8288#appendix-B.3))
 
 ```ruby
-parsed_header = collection.first
+link_header = LinkHeaderParser.parse('</posts.rss>; rel="alternate"; hreflang="en-US"; title="sixtwothree.org: Posts"; type="application/rss+xml"', base: 'https://sixtwothree.org').first
 
-parsed_header.relation_types # => ['preconnect']
-parsed_header.relations      # => 'preconnect'
-parsed_header.target         # => 'https://assets.sixtwothree.org/'
-parsed_header.target_uri     # => 'https://assets.sixtwothree.org/'
+link_header.link_parameters
+#=> [#<LinkHeaderParser::LinkHeaderParameter:0x3fdea54716ac name: "rel", value: "alternate">, #<LinkHeaderParser::LinkHeaderParameter:0x3fdea5471684 name: "hreflang", value: "en-US">, #<LinkHeaderParser::LinkHeaderParameter:0x3fdea5471670 name: "title", value: "sixtwothree.org: Posts">, #<LinkHeaderParser::LinkHeaderParameter:0x3fdea547165c name: "type", value: "application/rss+xml">]
 ```
 
-The naming conventions for these methods draws heavily on the terminology established in [RFC-5988](https://tools.ietf.org/html/rfc5988) and [RFC-8288](https://tools.ietf.org/html/rfc8288).
+Note that the `Array` returned by the `link_parameters` method may include multiple `LinkHeaderParameter`s with the same name depending on the provided Link header. Certain methods on `LinkHeader` will return values from the first occurrence of a parameter name (e.g. `link_header.relations_string`) in accordance with [RFC-8288](https://tools.ietf.org/html/rfc8288).
 
 ## Contributing
 
-Interested in helping improve link-header-parser-ruby? Awesome! Your help is greatly appreciated. See [CONTRIBUTING.md](https://github.com/jgarber623/link-header-parser-ruby/blob/master/CONTRIBUTING.md) for details.
+Interested in helping improve link-header-parser-ruby? Awesome! Your help is greatly appreciated. See [CONTRIBUTING.md](https://github.com/jgarber623/link-header-parser-ruby/blob/main/CONTRIBUTING.md) for details.
 
 ## Acknowledgments
 

data/lib/link-header-parser.rb

@@ -1,17 +1,21 @@
-require 'ostruct'
+require 'forwardable'
 
 require 'absolutely'
 
 require 'link_header_parser/version'
 require 'link_header_parser/exceptions'
 
-require 'link_header_parser/parsed_header'
-require 'link_header_parser/parsed_header_collection'
+require 'link_header_parser/link_header'
+require 'link_header_parser/link_header_parameter'
+require 'link_header_parser/link_headers_collection'
 
 module LinkHeaderParser
-  class << self
-    def parse(*headers, base:)
-      ParsedHeaderCollection.new(headers, base: base)
-    end
+  # Parse an array of HTTP Link headers
+  #
+  # @param headers [Array<String>]
+  # @param base [String]
+  # @return [LinkHeaderParser::LinkHeadersCollection]
+  def self.parse(*headers, base:)
+    LinkHeadersCollection.new(*headers, base: base)
   end
 end

data/lib/link_header_parser/link_header.rb

@@ -0,0 +1,106 @@
+module LinkHeaderParser
+  class LinkHeader
+    FIELD_VALUE_REGEXP_PATTERN = /^\s*<\s*(?<target_string>[^>]+)\s*>\s*(?<parameters>;\s*.*)$/.freeze
+    PARAMETERS_REGEXP_PATTERN = /(?<!;)\s*([^;]+)/.freeze
+
+    attr_reader :field_value
+
+    # Create a new parsed Link header
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.2
+    #
+    # @param field_value [String]
+    # @param base [String]
+    def initialize(field_value, base:)
+      raise ArgumentError, "field_value must be a String (given #{field_value.class})" unless field_value.is_a?(String)
+      raise ArgumentError, "base must be a String (given #{base.class})" unless base.is_a?(String)
+
+      @field_value = field_value
+      @base = base
+    end
+
+    # The context URL for this Link header extracted from field_value (or target URL if no context URL is present)
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.2 (Appendix B.2.2.11)
+    #
+    # @return [String]
+    def context_string
+      @context_string ||= grouped_link_parameters[:anchor]&.first || target_string
+    end
+
+    # The resolved context URL for this Link header
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.2 (Appendix B.2.2.12)
+    #
+    # @return [String]
+    def context_uri
+      @context_uri ||= Absolutely.to_abs(base: target_uri, relative: context_string)
+    end
+
+    def inspect
+      format(%(#<#{self.class.name}:%#0x target_uri: #{target_uri.inspect}, relation_types: #{relation_types.inspect}>), object_id)
+    end
+
+    # The parsed parameters for this Link header extracted from field_value
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.3
+    #
+    # @return [Array<LinkHeaderParser::LinkHeaderParameter>]
+    def link_parameters
+      @link_parameters ||= field_value_match_data[:parameters].scan(PARAMETERS_REGEXP_PATTERN).flatten.map { |parameter| LinkHeaderParameter.new(parameter) }
+    end
+
+    # The relations_string value returned as an Array
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.2 (Appendix B.2.2.10 and Appendix B.2.2.17.1)
+    #
+    # @return [Array<String>]
+    def relation_types
+      @relation_types ||= relations_string.split.map(&:downcase)
+    end
+
+    # The relation types for this Link header extracted from field_value
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.2 (Appendix B.2.2.9)
+    #
+    # @return [String]
+    def relations_string
+      @relations_string ||= grouped_link_parameters[:rel]&.first || ''
+    end
+
+    # The target URL for this Link header extracted from field_value
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.2 (Appendix B.2.2.4)
+    #
+    # @return [String]
+    def target_string
+      @target_string ||= field_value_match_data[:target_string]
+    end
+
+    # The resolved target URL for this Link header
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.2 (Appendix B.2.2.8)
+    #
+    # @return [String]
+    def target_uri
+      @target_uri ||= Absolutely.to_abs(base: base, relative: target_string)
+    end
+
+    # @return [Hash{Symbol => String, Array, Hash{Symbol => Array}}]
+    def to_h
+      {
+        target_string: target_string,
+        target_uri: target_uri,
+        context_string: context_string,
+        context_uri: context_uri,
+        relations_string: relations_string,
+        relation_types: relation_types,
+        link_parameters: grouped_link_parameters
+      }
+    end
+
+    private
+
+    attr_reader :base
+
+    def field_value_match_data
+      @field_value_match_data ||= field_value.match(FIELD_VALUE_REGEXP_PATTERN)
+    end
+
+    def grouped_link_parameters
+      @grouped_link_parameters ||= link_parameters.map(&:to_a).group_by(&:shift).transform_keys(&:to_sym).transform_values(&:flatten)
+    end
+  end
+end

data/lib/link_header_parser/link_header_parameter.rb

@@ -0,0 +1,41 @@
+module LinkHeaderParser
+  class LinkHeaderParameter
+    PARAMETER_REGEXP_PATTERN = /^(?<name>.+?)(?:="?(?<value>.*?)"?)?$/.freeze
+
+    attr_reader :parameter
+
+    # @param parameter [String]
+    def initialize(parameter)
+      @parameter = parameter
+    end
+
+    def inspect
+      format(%(#<#{self.class.name}:%#0x name: #{name.inspect}, value: #{value.inspect}>), object_id)
+    end
+
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.3 (Appendix B.3.2.9)
+    #
+    # @return [String]
+    def name
+      @name ||= parameter_match_data[:name].downcase
+    end
+
+    # @see https://tools.ietf.org/html/rfc8288#appendix-B.3 (Appendix B.3.2.8)
+    #
+    # @return [String, nil]
+    def value
+      @value ||= parameter_match_data[:value] || ''
+    end
+
+    # @return [Array<String>]
+    def to_a
+      [name, value]
+    end
+
+    private
+
+    def parameter_match_data
+      @parameter_match_data ||= parameter.match(PARAMETER_REGEXP_PATTERN)
+    end
+  end
+end

data/lib/link_header_parser/link_headers_collection.rb

@@ -0,0 +1,48 @@
+module LinkHeaderParser
+  class LinkHeadersCollection
+    extend Forwardable
+
+    include Enumerable
+
+    def_delegators :members, :[], :<<, :each, :last, :length, :push
+
+    attr_reader :headers
+
+    # @param headers [Array<String>]
+    # @param base [String]
+    def initialize(*headers, base:)
+      @headers = headers.flatten
+      @base = base
+
+      discrete_headers.each { |header| push(LinkHeader.new(header, base: base)) }
+    end
+
+    # @return [Hash{Symbol => Array<LinkHeaderParser::LinkHeader>}]
+    def group_by_relation_type
+      relation_types.map do |relation_type|
+        [relation_type, find_all { |member| member.relation_types.include?(relation_type) }]
+      end.to_h.transform_keys(&:to_sym)
+    end
+
+    def inspect
+      format(%(#<#{self.class.name}:%#0x headers: #{headers.inspect}, relation_types: #{relation_types.inspect}>), object_id)
+    end
+
+    # @return [Array<String>]
+    def relation_types
+      @relation_types ||= flat_map(&:relation_types).uniq.sort
+    end
+
+    private
+
+    attr_reader :base
+
+    def discrete_headers
+      @discrete_headers ||= headers.flat_map { |header| header.split(/,(?=[\s|<])/) }.map(&:strip)
+    end
+
+    def members
+      @members ||= []
+    end
+  end
+end

data/lib/link_header_parser/version.rb

@@ -1,3 +1,3 @@
 module LinkHeaderParser
-  VERSION = '0.1.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/link-header-parser.gemspec

@@ -1,10 +1,7 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'link_header_parser/version'
+require_relative 'lib/link_header_parser/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ['>= 2.4', '< 2.7']
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 2.8')
 
   spec.name          = 'link-header-parser'
   spec.version       = LinkHeaderParser::VERSION
@@ -16,23 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/jgarber623/link-header-parser-ruby'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|spec)/}) }
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|spec)/}) }
+  end
 
   spec.require_paths = ['lib']
 
-  spec.metadata = {
-    'bug_tracker_uri' => "#{spec.homepage}/issues",
-    'changelog_uri'   => "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md"
-  }
-
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'reek', '~> 5.4'
-  spec.add_development_dependency 'rspec', '~> 3.8'
-  spec.add_development_dependency 'rubocop', '~> 0.71.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.3'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.33'
-  spec.add_development_dependency 'simplecov', '~> 0.16.1'
-  spec.add_development_dependency 'simplecov-console', '~> 0.5.0'
+  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.0'
+  spec.add_runtime_dependency 'absolutely', '~> 5.0'
 end

metadata

@@ -1,141 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: link-header-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jason Garber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.71.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.71.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.33'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.33'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: absolutely
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 description: Parse HTTP Link headers.
 email:
 - jason@sixtwothree.org
@@ -160,8 +48,9 @@ files:
 - Rakefile
 - lib/link-header-parser.rb
 - lib/link_header_parser/exceptions.rb
-- lib/link_header_parser/parsed_header.rb
-- lib/link_header_parser/parsed_header_collection.rb
+- lib/link_header_parser/link_header.rb
+- lib/link_header_parser/link_header_parameter.rb
+- lib/link_header_parser/link_headers_collection.rb
 - lib/link_header_parser/version.rb
 - link-header-parser.gemspec
 homepage: https://github.com/jgarber623/link-header-parser-ruby
@@ -169,7 +58,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/jgarber623/link-header-parser-ruby/issues
-  changelog_uri: https://github.com/jgarber623/link-header-parser-ruby/blob/v0.1.0/CHANGELOG.md
+  changelog_uri: https://github.com/jgarber623/link-header-parser-ruby/blob/v2.1.0/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -178,17 +67,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Parse HTTP Link headers.

data/lib/link_header_parser/parsed_header.rb

@@ -1,57 +0,0 @@
-module LinkHeaderParser
-  class ParsedHeader
-    attr_reader :header
-
-    def initialize(header, base:)
-      raise ArgumentError, "header must be a String (given #{header.class})" unless header.is_a?(String)
-      raise ArgumentError, "base must be a String (given #{base.class})" unless base.is_a?(String)
-
-      @header = header
-      @base = base
-    end
-
-    def inspect
-      format(%(#<#{self.class.name}:%#0x @header="#{header.gsub('"', '\"')}">), object_id)
-    end
-
-    def parameters
-      @parameters ||= OpenStruct.new(header_attributes)
-    end
-
-    def relation_types
-      @relation_types ||= relations&.split(' ') || nil
-    end
-
-    def relations
-      @relations ||= parameters.rel || nil
-    end
-
-    def target
-      @target ||= header_match_data[:target]
-    end
-
-    def target_uri
-      @target_uri ||= Absolutely.to_abs(base: @base, relative: target)
-    end
-
-    def to_h
-      {
-        target: target,
-        target_uri: target_uri,
-        relations: relations,
-        relation_types: relation_types,
-        parameters: parameters.to_h
-      }
-    end
-
-    private
-
-    def header_attributes
-      @header_attributes ||= header_match_data[:attributes].tr('"', '').split(';').map { |tuple| tuple.split('=').map(&:strip) }.sort.to_h
-    end
-
-    def header_match_data
-      @header_match_data ||= header.match(/^<\s*(?<target>[^>]+)\s*>\s*;\s*(?<attributes>.*)$/)
-    end
-  end
-end

data/lib/link_header_parser/parsed_header_collection.rb

@@ -1,58 +0,0 @@
-module LinkHeaderParser
-  class ParsedHeaderCollection
-    include Enumerable
-
-    attr_reader :headers
-
-    def initialize(*headers, base:)
-      @headers = headers.flatten
-      @base = base
-    end
-
-    def by_relation_type
-      @by_relation_type ||= OpenStruct.new(mapped_relation_types)
-    end
-
-    def each
-      return to_enum unless block_given?
-
-      parsed_headers.each { |parsed_header| yield parsed_header }
-
-      self
-    end
-
-    def inspect
-      format(%(#<#{self.class.name}:%#0x @headers=#{headers}>), object_id)
-    end
-
-    def last
-      @last ||= parsed_headers[-1]
-    end
-
-    def length
-      @length ||= parsed_headers.length
-    end
-
-    def relation_types
-      @relation_types ||= parsed_headers.map(&:relation_types).flatten.uniq.sort
-    end
-
-    private
-
-    def find_all_by_relation_type(relation_type)
-      find_all { |parsed_header| parsed_header.relation_types.include?(relation_type) }
-    end
-
-    def mapped_relation_types
-      @mapped_relation_types ||= relation_types.map { |relation_type| [relation_type, find_all_by_relation_type(relation_type)] }.to_h
-    end
-
-    def uniq_headers
-      @uniq_headers ||= headers.map { |header| header.split(/,(?=[\s|<])/) }.flatten.map(&:strip)
-    end
-
-    def parsed_headers
-      @parsed_headers ||= uniq_headers.map { |header| ParsedHeader.new(header, base: @base) }
-    end
-  end
-end