validator_fn 0.3.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9bfac9a9c6e88cd08fc270860a60a919c2389a390fb7086e8767048542e0c7
-  data.tar.gz: 2168dc33c3a7bc6fba8f47f3832c744a2ec9514b0f9b752aa35fe2ce93d92c63
+  metadata.gz: 1748730b9f3adb3a7388282d193b000ba67f97f5f418aa306c699eb546bcfa03
+  data.tar.gz: a3625b480793914edb326fadd3640ec2e607dd3dc6e443f4ec3460bdb2c39a36
 SHA512:
-  metadata.gz: 944e615250789bb463461c42aab479685ca1dba5e386550d1d54ae08234e1a7142d21c78680b0aab1071fdcbc89666e9ba6be8ed68674cbe3fe31d9677ef48a7
-  data.tar.gz: d4f6d2389ecfef0b4b0e12305097b3890b80577d57318a9b8cfa99ca7e0029f2eacb68fddfce295fb59b818a3f670ac68f0dbef955125253d9a0690bb870b61a
+  metadata.gz: d8a1749eb560ed5935b879faac3437912bb7ef618b35bc5ea54d1f15664ec7eba6006b6c7a10099eae0014dc84844b433e648d7dece870cadca44122db03760c
+  data.tar.gz: fa5a2b780de8ea3ef0982c3f5107ddabc194d71d058ca24025bb2d62b3c9fdbe9fe8b4089d7711007ec41e5f3445b67255b718677788c589f9bedcd4d5d55ae9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validator_fn (0.3.9)
+    validator_fn (0.4.0)
       fn_reader
 
 GEM

data/README.md

@@ -62,7 +62,7 @@ user = hash_of.({name: is_a.(String), age: to_int})
 user.({name: "", age: "234"})
 ```
 
-Since we are using curried lambdas, you can compose validators as you which.
+Since we are using curried lambdas, you can compose validators as you wish.
 
 ```ruby
 postal_code = -> a {
@@ -97,7 +97,7 @@ This makes it very useful for processing JSON payloads.
 You can generate validator code from existing structure:
 
 ```ruby
-require 'openuri'
+require 'open-uri'
 require "json"
 struct = JSON.parse(URI.open("https://api.github.com/users/defunkt").read)
 
@@ -109,6 +109,9 @@ code = ValidatorFn.generate_validator.(struct)
 # You can reformat it using a code formatter
 require "rufo"
 puts Rufo.format(code)
+```
+The output
+```
 hash_of.({ "login" => is_a.(String),
            "id" => is_a.(Integer),
            "node_id" => is_a.(String),

data/lib/validator_fn/error.rb

@@ -23,7 +23,7 @@ module ValidatorFn
 
   class MissingKey < Error
     def initialize(key)
-      super("Missing field #{key}")
+      super("Missing field #{key.inspect}")
     end
   end
 end

data/lib/validator_fn/version.rb

@@ -1,3 +1,3 @@
 module ValidatorFn
-  VERSION = "0.3.9"
+  VERSION = "0.5.0"
 end

data/lib/validator_fn.rb

@@ -4,7 +4,7 @@ require "fn_reader"
 
 module ValidatorFn
   fn_reader :something, :matches, :either, :array_of, :any, :is_nil,
-    :maybe, :present, :is_a, :is_a_bool, :int, :hash_of, :invalid, :generate_validator, :handle_error, :error_str, :apply
+    :maybe, :present, :is_a, :is_a_bool, :int, :hash_of, :invalid, :generate_validator, :handle_error, :error_str, :apply, :enum_of
 
   @@apply = ->fn, a {
     begin
@@ -24,6 +24,10 @@ module ValidatorFn
     end
     value
   }.curry
+  @@enum_of = ->enum, a {
+    raise Error.new("Should be in #{enum.join(",")}") unless enum.include?(a)
+    a
+  }.curry
   @@array_of = ->fn, array {
     is_a.(Array).(array)
     array.each_with_index.map do |a, idx|
@@ -42,10 +46,13 @@ module ValidatorFn
   @@hash_of = ->fields, hash {
     hash ||= {}
     fields.reduce({}) do |memo, (key, fn)|
-      memo[key] = fn.(hash[key])
+      value = hash.fetch(key) { raise MissingKey.new(key) }
+      memo[key] = fn.(value)
       memo
     rescue Error => e
       invalid.("Invalid value for #{key.inspect} key:")
+    rescue MissingKey => e
+      invalid.(e.message)
     end
   }.curry
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validator_fn
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Martin Chabot
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fn_reader
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Series of lambdas for validating Ruby structures