nitlink 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d7bf9f8436e8b45762a03ae9a73b613db238f7
-  data.tar.gz: 4af8d8f6a3c09991d4254355be30c8e9148a9551
+  metadata.gz: bd514951777aea91ff90a20835d23e2ab3136328
+  data.tar.gz: 53dfc5982d3c257fe96f11019d0b11fbbcda0e94
 SHA512:
-  metadata.gz: 29b158182dad5e2199db2b2620affc893ec8af246df861ba91cf41e7119ca1515cf17d6830995fa7f6ffc478ba08faab7b067de829a03a79ec5d2ced9d80d409
-  data.tar.gz: e789dc5dafd4415e9b335be5e33b84503564b0a8db932ea203222374094e7f12ac9a840f4fc166c2e52b75e63555094e0d49f1f42a4ab261f012293df8bc3ec6
+  metadata.gz: f28cff5fab3af58703592a22a1d5d76a368f7b556be2129b5f0c48cf8754cd28ecdbd2f2f50126a6f295ba0a4d17d3920756fc28d0d45b2ab378a377b67f7e0b
+  data.tar.gz: e8bed9a781c09e0473285d852185364ed72373964fe437f3a6385eebfd28ed70856c243938ae4a9beb24325195a23c9fce7df525b784506140d01760fed16100

data/lib/nitlink/hash_with_indifferent_access.rb

@@ -0,0 +1,68 @@
+module Nitlink
+  class HashWithIndifferentAccess < ::Hash
+    def initialize(hash = {})
+      super()
+      hash.each do |key, value|
+        self[convert_key(key)] = value
+      end
+    end
+
+    def [](key)
+      super(convert_key(key))
+    end
+
+    def []=(key, value)
+      super(convert_key(key), value)
+    end
+
+    def delete(key)
+      super(convert_key(key))
+    end
+
+    def fetch(key, *args)
+      super(convert_key(key), *args)
+    end
+
+    def key?(key)
+      super(convert_key(key))
+    end
+
+    def values_at(*indices)
+      indices.map { |key| self[convert_key(key)] }
+    end
+
+    def merge(other)
+      dup.merge!(other)
+    end
+
+    def merge!(other)
+      other.each do |key, value|
+        self[convert_key(key)] = value
+      end
+      self
+    end
+
+    def reverse_merge(other)
+      self.class.new(other).merge(self)
+    end
+
+    def reverse_merge!(other_hash)
+      replace(reverse_merge(other_hash))
+    end
+
+    def replace(other_hash)
+      super(other_hash)
+    end
+
+    # Convert to a Hash with String keys.
+    def to_hash
+      Hash.new(default).merge!(self)
+    end
+
+    protected
+
+    def convert_key(key)
+      key.is_a?(Symbol) ? key.to_s : key
+    end
+  end
+end

data/lib/nitlink/link_collection.rb

@@ -1,4 +1,4 @@
-require 'hashwithindifferentaccess'
+require_relative './hash_with_indifferent_access'
 
 module Nitlink
   class LinkCollection < Array
@@ -7,10 +7,15 @@ module Nitlink
       find { |link| link.relation_type == relation_type.downcase.to_s }
     end
 
-    def to_h
-      hash = HashWithIndifferentAccess.new
-      each { |link| hash[link.relation_type] ||= link }
+    def to_h(options = { with_indifferent_access: true })
+      options = Nitlink::HashWithIndifferentAccess.new(options)
+      indifferent = options.key?(:with_indifferent_access) ? options[:with_indifferent_access] : true
+
+      hash = indifferent ? Nitlink::HashWithIndifferentAccess.new : {}
+      each { |link| hash[link.relation_type.to_s] ||= link }
       hash
     end
+
+    alias_method :to_hash, :to_h
   end
 end

data/lib/nitlink/parser.rb

@@ -61,7 +61,7 @@ module Nitlink
     end
 
     def first_match(link_parameters, param_name)
-      (link_parameters.find { |name, value| name == param_name } || []).last
+      (link_parameters.find { |name, _value| name == param_name } || []).last
     end
 
     def extract_target_attributes(link_parameters)

data/lib/nitlink/response.rb

@@ -8,7 +8,14 @@ module Nitlink
   end
 end
 
-decoratable_responses = ['Curl::Easy', 'Excon::Response', 'Faraday::Response', 'HTTP::Message', 'HTTP::Response', 'HTTParty::Response', 'Net::HTTPResponse', 'Patron::Response', 'RestClient::Response', 'Typhoeus::Response', 'Unirest::HttpResponse']
-decoratable_responses.select { |klass| Object.const_defined?(klass) }.each do |klass|
-  Object.const_get(klass).class_eval { include Nitlink::ResponseDecorator }
+third_party_clients = ['Curl::Easy', 'Excon::Response', 'Faraday::Response', 'HTTP::Message', 'HTTP::Response', 'HTTParty::Response', 'Net::HTTPResponse', 'Patron::Response', 'RestClient::Response', 'Typhoeus::Response', 'Unirest::HttpResponse']
+
+decoratable_responses = third_party_clients.select do |klass|
+  module_name, class_name = klass.split('::', 2)
+  Object.const_defined?(module_name) && Object.const_get(module_name).const_defined?(class_name)
+end
+
+decoratable_responses.each do |klass|
+  module_name, class_name = klass.split('::', 2)
+  Object.const_get(module_name).const_get(class_name).class_eval { include Nitlink::ResponseDecorator }
 end

data/lib/nitlink/response_normalizer.rb

@@ -1,5 +1,5 @@
 require 'uri'
-require 'hashwithindifferentaccess'
+require_relative './hash_with_indifferent_access'
 
 module Nitlink
   class ResponseNormalizer
@@ -8,7 +8,7 @@ module Nitlink
 
       uri, status, (link, content_location) = case response_class
       when 'Curl::Easy'
-        [response.url, response.response_code, grab_headers(headers_from_string response.header_str)]
+        [response.url.chomp('?'), response.response_code, grab_headers(headers_from_string response.header_str)]
       when 'Excon::Response'
         scheme = response.port == 443 ? 'https' : 'http'
         # We have to reconstruct to URL annoyingly
@@ -33,12 +33,11 @@ module Nitlink
         [response.base_uri, response.status[0], grab_headers(response.meta)]
       when 'Typhoeus::Response'
         [response.request.base_url, response.code, grab_headers(response.headers)]
-      # :nocov:
       when 'Unirest::HttpResponse'
+        warn "Unirest support is deprecated and will be removed in Nitlink 2.0"
         return metadata(response.raw_body)
-      # :nocov:
       when 'Hash'
-        response = HashWithIndifferentAccess.new(response)
+        response = Nitlink::HashWithIndifferentAccess.new(response)
         response[:headers] = headers_from_string(response[:headers]) if String === response[:headers]
 
         [response[:request_uri], response[:status], grab_headers(response[:headers])]

data/lib/nitlink/version.rb

@@ -1,3 +1,3 @@
 module Nitlink
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nitlink
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Peattie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashwithindifferentaccess
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 description: |-
   Nitlink is a nice, nitpicky gem for parsing Link headers, which aims to stick
    as closely as possible to RFC 5988. Has support for UTF-8 encoded parameters, URI resolution, boolean parameters,
@@ -106,6 +106,7 @@ extra_rdoc_files: []
 files:
 - lib/nitlink.rb
 - lib/nitlink/exceptions.rb
+- lib/nitlink/hash_with_indifferent_access.rb
 - lib/nitlink/link.rb
 - lib/nitlink/link_collection.rb
 - lib/nitlink/param_decoder.rb