yarrow 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c19632ef74b70bca618fa332e555bc93a277ccb71791df1e43f871b2d6d54e7
-  data.tar.gz: e1c4be606929e0d1c3a07e21bcf43b9d89847b45ccc59ff3a78ee9713a64bb55
+  metadata.gz: b067dcc24e059e6d5cfe506e6a3fc30b5679eb05e494ce842e515710ff60d170
+  data.tar.gz: c185b1f52f5b7aa173b26b179d47457f7705ef91460abd046ce3c81fa4733930
 SHA512:
-  metadata.gz: 592a83f0ae68084ad789353f8319a290b02e2268c00fd84fed70cba5e1469f5cbd215ea17732801622c8b10867513bdd37fd02dc8bda95d75c3a70014230fb46
-  data.tar.gz: f1eab1e023451b5bbd6a88aecf610a887db96b37fff19c6c4cf500dacfadeb0461865d4ffad118f4b4d254889e52bbbc4583b8d74e5299efe7940308a1eeba07
+  metadata.gz: 33c522da6809b8ffbcd0457082a20a3222b877d086856413b815e141004769fdfc37998903d5f8b5a711dba21614323381fb2021f702082136b3f073b885abbf
+  data.tar.gz: a9b2a1ae9d015093709c7f64073809a470b058003ea98984ad1f8d6700cc65281e3e8aafc9e03ce9a669adf4e3800385f1727fe57cf5d54e95ac31862b603516

data/lib/yarrow/schema/definitions.rb

@@ -2,10 +2,12 @@ module Yarrow
   module Schema
     module Definitions
       DEFINED_TYPES = {
-        string: Type::Raw[String],
-        integer: Type::Raw[Integer],
-        path: Type::Raw[Pathname],
-        any: Type::Any
+        #string: Types::String,
+        string: Types::Instance.of(String),
+        #integer: Types::Integer,
+        integer: Types::Instance.of(Integer),
+        path: Types::Instance.of(Pathname),
+        any: Types::Any.new
       }
 
       def self.register(identifier, type_class)

data/lib/yarrow/schema/dictionary.rb

@@ -23,6 +23,25 @@ module Yarrow
         @attrs_spec.keys
       end
 
+      def cast(input)
+        missing_attrs = @attrs_spec.keys.difference(input.keys)
+
+        if missing_attrs.any?
+          missing_attrs.each do |name|
+            raise "wrong number of attributes" unless @attrs_spec[name].is_a?(Types::Any)
+          end
+        end
+
+        mismatching_attrs = input.keys.difference(@attrs_spec.keys)
+
+        raise "attribute does not exist" if mismatching_attrs.any?
+
+        input.reduce({}) do |converted, (name, value)|
+          converted[name] = @attrs_spec[name].cast(value)
+          converted
+        end
+      end
+
       def check(input)
         missing_attrs = @attrs_spec.keys.difference(input.keys)
 

data/lib/yarrow/schema/entity.rb

@@ -16,12 +16,9 @@ module Yarrow
       end
 
       def initialize(config)
-        dictionary.check(config)
-        # dictionary.each_key do |name|
-        #   raise "missing declared attribute #{name}" unless config.key?(name)
-        # end
-        #
-        config.each_pair do |key, value|
+        converted = dictionary.cast(config)
+
+        converted.each_pair do |key, value|
           # raise "#{key} not a declared attribute" unless dictionary.key?(key)
           #
           # defined_type = dictionary[key]

data/lib/yarrow/schema/types.rb

@@ -24,10 +24,25 @@ module Yarrow
           new(unit_type)
         end
 
-        attr_reader :unit
+        attr_reader :unit, :accepts
   
         def initialize(unit_type=nil)
           @unit = unit_type
+          @accepts = {}
+        end
+
+        def accept(type, constructor)
+          accepts[type] = constructor
+          self
+        end
+
+        def should_coerce?(input)
+          accepts.key?(input.class)
+        end
+
+        def coerce(input)
+          constructor = accepts[input.class]
+          unit.send(constructor, input)
         end
   
         def check_instance_of!(input)
@@ -54,7 +69,10 @@ module Yarrow
           end
         end
 
-        def cast(input); end
+        def cast(input)
+          return coerce(input) if should_coerce?(input)
+          check(input)
+        end
       end
   
       class Any < TypeClass
@@ -64,14 +82,14 @@ module Yarrow
       end
   
       class Instance < TypeClass
-        def cast(input)
+        def check(input)
           check_instance_of!(input)
           input
         end
       end
   
       class Kind < TypeClass
-        def cast(input)
+        def check(input)
           check_kind_of!(input)
           input
         end
@@ -94,7 +112,7 @@ module Yarrow
 
         alias members unit
 
-        def cast(input)
+        def check(input)
           case implementation
           when :any then check_respond_to_any!(input, members)
           when :all then check_respond_to_all!(input, members)

data/lib/yarrow/schema/value.rb

@@ -43,9 +43,9 @@ module Yarrow
             kwargs
           end
 
-          validator.check(attr_values)
-          # TODO: type coercion or mapping decision goes here
-          super(**attr_values)
+          converted_values = validator.cast(attr_values)
+
+          super(**converted_values)
 
           freeze
         end

data/lib/yarrow/version.rb

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

data/lib/yarrow.rb

@@ -5,7 +5,6 @@ require 'yarrow/version'
 require 'yarrow/extensions'
 require 'yarrow/symbols'
 require 'yarrow/logging'
-require 'yarrow/schema'
 require 'yarrow/schema/types'
 require 'yarrow/schema/definitions'
 require 'yarrow/schema/dictionary'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Mark Rickerby
@@ -242,7 +242,6 @@ files:
 - lib/yarrow/process/project_manifest.rb
 - lib/yarrow/process/step_processor.rb
 - lib/yarrow/process/workflow.rb
-- lib/yarrow/schema.rb
 - lib/yarrow/schema/definitions.rb
 - lib/yarrow/schema/dictionary.rb
 - lib/yarrow/schema/entity.rb

data/lib/yarrow/schema.rb

@@ -1,41 +0,0 @@
-require "delegate"
-
-module Yarrow
-  module Schema
-    module Type
-      class Raw
-        class << self
-          def [](primitive)
-            @primitive = primitive
-          end
-
-          def new(input)
-            input
-          end
-        end
-      end
-
-      class Any
-      end
-      # class Attribute
-      #   class << self
-      #     def accepts(attr_type)
-      #       @accepts = attr_type
-      #     end
-      #   end
-      #
-      #   attr_accessor :value
-      #   alias_method :__getobj__, :value
-      #
-      #   def initialize(value)
-      #     raise "Invalid type" unless @accepts.is_a?(value.class)
-      #     @value = value
-      #   end
-      # end
-      #
-      # class Text < Attribute
-      #   accepts String
-      # end
-    end
-  end
-end