diff options
author | Austin Ziegler <austin@zieglers.ca> | 2018-08-12 11:15:21 -0400 |
---|---|---|
committer | Austin Ziegler <austin@zieglers.ca> | 2018-08-12 11:15:21 -0400 |
commit | edf3cd7ee59590d46ce7ac492cf169a723ca7423 (patch) | |
tree | c50540bb938d13d4e72bc59aec218578b0d1b7f1 /lib/mime/types.rb | |
parent | d5d7c57609d90c2113f4d52d29b7218b42236dcb (diff) | |
download | mime-types-edf3cd7ee59590d46ce7ac492cf169a723ca7423.tar.gz |
Resolve a bug related to the switch to Sets
Fully resolves #117, #127, and #134.
Diffstat (limited to 'lib/mime/types.rb')
-rw-r--r-- | lib/mime/types.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mime/types.rb b/lib/mime/types.rb index e3b9f61..fd56908 100644 --- a/lib/mime/types.rb +++ b/lib/mime/types.rb @@ -151,7 +151,7 @@ class MIME::Types def type_for(filename) Array(filename).flat_map { |fn| @extension_index[fn.chomp.downcase[/\.?([^.]*?)$/, 1]] - }.compact.inject(:+).sort { |a, b| + }.compact.inject(Set.new, :+).sort { |a, b| a.priority_compare(b) } end @@ -171,7 +171,7 @@ class MIME::Types nil when MIME::Types variants = mime_type.instance_variable_get(:@type_variants) - add(*variants.values.inject(:+).to_a, quiet) + add(*variants.values.inject(Set.new, :+).to_a, quiet) when Array add(*mime_type, quiet) else @@ -218,7 +218,7 @@ Type #{type} is already registered as a variant of #{type.simplified}. def match(pattern) @type_variants.select { |k, _| k =~ pattern - }.values.inject(:+) + }.values.inject(Set.new, :+) end end |