From 555745c48f6f3284f6f2df2abeefed7c983f07d6 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 8 Jun 2011 08:51:38 -0500
Subject: [PATCH] Remove binary override, set encoding instead

---
 lib/linguist/mime.rb   | 18 ++--------------
 lib/linguist/mimes.yml | 47 +++++++-----------------------------------
 2 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/lib/linguist/mime.rb b/lib/linguist/mime.rb
index e4303ddb..38934754 100644
--- a/lib/linguist/mime.rb
+++ b/lib/linguist/mime.rb
@@ -1,21 +1,6 @@
 require 'mime/types'
 require 'yaml'
 
-module MIME
-  class Type
-    attr_accessor :binary
-
-    undef_method :binary?
-    def binary?
-      if defined? @binary
-        @binary
-      else
-        @encoding == 'base64'
-      end
-    end
-  end
-end
-
 # Register additional mime type extensions
 mime_extensions = YAML.load_file(File.expand_path("../mimes.yml", __FILE__))
 mime_extensions.each do |mime_type, options|
@@ -33,7 +18,8 @@ mime_extensions.each do |mime_type, options|
     end
   end
 
-  mime.binary = options['binary'] if options.key?('binary')
+  mime.binary  = options['binary']    if options.key?('binary')
+  mime.encoding = options['encoding'] if options.key?('encoding')
 
   MIME::Types.add_type_variant(mime)
   MIME::Types.index_extensions(mime)
diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml
index c3ee7000..6087ee4f 100644
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -1,44 +1,20 @@
 # Additional types to add to MIME::Types
 
-application/atom+xml:
-  binary: false
-
-application/javascript:
-  binary: false
-
-application/json:
-  binary: false
-
-application/rdf+xml:
-  binary: false
-
-application/sh:
-  binary: false
-
 application/x-troff-ms:
-  binary: false
+  encoding: 8bit
 
 application/netcdf:
-  binary: false
+  encoding: 8bit
 
 application/x-pagemaker:
   exclude_extensions:
   - pm
 
-application/x-perl:
-  binary: false
-
-application/x-python:
-  binary: false
-
-application/x-ruby:
-  binary: false
-
 application/x-wais-source:
-  binary: false
+  encoding: 8bit
 
 application/vnd.mozilla.xul+xml:
-  binary: false
+  encoding: 8bit
 
 application/vnd.adobe.air-application-installer-package+zip:
   extensions:
@@ -74,7 +50,7 @@ application/octet-stream:
   - xpi
 
 application/postscript:
-  binary: true
+  encoding: base64
 
 application/java-archive:
   extensions:
@@ -89,15 +65,6 @@ application/x-shockwave-flash:
   extensions:
   - swf
 
-image/gif:
-  attachment: false
-
-image/jpeg:
-  attachment: false
-
-image/png:
-  attachment: false
-
 image/x-icns:
   extensions:
   - icns
@@ -115,11 +82,11 @@ application/x-silverlight-app:
   - xap
 
 application/xaml+xml:
-  binary: false
+  encoding: 8bit
   extensions:
   - xaml
 
 application/x-ms-xbap:
-  binary: false
+  encoding: 8bit
   extensions:
   - xbap