mime-types 2.6 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393ac8426babd4f63f6cd7dd13ec79df643c4dcf
-  data.tar.gz: 39b333003a9c9d4fe5b211893fa3f286e41cd6c4
+  metadata.gz: 2e6b782442ec6e1f9a3cf108f50147b71b94f1f8
+  data.tar.gz: ae6706bef22fdf15565c67a49c37f26e5d7b3d90
 SHA512:
-  metadata.gz: 147fe43e230dc0eba2e3197622388ee79ca26e59aa111e4eabc484dd81eb66770e1d769434656e2bccef020dcddd7af3cf5487c05ead2e04b99fde37a86ffce8
-  data.tar.gz: 6bda16873866db44e312bfbafe985b1fac2b482fddb0b0c03a53838a7ba691e436601e9bb37d24aafcf1cb07dfdcce2d7fabd0464a321d9a50637f35afc3ae59
+  metadata.gz: 0fde565b871514b957c258567e26c5144f88a8f2909f6bb9df22707a0ab74f68ba305f536c970dc6f5e19e967b04d4aea3c140de5defbe4bfc3e0f9d8fd3d677
+  data.tar.gz: b120c3be62d2bc6edec9b9e511fedb27603ecd7544693d3b85267c5a8c9fcf38f79dc1b9d94ebce82ad3a1ee9ed561f1f544ff577db9261feb2eaba549cc4450

data/History.rdoc

@@ -1,3 +1,9 @@
+== 2.6.1 / 2015-05-25
+
+* Bugs:
+  * Make columnar store handle all supported extensions, not just the first.
+  * Avoid circular require when using the columnar store.
+
 == 2.6 / 2015-05-25
 
 * New Feature:

data/lib/mime/type.rb

@@ -53,7 +53,7 @@ class MIME::Type
   end
 
   # The released version of the mime-types library.
-  VERSION = '2.6'
+  VERSION = '2.6.1'
 
   include Comparable
 

data/lib/mime/types/columnar.rb

@@ -26,7 +26,7 @@ module MIME::Types::Columnar
     @__root__ = path
 
     each_file_line('content_type', false) do |line|
-      content_type, extensions = line.split
+      content_type, *extensions = line.split
 
       type = MIME::Type::Columnar.new(self, content_type, extensions)
       @__mime_data__ << type

data/lib/mime/types/loader.rb

@@ -69,7 +69,7 @@ class MIME::Types::Loader
   # Loads a MIME::Types registry from columnar files recursively found in
   # +path+.
   def load_columnar
-    require 'mime/types/columnar'
+    require 'mime/types/columnar' unless defined?(MIME::Types::Columnar)
     container.extend(MIME::Types::Columnar)
     container.load_base_data(path)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: '2.6'
+  version: 2.6.1
 platform: ruby
 authors:
 - Austin Ziegler