easol-canvas 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b5e740ec1e4c86868924b010cbd13101ebd86b46a49bb719ed289bce268e8c
-  data.tar.gz: 5d79fe71368fb9bdd0f76c85803957291f34c9fd66c68904c68a7cbfede36680
+  metadata.gz: dc609cfddb0df9a458af860e381eda6b754b87c059f3cd5d98e88bfe4d2f0ba1
+  data.tar.gz: db1a86ed56ebb2dd0ef04c26648a92027fd53be43dd8ec143fcf36cc22c7ead3
 SHA512:
-  metadata.gz: bbde53fa9c5acbc400c899573b823913e39b732693122925eaa553f6e045bbeba3ad67eac2b20cfec69c9b767259fa3a9b7d947f97e62bf9b34d42ea13d4c8bd
-  data.tar.gz: c7d11808b5dc2b9eb70f8b22b2a89058bd38cb3cde27389a258cc9abcc27c5e3197a1eb2e58d92fc370683b590e59ba79ab5cbc835427b3112f23288b63fe526
+  metadata.gz: 8daf60e7d01290bcbee438acc338ed817ba21cdf9a3b47a4adc2faad0288595cc8fa2c46093ab31c9182bbdc2ab1ec1dd3104484a11534b7044b315263072759
+  data.tar.gz: d02ec887f74f5c30092500c4c92514f91f1253090fb0fac3b33d4aa6c6cb35c6eee44c82a5df9ed0d9ce7eb5a4a231dbdd5eb8db443c98472a42abb105815423

data/lib/canvas/validators/custom_type.rb

@@ -38,6 +38,7 @@ module Canvas
           ensure_has_required_keys &&
           ensure_no_unrecognized_keys &&
           ensure_keys_are_correct_types &&
+          ensure_key_is_lowercase &&
           ensure_key_value_is_not_reserved &&
           ensure_no_duplicate_attributes &&
           ensure_attributes_are_valid &&
@@ -92,6 +93,13 @@ module Canvas
         true
       end
 
+      def ensure_key_is_lowercase
+        return true if schema["key"] == schema["key"].downcase
+
+        @errors << %("key" #{schema["key"]} must be lowercase)
+        false
+      end
+
       # Ensuring the value for key doesn't clash with our primitive type keys.
       # See {Canvas::Constants::PRIMITIVE_TYPES}
       def ensure_key_value_is_not_reserved

data/lib/canvas/validators/schema_attributes/variant.rb

@@ -10,7 +10,8 @@ module Canvas
 
         def validate
           super &&
-            ensure_default_values_are_valid
+            ensure_default_values_are_valid &&
+            ensure_only_from_values_are_valid
         end
 
         private
@@ -23,6 +24,10 @@ module Canvas
           end
         end
 
+        def optional_keys
+          super.merge("only_from" => Array)
+        end
+
         def ensure_default_values_are_valid
           return true unless attribute.key?("default")
 
@@ -36,13 +41,29 @@ module Canvas
         def default_value_is_valid?(value)
           value = value.downcase
           if !ALLOWED_DEFAULT_VALUES.include?(value)
-            @errors << "\"default\" for variant-type variables must be "\
-                       "one of: #{ALLOWED_DEFAULT_VALUES.join(', ')}"
+            @errors << %["default" for variant-type variables must be one of: #{ALLOWED_DEFAULT_VALUES.join(', ')}]
             false
           else
             true
           end
         end
+
+        def ensure_only_from_values_are_valid
+          return true unless attribute.key?("only_from")
+
+          if attribute["only_from"].empty?
+            @errors << %["only_from" cannot be empty]
+            return false
+          end
+
+          unsupported_entries = attribute["only_from"] - Product::ALLOWED_RESTRICTIONS
+          if unsupported_entries.any?
+            @errors << %["only_from" for variant-type variables must be one of: #{Product::ALLOWED_RESTRICTIONS.join(', ')}]
+            return false
+          end
+
+          true
+        end
       end
     end
   end

data/lib/canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canvas
-  VERSION = "3.3.1"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Kyle Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor