media_types 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5674ca1175e8811375a3d065219c87cb8268e86
-  data.tar.gz: d945dc4c4326960d717be6f14350856b5bf596b2
+  metadata.gz: c410b6e7c2eaa9df298c4fef6306704921b75e1b
+  data.tar.gz: 9b21dfaf70f6d82c365a0309f5631565b5045ce9
 SHA512:
-  metadata.gz: 95cab60688688522ed99735dfd030f133ef0a49ffe18cbaffad9dcde6f596c56a12446dadb9973803f77147b70ecf56e81a84ccb05d0260e0ac677edff1f78b1
-  data.tar.gz: 219f62fb2a2c249326ae71e37dc7098db3b70b7e6f7af81509abf2afc0d5dd8782e7b7b7d360912b6553df86c9e2cb2777b6ee0759285e770865fc12dc13f95b
+  metadata.gz: da2ad8aa866bc5bc0aacceec506f9c0bd8c460fe5681f5beb80c6bbbfb9fa7795910889a6d4cbe9118122c05c9b5e9ffbec969a1708da10b965419e3093c0ffa
+  data.tar.gz: 2206345f8cca161de2cec0acde03b359cb5fd28fe1b2fa64fddbb14273c51a9e8bb806c1c6ff16daea9c33664ce82dde255b502c899d7efeead26a03a3b1a3a2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.4.0
+
+- Simplify `assert_media_type_format` by dumping views completely
+- Add test for `merge`
+- Add test for nested blocks in `validations` using `view` and `version` nesting
+- Add test for `validatable?`
+- Add block passing to `Scheme.new`
+
 # 0.3.0
 
 - Add `merge` dsl to merge two `Scheme`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    media_types (0.3.0)
+    media_types (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/media_types/constructable.rb

@@ -77,13 +77,16 @@ module MediaTypes
 
     def to_str(qualifier = nil)
       # TODO: remove warning by slicing out these arguments if they don't appear in the format
-      qualified(qualifier, @to_str ||= format(
-        opts.fetch(:format),
-        version: opts.fetch(:version),
-        suffix: opts.fetch(:suffix) { :json },
-        type: opts.fetch(:type),
-        view: format_view(opts[:view])
-      ))
+      qualified(
+        qualifier,
+        format(
+          opts.fetch(:format),
+          version: opts.fetch(:version),
+          suffix: opts.fetch(:suffix) { :json },
+          type: opts.fetch(:type),
+          view: format_view(opts[:view])
+        )
+      )
     end
 
     def valid?(output, **validation_opts)
@@ -102,6 +105,10 @@ module MediaTypes
       )
     end
 
+    def validatable?
+      __getobj__.validatable?(self)
+    end
+
     alias inspect to_str
     alias to_s to_str
 
@@ -116,7 +123,7 @@ module MediaTypes
     attr_accessor :opts
 
     def with(more_opts)
-      Hash(opts).merge(more_opts).dup
+      Hash(opts).clone.merge(more_opts)
     end
 
     def qualified(qualifier, media_type)

data/lib/media_types/dsl.rb

@@ -21,7 +21,9 @@ module MediaTypes
     module ClassMethods
 
       def to_constructable
-        media_type_constructable.dup
+        media_type_constructable.dup.tap do |constructable|
+          constructable.__setobj__(self)
+        end
       end
 
       def valid?(output, media_type = to_constructable, **opts)
@@ -32,6 +34,10 @@ module MediaTypes
         validations.find(String(media_type)).validate(output, backtrace: ['.'], **opts)
       end
 
+      def validatable?(media_type = to_constructable)
+        validations.find(String(media_type), -> { nil })
+      end
+
       def register
         registrations.to_a.map do |registerable|
           MediaTypes.register(registerable)
@@ -42,23 +48,25 @@ module MediaTypes
       private
 
       def media_type(name, defaults: {})
-        self.media_type_constructable =
-          Constructable.new(self, format: base_format, type: name)
-                       .version(defaults.fetch(:version) { nil })
-                       .suffix(defaults.fetch(:suffix) { nil })
-                       .view(defaults.fetch(:view) { nil })
+        self.media_type_constructable = Constructable.new(self, format: base_format, type: name)
+                                                     .version(defaults.fetch(:version) { nil })
+                                                     .suffix(defaults.fetch(:suffix) { nil })
+                                                     .view(defaults.fetch(:view) { nil })
       end
 
       def defaults(&block)
+        return media_type_constructable unless block_given?
         self.media_type_constructable = Defaults.new(to_constructable, &block).to_constructable
       end
 
       def registrations(symbol = nil, &block)
-        self.media_type_registrar = media_type_registrar || Registrar.new(self, symbol: symbol, &block)
+        return media_type_registrar unless block_given?
+        self.media_type_registrar = Registrar.new(self, symbol: symbol, &block)
       end
 
       def validations(&block)
-        self.media_type_validations = media_type_validations || Validations.new(to_constructable, &block)
+        return media_type_validations unless block_given?
+        self.media_type_validations = Validations.new(to_constructable, &block)
       end
     end
   end

data/lib/media_types/minitest/assert_media_type_format.rb

@@ -3,17 +3,7 @@
 module MediaTypes
   module Assertions
     def assert_media_type_format(media_type, output, **opts)
-      if media_type.collection?
-        output[:_embedded].each do |embedded|
-          assert_media_type_format(media_type.view(nil), embedded, **opts)
-        end
-        return
-      end
-
-      if media_type.index?
-        return output[:_index] # TODO: sub_schema the "self" link
-      end
-
+      return pass unless media_type.validatable?
       assert media_type.validate!(output, **opts)
     end
   end

data/lib/media_types/scheme.rb

@@ -58,12 +58,14 @@ module MediaTypes
     #
     # @see MissingValidation
     #
-    def initialize(allow_empty: false, force: nil)
+    def initialize(allow_empty: false, force: nil, &block)
       self.validations = {}
       self.allow_empty = allow_empty
       self.force = force
 
       validations.default = MissingValidation.new
+
+      instance_exec(&block) if block_given?
     end
 
     ##
@@ -213,10 +215,7 @@ module MediaTypes
         return validations.default = scheme
       end
 
-      scheme = Scheme.new(allow_empty: allow_empty, force: force)
-      scheme.instance_exec(&block)
-
-      validations.default = scheme
+      validations.default = Scheme.new(allow_empty: allow_empty, force: force, &block)
     end
 
     ##
@@ -225,7 +224,7 @@ module MediaTypes
     # @param [Scheme] scheme the scheme to merge into this
     #
     def merge(scheme, &block)
-      self.validations = validations.merge(scheme.send(:validations).dup)
+      self.validations = validations.merge(scheme.send(:validations).clone)
       instance_exec(&block) if block_given?
     end
 
@@ -307,10 +306,7 @@ module MediaTypes
         )
       end
 
-      scheme = Scheme.new(allow_empty: allow_empty, force: force)
-      scheme.instance_exec(&block)
-
-      validations[String(key)] = scheme
+      validations[String(key)] = Scheme.new(allow_empty: allow_empty, force: force, &block)
     end
 
     ##
@@ -419,7 +415,7 @@ module MediaTypes
         return yield(->(_) {})
       end
 
-      exhaustive_keys = keys.dup.map(&:to_s)
+      exhaustive_keys = keys.clone.map(&:to_s)
       # noinspection RubyScope
       result = yield ->(key) { exhaustive_keys.delete(String(key)) }
       return result if exhaustive_keys.empty?

data/lib/media_types/validations.rb

@@ -38,8 +38,10 @@ module MediaTypes
     # @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::NotStrict.new })
-      registry.fetch(String(media_type)) { default.call }
+    def find(media_type, default = -> { Scheme.new(allow_empty: true) { not_strict } })
+      registry.fetch(String(media_type)) do
+        default.call
+      end
     end
 
     def method_missing(method_name, *arguments, &block)

data/lib/media_types/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print