mr-edward 0.0.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612197f24983eb51736651387862a44a7653881b66ca9c987a577a0697d933cf
-  data.tar.gz: ed7a73faf3a2ea438079cce7d629a0fd33081fa2a39c7d808dfeddd2184b2e00
+  metadata.gz: 7be307969fab3a27723edc33011ed4c014d156f30d5c4fdae7ef3835afcb32c4
+  data.tar.gz: 578b5c36886e86b9862a318397f9c7b33ab2db00769364c40e86cc12a7f5d061
 SHA512:
-  metadata.gz: 0d302f85a8978d7b38bca88febed112ff6ea6249f1694bc44fe242028aeade84fcf6b6b9114fcc14ec0600cc0bd651aaa2cc8510abe2ddb0f8337d5fc7b5ba72
-  data.tar.gz: d00e37c4c6bc7a5cade4d8fa82cb858e6cfe94f7d7509cf57ed2c25ca878a07a498b0e8337455ad1dc31a2fbf725f89556ccb860ee25f6cc3b8a745a9ddc66c5
+  metadata.gz: 7cd05155e1c21850e379f6425f2995f0bc8932d54f89bd7dd48c34e9959ded031d1c154152a97a8e7020b4f34062ccad79b76bad4472039a7e8d8de95227db53
+  data.tar.gz: 41310aedffa6129e459d55b898f2ecbdd21c3afb50e57e34c8e2355140cd371b92d4d5bf8c63c6f6ada87f1dc6b0b6ff23d3482074d2621b6bfba26fc7aa45a8

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,28 +5,36 @@ require "tilt"
 module Edward
   # Builds a website
   class Builder
-    
-    attr_reader :target
-    
+
+    attr_reader :target, :pages
+
     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
 
+      @pages = []
+
       Dir.glob("**/*") do |path|
         visit_file path if visit_file?(path)
       end
+
+      write_pages
+
     end
     
     def visit_file? path
       File.file?(path) &&
       !path.start_with?("_") &&
-      !["Gemfile", "Gemfile.lock"].include?(path) &&
+      !["Gemfile", "Gemfile.lock", "Rakefile"].include?(path) &&
       !@gitignore.include?(path) &&
       !@edwardignore.include?(path)
     end
@@ -34,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}"
@@ -50,3 +64,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,27 @@
+module Edward
+  # Context for a template to run in.
+  # It has a reference to its page and the builder.
+  class RenderContext
+    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.
+    # 
+    # 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: "(local:)")
+      Tilt[include_path].new(options) { content }.render(self, { local: locals }, &block)
+    end
+  end
+end

data/{lib → src}/page.rb

@@ -13,17 +13,24 @@ 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))
     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
@@ -38,12 +45,13 @@ 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) }
+      @block = proc { |ctx| inner_template.render(ctx, nil, &inner_block) }
       @template = Tilt[layout_path].new(self[:options]) { content }
     end
     
@@ -64,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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr-edward
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.5.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

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,4 +0,0 @@
-# generated with rake release[0.0.3]
-module Edward
-  VERSION = "0.0.3"
-end