flora 0.1.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1924be5519b0ec6c689e7ffd28635492f273595e0a6fdd3d482618911475015
-  data.tar.gz: f6d24d9cf6c0d3c094805d5686320eddc5759542f595184329e1404abf0a0a79
+  metadata.gz: d37209dfce3b7a9f42b1f41f261ab64b404a13cfa07bb1246d36718395fb9aff
+  data.tar.gz: 145c6f72a9e6c82abad143f946bde715e200b693d5963f3568485b04622c14c4
 SHA512:
-  metadata.gz: ba0c66410d2db67867441765ac14f316ccf6f3c94b71da3d49024ac33b0ad7561e251910032d0db8cbb3ccc59087edd09c7ee9b3756d4a112582bafc341b16d5
-  data.tar.gz: 3590f10225344dd69fccf934e3c3d68e31dfc336a1f43a86294f35df7c3c71cdfa227ddff87e0e307ced25c57644a34b0ab6b4a93b6487488f2dbaac09ddfbb3
+  metadata.gz: 283edf79dedaa559fa4132a16f4fb79f897fb969436cf252b23fa520aa172232ddc22c65665e2886f3390761e31678bef7b244ada7eac9edf6a6b20c5f8151ba
+  data.tar.gz: c1e279fa9e7a777bc60bec261c6e7a688f34d88d049865ee639564316ecfb30b1eadf82156ab599bb5f1981125c16841b11fb5b38ec187f1c2680b0d6a2e22ba

data/README.md

@@ -1,3 +1,27 @@
 # Flora
 
 A static site generator.
+
+## Quickstart
+
+Make a new directory with a Gemfile that looks like this:
+
+```ruby
+source "https://rubygems.org"
+
+gem 'flora'
+```
+
+Make a new `index.rb` file that looks like this:
+
+```ruby
+html do
+  body do
+    h1 do
+      'Hello world!'
+    end
+  end
+end
+```
+
+Install everything with `bundle install`, and then run `bundle exec flora serve` and open up http://localhost:3000!

data/lib/flora/app.rb

@@ -2,12 +2,68 @@ require 'rack'
 
 class Flora::App
 
+  # TODO: make this support multiple apps.
+  OUT_DIR = '/tmp/flora/'
+
+
+  class Rebuilder
+
+    def initialize(app, dir, flora)
+      @app = app
+      @dir = Pathname.new(dir)
+      @flora = flora
+      @last_built = Time.at(0)
+    end
+
+
+    def call(env)
+      if should_rebuild?
+        @flora.build(OUT_DIR)
+        @last_built = Time.now.utc
+        # TODO: also trigger a reload in the browser
+      end
+
+      @app.call(env)
+    end
+
+
+    private
+
+      def should_rebuild?
+        # TODO: this is probably slow. I'm sure there's an easier kqueue-esq way
+        # of doing this.
+        @dir.find do |file|
+          return true if file.stat.mtime > @last_built
+        end
+
+        false
+      end
+
+  end
+
+
+  class Reloader
+
+    def initialize(app, flora)
+      @app = app
+      @flora = flora
+    end
+
+    def call(env)
+      @flora.reload_website_code
+
+      @app.call(env)
+    end
+
+  end
+
+
   # UGLY. Is there a better way to do this?
   class StaticWithoutHtml
 
     def initialize(app, dir)
       @app = app
-      @dir = dir
+      @dir = Pathname.new(dir)
     end
 
     def call(env)
@@ -24,13 +80,14 @@ class Flora::App
 
 
   def self.app(path)
-    flora = Flora::Engine.new(path, '/tmp/flora/')
-    # TODO: rebuild every req?
-    flora.build
+    flora = Flora.new(path)
 
     Rack::Builder.new do
-      use StaticWithoutHtml, flora.out_dir
-      use Rack::Static, urls: [''], root: flora.out_dir.to_s, index: 'index.html'
+      use Rebuilder, path, flora
+      use Reloader, flora
+      use StaticWithoutHtml, OUT_DIR
+      use Rack::Static, urls: [''], root: OUT_DIR, index: 'index.html'
+
       map "/" do
         run ->(env) do
           [404, {'Content-Type' => 'text/plain'}, ['Page Not Found!']]

data/lib/flora/cli.rb

@@ -4,7 +4,7 @@ class Flora::Cli < Thor
 
   desc 'build OUT_DIR', 'Build a site'
   def build(out_dir)
-    Flora::Engine.new('.', out_dir).build
+    Flora.new('.').build(out_dir)
   end
 
 

data/lib/flora/engine/config.rb

@@ -1,15 +1,12 @@
 class Flora::Engine::Config
 
-  attr_reader(:plugins)
-
-
-  def initialize
-    @plugins = []
+  def initialize(plugin_loader)
+    @plugin_loader = plugin_loader
   end
 
 
   def plugin(mod)
-    @plugins << mod
+    @plugin_loader.load_plugin(mod)
   end
 
 end

data/lib/flora/engine/page/html.rb

@@ -9,7 +9,7 @@ module Flora::Engine::Page::Html
     fieldset figcaption figure footer form
     h1 h2 h3 h4 h5 h6 head header hr html i iframe img input ins
     kbd keygen
-    label legend li
+    label legend li link
     main map mark menu meter
     nav
     object ol optgroup option output

data/lib/flora/engine.rb

@@ -1,61 +1,72 @@
 class Flora::Engine
 
-  attr_reader(:out_dir)
+  attr_reader(:website_loader)
 
 
-  def initialize(path, out_dir)
+  def initialize(path)
     @path = Pathname.new(path)
-    @out_dir = Pathname.new(out_dir)
-    @out_dir.mkdir unless @out_dir.exist?
-    @config = Config.new
+    @config = Config.new(self)
+
+    @website_loader = Zeitwerk::Loader.new
+
+    if website_has_supporting_code?
+      @website_loader.push_dir(@path.join('lib').to_s)
+    end
+
+    @website_loader.enable_reloading
+    @website_loader.setup
 
     Kernel.prepend(Flora::Engine::Page::Html)
   end
 
 
-  def build
-    with_load_path(@path) do
-      config_file = @path.join('_config.rb')
-      @config.instance_eval(config_file.read)  if config_file.exist?
+  def configure
+    config_file = @path.join('_config.rb')
+    @config.instance_eval(config_file.read)  if config_file.exist?
+  end
 
-      init_plugins
 
-      Page.each(@path) do |page|
-        layouts = []
-        page.dir.ascend do |dir|
-          maybe_layout = dir.join('_layout.rb')
-          layouts << maybe_layout if maybe_layout.exist?
-          break if dir == @path
-        end
+  def build(out_dir)
+    @out_dir = Pathname.new(out_dir)
+    @out_dir.mkdir unless @out_dir.exist?
 
-        $flora_added = []
-        tree = Page::Layout.new(layouts).render do
-          page.render
-        end
-        html = Page::Html.to_html(tree)
+    Page.each(@path) do |page|
+      layouts = []
+      page.dir.ascend do |dir|
+        maybe_layout = dir.join('_layout.rb')
+        layouts << maybe_layout if maybe_layout.exist?
+        break if dir == @path
+      end
 
-        out_filename = @out_dir.join(page.outname)
-        out_filename.dirname.mkdir unless out_filename.dirname.exist?
-        out_filename.write(html)
+      $flora_added = []
+      tree = Page::Layout.new(layouts).render do
+        page.render
       end
+      html = Page::Html.to_html(tree)
+
+      out_filename = @out_dir.join(page.outname)
+      out_filename.dirname.mkdir unless out_filename.dirname.exist?
+      out_filename.write(html)
     end
+
+  end
+
+
+  def load_plugin(mod)
+    self.class.include(mod::EngineMethods) if defined?(mod::EngineMethods)
+    Page::RubyPage.include(mod::PageMethods) if defined?(mod::PageMethods)
+    Config.include(mod::Config) if defined?(mod::Config)
   end
 
 
   private
 
-    def with_load_path(path)
-      $LOAD_PATH << path.to_s
-      yield
-      $LOAD_PATH.delete(path.to_s)
+    def website_has_supporting_code?
+      @path.join('lib').exist?
     end
 
 
-    def init_plugins
-      @config.plugins.each do |plugin|
-        Page.include(plugin::Page) if self.class.const_defined?("#{plugin}::Page")
-        Page::RubyPage.include(plugin::RubyPage) if self.class.const_defined?("#{plugin}::RubyPage")
-      end
+    def setup_website_loader
     end
 
 end

data/lib/{flora_blog → flora/plugins/blog}/post.rb

@@ -1,18 +1,19 @@
-class FloraBlog::Post
+class Flora::Plugins::Blog::Post
 
-  def initialize(page)
+  def initialize(page, root)
     @page = page
+    @root = root
     @frontmatter = parse_frontmatter
   end
 
 
   def url
-    'https://google.com'
+    '/' + @page.relative_path_from(@root).sub(@page.extname, '').to_s
   end
 
 
   def title
-    'google'
+    @frontmatter['title']
   end
 
 

data/lib/flora/plugins/blog.rb

@@ -0,0 +1,11 @@
+module Flora::Plugins::Blog
+
+  module PageMethods
+
+    def posts
+      @root.glob('posts/**').map { Post.new(it, @root) }
+    end
+
+  end
+
+end

data/lib/flora/plugins/redirector.rb

@@ -0,0 +1,39 @@
+module Flora::Plugins::Redirector
+
+  module EngineMethods
+
+    def build(*)
+      super
+
+      @config.redirects.each do |src, dest|
+        out_filename = @out_dir.join(src + '.html')
+        out_filename.dirname.mkdir unless out_filename.dirname.exist?
+        out_filename.write(build_redir_file(dest))
+      end
+    end
+
+
+    def build_redir_file(url)
+      <<~HTML
+        <html>
+          <head>
+            <meta http-equiv="refresh" content="0; url=#{url}" />
+          </head>
+        </html>
+      HTML
+    end
+
+  end
+
+
+  module Config
+
+    def self.included(base)
+      base.class_eval do
+        attr_accessor(:redirects)
+      end
+    end
+
+  end
+
+end

data/lib/flora/plugins/static_files.rb

@@ -0,0 +1,46 @@
+module Flora::Plugins::StaticFiles
+
+  class Copier
+
+    def initialize(dir)
+      @dir = dir
+    end
+
+
+    def copy_to(out)
+      @dir.find do |public_file|
+        next if public_file.directory?
+
+        out_filename = out.join(Pathname.new(public_file).relative_path_from(@dir))
+        out_filename.dirname.mkdir unless out_filename.dirname.exist?
+        out_filename.write(File.read(public_file))
+      end
+    end
+
+  end
+
+
+  module EngineMethods
+
+    def build(*)
+      super
+
+      base = @config.static_files_dir || 'public'
+      copier = Copier.new(@path.join(base))
+      copier.copy_to(@out_dir.join(base))
+    end
+
+  end
+
+
+  module Config
+
+    def self.included(base)
+      base.class_eval do
+        attr_accessor(:static_files_dir)
+      end
+    end
+
+  end
+
+end

data/lib/flora/version.rb

@@ -1,3 +1,3 @@
-module Flora
-  VERSION = "0.1.3"
+class Flora
+  VERSION = "0.5.0"
 end

data/lib/flora.rb

@@ -5,5 +5,22 @@ require 'kramdown'
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 
-module Flora
+class Flora
+
+  def initialize(dir)
+    # A new class so plugins only affect one instance.
+    @engine = Class.new(Engine).new(dir)
+    @engine.configure
+  end
+
+
+  def build(out)
+    @engine.build(out)
+  end
+
+
+  def reload_website_code
+    @engine.website_loader.reload
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flora
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Nick Vladimiroff
@@ -113,11 +113,12 @@ files:
 - lib/flora/engine/page/html.rb
 - lib/flora/engine/page/layout.rb
 - lib/flora/engine/page/markdown_page.rb
-- lib/flora/engine/page/plugin_hooks.rb
 - lib/flora/engine/page/ruby_page.rb
+- lib/flora/plugins/blog.rb
+- lib/flora/plugins/blog/post.rb
+- lib/flora/plugins/redirector.rb
+- lib/flora/plugins/static_files.rb
 - lib/flora/version.rb
-- lib/flora_blog.rb
-- lib/flora_blog/post.rb
 - tmp/.keep
 homepage: https://code.kat5.dev/nick/flora
 licenses:

data/lib/flora/engine/page/plugin_hooks.rb

@@ -1,10 +0,0 @@
-module Flora::Engine::Page::PluginHooks
-
-  def before_render
-  end
-
-
-  def after_render(html)
-  end
-
-end

data/lib/flora_blog.rb

@@ -1,13 +0,0 @@
-module FloraBlog
-
-  module RubyPage
-
-    def render
-      @posts = @root.glob('posts/**').map { Post.new(it) }
-
-      super
-    end
-
-  end
-
-end