mime-types 3.2 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68be96a28af41a771a3173cd5acd351b1ebf3636f3f1c39f5a17ae7a5423a25a
-  data.tar.gz: dad93f4ca58c9d5e26850bf846692bb5d8673ab63018e9529ca79e18a964d9a3
+  metadata.gz: cdb4b5717fbcc056be60ca6acbc08a7c607c70844350473acf68aa4b6252e9e8
+  data.tar.gz: b52eacc82336979cd8665abcbc7a9caf6e77834ed159c2232259c5035270a165
 SHA512:
-  metadata.gz: 1f946e0bb991ff49fa8295e781975a5bf56d865961625dc7a206654ea66679ec3d121b01a857e5dfe752457f72ac74831db08daf580db398ea8824218cfd1d65
-  data.tar.gz: 93fdd664aa8076662f2921bbe18f6e5c9706f1079eda29d7167d0a5df1e100711a69482aee3557fc442c213d8e639fed7377fc0af9ad95fc91d04bc7969d93cf
+  metadata.gz: 0defd9a40587347fd82255474660e0d0463001d3cbda11884775ccb0a8c026fbd5b204ffefbaf3596222760174301510b5b4dec33545a87bda0a46c528e70740
+  data.tar.gz: 3498c00a5509138051422e425172b931e12ba0d77312fd7e79667607e7a1fe82c921f65e64abb6fdbb8278a3282a5d97db6cfced82293098c92138e26c7f2375

data/History.md

@@ -1,3 +1,9 @@
+## 3.2.1 / 2018-08-12
+
+*   A few bugs related to MIME::Types::Container and its use in the
+    mime-types-data helper tools reared their head because I released 3.2
+    before verifying against mime-types-data.
+
 ## 3.2 / 2018-08-12
 
 *   2 minor enhancements

data/lib/mime/type.rb

@@ -57,7 +57,7 @@ class MIME::Type
   end
 
   # The released version of the mime-types library.
-  VERSION = '3.2'
+  VERSION = '3.2.1'
 
   include Comparable
 
@@ -368,13 +368,7 @@ class MIME::Type
 
   ##
   def xrefs=(x) # :nodoc:
-    MIME::Types::Container.new.merge(x).tap do |xr|
-      xr.each do |k, v|
-        xr[k] = Set[*v] unless v.kind_of? Set
-      end
-
-      @xrefs = xr
-    end
+    @xrefs = MIME::Types::Container.new(x)
   end
 
   # The decoded cross-reference URL list for this MIME::Type.
@@ -459,7 +453,7 @@ class MIME::Type
     unless xrefs.empty?
       {}.tap do |hash|
         xrefs.each do |k, v|
-          hash[k] = v.sort.to_a
+          hash[k] = v.to_a.sort
         end
         coder['xrefs'] = hash
       end

data/lib/mime/types/container.rb

@@ -12,20 +12,48 @@ require 'forwardable'
 class MIME::Types::Container #:nodoc:
   extend Forwardable
 
-  def initialize
+  def initialize(hash = {})
     @container = {}
+    merge!(hash)
   end
 
   def [](key)
     container[key] || EMPTY_SET
   end
 
+  def []=(key, value)
+    case value
+    when Set
+      container[key] = value
+    else
+      container[key] = Set[*value]
+    end
+  end
+
+  def merge(other)
+    self.class.new(other)
+  end
+
+  def merge!(other)
+    tap {
+      other = other.kind_of?(MIME::Types::Container) ? other.container : other
+      self.container.merge!(other)
+      normalize
+    }
+  end
+
+  def to_hash
+    container
+  end
+
   def_delegators :@container,
+    :==,
     :count,
+    :each,
     :each_value,
+    :empty?,
+    :flat_map,
     :keys,
-    :merge,
-    :merge!,
     :select,
     :values
 
@@ -42,16 +70,25 @@ class MIME::Types::Container #:nodoc:
   end
 
   def encode_with(coder)
+    debugger
     container.each { |k, v| coder[k] = v.to_a }
   end
 
   def init_with(coder)
+    @container = {}
     coder.map.each { |k, v| container[k] = Set[*v] }
   end
 
-  private
+  protected
 
-  attr_reader :container
+  attr_accessor :container
+
+  def normalize
+    container.each do |k, v|
+      next if v.kind_of?(Set)
+      container[k] = Set[*v]
+    end
+  end
 
   EMPTY_SET = Set.new.freeze
   private_constant :EMPTY_SET

data/test/test_mime_type.rb

@@ -490,9 +490,7 @@ describe MIME::Type do
 
   describe '#xrefs, #xrefs=' do
     let(:expected) {
-      {
-        'rfc' => Set[*%w(rfc1234 rfc5678)]
-      }
+      MIME::Types::Container.new({ 'rfc' => Set[*%w(rfc1234 rfc5678)] })
     }
 
     it 'returns the expected results' do

data/test/test_mime_types_class.rb

@@ -44,9 +44,13 @@ describe MIME::Types, 'registry' do
     end
 
     it 'sorts by priority with multiple matches' do
-      assert_equal %w(application/gzip application/x-gzip multipart/x-gzip),
-        MIME::Types[/gzip$/]
-      assert_equal 3, MIME::Types[/gzip$/].size
+      types = MIME::Types[/gzip$/].select { |t|
+        t == 'application/gzip' || t == 'application/x-gzip' || t == 'multipart/x-gzip'
+      }
+      # This is this way because of a new type ending with gzip that only
+      # appears in some data files.
+      assert_equal %w(application/gzip application/x-gzip multipart/x-gzip), types
+      assert_equal 3, types.size
     end
 
     it 'can be searched with a string' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: '3.2'
+  version: 3.2.1
 platform: ruby
 authors:
 - Austin Ziegler
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The mime-types library provides a library and registry for information about