mr-edward 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9220176669d7089cdf418e72f2694c9155ac9f4f1e7221396cbc313b1b311b
-  data.tar.gz: 3062475cca120f2246d75ae857c229bbd417d00cd106faaee1ed0c82c52f8535
+  metadata.gz: cba75b99f925e933379311f179ad9bfd42de5837b8f620adf73dd9a3a3790bbc
+  data.tar.gz: 527c2cc38460e315b16338b82e8bc7ffaeddf15afa0ab2b8e7f92a29903937b7
 SHA512:
-  metadata.gz: 60827cee11a1dff53cc072b97d23354ec1df9770fd91df71898caa2824b4cdfbcbe5ada7c5ec5631284fe89c0d21f2f9625c8cfeecf129bc12df96b52c1564bb
-  data.tar.gz: 39aeb57d0c7c60dd8486f698d02baccddda67ace4f0dacb1b1378ac7fc530d7f307b2b9c585d054376267ee236b94656a2ec2a3603dcfa0a4372784da487ca96
+  metadata.gz: 6e50f960d5ac335485ac800ede80e1835927e446bd389261857a2a5288408699957d2f137328d85ba94b2b18c47aee59528f28d1ee2786e8377ba0a1eed0770b
+  data.tar.gz: ff50d23ecaf57f3ad070924845f831dc848732133c3e1830c60a1a057a80864ddb4b29ea44debb0e61b43980259b93bba6291f0814a744a57ee9a50f53728ba3

data/src/builder.rb

@@ -6,7 +6,7 @@ module Edward
   # Builds a website
   class Builder
 
-    attr_reader :target
+    attr_reader :target, :pages
 
     def initialize
       @target = "_site"
@@ -21,9 +21,14 @@ module Edward
       FileUtils.rm_r @target if File.exist? @target
       FileUtils.mkdir_p @target
 
+      @pages = []
+
       Dir.glob("**/*") do |path|
         visit_file path if visit_file?(path)
       end
+
+      write_pages
+
     end
     
     def visit_file? path
@@ -37,14 +42,20 @@ module Edward
     def visit_file path
       if Page.page?(path)
         page = Edward::Page.new(path)
-        puts "converting #{page.path} => #{page.dirname}/#{page.new_name}"
+        @pages << page
         FileUtils.mkdir_p "#{@target}/#{page.dirname}"
-        File.write("#{@target}/#{page.new_path}", page.render)
       else
         copy_plain path
       end
     end
 
+    def write_pages
+      for page in @pages
+        puts "converting #{page.path} => #{page.dirname}/#{page.new_name}"
+        File.write("#{@target}/#{page.new_path}", page.render(self))
+      end
+    end
+
     # simply copy the file
     def copy_plain path
       FileUtils.mkdir_p "#{@target}/#{File.dirname path}"

data/src/context.rb

@@ -1,10 +1,16 @@
 module Edward
-  # Context for a template to run in
+  # Context for a template to run in.
+  # It has a reference to its page and the builder.
   class RenderContext
-    def initialize page
+    def initialize page, builder
       @page = page
+      @pages = builder.pages
     end
 
+    def pages_with_tag tag
+      @pages.filter { it.tag? tag }
+    end
+    
     # Include a partial file.
     # The file is searched for in _include,
     # rendered and returned.
@@ -14,7 +20,7 @@ module Edward
     def include file, locals = {}, &block
       include_path = "_include/" + file
       yaml, content = Page.extract_front_matter(File.read(include_path))
-      options = (yaml&.dig(:options) || {}).merge(fixed_locals: "(locals:)")
+      options = (yaml&.dig(:options) || {}).merge(fixed_locals: "(local:)")
       Tilt[include_path].new(options) { content }.render(self, { local: locals }, &block)
     end
   end

data/src/page.rb

@@ -17,21 +17,22 @@ module Edward
       @template = Tilt[path].new(self[:options]) { @content }
       add_layout(self[:layout]) if self[:layout]
     end
-    
+
     # transform extensions from options to strings (for use in pipeline)
     def transform_option_keys options
       options&.transform_keys! { |k| Tilt.default_mapping.registered?(k.to_s) ? k.to_s : k }
     end
-    
+
     # check if a file starts with yaml doc and can be mapped by tilt
     def self.page? path
       !Tilt.templates_for(path).empty? && YAML_FRONT_MATTER_REGEXP.match(File.read(path))
     end
 
-    def render
-      @template.render(Edward::RenderContext.new(self), nil, &@block)
+    def render builder
+      ctx = Edward::RenderContext.new(self, builder)
+      @template.render(ctx, nil, &proc { @block.call(ctx) })
     end
-    
+
     def self.extract_front_matter content
       if content =~ YAML_FRONT_MATTER_REGEXP
         yaml = YAML.safe_load(Regexp.last_match(1), symbolize_names: true, permitted_classes: [Symbol])
@@ -41,36 +42,48 @@ module Edward
         [nil, content]
       end
     end
-    
+
     # wrap this page in a layout
     def add_layout name
       layout_path = "_layouts/#{name}"
       yaml, content = Page.extract_front_matter(File.read(layout_path))
+      next_layout = yaml[:layout]
       @yaml = yaml.deep_merge!(@yaml, knockout_prefix: "--") if yaml
       transform_option_keys(self[:options])
       inner_template = @template
       inner_block = @block
-      @block = proc { inner_template.render(Edward::RenderContext.new(self), nil, &inner_block) }
+      @block = proc { |ctx| inner_template.render(ctx, nil, &inner_block) }
       @template = Tilt[layout_path].new(self[:options]) { content }
+      add_layout(next_layout) if next_layout
     end
-    
+
     def name
       File.basename(@path)
     end
-    
+
     # the name of the new file
     def new_name
       File.basename(@path, ".*")
     end
-    
+
     def dirname
       File.dirname(@path)
     end
-    
+
     def new_path
       "#{dirname}/#{new_name}"
     end
-    
+
+    # The directory name if new_name is index.html.
+    # Otherwise the full new path.
+    def href
+      if new_name == "index.html"
+         "/" + dirname
+      else
+        "/#{dirname}/#{new_name}"
+      end
+    end
+
     def tag? tag
       @yaml&.dig(:tags)&.include? tag
     end
@@ -78,6 +91,6 @@ module Edward
     def [](*keys)
       @yaml&.dig(*keys)
     end
-    
+
   end
 end

data/src/version.rb

@@ -1,4 +1,4 @@
-# generated with rake release[0.4.0]
+# generated with rake release[0.6.0]
 module Edward
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr-edward
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Rein Fernhout
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Statis site generator
 test_files: []