Merge pull request #100 from blanquer/avoid_mime_gem_conflict

Avoid conflict with existing `mime` gem
mime-types · May 24, 2015 · 492f769 · 492f769
2 parents 5a7c565 + 2a1f09c
commit 492f769
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Manifest.txt b/Manifest.txt
@@ -13,12 +13,12 @@ data/mime-types.json
 docs/COPYING.txt
 docs/artistic.txt
 lib/mime-types.rb
-lib/mime.rb
 lib/mime/type.rb
 lib/mime/types.rb
 lib/mime/types/cache.rb
 lib/mime/types/loader.rb
 lib/mime/types/loader_path.rb
+lib/mime/types/deprecations.rb
 support/apache_mime_types.rb
 support/benchmarks/load.rb
 support/convert.rb

diff --git a/lib/mime/type.rb b/lib/mime/type.rb
@@ -1,6 +1,6 @@
 # -*- ruby encoding: utf-8 -*-
 
-require 'mime'
+require 'mime/types/deprecations'
 require 'json'
 
 # The definition of one MIME content-type.

diff --git a/lib/mime.rb → lib/mime/types/deprecations.rb b/lib/mime.rb → lib/mime/types/deprecations.rb