schema-model 0.6.5 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9793fc154e42915262f3c54f42c5d753ff5b232c7e337ab072ac89f1b3a8c03a
-  data.tar.gz: 4f7c3f9f18c96a2194c1046015e428699d07a7d0c276edbada3dfeed2018b639
+  metadata.gz: 5d996d080555c7553965069f80fc44c902ef72831635bdab8ae6515883e00334
+  data.tar.gz: da062d6c1a477c63382116961a7a8634cd13444a8a1797c38067d34d44d1faf0
 SHA512:
-  metadata.gz: 1d888604b7606cdee7c428a8312deb91b950bc74dd44c5a3cfa76ca8e4bead6a31722557f243bf3ac463aac621d3fcdb66a739f3020afca1d3beaaedb174d386
-  data.tar.gz: 01a24bfa955b24aa2c4223a6b4abd35eb792fb8fbb74cb346ccc205c18c97c76062ec340f2614735b65839aa677e43acb071d6f53dd7c79660f5781d02257dcd
+  metadata.gz: b29a0e7d32895ffe1c941860cb9f1af7efcfa4bc0a82a8ea86956d5c322f5fb1255301ee1702555546cc5d662c4981c2145167c9f453bdb15ce21fd34002ce1d
+  data.tar.gz: 4bac466d153605319ae50dc62a028e42b07ffe93ae589f4ed99dcedd54ade7a899f51acfbef45b35f395f77f8f2450cbcbdf2f57caf6d7afcfa1f75b66f2f22b

data/lib/schema/active_model_validations.rb

@@ -10,11 +10,40 @@ module Schema
       base.schema_include OverrideParsingErrors
     end
 
+    def valid_model!
+      unless valid?
+        raise ValidationException.new(
+                "invalid values for attributes #{errors.map(&:attribute).join(', ')}",
+                self,
+                errors
+              )
+      end
+    end
+
+    def valid!
+      parsed!
+      valid_model!
+    end
+
     # no-doc
     module OverrideParsingErrors
       def parsing_errors
         @parsing_errors ||= ActiveModel::Errors.new(self)
       end
+
+      def parsed?
+        parsing_errors.empty?
+      end
+
+      def parsed!
+        unless parsed?
+          raise ParsingException.new(
+                  "schema parsing failed for attributes #{parsing_errors.errors.map(&:attribute).join(', ')}",
+                  self,
+                  parsing_errors
+                )
+        end
+      end
     end
   end
 end

data/lib/schema/associations/schema_creator.rb

@@ -20,7 +20,7 @@ module Schema
       def create_schema(base_schema, data, error_name = nil)
         if data.is_a?(Hash)
           unless (schema_class = get_schema_class(base_schema, data))
-            add_parsing_error(base_schema, error_name, UNKNOWN)
+            add_parsing_error(base_schema, error_name, UNKNOWN) if base_schema.class.capture_unknown_attributes?
             return nil
           end
           schema = schema_class.from_hash(data)

data/lib/schema/model.rb

@@ -25,6 +25,10 @@ module Schema
 
     # no-doc
     module ClassMethods
+      def self.include(base)
+        base.capture_unknown_attributes = true
+      end
+
       def schema
         {}.freeze
       end
@@ -40,10 +44,21 @@ module Schema
 
       def schema_config
         {
-          schema_includes: []
+          schema_includes: [],
+          capture_unknown_attributes: true
         }.freeze
       end
 
+      def capture_unknown_attributes=(v)
+        config = schema_config.dup
+        config[:capture_unknown_attributes] = v
+        redefine_class_method(:schema_config, config.freeze)
+      end
+
+      def capture_unknown_attributes?
+        schema_config[:capture_unknown_attributes]
+      end
+
       def attribute(name, type, options = {})
         options[:aliases] = [options[:alias]] if options.key?(:alias)
 
@@ -148,7 +163,7 @@ STR
     def update_model_attributes(schema, data)
       data.each do |key, value|
         unless schema.key?(key)
-          parsing_errors.add(key, ::Schema::ParsingErrors::UNKNOWN_ATTRIBUTE)
+          parsing_errors.add(key, ::Schema::ParsingErrors::UNKNOWN_ATTRIBUTE) if self.class.capture_unknown_attributes?
           next
         end
 

data/lib/schema/parsers/common.rb

@@ -7,7 +7,7 @@ module Schema
     # Schema::Parsers::Common are parser methods for basic types
     module Common
       INTEGER_REGEX = /^[-+]?(?:[1-9]\d*|0)(?:\.0+)?$/.freeze
-      FLOAT_REGEX = /^[-+]?(?:[1-9]\d*|0)(?:\.\d+)?(e-\d+)?$/.freeze
+      FLOAT_REGEX = /^[-+]?(?:[1-9]\d*|0)(?:\.\d+)?([Ee]-?\d+)?$/.freeze
       BOOLEAN_REGEX = /^(?:1|t|true|on|y|yes)$/i.freeze
 
       # rubocop:disable Metrics/CyclomaticComplexity

data/lib/schema-model.rb

@@ -4,6 +4,19 @@ autoload :SchemaValidator, 'schema_validator'
 
 # Schema is a series of tools for transforming data into models
 module Schema
+  class SchemaException < StandardError
+    attr_reader :schema,
+                :errors
+
+    def initialize(msg, schema, errors)
+      super(msg)
+      @schema = schema
+      @errors = errors
+    end
+  end
+  class ParsingException < SchemaException; end
+  class ValidationException < SchemaException; end
+
   autoload :ActiveModelValidations, 'schema/active_model_validations'
   autoload :All, 'schema/all'
   autoload :ArrayHeaders, 'schema/array_headers'

data/schema-model.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'schema-model'
-  s.version     = '0.6.5'
+  s.version     = '0.6.8'
   s.licenses    = ['MIT']
   s.summary     = 'Schema Model'
   s.description = 'Easy way to create models from payloads'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema-model
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.8
 platform: ruby
 authors:
 - Doug Youch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper