yarrow 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c362ba73bcbfc325bad91668bf1a1a006dd6355579a36ce96cc60323944804b
-  data.tar.gz: 51db819b1f52b3b75a9b39287359e22dfb6d52833ce0089636694f4d9feeda15
+  metadata.gz: d26941f2b464c551d825b73999b0365637b9e4feec159ee74de51a1abca3416e
+  data.tar.gz: 34081172c945cf83e97ab3ee03484436ba380de6c809c2dd87caaa50f1bba315
 SHA512:
-  metadata.gz: c7a41bb6ee0a6bcfd27c83d7780cc70f7b41131daaa4decd02e591346f9270318951b1a68d0f390ac81843593e0bf97a8062da51f3f7f1e2be78b6711af132d6
-  data.tar.gz: 866d6683eb25f9154d9582266b45016b680d622fca57a71c88b55f8c0ee41dc76076e839684026df8759e72ba73cf2597b96cbe05b83d3c877cc5ebcf6252bcf
+  metadata.gz: 6300e2c0f83c741862cf6c49acc42118636a3832401706057b483d942c07a947ea1124b2c10e056cc5052e25a28a59f896216d0156911026639d16e0faa5ba73
+  data.tar.gz: 0b897183df8712cbc08d0a479ed1e1d129a90305ad76f9bc802ea262707026ff5ffa57890d0d26d49955f55721ffd0887510671c86430e4780564266758ebaed

data/lib/yarrow/config.rb

@@ -37,17 +37,22 @@ module Yarrow
       :port,
       :host,
       :handler,
-      #:docroot,
-      :middleware,
-      #:root_dir
+      :middleware
     )
 
+    class Output < Yarrow::Schema::Entity[:output]
+      attribute :generator, :string
+      attribute :template_dir, :path
+      #attribute :scripts, :array
+    end
+
     # Top level root config namespace.
     class Instance < Yarrow::Schema::Entity
       attribute :source_dir, :path
       attribute :output_dir, :path
       attribute :meta, :any
       attribute :server, :any
+      #attribute :output, :output
     end
     #
     # `content_dir` and `output_dir` are placeholders and should be overriden

data/lib/yarrow/content/policy.rb

@@ -8,6 +8,8 @@ module Yarrow
         :match_path
       )
 
+      DEFAULT_HOME_NESTING = false
+
       DEFAULT_EXTENSIONS = [".md", ".yml", ".htm"]
 
       DEFAULT_MATCH_PATH = "."

data/lib/yarrow/content/tree_expansion.rb

@@ -6,11 +6,6 @@ module Yarrow
         #policy.match()
 
         #p graph.n(:root).out(:directory).first.props[:name]
-
-        expand_impl(policy)
-      end
-
-      def expand_impl(policy)
         type = policy.container
 
         # If match path represents entire content dir, then include the entire
@@ -18,13 +13,14 @@ module Yarrow
         # the collection.
         #start_node = if policy.match_path == "."
         start_node = if true
-          graph.n(:root)
+          # TODO: match against source_dir
+          graph.n(:root).out(:directory)
         else
-          graph.n(:root).out(name: type.to_s)
+          graph.n(:root).out(name: policy.container.to_s)
         end
 
         # Extract metadata from given start node
-        collection_metadata = extract_metadata(start_node, type)
+        collection_metadata = extract_metadata(start_node, policy.container)
 
         # Collect all nested collections in the subgraph for this content type
         subcollections = {}
@@ -37,7 +33,7 @@ module Yarrow
             # Create a collection node representing a collection of documents
             index = graph.create_node do |collection_node|
               collection_node.label = :collection
-              collection_node.props[:type] = type
+              collection_node.props[:type] = policy.container
               collection_node.props[:name] = node.props[:name]
 
               # TODO: title needs to be defined from metadata

data/lib/yarrow/defaults.yml

@@ -6,10 +6,8 @@ meta:
   title: Default Project
   author: Default Name
 output:
-  target_dir: public
+  generator: web
   template_dir: templates
-  object_map:
-    page: Yarrow::Model::Site.pages
 assets:
   input_dir: assets
   output_dir: public/assets

data/lib/yarrow/schema/definitions.rb

@@ -4,9 +4,16 @@ module Yarrow
       DEFINED_TYPES = {
         string: Types::Instance.of(String),
         integer: Types::Instance.of(Integer),
-        symbol: Types::Instance.of(Symbol),
+        symbol: Types::Instance.of(Symbol).accept(String, :to_sym),
         path: Types::Instance.of(Pathname).accept(String),
-        any: Types::Any.new
+        any: Types::Any.new,
+        array: Types::List.of(Types::Any),
+        hash: Types::Map.of(Symbol => Types::Any)
+      }
+
+      TEMPLATE_TYPES = {
+        list: Types::List,
+        map: Types::Map
       }
 
       def self.register(identifier, type_class)
@@ -18,13 +25,43 @@ module Yarrow
       end
 
       def resolve_type(identifier)
-        #return identifier unless identifier.is_a?(Symbol)
+        # Type is directly resolvable from the definition table
+        return DEFINED_TYPES[identifier] if DEFINED_TYPES.key?(identifier)
 
-        unless DEFINED_TYPES.key?(identifier)
-          raise "#{identifier} is not defined"
-        end
+        if identifier.is_a?(Hash)
+          # If type identifier is a compound template extract its key and value mapping
+          key_id = identifier.keys.first
+          value_id = identifier.values.first
 
-        return DEFINED_TYPES[identifier]
+          # Check if the given key is defined as a template type
+          unless TEMPLATE_TYPES.key?(key_id)
+            raise "compound type #{key_id} is not defined"
+          end
+
+          # Get reference to the type class we want to resolve
+          template_type = TEMPLATE_TYPES[key_id]
+          
+          # Resolve the type to an instance depending on structure of its template args
+          resolved_type = if value_id.is_a?(Hash)
+            # Map template with two argument constructor
+            template_type.new(
+              resolve_type(value_id.keys.first),
+              resolve_type(value_id.values.first)
+            )
+          else
+            # Use the single arg constructor with the given unit type
+            template_type.of(resolve_type(value_id).unit)
+          end
+
+          # Cache the resolved type for later reference
+          DEFINED_TYPES[identifier] = resolved_type
+          
+          # Return the resolve type
+          resolved_type
+        else
+          # Not a compound template so we know it’s missing in the lookup table
+          raise "type #{identifier} is not defined"
+        end
       end
     end
   end

data/lib/yarrow/schema/entity.rb

@@ -13,6 +13,19 @@ module Yarrow
         def dictionary
           @dictionary ||= Dictionary.new({})
         end
+
+        def [](label)
+          @label = label
+          self
+        end
+
+        def inherited(class_name)
+          if @label
+            class_type = Yarrow::Schema::Types::Instance.of(class_name)
+            Yarrow::Schema::Definitions.register(@label, class_type)
+            @label = nil
+          end
+        end
       end
 
       def initialize(config)

data/lib/yarrow/version.rb

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

data/lib/yarrow/web/document.rb

@@ -4,10 +4,10 @@ module Yarrow
       # 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, url_strategy)
+      def initialize(item, parent, is_index)
         @item = item
         @parent = parent
-        @url_strategy = url_strategy
+        @is_index = is_index
       end
 
       def name
@@ -23,13 +23,18 @@ module Yarrow
       end
 
       def url
-        case @url_strategy
-        when :mirror_source
-          unless @parent.nil?
-            "/#{@parent.props[:name]}/#{name}"
-          else
-            "/#{name}/"
+        if @parent.nil?
+          "/"
+        else
+          segments = [@item.props[:name]]
+          current = @parent
+
+          until current.in(:collection).first.nil? do
+            segments << current.props[:name]
+            current = current.in(:collection).first
           end
+
+          "/" + segments.reverse.join("/")
         end
       end
     end

data/lib/yarrow/web/manifest.rb

@@ -6,20 +6,29 @@ module Yarrow
 
         graph.n(:collection).each do |collection|
           # TODO: raise error if both content_only and index_only are set
-
-          # If the collection is tagged :content_only then skip top level listing/index
-          unless collection.props[:content_only]
-            manifest.add_document(collection_context(collection))
-          end
+          index = nil
 
           # If the collection is tagged :index_only then skip adding individual documents
           unless collection.props[:index_only]
             collection.out(:item).each do |item|
               #if item[:entity].status.to_sym == :published
-              manifest.add_document(item_context(item))
+              if item.props[:name] == "index"
+                index = item
+              else
+                manifest.add_document(item_context(item))
+              end
               #end
             end
           end
+
+          # If the collection is tagged :content_only then skip top level listing/index
+          unless collection.props[:content_only]
+            if index
+              manifest.add_document(collection_index_context(collection, index))
+            else 
+              manifest.add_document(collection_context(collection))
+            end
+          end
         end
 
         manifest
@@ -32,28 +41,6 @@ module Yarrow
         @assets = []
       end
 
-      def self.collection_context(collection)
-        # Yarrow::Output::Context.new(
-        #   parent: collection.in(:collection).first,
-        #   name: collection.props[:name],
-        #   #url: collection.props[:url],
-        #   title: collection.props[:title],
-        #   type: collection.props[:type]
-        # )
-        Document.new(collection, collection.in(:collection).first, :mirror_source)
-      end
-
-      def self.item_context(item)
-        # Yarrow::Output::Context.new(
-        #   parent: item.in(:collection).first,
-        #   name: item.props[:name],
-        #   #url: item.props[:url],
-        #   title: item.props[:title],
-        #   type: item.props[:type]
-        # )
-        Document.new(item, item.in(:collection).first, :mirror_source)
-      end
-
       def add_document(document)
         @documents << document
       end
@@ -61,6 +48,18 @@ module Yarrow
       def add_asset(asset)
         @assets << asset
       end
+
+      def self.collection_context(collection)
+        Document.new(collection, collection.in(:collection).first, true)
+      end
+
+      def self.collection_index_context(collection, item)
+        Document.new(item, collection.in(:collection).first, false)
+      end
+
+      def self.item_context(item)
+        Document.new(item, item.in(:collection).first, false)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable