plumb 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24a6b9a58d29c5aa9e443586d0d529aaf79fcf91a5ee724366d9153174c73fa9
-  data.tar.gz: c6200d6bc762aecf985e359c5326c6014003950f998406dabbfaa9c7aca8fc10
+  metadata.gz: c718a272ada163dfc399bd4a6ae0353ac95b99210ac5450e5adf5e77881ed2d5
+  data.tar.gz: 2721e793e2cba293fcf8859d6b1ff960b7bc5e0ae33cf4374aa09a7532c6724b
 SHA512:
-  metadata.gz: d683a2a89fc717f406efcc16b884cafa10dafa148be86ffc1810a377b4f065e1e40e0d21719fe70752e67d5c4eef86843076fa9ffd1513a2d345f666b705577f
-  data.tar.gz: 5788b7b83dfb2c342a9c59f1080b30e3db93f9ff7b3c3f6eda0060021275ae648406559bb9bbee96fe204463a3715571e7e042401771e98c9836f5d5306a4087
+  metadata.gz: c1ab0c74145b108e9b23503fe701a7237defcd72a463d05aa9500da2db1835559b279e3a0199c68774285000012b400d04026636dfbe21e53ee1872058bf7aed
+  data.tar.gz: fb65d7c1ebd803e08137a4473260a7050ec8025311696742ae8762b4b1fea77327ce5059a9b08a28c1ea78d3a9d8851378152c6b7f33d7489bc628f4375e2b9c

data/lib/plumb/array_class.rb

@@ -65,7 +65,7 @@ module Plumb
       # Steps might return the same result instance, so we map the values directly
       # separate from the errors.
       element_result = result.dup
-      errors = {}
+      errors = Hash.new(capacity: result.value.size)
       values = result.value.map.with_index do |e, idx|
         re = element_type.call(element_result.reset(e))
         errors[idx] = re.errors unless re.valid?

data/lib/plumb/attributes.rb

@@ -228,12 +228,14 @@ module Plumb
         super
       end
 
+      MUST_BE_HASH = ['Must be a Hash of attributes'].freeze
+
       # The Plumb::Step interface
       # @param result [Plumb::Result::Valid]
       # @return [Plumb::Result::Valid, Plumb::Result::Invalid]
       def call(result)
         return result if result.value.is_a?(self)
-        return result.invalid(errors: ['Must be a Hash of attributes']) unless result.value.respond_to?(:to_h)
+        return result.invalid(errors: MUST_BE_HASH) unless result.value.respond_to?(:to_h)
 
         instance = new(result.value.to_h)
         instance.valid? ? result.valid(instance) : result.invalid(instance, errors: instance.errors.to_h)

data/lib/plumb/composable.rb

@@ -295,6 +295,18 @@ module Plumb
       end
 
       def call(result) = type.call(result)
+
+      # Two nodes are equal when they wrap the same type with the same
+      # node_name and args. The default Composable#== compares #children,
+      # but a Node holds its identity in @node_name/@type/@args, so without
+      # this every as_node-wrapped type (Email, Boolean, etc.) would compare
+      # equal to every other.
+      def ==(other)
+        other.is_a?(self.class) &&
+          other.node_name == node_name &&
+          other.type == type &&
+          other.args == args
+      end
     end
 
     #  Wrap a Step in a node with a custom #node_name

data/lib/plumb/hash_class.rb

@@ -108,24 +108,30 @@ module Plumb
       return result unless _schema.any?
 
       input = result.value
-      errors = {}
-      field_result = result.dup
-      initial = {}
-      initial = initial.merge(input) if @inclusive
-      output = _schema.each.with_object(initial) do |(key, field), ret|
+      errors = nil # Do not allocate errors unless needed
+      output = @inclusive ? input.dup : {}
+      field_result = Result.valid(nil)
+
+      _schema.each do |key, field|
         key_s = key.to_key
         if input.key?(key_s)
           r = field.call(field_result.reset(input[key_s]))
-          errors[key_s] = r.errors unless r.valid?
-          ret[key_s] = r.value
+          output[key_s] = r.value
+          unless r.valid?
+            errors ||= {}
+            errors[key_s] = r.errors
+          end
         elsif !key.optional?
           r = field.call(BLANK_RESULT)
-          errors[key_s] = r.errors unless r.valid?
-          ret[key_s] = r.value unless r.value == Undefined
+          output[key_s] = r.value unless r.value == Undefined
+          unless r.valid?
+            errors ||= {}
+            errors[key_s] = r.errors
+          end
         end
       end
 
-      errors.any? ? result.invalid(output, errors:) : result.valid(output)
+      errors ? result.invalid(output, errors:) : result.valid(output)
     end
 
     def ==(other)

data/lib/plumb/interface_class.rb

@@ -59,7 +59,7 @@ module Plumb
     def call(result)
       obj = result.value
       missing_methods = @method_names.reject { |m| obj.respond_to?(m) }
-      return result.invalid(errors: "missing methods: #{missing_methods.join(', ')}") if missing_methods.any?
+      return result.invalid(errors: "Invalid #{self.name}. Missing methods: #{missing_methods.join(', ')}") if missing_methods.any?
 
       result
     end

data/lib/plumb/or.rb

@@ -27,8 +27,13 @@ module Plumb
       if right_result.valid?
         right_result
       else
-        right_result.invalid(errors: [left_result.errors,
-                                      right_result.errors].flatten)
+        # Decrease Array allocations slightly
+        # OR can be really expensive in composite ORed types
+        left_errors = left_result.errors.is_a?(Array) ? left_result.errors : [left_result.errors]
+        right_errors = right_result.errors.is_a?(Array) ? right_result.errors.first : right_result.errors
+        left_errors << right_errors
+
+        right_result.invalid(errors: left_errors)
       end
     end
   end

data/lib/plumb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Plumb
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plumb
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Ismael Celis
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Data validation and transformation library.
 test_files: []