Avoid circular require when you do require 'mime/types/columnar'

mime-types · May 25, 2015 · eaeb3b6 · eaeb3b6
1 parent e427f1c
commit eaeb3b6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/mime/types/loader.rb b/lib/mime/types/loader.rb
@@ -69,7 +69,7 @@ def load_json
   # 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)