yarrow 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8358e221f56cb48075609b4ae35e07ef7ea1bef577d6a1f929a8eb26ca4242
-  data.tar.gz: 8730eec22402eb73b1555a7421fd6ea5f22edb049d8dc7083c0b4de1ea777681
+  metadata.gz: 89667b38c1ebf2da983a381e20be9d8e0904bdb69137bb86a1bce6ee9507fbf1
+  data.tar.gz: 364c196cefad90398b10c387edb925b055490163be854b814f3522a6333234ef
 SHA512:
-  metadata.gz: 1571c747f38efd25382c758b9974c1e5b644f541aa93f76f9f8d3082c35db13b30cf39da52487e67ad2611feb73fc24ad39acdf7de57393aaa8e16cebe8dc0ea
-  data.tar.gz: aad027b60c53a918b9b96f800e144b8b981f3e083a211524ce329549b8242cbd9100da756b7130adcfac990b7944d557378de963b62042cf2effba12acade81e
+  metadata.gz: 113ce8dc745ec3e83121d5229beeed755671a7902e1330373ef7b129d7138048d090bbdb1abedd2458f0faca3f86f4433c30a855cc6a53119ba59576699f7002
+  data.tar.gz: 6b24b087284b3be6f2d55a8aa3afc25d0e3cc38dbbb2bd80bd9005487b9b95b3bf65d218a47c65b6ac9f4fd54e830a01984292bc1f0c4c8d1455b7af3a5b5049

data/.github/workflows/ruby.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [2.7, '3.0', 3.1, head]
+        ruby: [2.7, 3.1, 3.2]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/lib/yarrow/config.rb

@@ -43,9 +43,19 @@ module Yarrow
     # Yarrow::Schema.define do
     #   type :config_source_map, Yarrow::Schema::Types::Instance.of(Hash).accept(Symbol)
     # end
+    # class PolicySpec < Yarrow::Schema::Entity[:__config_policy_spec]
+    #   attribute :module, :string
+    #   attribute :source_map, :__config_source_map
+    # end
+
+    # Yarrow::Schema::Definitions.register(
+    #   :__config_source_map,
+    #   Yarrow::Schema::Types::Map.of(Symbol)
+    # )
 
     class Content < Yarrow::Schema::Entity[:__config_content]
       attribute :module, :string
+      #attribute :source_map, :__config_source_map
       attribute :source_map, :hash
     end
 

data/lib/yarrow/content/expansion/tree.rb

@@ -5,6 +5,7 @@ module Yarrow
         def expand(policy)
           #p graph.n(:root).out(:directory).to_a.count
           #policy.match()
+          p policy
 
           #p graph.n(:root).out(:directory).first.props[:name]
           type = policy.container

data/lib/yarrow/content/model.rb

@@ -2,6 +2,8 @@ module Yarrow
   module Content
     class Model
       def initialize(content_config)
+        p content_config
+
         @policies = {}
         content_config.source_map.each_entry do |policy_label, policy_spec|
           @policies[policy_label] = Policy.from_spec(

data/lib/yarrow/schema/types.rb

@@ -17,6 +17,10 @@ module Yarrow
         def self.respond_to_all(t, m)
           new("#{t} does not implement #{m}")
         end
+
+        def self.union_member(t, s)
+          new("#{t} is not a member of union")
+        end
       end
 
       class TypeClass
@@ -31,6 +35,10 @@ module Yarrow
           @accepts = {}
         end
 
+        def |(rhs_opt)
+          Union.new(self, rhs_opt)
+        end
+
         def accept(type, constructor=:new, options=nil)
           accepts[type] = if options.nil?
             [constructor]
@@ -201,6 +209,39 @@ module Yarrow
           [keys, values].transpose.to_h
         end
       end
+
+      class Union < TypeClass
+        def self.of(*unit_opts)
+          instances = unit_opts.map { |unit| Instance.of(unit) }
+          new(*instances)
+        end
+
+        def initialize(*type_opts)
+          @options = type_opts
+          super()
+        end
+
+        def |(rhs_opt)
+          @options << rhs_opt
+        end
+
+        def check(input)
+          failed_checks = []
+          @options.each do |opt|
+            begin
+              opt.check(input)
+            rescue CastError => err
+              failed_checks << err
+            end
+          end
+
+          if failed_checks.size == @options.size
+            raise CastError.union_member(input.class, @options.map { |opt| opt.class })
+          end
+
+          input
+        end
+      end
     end
   end
 end

data/lib/yarrow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Yarrow
   APP_NAME = "Yarrow"
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

data/yarrow.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'parallel', '~> 1.22.1'
   spec.add_runtime_dependency 'strings-inflection', '~> 0.1'
   spec.add_runtime_dependency 'strings-case', '~> 0.3'
+  # https://github.com/joeldrapper/phlex
   spec.add_runtime_dependency 'kramdown', '~> 2.4.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.11'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable