yarrow 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33fcaf7b1d66e43c0bd0a83967d0cc8b4891b96ec652bbfd28e5e91e7991b7e2
-  data.tar.gz: ccf4513eee11929864f76386e22adf39224a1898f5b207a3cefb11a30a5ed6e7
+  metadata.gz: 89667b38c1ebf2da983a381e20be9d8e0904bdb69137bb86a1bce6ee9507fbf1
+  data.tar.gz: 364c196cefad90398b10c387edb925b055490163be854b814f3522a6333234ef
 SHA512:
-  metadata.gz: 20272c169c2dd1280c06b80277a981217ae08c77c80892b4c8d07bac0564099ea0cbc248d54ac3160522e7e38c7dbe129aa703e6cb9e9cb848619f2009e15273
-  data.tar.gz: 143a1bbb91909f1e8921b9b587f611293b2f20de9f50d66b18a7346c00e6ebc2078d98ac0e9abcb88cad258e2f3a2d902f1f2eda811d27abd0348ece8f7cf87e
+  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/extensions/mementus.rb

@@ -6,6 +6,22 @@ module Mementus
       # Monkeypatch extension to ensure each pipeline step supports enumerable
       # methods. Mostly used for #map. API needs to be fixed in the gem itself.
       include Enumerable
+
+      def to
+        Step.new(map { |edge| edge.to }, Pipe.new(graph), graph)
+      end
+
+      def props
+        Step.new(map { |node| node.props }, Pipe.new(graph), graph)
+      end
+
+      # def props
+      #   node_props = source.inject([]) do |result, node|
+      #     result.concat(node.props)
+      #   end
+
+      #   Step.new(node_props, Pipe.new(graph), graph)
+      # end
     end
   end
   module Structure

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.5"
+  VERSION = "0.8.7"
 end

data/lib/yarrow/web/document.rb

@@ -1,20 +1,15 @@
-module Yarrow
+  module Yarrow
   module Web
-    class Document
-      # This class is somewhat verbose for simplicity and long-term maintainability
-      # (having a clear and easy to follow construction, rather than doing anything
-      # too clever which has burned this lib in the past).
-      def initialize(item, parent, is_index)
-        @item = item
-        @resource = item.props[:resource]
-        @parent = parent
-        @is_index = is_index
-      end
-
+    class BaseDocument
       def resource
         @resource
       end
 
+      def type
+        @type
+      end
+
+      # TODO: confirm this can be deleted
       def index
         _index = @item.out_e(:index)
         unless _index.first.nil?
@@ -24,16 +19,19 @@ module Yarrow
         end
       end
 
+      # TODO: confirm this can be deleted
       def index_body
         @item.props[:index_body]
       end
 
       # TODO: manage behaviour with and without current item
       # TODO: link to manifest
+      #
+      # TODO: replace @item and @collection with @node internally and in class interface
       def breadcrumbs
         path = []
 
-        current_parent = @item.in(:collection)
+        current_parent = @node.in(:collection)
 
         while !current_parent.first.nil?
           path << current_parent.first.props[:resource]
@@ -51,10 +49,6 @@ module Yarrow
         @resource.title
       end
 
-      def type
-        @item.props[:type]
-      end
-
       def body
         return @resource.body.to_html if @resource.respond_to?(:body)
         ""
@@ -78,5 +72,54 @@ module Yarrow
         end
       end
     end
+
+    class IndexDocument < BaseDocument
+      # Represents the index document of a collection. This contains
+      # a reference to the individual items in the collection as well as
+      # any document content itself.
+      def initialize(collection, item=nil, is_index=false)
+        @collection = collection
+        @item = item
+        # The parent node of the collection is the first incoming node link
+        @parent = collection.in(:collection).first
+        @is_index = is_index
+
+        template_map = collection.out_e(:child).to.all.inject([]) do |result, node|
+          result << Document.new(node, false)
+        end
+
+        instance_variable_set("@children", template_map)
+        define_singleton_method(:children){ template_map }
+
+        if @item.nil?
+          @resource = collection.props[:resource]
+          @type = collection.props[:type]
+          @node = collection
+        else
+          @resource = item.props[:resource]
+          @type = item.props[:type]
+          @node = item
+        end
+
+        instance_variable_set("@#{@type}", @resource)
+        define_singleton_method(@type){ @resource }
+      end
+    end
+
+    class Document < BaseDocument
+      # This class is somewhat verbose for simplicity and long-term maintainability
+      # (having a clear and easy to follow construction, rather than doing anything
+      # too clever which has burned this lib in the past).
+      def initialize(item, is_index)
+        @item = item
+        @type = item.props[:type]
+        @parent = item.in(:collection).first
+        @node = item
+        @is_index = is_index
+        @resource = item.props[:resource]
+        instance_variable_set("@#{item.props[:type]}", @resource)
+        define_singleton_method(item.props[:type]){ @resource }
+      end
+    end
   end
 end

data/lib/yarrow/web/manifest.rb

@@ -50,15 +50,15 @@ module Yarrow
       end
 
       def self.collection_context(collection)
-        Document.new(collection, collection.in(:collection).first, true)
+        IndexDocument.new(collection, nil, true)
       end
 
       def self.collection_index_context(collection, item)
-        Document.new(item, collection.in(:collection).first, false)
+        IndexDocument.new(collection, item, false)
       end
 
       def self.item_context(item)
-        Document.new(item, item.in(:collection).first, false)
+        Document.new(item, false)
       end
     end
   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.5
+  version: 0.8.7
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable