media_types 2.2.0 → 2.3.0

data/lib/media_types/testing/assertions.rb

@@ -1,20 +1,20 @@
-# frozen_string_literal: true
-
-module MediaTypes
-  module Testing
-    module Assertions
-      def assert_media_type_format(media_type, output, **opts)
-        return pass unless media_type.validatable?
-
-        assert media_type.validate!(output, **opts)
-      end
-
-      def assert_mediatype(mediatype)
-        mediatype.assert_sane!
-        assert mediatype.media_type_validations.scheme.asserted_sane?
-      rescue MediaTypes::AssertionError => e
-        flunk e.message
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module MediaTypes
+  module Testing
+    module Assertions
+      def assert_media_type_format(media_type, output, **opts)
+        return pass unless media_type.validatable?
+
+        assert media_type.validate!(output, **opts)
+      end
+
+      def assert_mediatype(mediatype)
+        mediatype.assert_sane!
+        assert mediatype.media_type_validations.scheme.asserted_sane?
+      rescue MediaTypes::AssertionError => e
+        flunk e.message
+      end
+    end
+  end
+end

data/lib/media_types/validations.rb

@@ -1,105 +1,118 @@
-# frozen_string_literal: true
-
-require 'media_types/scheme'
-
-module MediaTypes
-  ##
-  # Takes care of registering validations for a media type. It allows for nested schemes and registers each one so it
-  # can be looked up at a later time.
-  #
-  # @see MediaType::Dsl
-  # @see Scheme
-  #
-  class Validations
-
-    attr_reader :scheme
-
-    ##
-    # Creates a new stack of validations
-    #
-    # @param [Constructable] media_type a Constructable media type
-    # @param [Hash] registry the registry reference, or nil if top level
-    # @param [Scheme] scheme the current scheme or nil if top level
-    #
-    # @see MediaTypes::Dsl
-    # @see Constructable
-    # @see Scheme
-    #
-    def initialize(media_type, registry = {}, scheme = Scheme.new, &block)
-      self.media_type = media_type
-      self.registry = registry.merge!(media_type.as_key => scheme)
-      self.scheme = scheme
-
-      instance_exec(&block) if block_given?
-    end
-
-    ##
-    # Looks up the validations for Constructable
-    #
-    # @param [String, Constructable] media_type
-    # @param [lambda] default the lambda if nothing can be found
-    # @return [Scheme] the scheme for the given +media_type+
-    #
-    def find(media_type, default = -> { Scheme.new(allow_empty: true) { not_strict } })
-      registry.fetch(media_type.as_key) do
-        default.call
-      end
-    end
-
-
-    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)
-
-          return scheme.send(method_name, *arguments, &block)
-        end
-
-        super
-      end
-    end
-
-    def respond_to_missing?(method_name, include_private = false)
-      scheme.respond_to?(method_name) || super
-    end
-
-    private
-
-    attr_accessor :media_type, :registry
-    attr_writer :scheme
-
-    ##
-    # Switches the inner block to a specific version
-    #
-    # @param [Numeric] version the version to switch to
-    #
-    def version(version, &block)
-      Validations.new(media_type.version(version), registry, &block)
-    end
-
-    ##
-    # Switches the inner block to a specific view
-    #
-    # @param [String, Symbol] view the view to switch to
-    #
-    def view(view, &block)
-      Validations.new(media_type.view(view), registry, &block)
-    end
-
-    def suffix(name)
-      scheme.type_attributes[:suffix] = name
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'media_types/scheme'
+
+module MediaTypes
+  ##
+  # Takes care of registering validations for a media type. It allows for nested schemes and registers each one so it
+  # can be looked up at a later time.
+  #
+  # @see MediaType::Dsl
+  # @see Scheme
+  #
+  class Validations
+
+    attr_reader :scheme
+
+    ##
+    # Creates a new stack of validations
+    #
+    # @param [Constructable] media_type a Constructable media type
+    # @param [Hash] registry the registry reference, or nil if top level
+    # @param [Scheme] scheme the current scheme or nil if top level
+    #
+    # @see MediaTypes::Dsl
+    # @see Constructable
+    # @see Scheme
+    #
+    def initialize(media_type, registry = {}, scheme = Scheme.new(registry: registry, current_type: media_type), &block)
+      self.media_type = media_type
+      self.registry = registry.merge!(media_type.as_key => scheme)
+      self.scheme = scheme
+
+      instance_exec(&block) if block_given?
+    end
+
+    ##
+    # Looks up the validations for Constructable
+    #
+    # @param [String, Constructable] media_type
+    # @param [lambda] default the lambda if nothing can be found
+    # @return [Scheme] the scheme for the given +media_type+
+    #
+    def find(media_type, default = -> { Scheme.new(allow_empty: true) { not_strict } })
+      registry.fetch(media_type.as_key) do
+        default.call
+      end
+    end
+
+
+    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)
+
+          return scheme.send(method_name, *arguments, &block)
+        end
+
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      scheme.respond_to?(method_name) || super
+    end
+
+    private
+
+    attr_accessor :media_type, :registry
+    attr_writer :scheme
+
+    ##
+    # Switches the inner block to a specific version
+    #
+    # @param [Numeric] version the version to switch to
+    #
+    def version(version, &block)
+      Validations.new(media_type.version(version), registry, &block)
+    end
+
+    ##
+    # Runs the block for multiple versions
+    #
+    # @param [Array] list of versions to run this on
+    #
+    def versions(versions, &block)
+      versions.each do |v|
+        Validations.new(media_type.version(v), registry) do
+          block(v)
+        end
+      end
+    end
+
+    ##
+    # Switches the inner block to a specific view
+    #
+    # @param [String, Symbol] view the view to switch to
+    #
+    def view(view, &block)
+      Validations.new(media_type.view(view), registry, &block)
+    end
+
+    def suffix(name)
+      scheme.type_attributes[:suffix] = name
+    end
+  end
+end

data/lib/media_types/version.rb

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

data/lib/media_types/views.rb

@@ -1,12 +1,12 @@
-# frozen_string_literal: true
-
-module MediaTypes
-  # Shortcut used by #collection to #view('collection')
-  COLLECTION_VIEW = 'collection'
-
-  # Shortcut used by #index to #view('index')
-  INDEX_VIEW = 'index'
-
-  # Shortcut used by #create to #view('create')
-  CREATE_VIEW = 'create'
-end
+# frozen_string_literal: true
+
+module MediaTypes
+  # Shortcut used by #collection to #view('collection')
+  COLLECTION_VIEW = 'collection'
+
+  # Shortcut used by #index to #view('index')
+  INDEX_VIEW = 'index'
+
+  # Shortcut used by #create to #view('create')
+  CREATE_VIEW = 'create'
+end

data/lib/media_types.rb

@@ -1,73 +1,73 @@
-# frozen_string_literal: true
-
-require 'delegate'
-
-require 'media_types/version'
-require 'media_types/hash'
-require 'media_types/object'
-require 'media_types/scheme'
-require 'media_types/dsl'
-require 'media_types/errors'
-
-require 'media_types/views'
-
-module MediaTypes
-  def self.set_organisation(mod, organisation)
-    @organisation_prefixes ||= {}
-    @organisation_prefixes[mod.name] = organisation
-  end
-
-  def self.expect_string_keys(mod)
-    set_key_expectation(mod, false)
-  end
-
-  def self.expect_symbol_keys(mod)
-    set_key_expectation(mod, true)
-  end
-
-  # Keep track of modules setting their key expectations
-  def self.set_key_expectation(mod, expect_symbol_keys)
-    @key_expectations ||= {}
-    @key_expectations_used ||= {}
-
-    raise KeyExpectationSetError.new(mod: mod) unless @key_expectations[mod.name].nil?
-    raise KeyExpectationUsedError.new(mod: mod) if @key_expectations_used[mod.name]
-
-    @key_expectations[mod.name] = expect_symbol_keys
-  end
-
-  SYMBOL_KEYS_DEFAULT = true
-
-  def self.get_key_expectation(mod)
-    @key_expectations ||= {}
-    @key_expectations_used ||= {}
-
-    expect_symbol = find_key_expectation(mod)
-
-    expect_symbol.nil? ? SYMBOL_KEYS_DEFAULT : expect_symbol
-  end
-
-  def self.find_key_expectation(mod)
-    modules = mod.name.split('::')
-    expect_symbol = nil
-
-    while modules.any? && expect_symbol.nil?
-      current_module = modules.join('::')
-      expect_symbol = @key_expectations[current_module]
-      @key_expectations_used[current_module] = true
-      modules.pop
-    end
-
-    expect_symbol
-  end
-
-  def self.get_organisation(mod)
-    name = mod.name
-    prefixes = @organisation_prefixes.keys.select { |p| name.start_with? p }
-    return nil unless prefixes.any?
-
-    best = prefixes.max_by { |p| p.length }
-
-    @organisation_prefixes[best]
-  end
-end
+# frozen_string_literal: true
+
+require 'delegate'
+
+require 'media_types/version'
+require 'media_types/hash'
+require 'media_types/object'
+require 'media_types/scheme'
+require 'media_types/dsl'
+require 'media_types/errors'
+
+require 'media_types/views'
+
+module MediaTypes
+  def self.set_organisation(mod, organisation)
+    @organisation_prefixes ||= {}
+    @organisation_prefixes[mod.name] = organisation
+  end
+
+  def self.expect_string_keys(mod)
+    set_key_expectation(mod, false)
+  end
+
+  def self.expect_symbol_keys(mod)
+    set_key_expectation(mod, true)
+  end
+
+  # Keep track of modules setting their key expectations
+  def self.set_key_expectation(mod, expect_symbol_keys)
+    @key_expectations ||= {}
+    @key_expectations_used ||= {}
+
+    raise KeyExpectationSetError.new(mod: mod) unless @key_expectations[mod.name].nil?
+    raise KeyExpectationUsedError.new(mod: mod) if @key_expectations_used[mod.name]
+
+    @key_expectations[mod.name] = expect_symbol_keys
+  end
+
+  SYMBOL_KEYS_DEFAULT = true
+
+  def self.get_key_expectation(mod)
+    @key_expectations ||= {}
+    @key_expectations_used ||= {}
+
+    expect_symbol = find_key_expectation(mod)
+
+    expect_symbol.nil? ? SYMBOL_KEYS_DEFAULT : expect_symbol
+  end
+
+  def self.find_key_expectation(mod)
+    modules = mod.name.split('::')
+    expect_symbol = nil
+
+    while modules.any? && expect_symbol.nil?
+      current_module = modules.join('::')
+      expect_symbol = @key_expectations[current_module]
+      @key_expectations_used[current_module] = true
+      modules.pop
+    end
+
+    expect_symbol
+  end
+
+  def self.get_organisation(mod)
+    name = mod.name
+    prefixes = @organisation_prefixes.keys.select { |p| name.start_with? p }
+    return nil unless prefixes.any?
+
+    best = prefixes.max_by { |p| p.length }
+
+    @organisation_prefixes[best]
+  end
+end

data/media_types.gemspec

@@ -1,33 +1,33 @@
-# frozen_string_literal: true
-
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'media_types/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'media_types'
-  spec.version       = MediaTypes::VERSION
-  spec.authors       = ['Derk-Jan Karrenbeld', 'Max Maton']
-  spec.email         = ['derk-jan+github@karrenbeld.info', 'info@maxmaton.nl']
-
-  spec.summary       = 'Library to create media type definitions, schemes and validations'
-  spec.description   = 'Media Types as mime types are not easily supported by frameworks such as rails. '
-  spec.homepage      = 'https://github.com/SleeplessByte/media-types-ruby'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'bundler', '>= 2'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'oj'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'simplecov'
-end
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'media_types/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'media_types'
+  spec.version       = MediaTypes::VERSION
+  spec.authors       = ['Derk-Jan Karrenbeld', 'Max Maton']
+  spec.email         = ['derk-jan+github@karrenbeld.info', 'info@maxmaton.nl']
+
+  spec.summary       = 'Library to create media type definitions, schemes and validations'
+  spec.description   = 'Media Types as mime types are not easily supported by frameworks such as rails. '
+  spec.homepage      = 'https://github.com/SleeplessByte/media-types-ruby'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'bundler', '>= 2'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'oj'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'simplecov'
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
 - Max Maton
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -119,6 +119,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/debian.yml"
+- ".github/workflows/publish-bookworm.yml"
+- ".github/workflows/publish-sid.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -162,7 +164,7 @@ files:
 homepage: https://github.com/SleeplessByte/media-types-ruby
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.2.5
+signing_key: 
 specification_version: 4
 summary: Library to create media type definitions, schemes and validations
 test_files: []