media_types 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8285f897870c9a66139c5129db60c7abf31f870ef20103e6d21da6be99c139b8
-  data.tar.gz: a62bbb54c1e1de59cdbef2c98050f1aa0d040dc6aa15a7559aa8e016014d26b0
+  metadata.gz: d77ce12d19694083cf37f19ccf0c68b402abe672c5e50b0d322879e9600ebda2
+  data.tar.gz: d2f90701ea7c0caf572e7565dcb47ff144ecc9255c81dadbe3d8264b6fcf1b30
 SHA512:
-  metadata.gz: 132ca0f0f8acf1dcd915c75c7b7b283ee3cc3a896d3fb53acffd8adc958300535bf7dde1d030e26865b317905c5da62ad18e507dbb1f04829ef5582bd4b187b3
-  data.tar.gz: ee0d5bd2f3e51f492d5530bbfa45e1acfb067ebc2a690a4b4cdf02d1284792bed60eebfaa6757c0b8a36fb520566932da784c9434d235fa59fb7c58f97231da3
+  metadata.gz: 273d09cee3e58708829d3d198d5178a88e86f79bd8ac414ba43587e0af756e1cf63dea66e4e9c4c98c1385b6b87363fabde907962417f24768b34168f1483c11
+  data.tar.gz: 0fafe409b8b89eeb979177514c8e25df1641c90a165f88c577e2f933ddc3d858b3c46f7c17672fb96ae2f3b0244bae40824ac53e66c7a46b87dcb206be8e65b4

data/.gitignore

@@ -1,10 +1,10 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-.idea/
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+.idea/

data/CHANGELOG.md

@@ -1,4 +1,13 @@
+# 2.0.0
+
+ - Removed 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.
+
 # 1.0.0
+
  - Added 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.

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in media_types.gemspec
-gemspec
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in media_types.gemspec
+gemspec

data/Gemfile.lock

@@ -1,63 +1,34 @@
 PATH
   remote: .
   specs:
-    media_types (1.0.0)
+    media_types (2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.4)
-      actionview (= 5.2.4)
-      activesupport (= 5.2.4)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4)
-      activesupport (= 5.2.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     awesome_print (1.8.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    builder (3.2.4)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.9.0)
-    ffi (1.11.1)
-    ffi (1.11.1-x64-mingw32)
+    ffi (1.12.2)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    http (4.2.0)
+    http (4.3.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
+      http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
+    http-form_data (2.2.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    json (2.2.0)
-    loofah (2.4.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     minitest-ci (3.4.0)
       minitest (>= 5.0.6)
     minitest-reporters (1.4.2)
@@ -65,50 +36,30 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.7-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
-    oj (3.10.0)
-    public_suffix (4.0.1)
-    rack (2.0.7)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
+    public_suffix (4.0.3)
     rake (13.0.1)
     ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
-  actionpack
   awesome_print
-  bundler (~> 2)
+  bundler
   http
   media_types!
   minitest (~> 5.0)
   minitest-ci
   minitest-reporters
-  oj
   rake (~> 13.0)
   simplecov
 
 BUNDLED WITH
-   2.0.1
+   1.17.3

data/README.md

@@ -1,5 +1,5 @@
 # MediaTypes
-[![Build Status](https://travis-ci.com/SleeplessByte/media-types-ruby.svg?branch=master)](https://travis-ci.com/SleeplessByte/media-types-ruby)
+[![Build Status](https://github.com/SleeplessByte/media-types-ruby/workflows/Ruby/badge.svg?branch=master)](https://github.com/SleeplessByte/media-types-ruby/actions?query=workflow%3ARuby)
 [![Gem Version](https://badge.fury.io/rb/media_types.svg)](https://badge.fury.io/rb/media_types)
 [![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT) 
 [![Maintainability](https://api.codeclimate.com/v1/badges/6f2dc1fb37ecb98c4363/maintainability)](https://codeclimate.com/github/SleeplessByte/media-types-ruby/maintainability)
@@ -64,7 +64,7 @@ class Venue
     'mydomain'
   end
   
-  media_type 'venue', defaults: { suffix: :json }
+  use_name 'venue'
 
   validations do
     version 2 do
@@ -103,17 +103,6 @@ class Venue
       end
     end
   end
-
-  registrations :venue_json do
-    view 'create', :create_venue
-    view 'index', :venue_urls
-    view 'collection', :venue_collection
-    
-    versions [1,2]
-    
-    suffix :json
-    suffix :xml
-  end
 end
 ```
 
@@ -346,9 +335,6 @@ Venue.mime_type.identifier
 Venue.mime_type.version(1).identifier
 # => "application/vnd.mydomain.venue.v1+json"
 
-Venue.mime_type.version(1).suffix(:xml).identifier
-# => "application/vnd.mydomain.venue.v1+xml"
-
 Venue.mime_type.to_s(0.2)
 # => "application/vnd.mydomain.venue.v2+json; q=0.2"
 
@@ -359,43 +345,6 @@ Venue.mime_type.view('active').identifier
 # => "application/vnd.mydomain.venue.v2.active+json"
 ```
 
-## Integrations
-The integrations are not loaded by default, so you need to require them:
-```ruby
-# For Rails / ActionPack
-require 'media_types/integrations/actionpack'
-
-# For HTTP.rb
-require 'media_types/integrations/http' 
-```
-
-Define a `registrations` block on your media type, indicating the symbol for the base type (`registrations :symbol do`) and inside use the registrations dsl to define which media types to register. `versions array_of_numbers` determines which versions, `suffix name` adds a suffix, `type_alias name` adds an alias and `view name, symbol` adds a view.
-
-```Ruby
-Venue.register
-```
-
-### Rails
-Load the `actionpack` integration and call `.register` on all the media types you want to be available in Rails. You can do this in the `mime_types` initializer, or anywhere before your controllers are instantiated. Yes, the symbol (by default `<type>_v<version>_<suffix>`) can now be used in your `format` blocks, or as extension in the url.
-
-Rails only has a default serializer for `application/json`, and content with your `+json` media types (or different once) will not be deserialized by default. A way to overcome this is to set the JSON parameter parser for all new symbols. `.register` gives you back an array of `Registerable` objects that responds to `#to_sym` to get that symbol.
-
-```ruby
-symbols = Venue.register.map(&:to_sym)
-
-original_parsers = ActionDispatch::Request.parameter_parsers
-new_parser = original_parsers[Mime[:json].symbol]
-new_parsers = original_parsers.merge(Hash[*symbols.map { |s| [s, new_parser] }])
-ActionDispatch::Request.parameter_parsers = new_parsers
-```
-
-If you want to validate the content-type and not have your errors be `Rack::Error` but be handled by your controllers, leave this out and add a `before_action` to your controller that deserializes + validates for you.
-
-### HTTP.rb
-Load the `http` integration and call `.register` on all media types you want to be able to serialize and deserialize. The media type validations will run both before serialization and after deserialization.
-
-Currently uses `oj` under the hood and this can not be changed.
-
 ## API
 
 A defined schema has the following functions available:

data/Rakefile

@@ -1,12 +1,12 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
-task default: :test
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task default: :test

data/lib/media_types.rb

@@ -9,7 +9,6 @@ require 'media_types/scheme'
 require 'media_types/dsl'
 
 require 'media_types/views'
-require 'media_types/integrations'
 
 module MediaTypes
   def self.set_organisation(mod, organisation)

data/lib/media_types/constructable.rb

@@ -28,11 +28,6 @@ module MediaTypes
       with(view: view)
     end
 
-    def suffix(suffix = NO_ARG)
-      return opts[:suffix] if suffix == NO_ARG
-      with(suffix: suffix)
-    end
-
     def collection
       view(COLLECTION_VIEW)
     end
@@ -74,13 +69,18 @@ module MediaTypes
     end
 
     def as_key
-      [type, view, version, suffix]
+      [type, view, version]
     end
 
     def hash
       as_key.hash
     end
 
+    def suffix
+      schema = schema_for(self)
+      schema.type_attributes.fetch(:suffix, 'json')
+    end
+
     def to_str(qualifier = nil)
       qualified(
         qualifier,
@@ -88,7 +88,7 @@ module MediaTypes
           type: opts[:type],
           view: opts[:view],
           version: opts[:version],
-          suffix: opts[:suffix],
+          suffix: suffix
         )
       )
     end

data/lib/media_types/dsl.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'media_types/constructable'
-require 'media_types/defaults'
-require 'media_types/registrar'
 require 'media_types/validations'
 
 module MediaTypes
@@ -49,7 +47,9 @@ module MediaTypes
       def validatable?(media_type = to_constructable)
         return false unless validations
 
-        validations.find(media_type, -> { nil })
+        resolved = validations.find(media_type, -> { nil })
+
+        !resolved.nil?
       end
 
       def register
@@ -65,10 +65,7 @@ module MediaTypes
       def version(v)
         to_constructable.version(v)
       end
-      def suffix(s)
-        to_constructable.suffix(s)
-      end
-
+      
       def identifier_format
         self.media_type_name_for = Proc.new do |type:, view:, version:, suffix:|
           yield(type: type, view: view, version: version, suffix: suffix)
@@ -81,14 +78,18 @@ module MediaTypes
 
       def available_validations
         self.media_type_combinations.map do |a|
-          _, view, version, suffix = a
-          view(view).version(version).suffix(suffix)
+          _, view, version = a
+          view(view).version(version)
         end
       end
 
+      def schema_for(constructable)
+        validations.find(constructable)
+      end
+
       private
 
-      def use_name(name, defaults: {})
+      def use_name(name)
         if self.media_type_name_for.nil?
           self.media_type_name_for = Proc.new do |type:, view:, version:, suffix:|
             resolved_org = nil
@@ -109,25 +110,14 @@ module MediaTypes
             result
           end
         end
-        self.media_type_constructable = Constructable.new(self, type: name).suffix(defaults.fetch(:suffix) { nil })
-      end
-
-      def defaults(&block)
-        return media_type_constructable unless block_given?
-        self.media_type_constructable = Defaults.new(to_constructable, &block).to_constructable
-
-        self
-      end
-
-      def registrations(symbol = nil, &block)
-        return media_type_registrar unless block_given?
-        self.media_type_registrar = Registrar.new(self, symbol: symbol, &block)
-
-        self
+        self.media_type_constructable = Constructable.new(self, type: name)
       end
 
       def validations(&block)
-        return media_type_validations unless block_given?
+        unless block_given?
+          raise 'No validations defined' if media_type_validations.nil?
+          return media_type_validations
+        end
         self.media_type_validations = Validations.new(to_constructable, &block)
 
         self

data/lib/media_types/scheme.rb

@@ -56,10 +56,13 @@ module MediaTypes
     #
     def initialize(allow_empty: false, expected_type: ::Object, &block)
       self.rules = Rules.new(allow_empty: allow_empty, expected_type: expected_type)
+      self.type_attributes = {}
 
       instance_exec(&block) if block_given?
     end
 
+    attr_accessor :type_attributes
+
     ##
     # Checks if the +output+ is valid
     #
@@ -98,6 +101,7 @@ module MediaTypes
     #
     def validate(output, options = nil, **opts)
       options ||= ValidationOptions.new(**opts)
+      options.context = output
 
       catch(:end) do
         validate!(output, options, context: nil)

data/lib/media_types/scheme/missing_validation.rb

@@ -9,18 +9,21 @@ module MediaTypes
       def validate!(_output, options, context:, **_opts)
         # Check that no unknown keys are present
         return true unless options.strict
-        raise_strict!(key: context.key, strict_keys: context.rules, backtrace: options.backtrace)
+        raise_strict!(key: context.key, strict_keys: context.rules, backtrace: options.backtrace, found: options.scoped_output)
       end
 
-      def raise_strict!(key:, backtrace:, strict_keys:)
+      def raise_strict!(key:, backtrace:, strict_keys:, found:)
         raise StrictValidationError, format(
           "Unknown key %<key>s in data.\n" \
           "\tFound at: %<backtrace>s\n" \
           "\tExpected:\n\n" \
-          '%<strict_keys>s',
+          "%<strict_keys>s\n\n" \
+          "\tBut I Found:\n\n" \
+          '%<found>s',
           key: key.inspect,
           backtrace: backtrace.join('->'),
-          strict_keys: strict_keys.inspect(1)
+          strict_keys: strict_keys.keys,
+          found: (found.is_a? Hash) ? found.keys : found.class.name
         )
       end
 

data/lib/media_types/scheme/output_empty_guard.rb

@@ -21,7 +21,7 @@ module MediaTypes
       def call
         return unless MediaTypes::Object.new(output).empty?
         throw(:end, true) if allow_empty?
-        raise_empty!(backtrace: options.backtrace)
+        raise_empty!(backtrace: options.backtrace, found: options.scoped_output)
       end
 
       private
@@ -32,11 +32,12 @@ module MediaTypes
         rules.allow_empty? || rules.required.empty?
       end
 
-      def raise_empty!(backtrace:)
+      def raise_empty!(backtrace:, found:)
         raise EmptyOutputError, format(
-          'Expected output, got empty at %<backtrace>s. Required are: %<required>s.',
+          'Expected output, got empty at %<backtrace>s. Required are: %<required>s. Found: %<found>s',
           backtrace: backtrace.join('->'),
-          required: rules.required.keys
+          required: rules.required.keys,
+          found: (found.is_a? Hash) ? found.keys : found.class.name,
         )
       end
     end

data/lib/media_types/scheme/rules_exhausted_guard.rb

@@ -31,7 +31,7 @@ module MediaTypes
         result = iterate(->(key) { required_rules.remove(key) })
         return result if required_rules.empty?
 
-        raise_exhausted!(missing_keys: required_rules.keys, backtrace: options.backtrace)
+        raise_exhausted!(missing_keys: required_rules.keys, backtrace: options.backtrace, found: output)
       end
 
       def iterate(mark)
@@ -50,11 +50,12 @@ module MediaTypes
 
       attr_accessor :rules, :options, :output
 
-      def raise_exhausted!(missing_keys:, backtrace:)
+      def raise_exhausted!(missing_keys:, backtrace:, found:)
         raise ExhaustedOutputError, format(
-          'Missing keys in output: %<missing_keys>s at [%<backtrace>s]',
+          'Missing keys in output: %<missing_keys>s at [%<backtrace>s]. I did find: %<found>s',
           missing_keys: missing_keys,
-          backtrace: backtrace.join('->')
+          backtrace: backtrace.join('->'),
+          found: (found.is_a? Hash) ? found.keys : found.class.name,
         )
       end
     end

data/lib/media_types/scheme/validation_options.rb

@@ -3,20 +3,31 @@
 module MediaTypes
   class Scheme
     class ValidationOptions
-      attr_accessor :exhaustive, :strict, :backtrace
+      attr_accessor :exhaustive, :strict, :backtrace, :context
 
-      def initialize(exhaustive: true, strict: true, backtrace: [])
+      def initialize(context = {}, exhaustive: true, strict: true, backtrace: [])
         self.exhaustive = exhaustive
         self.strict = strict
         self.backtrace = backtrace
+        self.context = context
       end
 
       def inspect
-        "backtrack: #{backtrace.inspect}, strict: #{strict.inspect}, exhaustive: #{exhaustive}"
+        "backtrack: #{backtrace.inspect}, strict: #{strict.inspect}, exhaustive: #{exhaustive}, current_obj: #{scoped_output.to_json}"
+      end
+
+      def scoped_output
+        current = context
+
+        backtrace.drop(1).first([0, backtrace.size - 2].max).each do |e|
+          current = current[e] unless current.nil?
+        end
+
+        current
       end
 
       def with_backtrace(backtrace)
-        ValidationOptions.new(exhaustive: exhaustive, strict: strict, backtrace: backtrace)
+        ValidationOptions.new(context, exhaustive: exhaustive, strict: strict, backtrace: backtrace)
       end
 
       def trace(*traces)
@@ -24,7 +35,7 @@ module MediaTypes
       end
 
       def exhaustive!
-        ValidationOptions.new(exhaustive: true, strict: strict, backtrace: backtrace)
+        ValidationOptions.new(context, exhaustive: true, strict: strict, backtrace: backtrace)
       end
     end
   end

data/lib/media_types/validations.rb

@@ -46,6 +46,7 @@ module MediaTypes
 
     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)
@@ -79,5 +80,9 @@ module MediaTypes
     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 = '1.0.0'
+  VERSION = '2.0.0'
 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,12 @@ 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 'bundler'
   spec.add_development_dependency 'http'
   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 'simplecov'
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
+- Max Maton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         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
@@ -108,20 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +127,7 @@ 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: []
@@ -161,7 +135,6 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -170,19 +143,12 @@ files:
 - 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/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

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_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

data/lib/media_types/registrar.rb

@@ -1,148 +0,0 @@
-# frozen_string_literal: true
-
-module MediaTypes
-  class Registerable
-    def initialize(media_type, symbol:, aliases: [])
-      self.media_type = media_type
-      self.symbol = symbol
-      self.aliases = aliases
-
-      freeze
-    end
-
-    def to_s
-      String(media_type)
-    end
-
-    def to_sym
-      symbol
-    end
-
-    attr_accessor :media_type, :symbol, :aliases
-
-    alias synonyms aliases
-    alias mime_type to_s
-
-  end
-
-  ##
-  # Holds all the configuration options in order to call {MediaTypes.register} exactly enough times to register the
-  # media type in its entirety.
-  #
-  # @see Registerable
-  #
-  class Registrar
-
-    ##
-    # Creates a new registry with default values
-    #
-    # @param [Class] klazz the class that has {MediaTypes::Dsl} included
-    # @param [Symbol, NilClass] symbol the symbol the base view (nil view) should be registered under
-    #
-    def initialize(klazz, symbol: nil, &block)
-      self.base_media_type = klazz.to_constructable
-
-      self.registered_views = symbol ? { nil => { symbol: String(symbol).to_sym } } : {}
-      self.registered_versions = [base_media_type.version]
-      self.registered_aliases = []
-      self.registered_suffixes = [String(base_media_type.suffix).to_sym]
-
-      instance_exec(&block) if block_given?
-    end
-
-    ##
-    # Resolves all the permutations and returns a list of {Registerable}
-    #
-    # @return [Array<Registerable>] the registerables based on all the permutations of +self+
-    #
-    def to_a
-      result = []
-
-      each_resolved do |media_type, symbol|
-        result << Registerable.new(media_type, symbol: symbol, aliases: aliases(media_type))
-      end
-
-      result
-    end
-
-    private
-
-    attr_accessor :registered_views, :registered_versions, :registered_aliases, :registered_suffixes,
-                  :symbol_base, :base_media_type
-
-    ##
-    # Registers a +view+ with a +symbol+
-    #
-    # @param [String, Symbol] view the view
-    # @param [String, Symbol] symbol the symbol base for this view
-    #
-    def view(view, symbol)
-      registered_views[String(view)] = { symbol: String(symbol).to_sym }
-      self
-    end
-
-    ##
-    # Registers +versions+
-    #
-    # @param [*Numeric] versions the versions to register
-    #
-    def versions(*versions)
-      registered_versions.push(*versions)
-      self
-    end
-
-    ##
-    # Registers a type alias. This will become a synonym when registering the media type
-    #
-    # @param [String] alias_name the name of the alias
-    #
-    def type_alias(alias_name)
-      registered_aliases.push(String(alias_name))
-      self
-    end
-
-    ##
-    # Registers a suffix
-    #
-    # @param [String, Symbol] suffix the suffix to register
-    #
-    def suffix(suffix)
-      registered_suffixes.push(String(suffix).to_sym)
-      self
-    end
-
-    ##
-    # Calculates the aliased media types for a media type
-    #
-    # @param [Constructable] media_type the media type constructable
-    # @return [Array<String>] the resolved aliases
-    #
-    def aliases(media_type)
-      registered_aliases.map { |a| media_type.type(a).to_s }
-    end
-
-    def each_combination
-      iterable(registered_versions).each do |version|
-        registered_views.each do |view, view_opts|
-          iterable(registered_suffixes).each do |suffix|
-            opts = { view: view_opts }
-            yield version, view, suffix, opts
-          end
-        end
-      end
-    end
-
-    def iterable(source)
-      source.compact.uniq
-    end
-
-    def each_resolved
-      each_combination do |version, view, suffix, opts|
-        media_type = base_media_type.version(version).view(view).suffix(suffix)
-        symbol = iterable([opts[:view][:symbol], "v#{version}", suffix]).join('_').to_sym
-
-        yield media_type, symbol
-      end
-    end
-  end
-end