http-accept 1.7.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3b3754be244c82ac53b2ab75fcec39f8d34400fc
-  data.tar.gz: ce62525b629b972c86c0073d567fba3e1690f7d1
+SHA256:
+  metadata.gz: 1b4a14e8a82f11fa25b5da2a13a3cf6ddd5e5ced9c02ba37950ff340390b3dc5
+  data.tar.gz: 57faa362d425e4ce3a0ee437874c235f2b16c98100adda81a315dadfc0740212
 SHA512:
-  metadata.gz: 50a22597751d2dd3ed17ca4da33badae5c15d9941794763aaa199bdaff055b3edd6098cdc7ee6d932e7785069f57473ae054d6cef0a538703de6a245e949d841
-  data.tar.gz: 3955b2cf2ce082c40fbace1a98fba58e62d01efb92f1f5e4f6e07b4ea87fbe79958d0fe7047a90ae871d7b6c5ceb34483bf676e66fa3615cc34bd43e08169da0
+  metadata.gz: f4cf41a3713b243bc9d4a0cfba2e459709191072d60ba23f864b852ab9d5c2cd5e5a8fc5d80783c2d798e03270f98e8913e866adcaed84f98ff489dcbf3a3567
+  data.tar.gz: eda8944a035fbda557a09e6f394fcd6691664ba8a7fd4acf91b8c94b67874c9b2afab3c5935003b0000799c27d1b031afd85138b7af432cd678b56fdf8347731

data/.gitignore

@@ -1,9 +1,19 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.tags*
+.rspec_status

data/.rspec

@@ -1,4 +1,3 @@
---color
 --format documentation
---backtrace
---warnings
+--warnings
+--require spec_helper

data/.travis.yml

@@ -1,5 +1,21 @@
 language: ruby
-sudo: false
-env: COVERAGE=true
-rvm:
-  - 2.3.0
+sudo: required
+dist: xenial
+cache: bundler
+
+matrix:
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.6
+      env: COVERAGE=PartialSummary,Coveralls
+    - rvm: truffleruby
+    - rvm: jruby-head
+      env: JRUBY_OPTS="--debug -X+O"
+    - rvm: ruby-head
+  allow_failures:
+    - rvm: truffleruby
+    - rvm: ruby-head
+    - rvm: jruby-head

data/Gemfile

@@ -2,8 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in http-accept.gemspec
 gemspec
-
-group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-end

data/README.md

@@ -2,9 +2,9 @@
 
 Provides a robust set of parsers for dealing with HTTP `Accept`, `Accept-Language`, `Accept-Encoding`, `Accept-Charset` headers.
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/http-accept.svg)](http://travis-ci.org/ioquatix/http-accept)
-[![Code Climate](https://codeclimate.com/github/ioquatix/http-accept.svg)](https://codeclimate.com/github/ioquatix/http-accept)
-[![Coverage Status](https://coveralls.io/repos/ioquatix/http-accept/badge.svg)](https://coveralls.io/r/ioquatix/http-accept)
+[![Build Status](https://secure.travis-ci.org/socketry/http-accept.svg)](http://travis-ci.org/socketry/http-accept)
+[![Code Climate](https://codeclimate.com/github/socketry/http-accept.svg)](https://codeclimate.com/github/socketry/http-accept)
+[![Coverage Status](https://coveralls.io/repos/socketry/http-accept/badge.svg)](https://coveralls.io/r/socketry/http-accept)
 
 ## Motivation
 
@@ -52,7 +52,7 @@ Normally, you'd want to match the media types against some set of available mime
 ```ruby
 module ToJSON
   def content_type
-    HTTP::Accept::ContentType.new("application/json", charset: 'utf-8')
+    HTTP::Accept::ContentType.new("application", "json", charset: 'utf-8')
   end
 
   # Used for inserting into map.
@@ -115,7 +115,7 @@ The `desired_localizations` in the example above is a subset of `available_local
 
 Released under the MIT license.
 
-Copyright, 2016, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams). 
+Copyright, 2016, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).  
 Copyright, 2016, by [Matthew Kerwin](http://kerwin.net.au).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/Rakefile

@@ -1,8 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/http-accept.gemspec

@@ -1,7 +1,5 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'http/accept/version'
+
+require_relative 'lib/http/accept/version'
 
 Gem::Specification.new do |spec|
 	spec.name          = "http-accept"
@@ -17,7 +15,8 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 
-	spec.add_development_dependency "bundler", "~> 1.11"
+	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/http/accept.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require "http/accept/version"
-
 require_relative 'accept/version'
 
 # Accept: header

data/lib/http/accept/charsets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright (C) 2016, Matthew Kerwin <matthew@kerwin.net.au>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -65,9 +67,7 @@ module HTTP
 			
 			# Parse the list of browser preferred charsets and return ordered by priority.
 			def self.browser_preferred_charsets(env)
-				if accept_charsets = env[HTTP_ACCEPT_CHARSET]
-					accept_charsets.strip!
-					
+				if accept_charsets = env[HTTP_ACCEPT_CHARSET]&.strip
 					if accept_charsets.empty?
 						# https://tools.ietf.org/html/rfc7231#section-5.3.3 :
 						#

data/lib/http/accept/content_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,9 +27,9 @@ module HTTP
 	module Accept
 		# A content type is different from a media range, in that a content type should not have any wild cards.
 		class ContentType < MediaTypes::MediaRange
-			def initialize(mime_type, parameters = {})
+			def initialize(type, subtype, parameters = {})
 				# We do some basic validation here:
-				raise ArgumentError.new("#{self.class} can not have wildcards: #{mime_type}") if mime_type.include? '*'
+				raise ArgumentError.new("#{self.class} can not have wildcards: #{type}", "#{subtype}") if type.include?('*') || subtype.include?('*')
 				
 				super
 			end

data/lib/http/accept/encodings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright (C) 2016, Matthew Kerwin <matthew@kerwin.net.au>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -72,9 +74,7 @@ module HTTP
 			# specified, the behaviour is the same as if `Accept-Encoding: identity` was provided
 			# (according to RFC).
 			def self.browser_preferred_content_codings(env)
-				if accept_content_codings = env[HTTP_ACCEPT_ENCODING]
-					accept_content_codings.strip!
-					
+				if accept_content_codings = env[HTTP_ACCEPT_ENCODING]&.strip
 					if accept_content_codings.empty?
 						# "An Accept-Encoding header field with a combined field-value that is
 						# empty implies that the user agent does not want any content-coding in

data/lib/http/accept/languages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/http/accept/media_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,11 +33,11 @@ module HTTP
 		# Parse and process the HTTP Accept: header.
 		module MediaTypes
 			# According to https://tools.ietf.org/html/rfc7231#section-5.3.2
-			MIME_TYPE = /(#{TOKEN})\/(#{TOKEN})/
+			MIME_TYPE = /(?<type>#{TOKEN})\/(?<subtype>#{TOKEN})/
 			PARAMETER = /\s*;\s*(?<key>#{TOKEN})=((?<value>#{TOKEN})|(?<quoted_value>#{QUOTED_STRING}))/
 			
 			# A single entry in the Accept: header, which includes a mime type and associated parameters.
-			MediaRange = Struct.new(:mime_type, :parameters) do
+			MediaRange = Struct.new(:type, :subtype, :parameters) do
 				def parameters_string
 					return '' if parameters == nil or parameters.empty?
 					
@@ -52,8 +54,12 @@ module HTTP
 					end
 				end
 				
+				def mime_type
+					"#{type}/#{subtype}"
+				end
+				
 				def to_s
-					"#{mime_type}#{parameters_string}"
+					"#{type}/#{subtype}#{parameters_string}"
 				end
 				
 				alias to_str to_s
@@ -62,8 +68,8 @@ module HTTP
 					parameters.fetch('q', 1.0).to_f
 				end
 				
-				def split(on = '/', count = 2)
-					mime_type.split(on, count)
+				def split(*args)
+					return [type, subtype]
 				end
 				
 				def self.parse_parameters(scanner, normalize_whitespace)
@@ -86,10 +92,13 @@ module HTTP
 				def self.parse(scanner, normalize_whitespace = true)
 					return to_enum(:parse, scanner, normalize_whitespace) unless block_given?
 					
-					while mime_type = scanner.scan(MIME_TYPE)
+					while scanner.scan(MIME_TYPE)
+						type = scanner[:type]
+						subtype = scanner[:subtype]
+						
 						parameters = parse_parameters(scanner, normalize_whitespace)
 						
-						yield self.new(mime_type, parameters)
+						yield self.new(type, subtype, parameters)
 						
 						# Are there more?
 						break unless scanner.scan(/\s*,\s*/)
@@ -108,13 +117,11 @@ module HTTP
 			end
 			
 			HTTP_ACCEPT = 'HTTP_ACCEPT'.freeze
-			WILDCARD_MEDIA_RANGE = MediaRange.new("*/*", {}).freeze
+			WILDCARD_MEDIA_RANGE = MediaRange.new("*", "*", {}).freeze
 			
 			# Parse the list of browser preferred content types and return ordered by priority. If no `Accept:` header is specified, the behaviour is the same as if `Accept: */*` was provided (according to RFC).
 			def self.browser_preferred_media_types(env)
-				if accept_content_types = env[HTTP_ACCEPT]
-					accept_content_types.strip!
-					
+				if accept_content_types = env[HTTP_ACCEPT]&.strip
 					unless accept_content_types.empty?
 						return HTTP::Accept::MediaTypes.parse(accept_content_types)
 					end

data/lib/http/accept/media_types/map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/http/accept/parse_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/http/accept/quoted_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/http/accept/sort.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/http/accept/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -20,6 +22,6 @@
 
 module HTTP
 	module Accept
-		VERSION = "1.7.0"
+		VERSION = "2.1.0"
 	end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: http-accept
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +75,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -96,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Parse Accept and Accept-Language HTTP headers.

data/.simplecov

@@ -1,9 +0,0 @@
-
-SimpleCov.start do
-	add_filter "/spec/"
-end
-
-if ENV['TRAVIS']
-	require 'coveralls'
-	Coveralls.wear!
-end