media_types 1.0.0 → 2.1.1

data/lib/media_types/version.rb

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

data/media_types.gemspec

@@ -7,8 +7,8 @@ require 'media_types/version'
 Gem::Specification.new do |spec|
   spec.name          = 'media_types'
   spec.version       = MediaTypes::VERSION
-  spec.authors       = ['Derk-Jan Karrenbeld']
-  spec.email         = ['derk-jan+github@karrenbeld.info']
+  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. '
@@ -23,14 +23,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'actionpack'
   spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'http'
+  spec.add_development_dependency 'bundler', '>= 2'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'minitest-ci'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'oj'
-  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,29 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
-autorequire: 
+- Max Maton
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -40,32 +27,18 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-ci
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +85,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -154,35 +113,31 @@ description: 'Media Types as mime types are not easily supported by frameworks s
   as rails. '
 email:
 - derk-jan+github@karrenbeld.info
+- info@maxmaton.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/debian.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - lib/media_types.rb
-- lib/media_types/.dsl.rb.swp
 - lib/media_types/constructable.rb
-- lib/media_types/defaults.rb
 - lib/media_types/dsl.rb
+- lib/media_types/dsl/errors.rb
+- lib/media_types/errors.rb
 - lib/media_types/formatter.rb
 - lib/media_types/hash.rb
-- lib/media_types/integrations.rb
-- lib/media_types/integrations/actionpack.rb
-- lib/media_types/integrations/http.rb
-- lib/media_types/minitest/assert_media_type_format.rb
-- lib/media_types/minitest/assert_media_types_registered.rb
 - lib/media_types/object.rb
-- lib/media_types/registrar.rb
 - lib/media_types/scheme.rb
 - lib/media_types/scheme/allow_nil.rb
 - lib/media_types/scheme/any_of.rb
@@ -199,6 +154,7 @@ files:
 - lib/media_types/scheme/rules.rb
 - lib/media_types/scheme/rules_exhausted_guard.rb
 - lib/media_types/scheme/validation_options.rb
+- lib/media_types/testing/assertions.rb
 - lib/media_types/validations.rb
 - lib/media_types/version.rb
 - lib/media_types/views.rb
@@ -206,7 +162,7 @@ files:
 homepage: https://github.com/SleeplessByte/media-types-ruby
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,8 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Library to create media type definitions, schemes and validations
 test_files: []

data/.travis.yml

@@ -1,19 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - rbx-3
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx-3
-    - rvm: 2.6
-before_install:
-  - gem update --system
-  - gem --version
-install:
-  - bundle install --with development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}

data/lib/media_types/defaults.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module MediaTypes
-  class Defaults
-    def initialize(media_type, &block)
-      self.media_type = media_type
-
-      instance_exec(&block) if block_given?
-    end
-
-    def method_missing(method_name, *arguments, &block)
-      if media_type.respond_to?(method_name)
-        return self.media_type = media_type.send(method_name, *arguments, &block)
-      end
-
-      super
-    end
-
-    def respond_to_missing?(method_name, include_private = false)
-      media_type.respond_to?(method_name) || super
-    end
-
-    def to_constructable
-      media_type
-    end
-
-    private
-
-    attr_accessor :media_type
-  end
-end

data/lib/media_types/integrations.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module MediaTypes
-  INTEGRATION_METHODS = %i[register].freeze
-
-  module_function
-
-  def integrate(integration)
-    INTEGRATION_METHODS.each do |method|
-      next unless integration.respond_to?(method)
-      self.integrations = (integrations || {}).tap do |x|
-        x.merge!(method => (x[method] || []).concat([integration]))
-      end
-    end
-  end
-
-  # @!method register(registerable)
-  INTEGRATION_METHODS.each do |method|
-    define_singleton_method method do |*args, &block|
-      (integrations || {}).fetch(method) { [] }.each do |integration|
-        integration.send(method, *args, &block)
-      end
-    end
-
-  end
-
-  class << self
-    private
-
-    attr_accessor :integrations
-  end
-end

data/lib/media_types/integrations/actionpack.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'action_dispatch/http/mime_type'
-
-module MediaTypes
-  module ActionPackIntegration
-
-    module_function
-
-    def register(registerable)
-      mime_type = registerable.to_s
-      symbol = registerable.to_sym
-      synonyms = registerable.aliases
-
-      Mime::Type.register(mime_type, symbol, synonyms)
-    end
-  end
-
-  integrate ActionPackIntegration
-end
-

data/lib/media_types/integrations/http.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'http/mime_type'
-require 'oj'
-
-module MediaTypes
-  module HttpIntegration
-
-    module_function
-
-    def register(registerable)
-      mime_type = registerable.to_s
-
-      HTTP::MimeType.register_adapter mime_type, AdapterFor(registerable.media_type)
-      HTTP::MimeType.register_alias mime_type, registerable.to_sym
-
-      registerable.aliases.each do |alias_mime_type|
-        HTTP::MimeType.register_alias mime_type, alias_mime_type
-      end
-    end
-
-    class << self
-      private
-
-      # noinspection RubyInstanceMethodNamingConvention
-      def AdapterFor(media_type) # rubocop:disable Naming/MethodName
-        adapter_name = media_type.split(%r{[./_+-]}).map(&:capitalize).join('').tr('^A-z0-9', '_')
-
-        adapter = MediaTypes::HttpIntegration.const_set(adapter_name, Module.new)
-        adapter.define_singleton_method('encode') do |obj|
-          media_type.validate!(obj)
-          Oj.dump(obj, mode: :compat)
-        end
-
-        adapter.define_singleton_method('decode') do |str|
-          Oj.load(str, mode: :strict).tap do |result|
-            media_type.validate!(result)
-          end
-        end
-
-        adapter
-      end
-    end
-  end
-
-  integrate HttpIntegration
-end

data/lib/media_types/minitest/assert_media_type_format.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module MediaTypes
-  module Assertions
-    def assert_media_type_format(media_type, output, **opts)
-      return pass unless media_type.validatable?
-      assert media_type.validate!(output, **opts)
-    end
-  end
-end

data/lib/media_types/minitest/assert_media_types_registered.rb

@@ -1,166 +0,0 @@
-# frozen_string_literal: true
-
-require 'minitest/mock'
-
-module MediaTypes
-  module Assertions
-    class << self
-      def block_exec_instance(instance, &block)
-        case block.arity
-        when 1, -1
-          instance.instance_exec(instance, &block)
-        else
-          instance.instance_exec(&block)
-        end
-      end
-    end
-
-    def assert_media_types_registered(media_type, &block)
-      collector = Collector.new(media_type)
-      Assertions.block_exec_instance(collector, &block)
-      assert_registered_types(media_type, collector.prepare_verify)
-    end
-
-    class Collector
-      def initialize(media_type)
-        self.media_type = media_type
-        self.registers = {}
-      end
-
-      def mime_type(mime_type, symbol:, synonyms: [])
-        registers[mime_type] = { symbol: symbol, synonyms: synonyms }
-      end
-
-      def formatted_mime_type(mime_type_format, &block)
-        collector = FormattedCollector.new(mime_type_format, {})
-        Assertions.block_exec_instance(collector, &block)
-        registers.merge!(collector.to_h)
-      end
-
-      def prepare_verify
-        expected_types_hash = registers.dup
-        expected_types_hash.each do |key, value|
-          expected_types_hash[key] = [value[:symbol], Array(value[:synonyms])]
-        end
-
-        expected_types_hash
-      end
-
-      private
-
-      attr_accessor :media_type, :registers
-    end
-
-    class FormattedCollector
-      def initialize(format, args = {})
-        self.mime_type_format = format
-        self.format_args = args
-        self.registers = {}
-      end
-
-      def version(version, **opts, &block)
-        new_format_args = format_args.merge(version: version)
-        register(new_format_args, **opts, &block)
-      end
-
-      def view(view, **opts, &block)
-        new_format_args = format_args.merge(view: view)
-        register(new_format_args, **opts, &block)
-      end
-
-      def create(**opts, &block)
-        view(CREATE_VIEW, **opts, &block)
-      end
-
-      def collection(**opts, &block)
-        view(COLLECTION_VIEW, **opts, &block)
-      end
-
-      def index(**opts, &block)
-        view(INDEX_VIEW, **opts, &block)
-      end
-
-      def to_h
-        Hash(registers)
-      end
-
-      private
-
-      attr_accessor :mime_type_format, :registers, :format_args
-
-      def register(new_format_args, symbol: nil, synonyms: [], &block)
-        if block_given?
-          collector = FormattedCollector.new(mime_type_format, new_format_args)
-          Assertions.block_exec_instance(collector, &block)
-          registers.merge!(collector.to_h)
-        else
-          formatted_mime_type_format = format(mime_type_format, **new_format_args)
-          registers[formatted_mime_type_format] = { symbol: symbol, synonyms: synonyms }
-        end
-      end
-    end
-
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def assert_registered_types(media_type, expected_types_hash)
-      mock = Minitest::Mock.new
-      uncalled = expected_types_hash.dup
-
-      failed = []
-
-      uncalled.length.times do
-        mock.expect(:call, nil) do |registerable|
-          type = registerable.to_s
-          symbol = registerable.to_sym
-          synonyms = registerable.synonyms
-
-          options = uncalled.delete(type)
-          return true if options && options == [symbol, synonyms] && pass
-
-          failed <<
-            MockExpectationError.new(
-              format(
-                'Call failed to match expectations:' + "\n"\
-                '+++ actual [type: %<type>s, symbol: %<symbol>s, synonyms: %<synonyms>s]' + "\n"\
-                '--- expected [type: %<type>s, symbol: %<resolved_symbol>s, synonyms: %<resolved_synonyms>s]',
-                type: type,
-                symbol: symbol,
-                synonyms: synonyms,
-                resolved_symbol: options&.first,
-                resolved_synonyms: options&.last
-              )
-            )
-        end
-
-        false
-      end
-
-      MediaTypes.stub(:register, mock) do
-        if block_given?
-          yield media_type
-        else
-          media_type.register.flatten
-        end
-      end
-
-      messages = failed.map(&:message)
-      uncalled.each do |type, options|
-        messages << format(
-          'Call did not occur:' + "\n"\
-          '--- expected: [type: %<type>s, symbol: %<resolved_symbol>s, synonyms: %<resolved_synonyms>s]',
-          type: type,
-          resolved_symbol: options&.first,
-          resolved_synonyms: options&.last
-        )
-      end
-
-      if messages.length.positive?
-        flunk messages.join(",\n")
-      else
-        pass
-      end
-
-      assert mock
-    end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  end
-end