easol-canvas 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba3808e67ba544e61935e149356057b6a757454f3b1dbe2b4da9f85035a8edf
-  data.tar.gz: f89ba9a8687bf7ef413a19892892ca2c80482482bb8774e5c3e73030c133b220
+  metadata.gz: 2e5275a64698399c6ccd64afd11014f878d10e8807bf74e64c0d48e85a3d8bb9
+  data.tar.gz: ceee5b6ac86486dbc5c359efe9a25bbe50f798180c6b64eb4b926c51bba45b6c
 SHA512:
-  metadata.gz: aca6441038d4dd7ddfed0f8d94e7641131cb4972607f7e313ac1c448218553e003850604df4635c07a0afa6cc796e576fea4250c847eb74aad711ff6e6ff7cc5
-  data.tar.gz: 1fa803e9cd5d217c6309ec7b20b0719ac7e27cb9bee9cc8713bc88d3961abd47a25e071242dfb151aa630f2b1d882f63a3dded9641b971ec054f9f476a15aed3
+  metadata.gz: 4c83c2f825f1564e12d208098a0af2f926352d27e4e7c4b6aa6002d5983d06153bab1650edb7a02b52fcd9f2fb79302653ee58c9d481e8e86ef50d11d80a46c8
+  data.tar.gz: 6e28e6f1839eb050eecc0ca9ecaff1f8c13b0a0ab19a4d979a7aa4714c3423148f8de97f6aee0957eeaa789773f5b43ffc48b477f4e94d32caad51a7c928562d

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

@@ -7,7 +7,7 @@ module Canvas
       # Attribute validations specific to product-type variables.
       class Product < Base
         ALLOWED_DEFAULT_VALUES = %w[random].freeze
-        ALLOWED_RESTRICTIONS = %w[experiences accommodations extras].freeze
+        ALLOWED_RESTRICTIONS = %w[experiences accommodations].freeze
 
         def validate
           super &&

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.0"
+  VERSION = "3.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Kyle Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -98,7 +98,7 @@ dependencies:
 description: |
   Canvas is a command line tool to help with building themes for Easol.
   It provides tooling to check theme directories for errors and to make sure
-  they confirm with the Easol theme spec.
+  they conform with the Easol theme spec.
 email: developers@easol.com
 executables:
 - canvas