media_types 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d034c7e7a7fd3a142dd997efab0d1c3e61f2cbe3170078544f4f456c485ad4ec
-  data.tar.gz: 20dbb0fbdf7e9f93c79575239de5e9a4e2220dbd7d3a0fe1d41145c1b2a97b54
+  metadata.gz: 60066d3701955c4cd09e1aebea4c444e7bda6f046119fdf535af562757e50b42
+  data.tar.gz: 54dec80cb8d9b53a1b7dfcb0269f3d6688b06cf48050f74a93f50a91169ac8cc
 SHA512:
-  metadata.gz: b589dbf3292df73632d3d8c98b6b73ed2dec08099b64406b4a1ca2c2cbe19b5cf7161efefc2b05c3bff634b03b6056c6a8f4770ac038e559710415bbad663e10
-  data.tar.gz: 2ce0c0747e94f01de399e28cd262b921912097c9bfea2d205abcb11937f116d078366ebcee8a8f0999c12cada9a7b1ce1093ad51d80d397cfc73d5cd145424f8
+  metadata.gz: 9d75689e60008e8b728082181b81eed52d68fab6709b3588729cec9f257b7aca045dd8739ab2c888dc03730900f530fc1e6cf3f87544964be6028c0a177db4f3
+  data.tar.gz: cfe50c15068b984cf1f7576fdfb8cc70c2e4486ebb4be7594704160017534288b0c09dd8f59703fcc6b5b98b7068b34daa235185beefab8bc3394df0984d4f60

data/.github/workflows/debian.yml

@@ -3,40 +3,41 @@ name: Debian
 on:
   push:
     tags:
-    - '*'
-
+      - "*"
 
 jobs:
   build:
-
-    runs-on: ubuntu-18.04
-
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        DEBIAN_FRONTEND=noninteractive sudo apt-get --yes install gem2deb bundler ruby-{actionpack,awesome-print,http,minitest,minitest-reporters,oj,simplecov}
-        rm Gemfile.lock || true
-        bundle install --local
-        sudo apt-file update
-    - name: Build
-      run: |
-        bundle exec rake build
-        mkdir debpkg
-        cp pkg/media_types-*.gem media_types.gem
-        #(cd debpkg; gem2tgz media_types.gem)
-        #(cd debpkg; dh-make-ruby media_types-*.tar.gz)
-        #(cd debpkg; dh-make-ruby media_types-*.tar.gz)
-        (cd pkg; gem2deb media_types*.gem)
-        mv pkg/ruby-media-types_*_all.deb ruby-media-types.deb
-    - name: Upload gem
-      uses: actions/upload-artifact@v1
-      with:
-        name: media_types.gem
-        path: media_types.gem
-    - name: Upload deb
-      uses: actions/upload-artifact@v1
-      with:
-        name: ruby-media-types.deb
-        path: ruby-media-types.deb
+      - uses: actions/checkout@v1
+      - name: Set up Ruby 2.7 (debian ruby)
+        uses: ruby/setup-ruby@v2
+        with:
+          ruby-version: 2.7
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          DEBIAN_FRONTEND=noninteractive sudo apt-get --yes install gem2deb bundler ruby-{actionpack,awesome-print,http,minitest,minitest-reporters,oj,simplecov}
+          rm Gemfile.lock || true
+          bundle install --local
+          sudo apt-file update
+      - name: Build
+        run: |
+          bundle exec rake build
+          mkdir debpkg
+          cp pkg/media_types-*.gem media_types.gem
+          #(cd debpkg; gem2tgz media_types.gem)
+          #(cd debpkg; dh-make-ruby media_types-*.tar.gz)
+          #(cd debpkg; dh-make-ruby media_types-*.tar.gz)
+          (cd pkg; gem2deb media_types*.gem)
+          mv pkg/ruby-media-types_*_all.deb ruby-media-types.deb
+      - name: Upload gem
+        uses: actions/upload-artifact@v1
+        with:
+          name: media_types.gem
+          path: media_types.gem
+      - name: Upload deb
+        uses: actions/upload-artifact@v1
+        with:
+          name: ruby-media-types.deb
+          path: ruby-media-types.deb

data/.github/workflows/ruby.yml

@@ -4,19 +4,19 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
-    - name: Build and test with Rake
-      run: |
-        sudo apt-get update
-        DEBIAN_FRONTEND=noninteractive sudo apt-get install --yes bundler
-        rm Gemfile.lock || true
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      - uses: actions/checkout@v1
+      - name: Set up Ruby 3.1
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 3.1.x
+      - name: Build and test with Rake
+        run: |
+          sudo apt-get update
+          DEBIAN_FRONTEND=noninteractive sudo apt-get install --yes bundler
+          rm Gemfile.lock || true
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rake

data/.rubocop.yml

@@ -1,11 +1,11 @@
 AllCops:
   Include:
-    - '**/Rakefile'
-    - 'lib/**/*.rb'
+    - "**/Rakefile"
+    - "lib/**/*.rb"
   Exclude:
-    - 'Gemfile'
-    - 'bin/**/*'
-  TargetRubyVersion: 2.4
+    - "Gemfile"
+    - "bin/**/*"
+  TargetRubyVersion: 3.0
 
 Layout/EmptyLinesAroundClassBody:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.1
+
+- Fix Ruby 2.6 to 2.7 incompatible change
+
 ## 2.1.0
 
 - Add `override_suffix` to force a specific suffix

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    media_types (2.1.0)
+    media_types (2.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -10,21 +10,21 @@ GEM
     awesome_print (1.9.2)
     builder (3.2.4)
     docile (1.4.0)
-    minitest (5.14.4)
-    minitest-reporters (1.4.3)
+    minitest (5.18.0)
+    minitest-reporters (1.6.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    oj (3.13.1)
+    oj (3.14.2)
     rake (13.0.6)
-    ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
 
 PLATFORMS
   x64-mingw32
@@ -33,11 +33,11 @@ DEPENDENCIES
   awesome_print
   bundler (>= 2)
   media_types!
-  minitest (~> 5.0)
+  minitest
   minitest-reporters
   oj
-  rake (>= 12.0)
+  rake
   simplecov
 
 BUNDLED WITH
-   2.2.7
+   2.1.4

data/lib/media_types/dsl.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 require 'media_types/constructable'
 require 'media_types/validations'
 

data/lib/media_types/validations.rb

@@ -46,15 +46,29 @@ module MediaTypes
       end
     end
 
-    def method_missing(method_name, *arguments, **kwargs, &block)
-      if scheme.respond_to?(method_name)
-        media_type.__getobj__.media_type_combinations ||= Set.new
-        media_type.__getobj__.media_type_combinations.add(media_type.as_key)
 
-        return scheme.send(method_name, *arguments, **kwargs, &block)
+    if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.7.0')
+      def method_missing(method_name, *arguments, **kwargs, &block)
+        if scheme.respond_to?(method_name)
+          media_type.__getobj__.media_type_combinations ||= Set.new
+          media_type.__getobj__.media_type_combinations.add(media_type.as_key)
+
+          return scheme.send(method_name, *arguments, **kwargs, &block)
+        end
+
+        super
       end
+    else
+      def method_missing(method_name, *arguments, &block)
+        if scheme.respond_to?(method_name)
+          media_type.__getobj__.media_type_combinations ||= Set.new
+          media_type.__getobj__.media_type_combinations.add(media_type.as_key)
 
-      super
+          return scheme.send(method_name, *arguments, &block)
+        end
+
+        super
+      end
     end
 
     def respond_to_missing?(method_name, include_private = false)

data/lib/media_types/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MediaTypes
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/media_types.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'bundler', '>= 2'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'oj'
-  spec.add_development_dependency 'rake', '>= 12.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -43,16 +43,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement