mr-edward 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be307969fab3a27723edc33011ed4c014d156f30d5c4fdae7ef3835afcb32c4
-  data.tar.gz: 578b5c36886e86b9862a318397f9c7b33ab2db00769364c40e86cc12a7f5d061
+  metadata.gz: 9aac3eaf4cee5bd060f0b8a00cb3fa9eb8942d66c2909754582034f39fe3ec40
+  data.tar.gz: 2d1d534a9faa705b7c66914fc61cf0b5462917ba9019bc3f3e07f09586c58cb3
 SHA512:
-  metadata.gz: 7cd05155e1c21850e379f6425f2995f0bc8932d54f89bd7dd48c34e9959ded031d1c154152a97a8e7020b4f34062ccad79b76bad4472039a7e8d8de95227db53
-  data.tar.gz: 41310aedffa6129e459d55b898f2ecbdd21c3afb50e57e34c8e2355140cd371b92d4d5bf8c63c6f6ada87f1dc6b0b6ff23d3482074d2621b6bfba26fc7aa45a8
+  metadata.gz: 22af496c556dd5d924c1c9ba2b5b4e6d6e84b82c7714ae399a5d515e4d5bd952952b489d75f44233d23535e9c5defc9aceee7ffc95476e817fce99f645e0cf78
+  data.tar.gz: 490eed523a428719c786e6f2de5cab19102cc0aeeaa0e4bc1abf99bd3dac050c8fe3dee2178b75846bc022f4ed567e7573eb45ee65e2a6b028a42fc95134d3af

data/src/builder.rb

@@ -12,7 +12,6 @@ module Edward
       @target = "_site"
       @gitignore = File.read(".gitignore").lines rescue []
       @edwardignore = File.read(".edwardignore").lines rescue []
-      Tilt.register_pipeline("adoc_erb", :templates => ["erb", "adoc"])
       Tilt::AsciidoctorTemplate.include(AsciiDoctorUnsafeByDefault)
       load("./_setup.rb") if File.exist? "_setup.rb"
     end

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, ".*")
+      File.basename(@path, '.' + Tilt.default_mapping.matched_extension(@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,12 @@ module Edward
     def [](*keys)
       @yaml&.dig(*keys)
     end
-    
+
+  end
+end
+
+module Tilt
+  class BaseMapping
+    def matched_extension(file) = split(file).last
   end
 end

data/src/version.rb

@@ -1,4 +1,4 @@
-# generated with rake release[0.5.0]
+# generated with rake release[0.7.0]
 module Edward
-  VERSION = "0.5.0"
+  VERSION = "0.7.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.7.0
 platform: ruby
 authors:
 - Rein Fernhout
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -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.16
 specification_version: 4
 summary: Statis site generator
 test_files: []