summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2021-11-16 11:05:15 -0500
committerAustin Ziegler <austin@zieglers.ca>2021-11-16 11:06:12 -0500
commit35cc02d983479850b229faa58b21fc80f568f698 (patch)
tree2d1655aefaa10bd5439a46d4781355ca23aa2f78
parent54cb8ed53fa54926f4d6e85de8ed3fbf7250e8e8 (diff)
downloadmime-types-35cc02d983479850b229faa58b21fc80f568f698.tar.gz
Fix invalid syntax for < Ruby 2.3
Fixed a Ruby &lt; 2.3 incompatibility introduced by the use of standardrb, where `<<-` heredocs were converted to `<<~` heredocs. These have been reverted back to `<<-` with the indentation kept and a `.strip` call to prevent excess whitespace. Resolves #159
-rw-r--r--History.md9
-rw-r--r--lib/mime/type.rb2
-rw-r--r--lib/mime/types.rb2
-rw-r--r--lib/mime/types/cache.rb4
-rw-r--r--lib/mime/types/deprecations.rb2
-rw-r--r--lib/mime/types/registry.rb2
-rw-r--r--mime-types.gemspec6
-rw-r--r--support/deps.rb2
8 files changed, 19 insertions, 10 deletions
diff --git a/History.md b/History.md
index 95e0574..6e88f45 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,14 @@
# Changelog
+## 3.4.1 / 2021-11-16
+
+- 1 bugfix:
+
+ - Fixed a Ruby &lt; 2.3 incompatibility introduced by the use of standardrb,
+ where `<<-` heredocs were converted to `<<~` heredocs. These have been
+ reverted back to `<<-` with the indentation kept and a `.strip` call
+ to prevent excess whitespace.
+
## 3.4.0 / 2021-11-15
- 1 minor enhancement:
diff --git a/lib/mime/type.rb b/lib/mime/type.rb
index ba7e6bf..db1cb20 100644
--- a/lib/mime/type.rb
+++ b/lib/mime/type.rb
@@ -93,7 +93,7 @@ class MIME::Type
end
# The released version of the mime-types library.
- VERSION = "3.4.0"
+ VERSION = "3.4.1"
include Comparable
diff --git a/lib/mime/types.rb b/lib/mime/types.rb
index 1424666..31692ca 100644
--- a/lib/mime/types.rb
+++ b/lib/mime/types.rb
@@ -187,7 +187,7 @@ class MIME::Types
# truthy value to suppress that warning.
def add_type(type, quiet = false)
if !quiet && @type_variants[type.simplified].include?(type)
- MIME::Types.logger.warn <<~WARNING
+ MIME::Types.logger.warn <<-WARNING.chomp.strip
Type #{type} is already registered as a variant of #{type.simplified}.
WARNING
end
diff --git a/lib/mime/types/cache.rb b/lib/mime/types/cache.rb
index 31113a6..71d488e 100644
--- a/lib/mime/types/cache.rb
+++ b/lib/mime/types/cache.rb
@@ -22,13 +22,13 @@ class << MIME::Types::Cache
if cache.version == MIME::Types::Data::VERSION
Marshal.load(cache.data)
else
- MIME::Types.logger.warn <<~WARNING.chomp
+ MIME::Types.logger.warn <<-WARNING.chomp.strip
Could not load MIME::Types cache: invalid version
WARNING
nil
end
rescue => e
- MIME::Types.logger.warn <<~WARNING.chomp
+ MIME::Types.logger.warn <<-WARNING.chomp.strip
Could not load MIME::Types cache: #{e}
WARNING
nil
diff --git a/lib/mime/types/deprecations.rb b/lib/mime/types/deprecations.rb
index 8bd6455..3c64977 100644
--- a/lib/mime/types/deprecations.rb
+++ b/lib/mime/types/deprecations.rb
@@ -25,7 +25,7 @@ module MIME
else
message
end
- MIME::Types.logger.warn <<~WARNING.chomp
+ MIME::Types.logger.warn <<-WARNING.chomp.strip
#{caller(2..2).first}: #{klass}#{level}#{sym} is deprecated #{message}.
WARNING
diff --git a/lib/mime/types/registry.rb b/lib/mime/types/registry.rb
index 8d92d65..e557a5c 100644
--- a/lib/mime/types/registry.rb
+++ b/lib/mime/types/registry.rb
@@ -45,7 +45,7 @@ class << MIME::Types
def lazy_load?
return unless ENV.key?("RUBY_MIME_TYPES_LAZY_LOAD")
- MIME::Types.logger.warn <<~WARNING.chomp
+ MIME::Types.logger.warn <<-WARNING.chomp.strip
Lazy loading ($RUBY_MIME_TYPES_LAZY_LOAD) is deprecated and will be removed.
WARNING
diff --git a/mime-types.gemspec b/mime-types.gemspec
index f3ea52f..fde9c53 100644
--- a/mime-types.gemspec
+++ b/mime-types.gemspec
@@ -1,15 +1,15 @@
# -*- encoding: utf-8 -*-
-# stub: mime-types 3.4.0 ruby lib
+# stub: mime-types 3.4.1 ruby lib
Gem::Specification.new do |s|
s.name = "mime-types".freeze
- s.version = "3.4.0"
+ s.version = "3.4.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
s.metadata = { "bug_tracker_uri" => "https://github.com/mime-types/ruby-mime-types/issues", "changelog_uri" => "https://github.com/mime-types/ruby-mime-types/blob/master/History.md", "homepage_uri" => "https://github.com/mime-types/ruby-mime-types/", "source_code_uri" => "https://github.com/mime-types/ruby-mime-types/" } if s.respond_to? :metadata=
s.require_paths = ["lib".freeze]
s.authors = ["Austin Ziegler".freeze]
- s.date = "2021-11-15"
+ s.date = "2021-11-16"
s.description = "The mime-types library provides a library and registry for information about\nMIME content type definitions. It can be used to determine defined filename\nextensions for MIME types, or to use filename extensions to look up the likely\nMIME type definitions.\n\nVersion 3.0 is a major release that requires Ruby 2.0 compatibility and removes\ndeprecated functions. The columnar registry format introduced in 2.6 has been\nmade the primary format; the registry data has been extracted from this library\nand put into {mime-types-data}[https://github.com/mime-types/mime-types-data].\nAdditionally, mime-types is now licensed exclusively under the MIT licence and\nthere is a code of conduct in effect. There are a number of other smaller\nchanges described in the History file.".freeze
s.email = ["halostatue@gmail.com".freeze]
s.extra_rdoc_files = ["Code-of-Conduct.md".freeze, "Contributing.md".freeze, "History.md".freeze, "Licence.md".freeze, "Manifest.txt".freeze, "README.rdoc".freeze]
diff --git a/support/deps.rb b/support/deps.rb
index 176c4d9..9254171 100644
--- a/support/deps.rb
+++ b/support/deps.rb
@@ -35,7 +35,7 @@ class Deps
end
def gem_downloads(name)
- rubygems_get(gem_name: name)["downloads"]
+ rubygems_get(gem_name: name)["downloads"]
rescue => e
puts "#{name} #{e.message}"
end