yarrow 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea37c60e3c8bfe51e6ceb9425f0d0c81b93757a681c7987f7852c3335644824
-  data.tar.gz: 19cd090d3b3348f633f5d303d8b826fd2b8c054b790136355a41d9b4f0f098c4
+  metadata.gz: b4319be245b1b70240d28422cf095d64bb61bdacf1b95c545cd055ed7c9e645b
+  data.tar.gz: 1c0fc21f3536a09dd5c11a1c359ce11ab128ea9c527f002a6e6a777090848173
 SHA512:
-  metadata.gz: ebd0dd29f6d8800b20560c2e24fd2988caecf19e9ae5f3e44a3d0b427afc9201971be1b086705e72c874683d30625821b270e6ad944c5c28ca9b6cd9ecd65ea2
-  data.tar.gz: 92d36891c8a270ff663a299b2a217ffe3bb6985200e70d84c4c9d29ee87bb00fb7b2e824e0d932d585b5f8b4a22d578748ee58ad3ae022aa8f1b8ab04117ac6f
+  metadata.gz: 0c3d3176870c6bc82695a825bfa7dc46908311200a35722142620e2fdfd5ce60ea795ef03b88ee35c206379e9f382bab41e0cd38f96d5cc261ba0578d7fe51ed
+  data.tar.gz: 3d8b4f4acb48ef94dc75b65ebda43c5a0d0e588679688b090a6ebaba6c5bccc7f7610793d60663a2e7c5cdd6fcdc213be989f064ac8d9092f6dfd191a0b38b90

data/lib/yarrow/config.rb

@@ -62,7 +62,7 @@ module Yarrow
       attribute :meta, :any
       attribute :server, :any
       attribute :content, :__config_content
-      #attribute :output, :__config_output
+      attribute :output, :__config_output
     end
     #
     # `content_dir` and `output_dir` are placeholders and should be overriden

data/lib/yarrow/configuration.rb

@@ -59,6 +59,12 @@ module Yarrow
           })
         end
 
+        output_obj = if config.key?(:output)
+          Yarrow::Config::Output.new(config[:output])
+        else
+          Yarrow::Config::Output.new({ generator: "web", template_dir: "templates" })
+        end
+
         # TODO: messy hack to get rid of Hashie::Mash, this should either be
         # automated as part of the schema types or a default value should be
         # generated here (eg: `"#{Dir.pwd}/docs"`)
@@ -70,7 +76,8 @@ module Yarrow
           source_dir: Pathname.new(File.expand_path(source_dir_or_string)),
           meta: meta_obj,
           server: server_obj,
-          content: content_obj
+          content: content_obj,
+          output: output_obj
         )
       end
     end

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

@@ -3,19 +3,19 @@ module Yarrow
     module Expansion
       class Strategy
         include Yarrow::Tools::FrontMatter
-  
+
         attr_reader :graph
-  
+
         def initialize(graph)
           @graph = graph
         end
-  
+
         # Extract collection level configuration/metadata from the root node for
         # this content type.
         def extract_metadata(node, type)
           # TODO: support _index or _slug convention as well
           meta_file = node.out(slug: type.to_s).first
-  
+
           if meta_file
             # Process metadata and add it to the collection node
             # TODO: pass in content converter object
@@ -25,15 +25,15 @@ module Yarrow
             # Otherwise, assume default collection behaviour
             data = {}
           end
-  
+
           # Generate a default title if not provided in metadata
           unless data.key?(:title)
             data[:title] = type.to_s.capitalize
           end
-  
+
           data
         end
-  
+
         # Workaround for handling meta and content source in multiple files or a single
         # file with front matter.
         def process_content(path)
@@ -46,6 +46,7 @@ module Yarrow
           when '.yml'
             [nil, YAML.load(File.read(path.to_s), symbolize_names: true)]
           end
+          # TODO: Raise error if unsupported extname reaches here
         end
       end
     end

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

@@ -63,6 +63,9 @@ module Yarrow
                 item_node.props[:body] = body if body
                 item_node.props[:title] = meta[:title] if meta
                 # TODO: better handling of metadata on node props
+
+                # TODO: new schema edits go here
+                #puts policy.entity_const
               end
 
               # We may not have an expanded node for the parent collection if this is a

data/lib/yarrow/content/model.rb

@@ -4,7 +4,11 @@ module Yarrow
       def initialize(content_config)
         @policies = {}
         content_config.source_map.each_entry do |policy_label, policy_spec|
-          @policies[policy_label] = Policy.from_spec(policy_label, policy_spec)
+          @policies[policy_label] = Policy.from_spec(
+            policy_label,
+            policy_spec,
+            content_config.module
+          )
         end
       end
 

data/lib/yarrow/content/policy.rb

@@ -9,6 +9,8 @@ module Yarrow
 
       DEFAULT_MATCH_PATH = "."
 
+      MODULE_SEPARATOR = "::"
+
       # Construct a content policy from the given source specification.
       def self.from_spec(policy_label, policy_props, module_prefix="")
         # TODO: validate length, structure etc
@@ -27,7 +29,7 @@ module Yarrow
             if policy_props.key?(:entity)
               Yarrow::Symbols.to_plural(policy_props[:entity])
             else
-              Yarrow::Symbols.to_plural(label)
+              Yarrow::Symbols.to_plural(policy_label)
             end
           end
 
@@ -38,7 +40,7 @@ module Yarrow
             if policy_props.key?(:container)
               Yarrow::Symbols.to_singular(policy_props[:container])
             else
-              Yarrow::Symbols.to_singular(label)
+              Yarrow::Symbols.to_singular(policy_label)
             end
           end
 
@@ -64,7 +66,7 @@ module Yarrow
         end
       end
 
-      attr_reader :container, :entity, :expansion, :extensions, :match_path, :module
+      attr_reader :container, :entity, :expansion, :extensions, :match_path, :module_prefix
 
       def initialize(container, entity, expansion, extensions, match_path, module_prefix)
         @container = container
@@ -72,35 +74,15 @@ module Yarrow
         @expansion = expansion
         @extensions = extensions
         @match_path = match_path
-        @module_prefix = module_prefix
+        @module_prefix = module_prefix.split(MODULE_SEPARATOR)
       end
 
       def container_const
-        @container_const ||= Yarrow::Symbols.to_module_const([module_prefix, container])
+        @container_const ||= Yarrow::Symbols.to_module_const([*module_prefix, container])
       end
 
       def entity_const
-        @entity_const ||= Yarrow::Symbols.to_module_const([module_prefix, entity])
-      end
-
-      def _container
-        return @properties.container if @properties.container
-        Yarrow::Symbols.to_plural(@properties.entity)
-      end
-
-      def _entity
-        return @properties.entity if @properties.entity
-        Yarrow::Symbols.to_singular(@properties.container)
-      end
-
-      def _extensions
-        return @properties.extensions if @properties.extensions
-        DEFAULT_EXTENSIONS
-      end
-
-      def _match_path
-        return @properties.match_path if @properties.match_path
-        DEFAULT_MATCH_PATH
+        @entity_const ||= Yarrow::Symbols.to_module_const([*module_prefix, entity])
       end
     end
   end

data/lib/yarrow/version.rb

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

data/lib/yarrow/web/generator.rb

@@ -18,7 +18,7 @@ module Yarrow
       end
 
       def write_document(document)
-        template = Template.for_document(document)
+        template = Template.for_document(document, config)
         write_output_file(document.url, template.render(document))
       end
 
@@ -39,6 +39,8 @@ module Yarrow
         File.open(path.to_s, 'w+:UTF-8') do |file|
           file.puts(content)
         end
+
+        puts "[write] #{path} → #{url}"
       end
 
       def generate_sitemap(manifest)

data/lib/yarrow/web/template.rb

@@ -1,14 +1,15 @@
 module Yarrow
   module Web
     class Template
-      def self.for_document(document)
+      def self.for_document(document, config)
         layout_name = if document.respond_to?(:layout)
           document.layout || document.type
         else
           document.type
         end
 
-        @template_dir = "./spec/fixtures/templates/doctest"
+        @template_dir = config.output.template_dir
+        #@template_dir = "./spec/fixtures/templates/doctest"
         @template_ext = ".html"
 
         template_file = "#{layout_name}#{@template_ext}"

metadata

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