media_types 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77ce12d19694083cf37f19ccf0c68b402abe672c5e50b0d322879e9600ebda2
-  data.tar.gz: d2f90701ea7c0caf572e7565dcb47ff144ecc9255c81dadbe3d8264b6fcf1b30
+  metadata.gz: 015cccf33a3af68f0e282b1c95c7ffe7015ae4a889e8e20731a2abfcc80322f2
+  data.tar.gz: edbdf2641d03043cadfd60392ea9b092e902a4471febf95a7bccb3e926b69e58
 SHA512:
-  metadata.gz: 273d09cee3e58708829d3d198d5178a88e86f79bd8ac414ba43587e0af756e1cf63dea66e4e9c4c98c1385b6b87363fabde907962417f24768b34168f1483c11
-  data.tar.gz: 0fafe409b8b89eeb979177514c8e25df1641c90a165f88c577e2f933ddc3d858b3c46f7c17672fb96ae2f3b0244bae40824ac53e66c7a46b87dcb206be8e65b4
+  metadata.gz: 8d55fd91afc2be432ccc7842d8b53df3a6f8190d487111f49c04386b77678d5b88088406f7d40bc1535aebe48af6617edcab46141689f57759d5430e75d94db7
+  data.tar.gz: '09f57d4eeee475e1dc40aff213128bee1b69a35b166d7e055f3a60146d77972723c2feafeae6fecb58e87910fbac8e9cafbdc1f3690940863476f90cc54f48f4'

data/.github/workflows/debian.yml

@@ -0,0 +1,42 @@
+name: Debian
+
+on:
+  push:
+    tags:
+    - '*'
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        DEBIAN_FRONTEND=noninteractive sudo apt-get --yes install gem2deb bundler ruby-{actionpack,awesome-print,http,minitest,minitest-reporters,oj,simplecov}
+        rm Gemfile.lock || true
+        bundle install --local
+        sudo apt-file update
+    - name: Build
+      run: |
+        bundle exec rake build
+        mkdir debpkg
+        cp pkg/media_types-*.gem media_types.gem
+        #(cd debpkg; gem2tgz media_types.gem)
+        #(cd debpkg; dh-make-ruby media_types-*.tar.gz)
+        #(cd debpkg; dh-make-ruby media_types-*.tar.gz)
+        (cd pkg; gem2deb media_types*.gem)
+        mv pkg/ruby-media-types_*_all.deb ruby-media-types.deb
+    - name: Upload gem
+      uses: actions/upload-artifact@v1
+      with:
+        name: media_types.gem
+        path: media_types.gem
+    - name: Upload deb
+      uses: actions/upload-artifact@v1
+      with:
+        name: ruby-media-types.deb
+        path: ruby-media-types.deb

data/.github/workflows/ruby.yml

@@ -15,6 +15,8 @@ jobs:
         ruby-version: 2.6.x
     - name: Build and test with Rake
       run: |
-        gem install bundler
+        sudo apt-get update
+        DEBIAN_FRONTEND=noninteractive sudo apt-get install --yes bundler
+        rm Gemfile.lock || true
         bundle install --jobs 4 --retry 3
         bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.0.1
+
+ - Views can now be accessed indifferently.
+ - Attribute keys no longer match indifferently.
+ - Fixed infinite loop when validating non-hash, non-array items.
+
 # 2.0.0
 
  - Removed ability to set default suffix. All suffixes now default to `+json`.

data/Gemfile.lock

@@ -1,64 +1,40 @@
 PATH
   remote: .
   specs:
-    media_types (2.0.0)
+    media_types (2.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     awesome_print (1.8.0)
     builder (3.2.4)
     docile (1.3.2)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.12.2)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    http (4.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.2.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
     minitest (5.14.0)
-    minitest-ci (3.4.0)
-      minitest (>= 5.0.6)
     minitest-reporters (1.4.2)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    public_suffix (4.0.3)
+    oj (3.10.5)
     rake (13.0.1)
     ruby-progressbar (1.10.1)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   awesome_print
-  bundler
-  http
+  bundler (>= 1.16.1)
   media_types!
   minitest (~> 5.0)
-  minitest-ci
   minitest-reporters
-  rake (~> 13.0)
+  oj
+  rake (>= 12.0)
   simplecov
 
 BUNDLED WITH

data/lib/media_types/constructable.rb

@@ -69,7 +69,7 @@ module MediaTypes
     end
 
     def as_key
-      [type, view, version]
+      [type, view&.to_s, version]
     end
 
     def hash

data/lib/media_types/dsl.rb

@@ -115,7 +115,7 @@ module MediaTypes
 
       def validations(&block)
         unless block_given?
-          raise 'No validations defined' if media_type_validations.nil?
+          raise "No validations defined for #{self.name}" if media_type_validations.nil?
           return media_type_validations
         end
         self.media_type_validations = Validations.new(to_constructable, &block)

data/lib/media_types/scheme.rb

@@ -159,6 +159,11 @@ module MediaTypes
     #   # => true
     #
     def attribute(key, type = ::Object, optional: false, **opts, &block)
+      raise KeyTypeError, "Unexpected key type #{key.class.name}, please use either a symbol or string." unless key.is_a?(String) || key.is_a?(Symbol)
+      raise DuplicateKeyError, "An attribute with key #{key.to_s} has already been defined. Please remove one of the two." if rules.has_key?(key)
+      raise DuplicateKeyError, "A string attribute with the same string representation as the symbol :#{key.to_s} already exists. Please remove one of the two." if key.is_a?(Symbol)&& rules.has_key?(key.to_s)
+      raise DuplicateKeyError, "A symbol attribute with the same string representation as the string '#{key}' already exists. Please remove one of the two." if key.is_a?(String) && rules.has_key?(key.to_sym)
+
       if block_given?
         return collection(key, expected_type: ::Hash, optional: optional, **opts, &block)
       end
@@ -380,13 +385,13 @@ module MediaTypes
     end
 
     def assert_pass(fixture)
-      json = JSON.parse(fixture)
+      json = JSON.parse(fixture, { symbolize_names: true })
 
       validate(json)
     end
     
     def assert_fail(fixture)
-      json = JSON.parse(fixture)
+      json = JSON.parse(fixture, { symbolize_names: true })
 
       begin
         validate(json)

data/lib/media_types/scheme/errors.rb

@@ -6,6 +6,12 @@ module MediaTypes
     # Base class for all validations errors
     class ValidationError < ArgumentError; end
 
+    # Raised when trying to register an attribute with a non-string key
+    class KeyTypeError < ArgumentError; end
+
+    # Raised when trying to register a key twice
+    class DuplicateKeyError < ArgumentError; end
+
     # Raised when it did not expect more data, but there was more left
     class StrictValidationError < ValidationError; end
 

data/lib/media_types/scheme/missing_validation.rb

@@ -22,8 +22,8 @@ module MediaTypes
           '%<found>s',
           key: key.inspect,
           backtrace: backtrace.join('->'),
-          strict_keys: strict_keys.keys,
-          found: (found.is_a? Hash) ? found.keys : found.class.name
+          strict_keys: keys_to_str(strict_keys.keys),
+          found: (found.respond_to? :keys) ? keys_to_str(found.keys) : found.class.name
         )
       end
 
@@ -31,6 +31,11 @@ module MediaTypes
         '((raise when strict))'
       end
 
+      def keys_to_str(keys)
+        converted = keys.map { |k| k.is_a?(Symbol) ? ":#{k}" : "'#{k}'" }
+        "[#{converted.join ', '}]"
+      end
+
     end
   end
 end

data/lib/media_types/scheme/output_iterator_with_predicate.rb

@@ -26,7 +26,11 @@ module MediaTypes
           return iterate_hash { |*args, **opts| yield(*args, **opts) }
         end
 
-        iterate { |*args, **opts| yield(*args, **opts) }
+        if array?
+          return iterate { |*args, **opts| yield(*args, **opts) }
+        end
+
+        raise "Internal consistency error, unexpected: #{enumerable.class}"
       end
 
       private
@@ -37,6 +41,10 @@ module MediaTypes
         enumerable.is_a?(::Hash) || enumerable.respond_to?(:key)
       end
 
+      def array?
+        enumerable.is_a?(::Array)
+      end
+
       def iterate_hash
         context = EnumerationContext.new(rules: rules)
 
@@ -46,7 +54,10 @@ module MediaTypes
       end
 
       def iterate(&block)
-        Array(enumerable).each_with_index.all? do |array_like_element, i|
+        hash_rule = Rules.new(allow_empty: false, expected_type: ::Hash)
+
+        enumerable.each_with_index.all? do |array_like_element, i|
+          OutputTypeGuard.call(array_like_element, options.trace(1), rules: hash_rule)
           OutputIteratorWithPredicate.call(array_like_element, options.trace(i), rules: rules, &block)
         end
       end

data/lib/media_types/scheme/output_type_guard.rb

@@ -18,6 +18,8 @@ module MediaTypes
       end
 
       def call
+        #puts @rules
+        #puts "input: <#{output}>, type: <#{expected_type.name}>"
         return unless expected_type && !(expected_type === output) # rubocop:disable Style/CaseEquality
         raise_type_error!(type: output.class, backtrace: options.backtrace)
       end

data/lib/media_types/scheme/rules.rb

@@ -114,7 +114,8 @@ module MediaTypes
       attr_writer :expected_type
 
       def normalize_key(key)
-        String(key).to_sym
+        # Because default ruby hashes don't treat symbols and string equal we can't normalize them here.
+        key
       end
     end
   end

data/lib/media_types/version.rb

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

data/media_types.gemspec

@@ -24,11 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'http'
+  spec.add_development_dependency 'bundler', '>= 1.16.1'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'minitest-ci'
   spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'oj'
+  spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -31,28 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: http
-  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'
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest-ci
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -99,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
@@ -132,6 +118,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/debian.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"