mr-edward 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9220176669d7089cdf418e72f2694c9155ac9f4f1e7221396cbc313b1b311b
-  data.tar.gz: 3062475cca120f2246d75ae857c229bbd417d00cd106faaee1ed0c82c52f8535
+  metadata.gz: 7be307969fab3a27723edc33011ed4c014d156f30d5c4fdae7ef3835afcb32c4
+  data.tar.gz: 578b5c36886e86b9862a318397f9c7b33ab2db00769364c40e86cc12a7f5d061
 SHA512:
-  metadata.gz: 60827cee11a1dff53cc072b97d23354ec1df9770fd91df71898caa2824b4cdfbcbe5ada7c5ec5631284fe89c0d21f2f9625c8cfeecf129bc12df96b52c1564bb
-  data.tar.gz: 39aeb57d0c7c60dd8486f698d02baccddda67ace4f0dacb1b1378ac7fc530d7f307b2b9c585d054376267ee236b94656a2ec2a3603dcfa0a4372784da487ca96
+  metadata.gz: 7cd05155e1c21850e379f6425f2995f0bc8932d54f89bd7dd48c34e9959ded031d1c154152a97a8e7020b4f34062ccad79b76bad4472039a7e8d8de95227db53
+  data.tar.gz: 41310aedffa6129e459d55b898f2ecbdd21c3afb50e57e34c8e2355140cd371b92d4d5bf8c63c6f6ada87f1dc6b0b6ff23d3482074d2621b6bfba26fc7aa45a8

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

@@ -28,8 +28,9 @@ module Edward
       !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
@@ -50,7 +51,7 @@ module Edward
       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 }
     end
     
@@ -71,6 +72,16 @@ module Edward
       "#{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

data/src/version.rb

@@ -1,4 +1,4 @@
-# generated with rake release[0.4.0]
+# generated with rake release[0.5.0]
 module Edward
-  VERSION = "0.4.0"
+  VERSION = "0.5.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.5.0
 platform: ruby
 authors:
 - Rein Fernhout