validator_fn 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284455c8d1f77ee4413e6596c6bb2f4a3c320406d36c88c90284be93a55268fb
-  data.tar.gz: 989078e17fd8e98f7fe28081f1453cd6796751d5de7b2235703ce7d03ac0ea2a
+  metadata.gz: 59d88acda61662b4adc0cf17e6abe58ccab42be28b84291191504ed2545e8d5a
+  data.tar.gz: 0c7485fe2f3208a490ad0e4220f00e5770cad7ecb1a1798f5cae98d7bde40a0e
 SHA512:
-  metadata.gz: f6d0e379884cd064bfbbff8ab6d9502d5f4afb7a09223110240eadf94ee95e6b67ce7e4c3a85db53273bf5c084bb83200edb697f06043e84b0bc36792b955d9d
-  data.tar.gz: 7e7422bd1f91b7fa3563081d2fc7c1466940f725852694119146659327beaeed8467a472bfee80a7fc92674192ec5d68c28cfd0035cd6d3da70c9f90a6baa891
+  metadata.gz: cea6572a3db872f38516950d3b763b67a81bd1d10dd576624662b84e9203a99e80c9fdaba10b21f6e77d56ba079d261f27d2a5a454bb825dc26b0f64be6664fa
+  data.tar.gz: f4917cd8611691a44dc56b49fa2c36b350c30edced673ac71a4aa6b41f412ffb0e538a22d2edcc98ba02522cb2c9aabb2624fa68b43898ee0ca3b22f52113e00

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+gem "pry-nav"

data/Gemfile.lock

@@ -1,14 +1,21 @@
 PATH
   remote: .
   specs:
-    validator_fn (0.1.1)
+    validator_fn (0.1.2)
       fn_reader
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.4.4)
     fn_reader (0.1.0)
+    method_source (0.9.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
     rake (12.3.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -28,6 +35,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  pry-nav
   rake (~> 12.0)
   rspec (~> 3.0)
   validator_fn!

data/lib/validator_fn.rb

@@ -1,38 +1,65 @@
 require "validator_fn/version"
 require "fn_reader"
+require "pry-nav"
 
 module ValidatorFn
   class Error < StandardError; end
 
   fn_reader :something, :matches, :either, :array_of, :any, :is_nil,
-    :maybe, :present, :is_a, :int, :hash_of, :invalid, :generate_validator, :handle_error, :error_str
+    :maybe, :present, :is_a, :int, :hash_of, :invalid, :generate_validator, :handle_error, :error_str, :apply
 
-  class Error < StandardError; end
+  class Error < StandardError
+    attr_reader :my_msg
+
+    def initialize(msg)
+      @my_msg = msg
+      super(msg)
+    end
+
+    def message(indent = 0)
+      if cause
+        cause_msg = if cause.kind_of?(Error)
+            cause.message(indent + 1)
+          else
+            cause.message
+          end
+        my_msg + "\n" + ("  " * (indent + 1)) + cause_msg
+      else
+        my_msg
+      end
+    end
+  end
 
+  @@apply = ->fn, a {
+    begin
+      fn.(a)
+    rescue StandardError => e
+      invalid.("Error applying function")
+    end
+  }.curry
   @@invalid = ->msg { raise Error.new(msg) }
   @@something = ->a { invalid.("Cannot be nil") if a.nil?; a }
   @@matches = ->regex, a { invalid.("Should match") unless a =~ regex }.curry
   @@either = ->a, b, value {
     begin
-      a.(value) || a.(value)
+      a.(value)
     rescue Error => e
+      b.(value)
     end
-    a
+    value
   }.curry
   @@array_of = ->fn, array {
     is_a.(Array).(array)
-    array.each_with_index do |a, idx|
+    array.each_with_index.map do |a, idx|
       fn.(a)
     rescue Error => e
       invalid.("Invalid value in Array at index #{idx}")
     end
-    array
   }.curry
   @@any = ->a { a }
   @@is_nil = ->a { invalid.("Should be nil") unless a.nil?; a }
   @@maybe = either.(is_nil)
   @@is_a = ->klass, a { invalid.("Expected type #{klass}, got #{a.inspect}") unless a.is_a?(klass); a }.curry
-  @@int = ->a { invalid.("#{a.inspect} is not a valid integer") unless a.is_a?(Integer) }
   @@hash_of = ->fields, hash {
     hash ||= {}
     fields.map do |(key, fn)|

data/lib/validator_fn/version.rb

@@ -1,3 +1,3 @@
 module ValidatorFn
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validator_fn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Martin Chabot
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fn_reader