mr-edward 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be307969fab3a27723edc33011ed4c014d156f30d5c4fdae7ef3835afcb32c4
-  data.tar.gz: 578b5c36886e86b9862a318397f9c7b33ab2db00769364c40e86cc12a7f5d061
+  metadata.gz: cba75b99f925e933379311f179ad9bfd42de5837b8f620adf73dd9a3a3790bbc
+  data.tar.gz: 527c2cc38460e315b16338b82e8bc7ffaeddf15afa0ab2b8e7f92a29903937b7
 SHA512:
-  metadata.gz: 7cd05155e1c21850e379f6425f2995f0bc8932d54f89bd7dd48c34e9959ded031d1c154152a97a8e7020b4f34062ccad79b76bad4472039a7e8d8de95227db53
-  data.tar.gz: 41310aedffa6129e459d55b898f2ecbdd21c3afb50e57e34c8e2355140cd371b92d4d5bf8c63c6f6ada87f1dc6b0b6ff23d3482074d2621b6bfba26fc7aa45a8
+  metadata.gz: 6e50f960d5ac335485ac800ede80e1835927e446bd389261857a2a5288408699957d2f137328d85ba94b2b18c47aee59528f28d1ee2786e8377ba0a1eed0770b
+  data.tar.gz: ff50d23ecaf57f3ad070924845f831dc848732133c3e1830c60a1a057a80864ddb4b29ea44debb0e61b43980259b93bba6291f0814a744a57ee9a50f53728ba3

data/src/page.rb

@@ -17,12 +17,12 @@ 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))
@@ -32,7 +32,7 @@ module Edward
       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])
@@ -42,46 +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 { |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
+         "/" + dirname
       else
-        "#{dirname}/#{new_name}"
+        "/#{dirname}/#{new_name}"
       end
     end
-    
+
     def tag? tag
       @yaml&.dig(:tags)&.include? tag
     end
@@ -89,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.5.0]
+# generated with rake release[0.6.0]
 module Edward
-  VERSION = "0.5.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.5.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: []