runapi-core 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb5369d4bc3ec00ba92341e7151b7e1d62b6972ef3e84fd35474638da86a9926
-  data.tar.gz: ed1fe305dba138db597e86e31421312bf0a017d9c3ed1564b0e44044a9a537a0
+  metadata.gz: ed0b6cfd9c5bdf13cf3eefa0908ca4daffe4eae9d73c2f57a42676bfacfb4106
+  data.tar.gz: 35666b5f7e5d4196e04d27c35b6c434a155781d9a54dfa489aa5f17fea9037ee
 SHA512:
-  metadata.gz: 7c885608b3f52f9e5ab11937e032149a164a781c8f413e19d394484a7b6576b622afd82c2c152ed52ca5ff67c389f9ee40d28aef174f7553947fd888c204a1cb
-  data.tar.gz: b0af7a1272a3f69003bb4fa80ca4848511f847dcd7a5a1e1c5678b358c90313962312ddc4f7a0f870a32de801cf2e5af94e33879fec14084ecf1b36e920be8ed
+  metadata.gz: e2126afb383fc59dd861c8ff3e08fc248b05ddbb0d205b0f9f26e67c2a10db51022d1c0f07f19f2bb85b58dd366d9a8ed5b8be7f44116321d60b6a22dbe8cb79
+  data.tar.gz: f335af67d8763ea0cd6a02f31e0278b6edef4628e7d1d7e3c7c2962cdc39b285b064f36ec38439db659bc7c7c2860bde08bad28a0483a1a48a0bae0812b43115

data/lib/runapi/core/http_client.rb

@@ -127,7 +127,9 @@ module RunApi
 
       def multipart_parts(body)
         opened_files = []
-        field_parts = body.fields.map { |key, value| [key, value.to_s] }
+        field_parts = body.fields.flat_map do |key, value|
+          Array(value).map { |item| [key, item.to_s] }
+        end
         file_parts = body.files.map do |key, file|
           options = {filename: file.filename}
           options[:content_type] = file.content_type if file.content_type

data/lib/runapi/core/resource_helpers.rb

@@ -149,7 +149,9 @@ module RunApi
 
       def enum_value_allowed?(enum, value)
         enum.any? do |allowed|
-          if allowed.is_a?(Numeric)
+          if allowed == true || allowed == false
+            value == allowed
+          elsif allowed.is_a?(Numeric)
             value.is_a?(Numeric) && value == allowed
           elsif value.is_a?(Numeric)
             allowed == value
@@ -161,25 +163,57 @@ module RunApi
 
       def enforce_contract_rule!(params, rule)
         conditions = rule["when"] || {}
-        return unless conditions.all? { |field, value| rule_condition_met?(params, field, value) }
+        return unless conditions.all? { |field, condition| rule_condition_met?(params, field, condition) }
+
+        context = conditions.map { |field, condition| rule_condition_label(field, condition) }.join(" and ")
+        qualifier = context.empty? ? "" : " when #{context}"
 
-        context = conditions.map { |field, value| "#{field} is #{value}" }.join(" and ")
         Array(rule["required"]).each do |field|
           next if field_present?(params, field)
 
-          raise Core::ValidationError, "#{field} is required when #{context}"
+          raise Core::ValidationError, "#{field} is required#{qualifier}"
+        end
+
+        required_any = Array(rule["required_any"])
+        if required_any.any? && required_any.none? { |field| field_present?(params, field) }
+          raise Core::ValidationError, "one of #{required_any.join(", ")} is required#{qualifier}"
         end
+
         Array(rule["forbidden"]).each do |field|
           next unless field_present?(params, field)
 
-          raise Core::ValidationError, "#{field} is not allowed when #{context}"
+          raise Core::ValidationError, "#{field} is not allowed#{qualifier}"
+        end
+
+        (rule["enum"] || {}).each do |field, allowed|
+          next unless field_present?(params, field)
+
+          value = param_value(params, field)
+          next if Array(allowed).any? { |candidate| candidate.to_s == value.to_s }
+
+          raise Core::ValidationError, "#{field} must be one of: #{Array(allowed).join(", ")}#{qualifier}"
         end
       end
 
-      def rule_condition_met?(params, field, value)
+      # A `when` entry is either `{present: true|false}` or a scalar the
+      # supplied value must equal. Rules never resolve declared defaults.
+      def rule_condition_met?(params, field, condition)
+        if condition.is_a?(Hash) && (condition.key?("present") || condition.key?(:present))
+          expected = condition["present"].nil? ? condition[:present] : condition["present"]
+          return field_present?(params, field) == (expected == true)
+        end
         return false unless param_key?(params, field)
 
-        param_value(params, field).to_s == value.to_s
+        param_value(params, field).to_s == condition.to_s
+      end
+
+      def rule_condition_label(field, condition)
+        if condition.is_a?(Hash) && (condition.key?("present") || condition.key?(:present))
+          expected = condition["present"].nil? ? condition[:present] : condition["present"]
+          return (expected == true) ? "#{field} is present" : "#{field} is absent"
+        end
+
+        "#{field} is #{condition}"
       end
 
       def field_present?(params, field)

data/lib/runapi/core/version.rb

@@ -2,7 +2,7 @@
 
 module RunApi
   module Core
-    VERSION = "0.3.1"
+    VERSION = "0.3.3"
   end
 
   VERSION = Core::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runapi-core
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - RunAPI