Finalizing the 1.24 release.

6 files changed, 19 insertions, 20 deletions

diff --git a/Gemfile b/Gemfile
index 9ac891d22d..03c42ae6f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,16 +6,15 @@ source "https://rubygems.org/"
 
 
 gem "rubyforge", ">=2.0.4", :group => [:development, :test]
-gem "minitest", "~>4.7", :group => [:development, :test]
+gem "minitest", "~>5.0", :group => [:development, :test]
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2", :group => [:development, :test]
 gem "hoe-doofus", "~>1.0", :group => [:development, :test]
-gem "hoe-gemspec", "~>1.0", :group => [:development, :test]
+gem "hoe-gemspec2", "~>1.1", :group => [:development, :test]
 gem "hoe-git", "~>1.5", :group => [:development, :test]
 gem "hoe-rubygems", "~>1.0", :group => [:development, :test]
 gem "hoe-travis", "~>1.2", :group => [:development, :test]
-gem "nokogiri", "~>1.5", :group => [:development, :test]
 gem "rake", "~>10.0", :group => [:development, :test]
-gem "hoe", "~>3.6", :group => [:development, :test]
+gem "hoe", "~>3.7", :group => [:development, :test]
 
 # vim: syntax=ruby
diff --git a/History.rdoc b/History.rdoc
index 8d16f99b94..b37b7f6fc1 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,4 +1,4 @@
-== 1.24 / YYYY-MM-DD
+== 1.24 / 2013-08-14
 
 * Code Climate:
   * Working on improving the quality of the mime-types codebase through the use
@@ -9,6 +9,10 @@
     examples that could never possibly work because MIME::Types#[] returns (for
     all the versions I have handy) an array, not a single type. I have updated
     README.rdoc to reflect this.
+* Removed Nokogiri as a declared development dependency. It is still required
+  if you're going to use the IANA parser functionality, but it is not necessary
+  for most development purposes. This has been removed to ensure that Travis CI
+  passes on Ruby 1.8.7.
 * New MIME Types:
   * 7zip (application/x-7z-compressed). Fixes a request by kodram.
     https://github.com/halostatue/mime-types/issues/32
diff --git a/README.rdoc b/README.rdoc
index 2af5011526..47d0e68d95 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -10,9 +10,8 @@ continuous integration :: {<img src="https://travis-ci.org/halostatue/mime-types
 == Description
 
 This library allows for the identification of a file's likely MIME content
-type. This is release 1.23 that adds the ability to enumerate over the
-collection of MIME types and updates the sources of a few MIME types. The
-identification of MIME content type is based on a file's filename extensions.
+type. This is release 1.24, adding and updating a few MIME types and fixing
+some issues with documentation.
 
 MIME types are used in MIME-compliant communications, as in e-mail or HTTP
 traffic, to indicate the type of content which is transmitted. MIME::Types
@@ -41,7 +40,7 @@ files). A MIME::Type stores the known information about one MIME type.
     require 'mime/types'
 
     plaintext = MIME::Types['text/plain']
-    # returns [text/plain, text/plan]
+    # returns [text/plain, text/plain]
     text      = plaintext.first
     puts text.media_type            # => 'text'
     puts text.sub_type              # => 'plain'
diff --git a/Rakefile b/Rakefile
index 5c73792df7..1831227417 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,7 +30,6 @@ spec = Hoe.spec 'mime-types' do
   self.extra_dev_deps << ['hoe-rubygems', '~> 1.0']
   self.extra_dev_deps << ['hoe-travis', '~> 1.2']
   self.extra_dev_deps << ['minitest', '~> 4.5']
-  self.extra_dev_deps << ['nokogiri', '~> 1.5']
   self.extra_dev_deps << ['rake', '~> 10.0']
 end
 
diff --git a/lib/mime/types.rb b/lib/mime/types.rb
index f94dc9a332..dc2fbcd794 100644
--- a/lib/mime/types.rb
+++ b/lib/mime/types.rb
@@ -12,7 +12,7 @@ module MIME
   #  require 'mime/types'
   #
   #  plaintext = MIME::Types['text/plain'].first
-  #  # returns [text/plain, text/plan]
+  #  # returns [text/plain, text/plain]
   #  text      = plaintext.first
   #  print text.media_type           # => 'text'
   #  print text.sub_type             # => 'plain'
@@ -33,7 +33,7 @@ module MIME
   #
   class Type
     # The released version of Ruby MIME::Types
-    VERSION = '1.23'
+    VERSION = '1.24'
 
     include Comparable
 
diff --git a/mime-types.gemspec b/mime-types.gemspec
index 4ef07a7731..9063aa1c03 100644
--- a/mime-types.gemspec
+++ b/mime-types.gemspec
@@ -2,13 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "mime-types"
-  s.version = "1.23"
+  s.version = "1.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Ziegler"]
-  s.cert_chain = ["/Users/AZiegler/.gem/gem-public_cert.pem"]
-  s.date = "2013-04-30"
-  s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.23 that adds the ability to enumerate over the\ncollection of MIME types and updates the sources of a few MIME types. The\nidentification of MIME content type is based on a file's filename extensions.\n\nMIME types are used in MIME-compliant communications, as in e-mail or HTTP\ntraffic, to indicate the type of content which is transmitted. MIME::Types\nprovides the ability for detailed information about MIME entities (provided as\na set of MIME::Type objects) to be determined and used programmatically. There\nare many types defined by RFCs and vendors, so the list is long but not\ncomplete; don't hesitate to ask to add additional information. This library\nfollows the IANA collection of MIME types (see below for reference).\n\nMIME::Types for Ruby was originally based on and synchronized with MIME::Types\nfor Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data\nformat for the MIME::Type list has changed and the synchronization will no\nlonger happen.\n\nMIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It\nfollows the official {IANA registry}[http://www.iana.org/assignments/media-types/]\n({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types\nadded from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]."
+  s.date = "2013-08-14"
+  s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.24, adding and updating a few MIME types and fixing\nsome issues with documentation.\n\nMIME types are used in MIME-compliant communications, as in e-mail or HTTP\ntraffic, to indicate the type of content which is transmitted. MIME::Types\nprovides the ability for detailed information about MIME entities (provided as\na set of MIME::Type objects) to be determined and used programmatically. There\nare many types defined by RFCs and vendors, so the list is long but not\ncomplete; don't hesitate to ask to add additional information. This library\nfollows the IANA collection of MIME types (see below for reference).\n\nMIME::Types for Ruby was originally based on MIME::Types for Perl by Mark\nOvermeer, copyright 2001 - 2009. As of version 1.15, the data format for the\nMIME::Type list has changed and the synchronization will no longer happen.\n\nMIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It\ntracks the {IANA registry}[http://www.iana.org/assignments/media-types/]\n({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types\nadded from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]\nand added by the users of MIME::Types."
   s.email = ["austin@rubyforge.org"]
   s.extra_rdoc_files = ["Contributing.rdoc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "docs/artistic.txt", "Contributing.rdoc", "History.rdoc", "Licence.rdoc", "README.rdoc"]
   s.files = [".gemtest", ".hoerc", ".travis.yml", "Contributing.rdoc", "Gemfile", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "docs/COPYING.txt", "docs/artistic.txt", "lib/mime-types.rb", "lib/mime/types.rb", "lib/mime/types/application", "lib/mime/types/application.mac", "lib/mime/types/application.nonstandard", "lib/mime/types/application.obsolete", "lib/mime/types/audio", "lib/mime/types/audio.nonstandard", "lib/mime/types/audio.obsolete", "lib/mime/types/image", "lib/mime/types/image.nonstandard", "lib/mime/types/image.obsolete", "lib/mime/types/message", "lib/mime/types/message.obsolete", "lib/mime/types/model", "lib/mime/types/multipart", "lib/mime/types/multipart.nonstandard", "lib/mime/types/multipart.obsolete", "lib/mime/types/other.nonstandard", "lib/mime/types/text", "lib/mime/types/text.nonstandard", "lib/mime/types/text.obsolete", "lib/mime/types/text.vms", "lib/mime/types/video", "lib/mime/types/video.nonstandard", "lib/mime/types/video.obsolete", "test/test_mime_type.rb", "test/test_mime_types.rb"]
@@ -18,7 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = "mime-types"
   s.rubygems_version = "1.8.25"
-  s.signing_key = "/Users/AZiegler/.gem/gem-private_key.pem"
   s.summary = "This library allows for the identification of a file's likely MIME content type"
   s.test_files = ["test/test_mime_type.rb", "test/test_mime_types.rb"]
 
@@ -27,7 +25,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_development_dependency(%q<minitest>, ["~> 4.7"])
+      s.add_development_dependency(%q<minitest>, ["~> 5.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<hoe-bundler>, ["~> 1.2"])
       s.add_development_dependency(%q<hoe-doofus>, ["~> 1.0"])
@@ -40,7 +38,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<hoe>, ["~> 3.6"])
     else
       s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_dependency(%q<minitest>, ["~> 4.7"])
+      s.add_dependency(%q<minitest>, ["~> 5.0"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
       s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
@@ -54,7 +52,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-    s.add_dependency(%q<minitest>, ["~> 4.7"])
+    s.add_dependency(%q<minitest>, ["~> 5.0"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
     s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])