schema-model 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2930827fc56c8ef958799e26a4fe5c0e4033449ff61d0e58bbdd107d77dc0f2c
-  data.tar.gz: 43306799287c8c4edb21e07bf21924f2a6b165bdef2cb934401edb2e0549414d
+  metadata.gz: da011575b9914ac318fbb72560445ea592d6a90ae38cb585938875545623e0e1
+  data.tar.gz: 79a01b51f835ce95c06ab76455c6b003195b594320b847ce2c86f65654e7ea23
 SHA512:
-  metadata.gz: 97ac444c3f460681e01b529f6d5e872f426e3b3ef44097a9c6492168f2175dc403b3f98318e72f1c79702440bbb7b2d45c9158591896e71c2bd94f0b6f4ece8b
-  data.tar.gz: 4a090a51203d1c97c75946ce6f297252e31a1137b7e7637821d148c702ba148f1d13e4de5b0c5c5843e2dbbf4b314a3688d1b7d7ced8e291050f8eb240964ee7
+  metadata.gz: c2ee95f2602f4217373b1f65ecbfd8f6f16c39e0cc1d3627f60b34340ba67071b120a336a96017ff2f219a854aca6dcd243fa6dc759a79d223922b10035287f5
+  data.tar.gz: 9b3a13a9c2e825a47f76b82f19942703be354d5c8ae912d4f1c2b44e9a5f31f3e9134b6df509531be5113ae75eacdf7a225007cbeead2992404f1b442e302d1a

data/lib/schema/associations/dynamic_types.rb

@@ -24,7 +24,7 @@ module Schema
         end
 
         def dynamic_type_names
-          dynamic_types.keys
+          dynamic_types.keys - [:default]
         end
 
         private

data/lib/schema/associations/schema_creator.rb

@@ -58,7 +58,13 @@ module Schema
           name = name.downcase if @ignorecase
           return base_schema.class.const_get(class_name) if name == type
         end
-        nil
+        get_default_dynamic_schema_class(base_schema)
+      end
+
+      def get_default_dynamic_schema_class(base_schema)
+        return unless (class_name = @types[:default])
+
+        base_schema.class.const_get(class_name)
       end
 
       def get_dynamic_type(base_schema, data)

data/lib/schema/parsers/array.rb

@@ -7,7 +7,8 @@ module Schema
       def parse_array(field_name, parsing_errors, value)
         case value
         when ::Array
-          value
+          schema_options = self.class.schema[field_name]
+          Array.convert_array_values(self, field_name, parsing_errors, value, schema_options)
         when String
           schema_options = self.class.schema[field_name]
           if (data = Array.parse_string_array(self, field_name, parsing_errors, value, schema_options))

data/lib/schema_validator.rb

@@ -3,6 +3,20 @@
 # SchemaValidator validates nested schemas
 class SchemaValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors.add(attribute, options.fetch(:message, :invalid)) if value && !value.valid?
+    record.errors.add(attribute, options.fetch(:message, :invalid)) unless valid_schema?(value)
+  end
+
+  private
+
+  def valid_schema?(value)
+    return true unless value
+
+    if value.is_a?(Array)
+      value.all? do |schema|
+        !schema || schema.valid?
+      end
+    else
+      value.valid?
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema-model
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Doug Youch