media_types 2.2.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60066d3701955c4cd09e1aebea4c444e7bda6f046119fdf535af562757e50b42
-  data.tar.gz: 54dec80cb8d9b53a1b7dfcb0269f3d6688b06cf48050f74a93f50a91169ac8cc
+  metadata.gz: 1142ee3380c374e5f49563e0bc5dd52d379b1d5f0971f32573d1c4e508da8a53
+  data.tar.gz: 1110579b304aeaaa2cdf1c78c9083df5dae0c42a903daf448c5f8c3abea77c41
 SHA512:
-  metadata.gz: 9d75689e60008e8b728082181b81eed52d68fab6709b3588729cec9f257b7aca045dd8739ab2c888dc03730900f530fc1e6cf3f87544964be6028c0a177db4f3
-  data.tar.gz: cfe50c15068b984cf1f7576fdfb8cc70c2e4486ebb4be7594704160017534288b0c09dd8f59703fcc6b5b98b7068b34daa235185beefab8bc3394df0984d4f60
+  metadata.gz: 9c91d590c74715eaf9d5cc705f9fc8cc1c8777fd32aaabd0a155548dc04c1c22426a5cd387803116956d8665465ec9ff5bee8c3f81140acb649e3a74821c449f
+  data.tar.gz: 520d8fa98570b498aaeae73168ea6e2c286fa918936874030eb16d42901e81a4431c10c2af168594f33c01e677f00ce46f2d7b9bd993051aaa634231ab70bf61

data/.github/workflows/debian.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Set up Ruby 2.7 (debian ruby)
-        uses: ruby/setup-ruby@v2
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
       - name: Install dependencies

data/.github/workflows/publish-bookworm.yml

@@ -0,0 +1,34 @@
+name: Publish debian bookworm packages
+
+on:
+  - workflow_dispatch
+
+jobs:
+  publish-bookworm:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:bookworm
+    steps:
+      - name: Install repo
+        run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --yes install wget && wget -O key.deb https://deb1.ws.maxmaton.nl/key.deb && DEBIAN_FRONTEND=noninteractive apt-get --yes install ./key.deb && echo "deb [signed-by=/usr/share/keyrings/maxmaton.gpg] http://deb.maxmaton.nl/debian bookworm main non-free" > /etc/apt/sources.list.d/maxmaton.list
+      - name: Install dependencies
+        run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --yes install git build-essential gem scrypt sshpass gem2deb ruby-actionpack ruby-activesupport
+      - uses: actions/checkout@v3
+        name: Check out repository
+      - name: Build gem
+        run: |
+          git config --global --add safe.directory "$(pwd)"
+          sed -i -re "s/VERSION\s+=\s+'([0-9]+.[0-9]+.[0-9]+)'/VERSION = '\1.bookworm'/g" lib/media_types/version.rb
+          gem build media_types.gemspec
+      - name: Build deb
+        run: DEBEMAIL=info@delftsolutions.nl gem2deb media_types-*.gem && ls -hal
+      - name: Publish
+        env:
+          PUBLISH_SIGNING_KEY: ${{ secrets.PUBLISH_SIGNING_KEY }}
+          SSHPASS: ${{ secrets.SSHPASS }}
+        run: |
+          echo "deb1.ws.maxmaton.nl ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgN3TiyKvRTj4xBSyQtYz0OuHZYv2i+x3NL+svh2k0SgPr0Xms4Vu+g3AXntXUQGRM0W9zbcZSHiBIWbliv3Y+20f7lKlj9uXUEMHDuiB7Fu7dXObfHswIvTX3XWiPdDeG1jYQbGM3tENX/wtEoixyL++33O69t2SFR5MkPk+/j+zlGLCFf0ypTAMb7bT5NjRNM3+v0LT2WVSZuawA7Fl8WBVTq7MSSuCZIxHIv1kEq6AWpOjWZHNVZrijs+uRTIPcrZ47wSt6tanjAnWT9sAzu8KqcvQsPw9IQwqV1nfQWz0wMit7ijn9B3MrkNHXP5PaNiZQCezsbrh9glhShz0z" > known_hosts
+          echo "deb1.ws.maxmaton.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMr5uAraiRj0pQ9Q9dQO0xMosTzFUAe+VjtMclIUbdJ7r7XMUa3etxh3BfBlW4nq3ZdIFCsV2zwzTaYSmfh95Xs=" >> known_hosts
+          echo "deb1.ws.maxmaton.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhQl7Ik6h7hSQbdo9ZfF78WYFCzch8SAOXFBxxAZH06" >> known_hosts
+          echo "Uploading :" ruby-media-types_*.deb
+          scrypt enc --passphrase "env:PUBLISH_SIGNING_KEY" ruby-media-types_*.deb | sshpass -e ssh -o "UserKnownHostsFile=known_hosts" publish@deb1.ws.maxmaton.nl "echo 'uploading bookworm' && sudo /opt/max/publish-deb ruby-media-types bookworm main && echo 'bookworm done'"

data/.github/workflows/publish-sid.yml

@@ -0,0 +1,34 @@
+name: Publish debian sid packages
+
+on:
+  - workflow_dispatch
+
+jobs:
+  publish-sid:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:sid
+    steps:
+      - name: Install repo
+        run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --yes install wget && wget -O key.deb https://deb1.ws.maxmaton.nl/key.deb && DEBIAN_FRONTEND=noninteractive apt-get --yes install ./key.deb && echo "deb [signed-by=/usr/share/keyrings/maxmaton.gpg] http://deb.maxmaton.nl/debian sid main non-free" > /etc/apt/sources.list.d/maxmaton.list
+      - name: Install dependencies
+        run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --yes install git build-essential gem scrypt sshpass gem2deb ruby-actionpack ruby-activesupport
+      - uses: actions/checkout@v3
+        name: Check out repository
+      - name: Build gem
+        run: |
+          git config --global --add safe.directory "$(pwd)"
+          sed -i -re "s/VERSION\s+=\s+'([0-9]+.[0-9]+.[0-9]+)'/VERSION = '\1.sid'/g" lib/media_types/version.rb
+          gem build media_types.gemspec
+      - name: Build deb
+        run: DEBEMAIL=info@delftsolutions.nl gem2deb media_types-*.gem && ls -hal
+      - name: Publish
+        env:
+          PUBLISH_SIGNING_KEY: ${{ secrets.PUBLISH_SIGNING_KEY }}
+          SSHPASS: ${{ secrets.SSHPASS }}
+        run: |
+          echo "deb1.ws.maxmaton.nl ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgN3TiyKvRTj4xBSyQtYz0OuHZYv2i+x3NL+svh2k0SgPr0Xms4Vu+g3AXntXUQGRM0W9zbcZSHiBIWbliv3Y+20f7lKlj9uXUEMHDuiB7Fu7dXObfHswIvTX3XWiPdDeG1jYQbGM3tENX/wtEoixyL++33O69t2SFR5MkPk+/j+zlGLCFf0ypTAMb7bT5NjRNM3+v0LT2WVSZuawA7Fl8WBVTq7MSSuCZIxHIv1kEq6AWpOjWZHNVZrijs+uRTIPcrZ47wSt6tanjAnWT9sAzu8KqcvQsPw9IQwqV1nfQWz0wMit7ijn9B3MrkNHXP5PaNiZQCezsbrh9glhShz0z" > known_hosts
+          echo "deb1.ws.maxmaton.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMr5uAraiRj0pQ9Q9dQO0xMosTzFUAe+VjtMclIUbdJ7r7XMUa3etxh3BfBlW4nq3ZdIFCsV2zwzTaYSmfh95Xs=" >> known_hosts
+          echo "deb1.ws.maxmaton.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhQl7Ik6h7hSQbdo9ZfF78WYFCzch8SAOXFBxxAZH06" >> known_hosts
+          echo "Uploading :" ruby-media-types_*.deb
+          scrypt enc --passphrase "env:PUBLISH_SIGNING_KEY" ruby-media-types_*.deb | sshpass -e ssh -o "UserKnownHostsFile=known_hosts" publish@deb1.ws.maxmaton.nl "echo 'uploading sid' && sudo /opt/max/publish-deb ruby-media-types sid main && echo 'sid done'"

data/.gitignore

@@ -8,3 +8,13 @@
 /tmp/
 
 .idea/
+
+/media_types-*.gem
+/media-types-*.tar.gz
+/ruby-media-types-*
+/ruby-media-types_*.deb
+/ruby-media-types_*.buildinfo
+/ruby-media-types_*.changes
+/ruby-media-types_*.debian.tar.xz
+/ruby-media-types_*.dsc
+/ruby-media-types_*.orig.tar.gz

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 2.3.2
+
+- Fix that causes bailout in nested rule to stop validation altogether
+
+## 2.3.1
+
+- Fix build issue that caused debian package to be empty
+
+## 2.3.0
+
+- Add ability to define multiple versions using one block.
+- Add `index` attribute type that automatically generates a link list compatible with media_types-serialization.
+- Add support for `collection` to automatically look up a previously defined schema when passing a view.
+- Add ability to mark certain attributes as optional when validating with `loose: true` and required otherwise.
+
+## 2.2.0
+
+- Change dependencies and build output to be debian compatible
+
 ## 2.1.1
 
 - Fix Ruby 2.6 to 2.7 incompatible change
@@ -17,25 +36,25 @@
 
 ## 2.0.0
 
-- Removed ability to set default suffix. All suffixes now default to `+json`.
+- Remove ability to set default suffix. All suffixes now default to `+json`.
 - Suffixes are now set for a given view and version instead of as a block.
-- Added `suffix :yoursuffix` command to override the default `:json` suffix.
-- Removed defaults block.
-- Removed registrations block.
+- Add `suffix :yoursuffix` command to override the default `:json` suffix.
+- Remove defaults block.
+- Remove registrations block.
 
 ## 1.0.0
 
-- Added the ability to do inline tests when defining validations using `assert_pass '<json>'` and `assert_fail '<json>'`.
+- Add the ability to do inline tests when defining validations using `assert_pass '<json>'` and `assert_fail '<json>'`.
 - `media_type` has been replaced with `use_name`.
 - It is no longer possible to set a default version. Please use `version <x> do` instead.
 - You no longer need to specify a custom format string. If you set an organisation with `def self.organisation` or set a module wide organisation with `MediaTypes::set_organisation <module>, '<organisation>'` the library will generate identifiers for you.
 - `self.base_format` has been replaced by `identifier_format do |type:, view:, version:, suffix:|`.
-- Added the `empty` validation to mark an empty object as valid.
-- Added the `identifier` function to get the [Media Type Identifier](https://en.wikipedia.org/wiki/Media_type) for the validator.
-- Added `version(x)` and `view(x)` functions.
-- Added an `available_validations` functions that returns all defined validations.
-- Fixed an issue where validations could accidentally merge if defined with a bad `base_format`.
-- Fixed an issue where undefined validations would accept an empty object.
+- Add the `empty` validation to mark an empty object as valid.
+- Add the `identifier` function to get the [Media Type Identifier](https://en.wikipedia.org/wiki/Media_type) for the validator.
+- Add `version(x)` and `view(x)` functions.
+- Add an `available_validations` functions that returns all defined validations.
+- Fix an issue where validations could accidentally merge if defined with a bad `base_format`.
+- Fix an issue where undefined validations would accept an empty object.
 
 ## 0.6.2
 

data/Gemfile.lock

@@ -1,43 +1,43 @@
-PATH
-  remote: .
-  specs:
-    media_types (2.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    awesome_print (1.9.2)
-    builder (3.2.4)
-    docile (1.4.0)
-    minitest (5.18.0)
-    minitest-reporters (1.6.0)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    oj (3.14.2)
-    rake (13.0.6)
-    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.4)
-
-PLATFORMS
-  x64-mingw32
-
-DEPENDENCIES
-  awesome_print
-  bundler (>= 2)
-  media_types!
-  minitest
-  minitest-reporters
-  oj
-  rake
-  simplecov
-
-BUNDLED WITH
-   2.1.4
+PATH
+  remote: .
+  specs:
+    media_types (2.3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    awesome_print (1.9.2)
+    builder (3.2.4)
+    docile (1.4.0)
+    minitest (5.18.0)
+    minitest-reporters (1.6.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    oj (3.14.2)
+    rake (13.0.6)
+    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.4)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  awesome_print
+  bundler (>= 2)
+  media_types!
+  minitest
+  minitest-reporters
+  oj
+  rake
+  simplecov
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -81,7 +81,7 @@ class Venue
     
     version 1 do
       attribute :name, String
-      attribute :coords, String
+      attribute :coords, String, optional: :loose
       attribute :updated_at, String
     
       link :self
@@ -94,8 +94,10 @@ class Venue
         attribute :altitude, AllowNil(Numeric)
       end
       
-      version 1 do
+      versions [1, 2] do |v|
         collection :location do
+          link :extra if v > 1
+          
           attribute :latitude, Numeric
           attribute :longitude, Numeric
           attribute :altitude, AllowNil(Numeric)
@@ -465,8 +467,8 @@ class MyMedia
     { "foo": { "bar": "string" } }
     FIXTURE
     assert_fail '{"foo": {}}'
-    assert_fail '{"foo": null}'
-    assert_fail '{"foo": [42]}'
+    assert_fail '{"foo": null}', loose: true
+    assert_fail '{"foo": [42]}', loose: false
   end
 end
 

data/lib/media_types/constructable.rb

@@ -125,6 +125,7 @@ module MediaTypes
     end
 
     def validatable?
+      return false if media_type_combinations.nil?
       return false unless media_type_combinations.include? as_key
 
       __getobj__.validatable?(self)

data/lib/media_types/errors.rb

@@ -15,5 +15,11 @@ module MediaTypes
         super(format('Unable to change key type expectation for %<mod>s since its current expectation is already used', mod: mod.name))
       end
     end
+
+    class CollectionDefinitionNotFound < StandardError
+      def initialize(current, target)
+        super(format('Unable to use %<target>s as a collection inside %<current>s, no such schema has been defined.', current: current, target: target))
+      end
+    end
   end
 end

data/lib/media_types/scheme/output_empty_guard.rb

@@ -29,15 +29,15 @@ module MediaTypes
       attr_accessor :output, :options, :rules
 
       def allow_empty?
-        rules.allow_empty? || rules.required.empty?
+        rules.allow_empty? || rules.required(loose: options.loose).empty?
       end
 
       def raise_empty!(backtrace:, found:)
         raise EmptyOutputError, format(
-          'Expected output, got empty at %<backtrace>s. Required are: %<required>s. Found: %<found>s',
+          'The object at %<backtrace>s was empty but I expected contents. Required keys are: %<required>s.',
           backtrace: backtrace.join('->'),
-          required: rules.required.keys,
-          found: (found.is_a? Hash) ? found.keys : found.class.name,
+          required: rules.required(loose: options.loose).keys,
+          found: (found.respond_to? :keys) ? found.keys : found.class.name,
         )
       end
     end

data/lib/media_types/scheme/rules.rb

@@ -14,6 +14,7 @@ module MediaTypes
         self.allow_empty = allow_empty
         self.expected_type = expected_type
         self.optional_keys = []
+        self.strict_keys = []
         self.original_key_type = {}
 
         self.default = MissingValidation.new
@@ -32,7 +33,11 @@ module MediaTypes
 
         normalized_key = normalize_key(key)
         __getobj__[normalized_key] = val
-        optional_keys << normalized_key if optional
+        if optional == :loose
+          strict_keys << normalized_key
+        else
+          optional_keys << normalized_key if optional
+        end
         original_key_type[normalized_key] = key.class
 
         self
@@ -87,11 +92,16 @@ module MediaTypes
       #
       # @return [Array<Symbol>] required keys
       #
-      def required
+      def required(loose:)
         clone.tap do |cloned|
           optional_keys.each do |key|
             cloned.delete(key)
           end
+          if loose
+            strict_keys.each do |key|
+              cloned.delete(key)
+            end
+          end
         end
       end
 
@@ -113,6 +123,9 @@ module MediaTypes
           if rules.respond_to?(:optional_keys, true)
             optional_keys.push(*rules.send(:optional_keys))
           end
+          if rules.respond_to?(:strict_keys, true)
+            strict_keys.push(*rules.send(:strict_keys))
+          end
 
           self
         end
@@ -123,7 +136,7 @@ module MediaTypes
         return "#{prefix}[Error]Depth limit reached[/Error]" if indent > 5_000
 
         [
-          "#{prefix}[Rules n=#{keys.length} optional=#{optional_keys.length} allow_empty=#{allow_empty?}]",
+          "#{prefix}[Rules n=#{keys.length} optional=#{optional_keys.length} strict=#{strict_keys.length} allow_empty=#{allow_empty?}]",
           "#{prefix}  #{inspect_format_attribute(indent, '*', default)}",
           *keys.map { |key| "#{prefix}  #{inspect_format_attribute(indent, key)}" },
           "#{prefix}[/Rules]"
@@ -162,7 +175,7 @@ module MediaTypes
 
       private
 
-      attr_accessor :allow_empty, :optional_keys, :original_key_type
+      attr_accessor :allow_empty, :strict_keys, :optional_keys, :original_key_type
       attr_writer :expected_type
 
       def normalize_key(key)

data/lib/media_types/scheme/rules_exhausted_guard.rb

@@ -26,7 +26,7 @@ module MediaTypes
           return iterate(EMPTY_MARK)
         end
 
-        required_rules = rules.required
+        required_rules = rules.required(loose: options.loose)
         # noinspection RubyScope
         result = iterate(->(key) { required_rules.remove(key) })
         return result if required_rules.empty?
@@ -48,11 +48,13 @@ module MediaTypes
 
           mark.call(key)
 
-          rules.get(key).validate!(
-            value,
-            options.trace(key),
-            context: context
-          )
+          catch(:end) do
+            rules.get(key).validate!(
+              value,
+              options.trace(key),
+              context: context
+            )
+          end
         end
       end
 

data/lib/media_types/scheme/validation_options.rb

@@ -3,18 +3,19 @@
 module MediaTypes
   class Scheme
     class ValidationOptions
-      attr_accessor :exhaustive, :strict, :backtrace, :context, :expected_key_type
+      attr_accessor :exhaustive, :strict, :backtrace, :context, :expected_key_type, :loose
 
-      def initialize(context = {}, exhaustive: true, strict: true, backtrace: [], expected_key_type:)
+      def initialize(context = {}, exhaustive: true, strict: true, backtrace: [], loose: false, expected_key_type:)
         self.exhaustive = exhaustive
         self.strict = strict
         self.backtrace = backtrace
         self.context = context
         self.expected_key_type = expected_key_type
+        self.loose = loose
       end
 
       def inspect
-        "backtrack: #{backtrace.inspect}, strict: #{strict.inspect}, exhaustive: #{exhaustive}, current_obj: #{scoped_output.to_json}"
+        "backtrack: #{backtrace.inspect}, strict: #{strict.inspect}, loose: #{loose}, exhaustive: #{exhaustive}, current_obj: #{scoped_output.to_json}"
       end
 
       def scoped_output
@@ -28,7 +29,7 @@ module MediaTypes
       end
 
       def with_backtrace(backtrace)
-        ValidationOptions.new(context, exhaustive: exhaustive, strict: strict, backtrace: backtrace, expected_key_type: expected_key_type)
+        ValidationOptions.new(context, exhaustive: exhaustive, strict: strict, backtrace: backtrace, expected_key_type: expected_key_type, loose: loose)
       end
 
       def trace(*traces)
@@ -36,7 +37,7 @@ module MediaTypes
       end
 
       def exhaustive!
-        ValidationOptions.new(context, exhaustive: true, strict: strict, backtrace: backtrace, expected_key_type: expected_key_type)
+        ValidationOptions.new(context, exhaustive: true, strict: strict, backtrace: backtrace, expected_key_type: expected_key_type, loose: loose)
       end
     end
   end

data/lib/media_types/scheme.rb

@@ -51,13 +51,14 @@ module MediaTypes
   end
 
   class FixtureData
-    def initialize(caller:, fixture:, expect_to_pass:)
+    def initialize(caller:, fixture:, expect_to_pass:, loose:)
       self.caller = caller
       self.fixture = fixture
       self.expect_to_pass = expect_to_pass
+      self.loose = loose
     end
 
-    attr_accessor :caller, :fixture, :expect_to_pass
+    attr_accessor :caller, :fixture, :expect_to_pass, :loose
 
     alias expect_to_pass? expect_to_pass
   end
@@ -93,11 +94,13 @@ module MediaTypes
     #
     # @see MissingValidation
     #
-    def initialize(allow_empty: false, expected_type: ::Object, &block)
+    def initialize(allow_empty: false, expected_type: ::Object, current_type: nil, registry: nil, &block)
       self.rules = Rules.new(allow_empty: allow_empty, expected_type: expected_type)
       self.type_attributes = {}
       self.fixtures = []
       self.asserted_sane = false
+      @registry = registry
+      @current_type = current_type
 
       instance_exec(&block) if block_given?
     end
@@ -269,7 +272,7 @@ module MediaTypes
         return rules.default = Attribute.new(scheme)
       end
 
-      rules.default = Scheme.new(allow_empty: allow_empty, expected_type: expected_type, &block)
+      rules.default = Scheme.new(allow_empty: allow_empty, expected_type: expected_type, registry: @registry, current_type: @current_type, &block)
     end
 
     ##
@@ -347,10 +350,20 @@ module MediaTypes
     #   MyMedia.valid?({ foo: [{ required: 'test', number: 42 }, { required: 'other', number: 0 }] })
     #   # => true
     #
-    def collection(key, scheme = nil, allow_empty: false, expected_type: ::Array, optional: false, &block)
+    def collection(key, scheme = nil, view: nil, allow_empty: false, expected_type: ::Array, optional: false, &block)
       raise ConflictingTypeDefinitionError, 'You cannot apply a block to a non-hash typed collection, either remove the type or the block' if scheme != ::Hash && block_given? && !scheme.nil?
 
       unless block_given?
+        if scheme.nil?
+          dependent_key = @current_type.as_key.dup
+          dependent_key[1] = view
+
+          unless @registry.has_key? dependent_key
+            raise Errors::CollectionDefinitionNotFound.new(@current_type.override_suffix('json').to_s, @current_type.view(view).override_suffix('json').to_s)
+          end
+          scheme = @registry[dependent_key]
+        end
+
         return rules.add(
           key,
           EnumerationOfType.new(
@@ -362,7 +375,16 @@ module MediaTypes
         )
       end
 
-      rules.add(key, Scheme.new(allow_empty: allow_empty, expected_type: expected_type, &block), optional: optional)
+      rules.add(key, Scheme.new(allow_empty: allow_empty, expected_type: expected_type, registry: @registry, current_type: @current_type, &block), optional: optional)
+    end
+
+    ##
+    # Expect an index of links
+    #
+    def index(optional: false)
+      collection(:_links, optional: optional) do
+        link :_self
+      end
     end
 
     ##
@@ -431,14 +453,14 @@ module MediaTypes
       ].join("\n")
     end
 
-    def assert_pass(fixture)
+    def assert_pass(fixture, loose: false)
       reduced_stack = remove_current_dir_from_stack(caller_locations)
-      @fixtures << FixtureData.new(caller: reduced_stack.first, fixture: fixture, expect_to_pass: true)
+      @fixtures << FixtureData.new(caller: reduced_stack.first, fixture: fixture, expect_to_pass: true, loose: loose)
     end
 
-    def assert_fail(fixture)
+    def assert_fail(fixture, loose: false)
       reduced_stack = remove_current_dir_from_stack(caller_locations)
-      @fixtures << FixtureData.new(caller: reduced_stack.first, fixture: fixture, expect_to_pass: false)
+      @fixtures << FixtureData.new(caller: reduced_stack.first, fixture: fixture, expect_to_pass: false, loose: loose)
     end
 
     # Removes all calls originating in current dir from given stack
@@ -496,7 +518,7 @@ module MediaTypes
       expected_key_type = expect_symbol_keys ? Symbol : String
 
       begin
-        validate(json, expected_key_type: expected_key_type, backtrace: backtrace)
+        validate(json, expected_key_type: expected_key_type, backtrace: backtrace, loose: fixture_data.loose)
         unless fixture_data.expect_to_pass?
           raise UnexpectedValidationResultError.new(fixture_data.caller, 'No error encounterd whilst expecting to')
         end

data/lib/media_types/validations.rb

@@ -25,7 +25,7 @@ module MediaTypes
     # @see Constructable
     # @see Scheme
     #
-    def initialize(media_type, registry = {}, scheme = Scheme.new, &block)
+    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
@@ -89,6 +89,19 @@ module MediaTypes
       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
     #

data/lib/media_types/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-08-17 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"