broi-input 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec70915468a81f1e76fd79fa968c819a708c8d65040b2feee9da121f6f21458
-  data.tar.gz: 1ba022fe06b37bac5d8d59aa263420cd5069cc481a215c43dbb58c5b2e665093
+  metadata.gz: e13c93b82d7cb1ba3fa069fcb9c5bda023c61c6988281f7147b767043a97d7dc
+  data.tar.gz: fa65e198e065ae420b64b9e9134d23cb43359858f59dbdcef13e49ee7b43f7f9
 SHA512:
-  metadata.gz: 35b14bb7ffa1339d748fb21cc66bb545ff231dde3f78798282199adfc72f192af22cba0e86e9780750948ebc0129f83805bd54a52918596097bd041fb943d603
-  data.tar.gz: 781d9b48dc23b59c32cf24ed7c174e3c04c2dca8de0edaafeada7321e244776cc5a32ddf668888a5a6540518f796362f02adc4eec3d8bd5977c6aaa3a0d96181
+  metadata.gz: 150a21be121b39c47a2e85a00fcc406521ae6b4185ca034ede43a0250e410e936f493e86f051f132dac15cab6386c6902fb60af7283eac2f92f66ce3ced929b4
+  data.tar.gz: b7e507c92ec3e84d1938e86d67be7f4add22596f5091546dec9ab5c93c4f9b9517b3c57e05886bf54186f560cb961a020357ce6ca7d1b4fa25a711fb85dd66f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    broi-input (0.1.1)
+    broi-input (0.1.2)
       dry-monads (~> 1.0)
       dry-struct (~> 0.5)
       dry-validation (~> 0.12)

data/input.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'broi-input'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['broisatse']
   spec.email         = ['sklajn@gmail.com']
 

data/lib/broi/errors.rb

@@ -0,0 +1,49 @@
+module Broi
+  # TODO: Separate gem?
+  class Errors
+    include Enumerable
+
+    def initialize(error_hash = {})
+      @errors = errorize_hash(error_hash)
+    end
+
+    def to_nested_hash
+      Broi::Input::Utils.deep_transform_values(@errors) do |value|
+        value.respond_to?(:to_nested_hash) ? value.to_nested_hash : value
+      end
+    end
+
+    def to_flat_hash
+      result = {}
+      @errors.each do |key, value|
+        if value.respond_to?(:to_flat_hash)
+          value.to_flat_hash.each do |inner_key, inner_value|
+            result[:"#{key}.#{inner_key}"] = inner_value.dup
+          end
+        else
+          result[key] = value.dup
+        end
+      end
+      result
+    end
+
+    def each(&block)
+      to_flat_hash.each(&block)
+    end
+
+    def [](key)
+      key, nested = key.to_s.split('.', 2)
+      return unless (result = @errors[key.to_sym])
+      return result unless nested
+      result[nested]
+    end
+
+    alias empty? none?
+
+    private
+
+    def errorize_hash(hash)
+      hash.map {|k, v| [k.to_sym, v.is_a?(Hash) ? Errors.new(errorize_hash(v)) : v] }.to_h
+    end
+  end
+end

data/lib/broi/input/success.rb

@@ -6,7 +6,7 @@ module Broi
       end
 
       def errors
-        {}
+        Errors.new({})
       end
     end
   end

data/lib/broi/input.rb

@@ -2,6 +2,7 @@ require 'dry-struct'
 require 'dry/validation'
 require 'dry/monads/result'
 
+require 'broi/errors'
 require 'broi/input/success'
 require 'broi/input/failure'
 require 'broi/input/utils'
@@ -9,8 +10,6 @@ require 'broi/input/value'
 require 'broi/input/invalid_value'
 require 'broi/input/soft'
 
-require 'byebug'
-
 module Broi
   class Input < Dry::Struct::Value
 
@@ -43,18 +42,10 @@ module Broi
       def call(params = {})
         result = validation.(params)
         input = Soft.(self, result.output, result.errors)
-        # output = input[result.output]
-        # input = Utils.deep_merge(output, result.errors) do |target, _error|
-        #   InvalidValue.new(target)
-        # end
-        # input = Utils.deep_transform_values(input) do |value|
-        #   value.is_a?(InvalidValue) ? value : Value.new(value)
-        # end
-        # input = new(input)
         if result.success?
           Success.new(input)
         else
-          Failure.new(input, result.errors)
+          Failure.new(input, Errors.new(result.errors))
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: broi-input
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - broisatse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -141,6 +141,7 @@ files:
 - bin/console
 - bin/setup
 - input.gemspec
+- lib/broi/errors.rb
 - lib/broi/input.rb
 - lib/broi/input/failure.rb
 - lib/broi/input/invalid_error.rb