http_headers-utils 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4e6817ad1c97d2254f434882726ca515a6a34ac6a4ab26a5750aa5a17aa53f
-  data.tar.gz: c7315d9b3dbe69884e8e0acb0678346cc013bb93f6be5e4554c8345465cce79b
+  metadata.gz: f7f3ae6d09938a47e48e9459736fe03829cb53d05c2e4d67dfac7ce7c91b853b
+  data.tar.gz: 464ef40919624f9d2e40ba66bc190649e9b87a3dc20c1ef4bea7d1b862e8ff8e
 SHA512:
-  metadata.gz: 2dea1c2db8331b3532955091008b7f3a9117b341ab1df1a862f2edb38caf2df251069b169ecb3113fffb09e18b8d8228eea8be375077457e095a506032c43f72
-  data.tar.gz: 9d5a5dc58193be367b432a69bf106f38f9d462a6815eb90088e27191d076f840b2aa2badee287f790bbeb6aa4640d8d48396c0502483dbe89a2875ca8091e741
+  metadata.gz: 54ed03eadbe9b7d7c658d2083413c607f8c8ecbc60c6248d7787c59f877349cbed77c393d9f4391b1b5dbd5fac357acf05e0309b56e99cf9a2ce69c8b6b72faf
+  data.tar.gz: 53a3145d07bc953cc0d04a1e665b0da0b61ab3e56c11ae1f4024824384c851f1b8249777c8753ea7c656e0f244e5711796aa72653e0753f20d8fc705d599318c

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
+## 0.2.0
+
+- Fix whitespace on input by using `strip`
+- Change `List` from `class` to `module`
+- Change `List.new` to automatically sort
+- Add `Single` for a single header value
+- Add `to_header` lookup and implementation for `Single` and `List`
+- Change `to_header` to use `HEADER_DELIMITER`
+
 ## 0.1.1
 
-Add a missing require to `delegate`
+- Add a missing require to `delegate`
 
 ## 0.1.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    http_headers-utils (0.1.1)
+    http_headers-utils (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/http_headers/utils.rb

@@ -1,5 +1,7 @@
 require 'http_headers/utils/version'
+
 require 'http_headers/utils/list'
+require 'http_headers/utils/single'
 
 module HttpHeaders
   module Utils

data/lib/http_headers/utils/list.rb

@@ -1,15 +1,12 @@
-require 'delegate'
-
 module HttpHeaders
   module Utils
 
     ##
     # @example Accept values
     #
-    #   class Accept < HttpHeaders::Utils::List
+    #   class Accept < DelegateClass(Array)
     #     def initialize(value)
-    #       super value, entry_klazz: Accept::Entry
-    #       sort!
+    #       super HttpHeaders::List.new(value, entry_klazz: Accept::Entry)
     #     end
     #
     #     class Entry
@@ -32,39 +29,35 @@ module HttpHeaders
     #   Accept.new(['*/*; q=0.1', 'application/json, text/html; q=0.8'])
     #   # => List['application/json', 'text/html', '*/*']
     #
-    class List < DelegateClass(Array)
-
+    module List
       HEADER_DELIMITER    = ','
       PARAMETER_DELIMITER = ';'
 
-      class << self
-        def parse(combined, entry_klazz:)
-          Array(combined).map { |line| line.split(HEADER_DELIMITER) }.flatten.each_with_index.map do |entry, index|
-            value, *parameters = entry.split(PARAMETER_DELIMITER)
-            indexed_parameters = Hash[Array(parameters).map { |p| p.strip.split('=') }].transform_keys!(&:to_sym)
-            entry_klazz.new(value, index: index, parameters: indexed_parameters)
-          end
+      module_function
+
+      def parse(combined, entry_klazz:)
+        Array(combined).map { |line| line.split(HEADER_DELIMITER) }.flatten.each_with_index.map do |entry, index|
+          value, *parameters = entry.strip.split(PARAMETER_DELIMITER)
+          indexed_parameters = Hash[Array(parameters).map { |p| p.strip.split('=') }].transform_keys!(&:to_sym)
+          entry_klazz.new(value, index: index, parameters: indexed_parameters)
         end
       end
 
-      ##
-      # Create a new list
-      #
-      # @param value [String] the header value
-      # @param entry_klazz [Class] the class for the list items
-      #
-      # @see List.parse
-      #
-      def initialize(value, entry_klazz:)
-        super List.parse(value, entry_klazz: entry_klazz)
+      def new(combined, entry_klazz:)
+        result = parse(combined, entry_klazz: entry_klazz)
+        entry_klazz.instance_methods(false).include?(:<=>) ? result.sort! : result
       end
 
-      def sort!
-        __setobj__(__getobj__.sort!)
+      def to_header(list)
+        # noinspection RubyBlockToMethodReference
+        list.map { |entry| stringify_entry(entry) }
+            .join("#{HEADER_DELIMITER} ")
       end
 
-      def inspect
-        map(&:inspect).join(', ')
+      def stringify_entry(entry)
+        return entry.to_header if entry.respond_to?(:to_header)
+        return entry.to_s if entry.respond_to?(:to_s)
+        entry.inspect
       end
     end
   end

data/lib/http_headers/utils/single.rb

@@ -0,0 +1,23 @@
+require 'http_headers/utils/list'
+
+module HttpHeaders
+  module Utils
+    module Single
+      module_function
+
+      def parse(value, entry_klazz:)
+        List.new(value, entry_klazz: entry_klazz).last
+      end
+
+      def new(*args)
+        parse(*args)
+      end
+
+      def to_header(single)
+        List.stringify_entry(single)
+      end
+
+      alias new parse
+    end
+  end
+end

data/lib/http_headers/utils/version.rb

@@ -1,5 +1,5 @@
 module HttpHeaders
   module Utils
-    VERSION = "0.1.1"
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_headers-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - http_headers-utils.gemspec
 - lib/http_headers/utils.rb
 - lib/http_headers/utils/list.rb
+- lib/http_headers/utils/single.rb
 - lib/http_headers/utils/version.rb
 homepage: https://github.com/XPBytes/http_headers-utils
 licenses: