schema-model 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75daea073072722da9fb5e80565a35fe6861ab6293d757a2d91b76769835c119
-  data.tar.gz: ed1036610bf036e2bf96baf3f39561cd91063ca48cecace447b80129f7409db2
+  metadata.gz: 2930827fc56c8ef958799e26a4fe5c0e4033449ff61d0e58bbdd107d77dc0f2c
+  data.tar.gz: 43306799287c8c4edb21e07bf21924f2a6b165bdef2cb934401edb2e0549414d
 SHA512:
-  metadata.gz: 1e5475f9dc0c8b844083619584376988a8d7dabe763fd2abe67929c472093a2bb5e2a6bbb4d42cc1400cdbb5a7c8d8532bc7f3733d44fc66f4cd07b63debe365
-  data.tar.gz: 5a214b983dd1c2fbf298ddbc74667cda767ee20fb29c735e2dfc1ca4a8e44f3f1df208412b518b76314ca0c12b0d59e90ba66b7f7b2ba96a6b1f1b1793ef1ab0
+  metadata.gz: 97ac444c3f460681e01b529f6d5e872f426e3b3ef44097a9c6492168f2175dc403b3f98318e72f1c79702440bbb7b2d45c9158591896e71c2bd94f0b6f4ece8b
+  data.tar.gz: 4a090a51203d1c97c75946ce6f297252e31a1137b7e7637821d148c702ba148f1d13e4de5b0c5c5843e2dbbf4b314a3688d1b7d7ced8e291050f8eb240964ee7

data/lib/schema/active_model_validations.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'active_model'
+
+module Schema
+  # Schema::Model adds schema building methods to a class, uses ActiveModel::Errors for parsing_errors
+  module ActiveModelValidations
+    def self.included(base)
+      base.schema_include ::ActiveModel::Validations
+      base.schema_include OverrideParsingErrors
+    end
+
+    # no-doc
+    module OverrideParsingErrors
+      def parsing_errors
+        @parsing_errors ||= ActiveModel::Errors.new(self)
+      end
+    end
+  end
+end

data/lib/schema/associations/schema_creator.rb

@@ -4,28 +4,28 @@ module Schema
   module Associations
     # Schema::Associations::SchemaCreator is used to create schema objects for associations
     class SchemaCreator
+      include ::Schema::ParsingErrors
+
       def initialize(base_schema, name)
         options = base_schema.class.schema[name]
         @schema_name = name
         @schema_class = base_schema.class.const_get(options[:class_name])
-        @aliases = options[:aliases] || []
-        @type_field = options[:type_field]
-        @external_type_field = options[:external_type_field]
-        @types = options[:types]
-        @ignorecase = !options[:type_ignorecase].nil?
+        @aliases = options.fetch(:aliases, [])
+        @ignorecase = options[:type_ignorecase]
+        configure_dynamic_schema_options(options)
       end
 
       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)
             return nil
           end
           schema = schema_class.from_hash(data)
-          add_parsing_error(base_schema, error_name, :invalid) unless schema.parsing_errors.empty?
+          add_parsing_error(base_schema, error_name, INVALID) unless schema.parsing_errors.empty?
           schema
         elsif !data.nil?
-          add_parsing_error(base_schema, error_name, :incompatable)
+          add_parsing_error(base_schema, error_name, INCOMPATABLE)
           nil
         end
       end
@@ -34,7 +34,7 @@ module Schema
         if list.is_a?(Array)
           list.each_with_index.map { |data, idx| create_schema(base_schema, data, "#{@schema_name}:#{idx}") }
         elsif !list.nil?
-          add_parsing_error(base_schema, @schema_name, :incompatable)
+          add_parsing_error(base_schema, @schema_name, INCOMPATABLE)
           nil
         end
       end
@@ -83,6 +83,12 @@ module Schema
       def add_parsing_error(base_schema, error_name, error_msg)
         base_schema.parsing_errors.add(error_name || @schema_name, error_msg)
       end
+
+      def configure_dynamic_schema_options(options)
+        @type_field = options[:type_field]
+        @external_type_field = options[:external_type_field]
+        @types = options[:types]
+      end
     end
   end
 end

data/lib/schema/model.rb

@@ -28,6 +28,15 @@ module Schema
         {}.freeze
       end
 
+      def schema_with_string_keys
+        @schema_with_string_keys ||=
+          begin
+            hsh = {}
+            schema.each { |field_name, field_options| hsh[field_name.to_s] = field_options }
+            hsh.freeze
+          end
+      end
+
       def schema_config
         {
           schema_includes: []
@@ -82,13 +91,14 @@ module Schema
     end
 
     def update_attributes(data)
-      self.class.schema.each do |field_name, field_options|
-        next if !data.key?(field_options[:key]) && !data.key?(field_name)
+      schema = get_schema(data)
+      data.each do |key, value|
+        unless schema.key?(key)
+          parsing_errors.add(key, ::Schema::ParsingErrors::UNKNOWN_ATTRIBUTE)
+          next
+        end
 
-        public_send(
-          field_options[:setter],
-          data[field_options[:key]] || data[field_name.to_sym]
-        )
+        public_send(schema[key][:setter], value)
       end
 
       self
@@ -109,7 +119,16 @@ module Schema
     alias to_h to_hash
 
     def parsing_errors
-      @parsing_errors ||= ::Schema::Errors.new
+      @parsing_errors ||= Errors.new
+    end
+
+    def get_schema(data)
+      data.each_key do |key|
+        break unless key.is_a?(Symbol)
+
+        return self.class.schema
+      end
+      self.class.schema_with_string_keys
     end
   end
 end

data/lib/schema/parsers/array.rb

@@ -14,10 +14,10 @@ module Schema
             return data
           end
 
-          parsing_errors.add(field_name, :incompatable)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::INCOMPATABLE)
           nil
         else
-          parsing_errors.add(field_name, :incompatable)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::INCOMPATABLE)
           nil
         end
       end

data/lib/schema/parsers/common.rb

@@ -19,16 +19,16 @@ module Schema
           if INTEGER_REGEX.match?(value)
             Integer(value)
           else
-            parsing_errors.add(field_name, :invalid)
+            parsing_errors.add(field_name, ::Schema::ParsingErrors::INVALID)
             nil
           end
         when Float
-          parsing_errors.add(field_name, :incompatable) if (value % 1) > 0.0
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::INCOMPATABLE) if (value % 1) > 0.0
           value.to_i
         when nil
           nil
         else
-          parsing_errors.add(field_name, :unhandled_type)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::UNHANDLED_TYPE)
           nil
         end
       end
@@ -39,7 +39,7 @@ module Schema
         when String
           value
         when ::Hash, ::Array
-          parsing_errors.add(field_name, :incompatable)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::INCOMPATABLE)
           nil
         when nil
           nil
@@ -58,13 +58,13 @@ module Schema
           if FLOAT_REGEX.match?(value)
             Float(value)
           else
-            parsing_errors.add(field_name, :invalid)
+            parsing_errors.add(field_name, ::Schema::ParsingErrors::INVALID)
             nil
           end
         when nil
           nil
         else
-          parsing_errors.add(field_name, :unhandled_type)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::UNHANDLED_TYPE)
           nil
         end
       end
@@ -79,13 +79,13 @@ module Schema
           begin
             Time.xmlschema(value)
           rescue ArgumentError
-            parsing_errors.add(field_name, :invalid)
+            parsing_errors.add(field_name, ::Schema::ParsingErrors::INVALID)
             nil
           end
         when nil
           nil
         else
-          parsing_errors.add(field_name, :unhandled_type)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::UNHANDLED_TYPE)
           nil
         end
       end
@@ -100,13 +100,13 @@ module Schema
           begin
             Date.parse(value)
           rescue ArgumentError
-            parsing_errors.add(field_name, :invalid)
+            parsing_errors.add(field_name, ::Schema::ParsingErrors::INVALID)
             nil
           end
         when nil
           nil
         else
-          parsing_errors.add(field_name, :unhandled_type)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::UNHANDLED_TYPE)
           nil
         end
       end
@@ -122,7 +122,7 @@ module Schema
         when nil
           nil
         else
-          parsing_errors.add(field_name, :unhandled_type)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::UNHANDLED_TYPE)
           nil
         end
       end

data/lib/schema/parsers/hash.rb

@@ -9,7 +9,7 @@ module Schema
         when ::Hash
           value
         else
-          parsing_errors.add(field_name, :incompatable)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::INCOMPATABLE)
           nil
         end
       end

data/lib/schema/parsers/json.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'json'
 
 module Schema
@@ -11,11 +12,11 @@ module Schema
           begin
             ::JSON.parse(value)
           rescue ::JSON::ParserError
-            parsing_errors.add(field_name, :invalid)
+            parsing_errors.add(field_name, ::Schema::ParsingErrors::INVALID)
             nil
           end
         else
-          parsing_errors.add(field_name, :incompatable)
+          parsing_errors.add(field_name, ::Schema::ParsingErrors::INCOMPATABLE)
           nil
         end
       end

data/lib/schema/parsing_errors.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Schema
+  # Schema::ParsingErrors is a collection of parsing error messages
+  module ParsingErrors
+    INVALID = 'invalid'
+    INCOMPATABLE = 'incompatable'
+    UNKNOWN = 'unknown'
+    UNKNOWN_ATTRIBUTE = 'unknown_attribute'
+    UNHANDLED_TYPE = 'unhandled_type'
+  end
+end

data/lib/schema.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
+autoload :SchemaValidator, 'schema_validator'
+
 # Schema is a series of tools for transforming data into models
 module Schema
+  autoload :ActiveModelValidations, 'schema/active_model_validations'
   autoload :ArrayHeaders, 'schema/array_headers'
   autoload :Arrays, 'schema/arrays'
   autoload :CSVParser, 'schema/csv_parser'
   autoload :Errors, 'schema/errors'
   autoload :CSVParser, 'schema/csv_parser'
   autoload :Model, 'schema/model'
+  autoload :ParsingErrors, 'schema/parsing_errors'
   autoload :Utils, 'schema/utils'
 
   # Schema::Parsers are used to convert values into the correct data type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema-model
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Doug Youch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/schema.rb
+- lib/schema/active_model_validations.rb
 - lib/schema/array_headers.rb
 - lib/schema/arrays.rb
 - lib/schema/associations/base.rb
@@ -45,6 +46,7 @@ files:
 - lib/schema/parsers/common.rb
 - lib/schema/parsers/hash.rb
 - lib/schema/parsers/json.rb
+- lib/schema/parsing_errors.rb
 - lib/schema/utils.rb
 - lib/schema_validator.rb
 homepage: https://github.com/dougyouch/schema