yarrow 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1a14b73412ec27fad2ff75bd7944f1ef25f241779c532d3449339a436e4c32
-  data.tar.gz: 2cf2db75cc8c107b1d1bcbb6a79ad7fd92a6ba32e27413f2057158f7b8bb3c8a
+  metadata.gz: 30b0321a3081bb91c9f121e41e360b548eab71f03c4cbfded36709473e3cc586
+  data.tar.gz: 67ed41c8e4579d80e211fc08c125410b1f957adfe8e505d778020f02566efd33
 SHA512:
-  metadata.gz: 436cec2447208c2641d4ac332cbb1910b7b016983a0630782282a28fe34e7a929b4661f424f0002d937854316d00f6d822ec05407f40185a7d5bbd642a2b88d2
-  data.tar.gz: bd798c5d999b7d2665209778d507bfe9b54da98473850dd66b62c60391a270f93aa00d913315a7b29e6c92e7cb436f64fb89b692ecb4ea2da8bad5387d43b0b6
+  metadata.gz: fcff8cbddd540f7a44d32411c5930a70fff1a86581b5e6efdfc2e1f1eae43afa729b3f254b56581d33bcaf4d30828b2409e3129284a1ba1221823c8a26758fdb
+  data.tar.gz: 485752729e471a4b33f55663f8e762f8d93d1fc9ec29763a2ead843bbda1bb662b210163c723c8dc7d71111693c703e780e8c6f1394c9c317ef254461a3e8d1c

data/lib/yarrow/schema.rb

@@ -11,24 +11,16 @@ module Yarrow
     #
     # Current design throws on error rather than returns a boolean result.
     class Validator
-      # @param slots [Array<Symbol>, <Hash>] defines the slots in the schema to validate against
-      def initialize(slots)
-        @keys = slots.reduce({}) do |keys, slot|
-          if slot.is_a?(Array)
-            keys[slot[0]] = slot[1]
-          else
-            keys[slot.to_sym] = Type::Any
-          end
-
-          keys
-        end
+      # @param fields_spec [Hash] defines the slots in the schema to validate against
+      def initialize(fields_spec)
+        @spec = fields_spec
       end
 
       def check(fields)
-        raise "wrong number of args" unless fields.keys.length == @keys.keys.length
+        raise "wrong number of args" unless fields.keys.length == @spec.keys.length
 
         fields.keys.each do |key|
-          raise "key does not exist" unless @keys.key?(key)
+          raise "key does not exist" unless @spec.key?(key)
         end
       end
     end
@@ -38,19 +30,38 @@ module Yarrow
     # Ruby struct but wraps the constructor with method advice that handles
     # validation (and eventually type coercion if !yagni).
     class Value
-      def self.new(*slots, &block)
-        factory(*slots, &block)
+      def self.new(*slots, **fields, &block)
+        factory(*slots, **fields, &block)
       end
 
-      def self.factory(*slots, &block)
-        validator = Validator.new(slots)
+      def self.factory(*slots, **fields, &block)
+        if slots.empty? && fields.empty?
+          raise ArgumentError.new("missing attribute definition")
+        end
+
+        slots_spec, fields_spec = if fields.any?
+          raise ArgumentError.new("cannot use slots when field map is supplied") if slots.any?
+          [fields.keys, fields]
+        else
+          [slots, Hash[slots.map { |s| [s, Type::Any]}]]
+        end
+
+        validator = Validator.new(fields_spec)
+
+        struct = Struct.new(*slots_spec, keyword_init: true, &block)
 
-        struct = Struct.new(*slots, keyword_init: true, &block)
+        struct.define_method :initialize do |*args, **kwargs|
+          attr_values = if args.any?
+            raise ArgumentError.new("cannot mix slots and kwargs") if kwargs.any?
+            Hash[slots.zip(args)]
+          else
+            kwargs
+          end
 
-        struct.define_method :initialize do |kwargs|
-          validator.check(kwargs)
+          validator.check(attr_values)
           # TODO: type coercion or mapping decision goes here
-          super(**kwargs)
+          super(**attr_values)
+
           freeze
         end
 

data/lib/yarrow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Yarrow
   APP_NAME = 'Yarrow'
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie