mr-edward 0.0.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 550618153f13429874ed99478ecd6342971ae3bfb8129d7ef2a1398c0fb8ac81
-  data.tar.gz: ca24dacaa44c6d0141b24d0738e887bdeb5b1f25944c5f080fbfcf16160c2ef8
+  metadata.gz: 3a9220176669d7089cdf418e72f2694c9155ac9f4f1e7221396cbc313b1b311b
+  data.tar.gz: 3062475cca120f2246d75ae857c229bbd417d00cd106faaee1ed0c82c52f8535
 SHA512:
-  metadata.gz: 1806e0ff497429cc18556b2f5d7d959da925478d0ac843d4cacbf6878a05bea3206cf8db05b20d544531ff26a91468caf4b1ac9d598f1d29f24663d4d8026f4b
-  data.tar.gz: aaaffbc06816b7c55f6c69d2377f22186a8dd3c6cb3d0e3c4f74e4aa416c1f7b53bb3e6d82785a25a8b10c8cdea379818d89c0558b7c9815d5377c60ef06b58b
+  metadata.gz: 60827cee11a1dff53cc072b97d23354ec1df9770fd91df71898caa2824b4cdfbcbe5ada7c5ec5631284fe89c0d21f2f9625c8cfeecf129bc12df96b52c1564bb
+  data.tar.gz: 39aeb57d0c7c60dd8486f698d02baccddda67ace4f0dacb1b1378ac7fc530d7f307b2b9c585d054376267ee236b94656a2ec2a3603dcfa0a4372784da487ca96

data/bin/edward

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift "#{__dir__}/../lib"
+$:.unshift "#{__dir__}/../src"
 
 require 'edward'
 Edward::CLI.new.main

data/{lib → src}/builder.rb

@@ -5,14 +5,18 @@ require "tilt"
 module Edward
   # Builds a website
   class Builder
-    
+
     attr_reader :target
-    
+
     def initialize
       @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
-    
+
     def start
       FileUtils.rm_r @target if File.exist? @target
       FileUtils.mkdir_p @target
@@ -25,8 +29,9 @@ module Edward
     def visit_file? path
       File.file?(path) &&
       !path.start_with?("_") &&
-      !["Gemfile", "Gemfile.lock"].include?(path) &&
-      !@gitignore.include?(path)
+      !["Gemfile", "Gemfile.lock", "Rakefile"].include?(path) &&
+      !@gitignore.include?(path) &&
+      !@edwardignore.include?(path)
     end
 
     def visit_file path
@@ -48,3 +53,10 @@ module Edward
 
   end
 end
+
+module AsciiDoctorUnsafeByDefault
+  def prepare
+    @options[:safe] = :unsafe if @options[:safe].nil?
+    super
+  end
+end

data/{lib → src}/cli.rb

@@ -22,6 +22,7 @@ module Edward
       @server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => @builder.target
       trap("INT") { @server.shutdown }
       listen
+      @builder.start
       puts "visit edward at http://127.0.0.1:#{@server.config[:Port]}"
       @server.start
     end
@@ -30,6 +31,9 @@ module Edward
       require "listen"
       Listen.to('.', ignore: /_site/) { |modified, added, removed|
         puts "rebuilding"
+        if [modified, added, removed].flatten.map(&File.method(:basename)).include? "_setup.rb"
+          puts "WARNING: restart to apply changes to _setup.rb"
+        end
         @builder.start
       }.start
     end

data/src/context.rb

@@ -0,0 +1,21 @@
+module Edward
+  # Context for a template to run in
+  class RenderContext
+    def initialize page
+      @page = page
+    end
+
+    # Include a partial file.
+    # The file is searched for in _include,
+    # rendered and returned.
+    # 
+    # If you need to include a file plainly consider
+    # just using File.read or use an ERB template.
+    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:)")
+      Tilt[include_path].new(options) { content }.render(self, { local: locals }, &block)
+    end
+  end
+end

data/{lib → src}/page.rb

@@ -13,10 +13,16 @@ module Edward
       content = File.read(path)
       @yaml, @content = Page.extract_front_matter(content)
       @block = nil
+      transform_option_keys(self[:options])
       @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))
@@ -38,9 +44,10 @@ module Edward
     
     # wrap this page in a layout
     def add_layout name
-      layout_path = "_layouts/#{name}.slim"
+      layout_path = "_layouts/#{name}"
       yaml, content = Page.extract_front_matter(File.read(layout_path))
       @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) }

data/src/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr-edward
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Rein Fernhout
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -71,12 +71,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/edward
-- lib/builder.rb
-- lib/cli.rb
-- lib/context.rb
-- lib/edward.rb
-- lib/page.rb
-- lib/version.rb
+- src/builder.rb
+- src/cli.rb
+- src/context.rb
+- src/edward.rb
+- src/page.rb
+- src/version.rb
 homepage: https://github.com/LevitatingBusinessMan/edward
 licenses:
 - MIT
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Statis site generator
 test_files: []

data/lib/context.rb

@@ -1,15 +0,0 @@
-module Edward
-  # Context for a template to run in
-  class RenderContext
-    def initialize page
-      @page = page
-    end
-
-    def include file, locals = {}, &block
-      include_path = "_include/" + file
-      # yaml in includes is currently ignored
-      _yaml, content = Page.extract_front_matter(File.read(include_path))
-      Tilt[include_path].new(@page[:options]&.merge(fixed_locals: "(locals:)")){ content }.render(self, { local: locals }, &block)
-    end
-  end
-end

data/lib/version.rb

@@ -1,3 +0,0 @@
-module Edward
-  VERSION = "0.0.2"
-end