media_types 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f24bfe6e322e33b8fa5bfb4af2df6d7af751cd81f85830477a73777e5ca9b96
-  data.tar.gz: 3936ae9836750c1fbb136efe0995df8214393380f990032d7b0e1e0d8787441c
+  metadata.gz: b854726c0783d1e7f27c66a195362a9df615500fb0bc329a935aa589d3451138
+  data.tar.gz: 3699e6ea389a304a2a7970911a39ae269e0705b3283c8b816868f1ba76abc6fa
 SHA512:
-  metadata.gz: 50b0ed65d73f88590394327ecf7ae2e51c33dbf68faad099f6e880ec8bde4de17c698da9229d8f7cb0cc0b4ca1de7922475d0ae424caf04d78c4b50a2da8d3d4
-  data.tar.gz: 885a33a8888c23aa2e4aaf903432464cfc435efeeaa360d10e9d85fbae65ee547ec56db7c93bf5292ebc0cf662a5299eaae20abd3072e5a08ce3442caf9906fc
+  metadata.gz: 05a9e6bb7d2cf222148750830b4efb69fc73a7b955e4a7cf51de6dbe3ed4866187cc498c7b11c8060f0a3dc53eac76fa7bc762049ed6174bdaccc0ea3fa118c7
+  data.tar.gz: c811c45d8ed2355a39f49f924d09a6a3326abe715e86b5ce4634d6a7dc1d2a18c565e6f1f6de60a769aa2fd6a863bd328da82a15ee3a8e6eaded39beab35856d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.6.2
+
+- Fix handling empty collections
+
 # 0.6.1
 
 - Fix no `validations` error on `validatable?` (now returns `false`)

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    media_types (0.6.1)
+    media_types (0.6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -29,13 +29,13 @@ GEM
     ansi (1.5.0)
     awesome_print (1.8.0)
     builder (3.2.3)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
     docile (1.3.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.8.0)
-    http (4.0.5)
+    http (4.1.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.0)
@@ -59,11 +59,11 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.10.1)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.1-x64-mingw32)
+    nokogiri (1.10.3-x64-mingw32)
       mini_portile2 (~> 2.4.0)
-    oj (3.7.9)
+    oj (3.7.12)
     public_suffix (3.0.3)
     rack (2.0.6)
     rack-test (1.1.0)

data/lib/media_types/scheme.rb

@@ -290,10 +290,6 @@ module MediaTypes
     #
     def collection(key, scheme = nil, allow_empty: false, expected_type: ::Array, optional: false, &block)
       unless block_given?
-        if scheme.is_a?(Scheme)
-          return rules.add(key, scheme, optional: optional)
-        end
-
         return rules.add(
           key,
           EnumerationOfType.new(

data/lib/media_types/scheme/enumeration_of_type.rb

@@ -59,12 +59,16 @@ module MediaTypes
       end
 
       def validate_items!(output, options)
-        output.all? do |item|
+        output.each_with_index.all? do |item, index|
           next true if item_type === item # rubocop:disable Style/CaseEquality
+          if item_type.is_a?(Scheme)
+            item_type.validate(item, options.trace("[#{index}]"))
+            next true
+          end
           raise ValidationError,
                 format(
                   'Expected collection item as %<type>s, got %<actual>s at [%<backtrace>s]',
-                  type: item_type,
+                  type: item_type.inspect,
                   actual: item.inspect,
                   backtrace: options.backtrace.join('->')
                 )

data/lib/media_types/scheme/rules.rb

@@ -91,7 +91,7 @@ module MediaTypes
         return "#{prefix}[Error]Depth limit reached[/Error]" if indent > 5_000
 
         [
-          "#{prefix}[Rules n=#{keys.length} optional=#{optional_keys.length}]",
+          "#{prefix}[Rules n=#{keys.length} optional=#{optional_keys.length} allow_empty=#{allow_empty?}]",
           "#{prefix}  #{inspect_format_attribute(indent, '*', default)}",
           *keys.map { |key| "#{prefix}  #{inspect_format_attribute(indent, key)}" },
           "#{prefix}[/Rules]"

data/lib/media_types/scheme/validation_options.rb

@@ -11,6 +11,10 @@ module MediaTypes
         self.backtrace = backtrace
       end
 
+      def inspect
+        "backtrack: #{backtrace.inspect}, strict: #{strict.inspect}, exhaustive: #{exhaustive}"
+      end
+
       def with_backtrace(backtrace)
         ValidationOptions.new(exhaustive: exhaustive, strict: strict, backtrace: backtrace)
       end

data/lib/media_types/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -219,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Library to create media type definitions, schemes and validations