mimemagic-dorian 0.5.5 → 0.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 144a66162ec74400e632d236e81adbaa15a5e508c55f780b1b8314800af3fc64
4
- data.tar.gz: 0c17b8d7bcb7b35cd49e2e89ebe7f81a05ae41a5a20309171e4632bf01005a0a
3
+ metadata.gz: 55e0a759758cd3414ee9984b6cd26eb568cac66ec33cd2e28a06a2c44eec9c42
4
+ data.tar.gz: 911541d760f5089a8ac94f9fa71d292f3252f407b49e29a449c9853fff0ba21a
5
5
  SHA512:
6
- metadata.gz: 1837bd49db48079d34ae234b73825d449164c9ab6a4c9c2e8b4faa5f386a871342f6d1893cbeaa1cf11d821a5fd4bb9295d98b8aca4bbbb23d5591382fa7a695
7
- data.tar.gz: 97f8bc92d245a7c3cd1f6dff1340064ac95c3c01a882c0703774cfa0ac74d407775f3b26c0acb98e720e05718ae96b3ce3f9ad564c27136e1bdb452fbc51ebaf
6
+ metadata.gz: ec984c09168d80f0bb60feb0fe4c783ef435f312bbe53a4cf733581c297f588884377cc84c61b86ba401233132de7d6cd5b64844db46877cf8447b15260a0bc9
7
+ data.tar.gz: 4bb8f3946b7dd31952db7d423da4fc9963b590be671d17590ccff130c886480955617f9a8b3a5e1022b5c08d1fbce080c0976cb616d7b7c46025306f790872b0
@@ -1,5 +1,5 @@
1
1
  class MimeMagic
2
2
  # MimeMagic version string
3
3
  # @api public
4
- VERSION = '0.5.5'
4
+ VERSION = '0.5.7'.freeze
5
5
  end
data/lib/mimemagic.rb CHANGED
@@ -122,6 +122,10 @@ class MimeMagic
122
122
  # @return [MimeMagic, nil] the canonical type, if present.
123
123
  #
124
124
  def canonical
125
+ # special case for application/octet-stream, which is apparently
126
+ # not in there
127
+ return self if type.downcase == 'application/octet-stream'
128
+
125
129
  t = TYPES[type.downcase] or return
126
130
  return self if type == t[3]
127
131
  self.class.new t[3]
@@ -155,8 +159,9 @@ class MimeMagic
155
159
  #
156
160
  def descendant_of? ancestor
157
161
  # always false if we don't know what this is
158
- return false unless c = canonical
159
- return false unless ancestor = self.class[ancestor].canonical
162
+ c = canonical || self
163
+ return false unless ancestor = self.class[ancestor]
164
+ ancestor = ancestor.canonical || ancestor
160
165
 
161
166
  # ancestor canonical could be nil which will be false
162
167
  c.lineage.include? ancestor
data/mimemagic.gemspec CHANGED
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
24
24
  s.license = 'MIT'
25
25
 
26
26
  s.add_dependency('nokogiri', '~> 1')
27
- s.add_dependency('rake')
27
+ s.add_dependency('rake', '~> 13')
28
28
 
29
29
  s.add_development_dependency('minitest', '~> 5.14')
30
30
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mimemagic-dorian
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.5
4
+ version: 0.5.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dorian Taylor
@@ -29,16 +29,16 @@ dependencies:
29
29
  name: rake
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ">="
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '0'
34
+ version: '13'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ">="
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '0'
41
+ version: '13'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: minitest
44
44
  requirement: !ruby/object:Gem::Requirement