flora 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b44217297cbd020d161b21d49829be840dd7ec4b99327108aa1b0c14e4f3286
-  data.tar.gz: 32871444dfee770b17d99e57aa4753e1f8a40e02d3743e7e52e3a1ef77098a8d
+  metadata.gz: d37209dfce3b7a9f42b1f41f261ab64b404a13cfa07bb1246d36718395fb9aff
+  data.tar.gz: 145c6f72a9e6c82abad143f946bde715e200b693d5963f3568485b04622c14c4
 SHA512:
-  metadata.gz: 6567dab062a120dca84dabec2246266c5f482fcc2ba8899c541f2d4fd5a0801f7e6c7a9ef8f4af47896495dcf1768ce6eb763eea9df8b33db935a70fdc561617
-  data.tar.gz: f24f358cb9c3da51053b2c1301f2d5c0f85aaebadf1956558f623839e8c24acc241157b77962f7772e83a6e7d3542a768e488d0efbd6785878ba5431386dd747
+  metadata.gz: 283edf79dedaa559fa4132a16f4fb79f897fb969436cf252b23fa520aa172232ddc22c65665e2886f3390761e31678bef7b244ada7eac9edf6a6b20c5f8151ba
+  data.tar.gz: c1e279fa9e7a777bc60bec261c6e7a688f34d88d049865ee639564316ecfb30b1eadf82156ab599bb5f1981125c16841b11fb5b38ec187f1c2680b0d6a2e22ba

data/lib/flora/app.rb

@@ -2,6 +2,62 @@ 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
 
@@ -25,12 +81,13 @@ class Flora::App
 
   def self.app(path)
     flora = Flora.new(path)
-    # TODO: rebuild every req?
-    flora.build('/tmp/flora/')
 
     Rack::Builder.new do
-      use StaticWithoutHtml, '/tmp/flora'
-      use Rack::Static, urls: [''], root: '/tmp/flora', 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/engine.rb

@@ -1,15 +1,21 @@
 class Flora::Engine
 
+  attr_reader(:website_loader)
+
+
   def initialize(path)
     @path = Pathname.new(path)
     @config = Config.new(self)
 
-    @site_loader = Zeitwerk::Loader.new
+    @website_loader = Zeitwerk::Loader.new
 
-    if site_has_supporting_code?
-      setup_site_loader
+    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
 
@@ -55,15 +61,12 @@ class Flora::Engine
 
   private
 
-    def site_has_supporting_code?
+    def website_has_supporting_code?
       @path.join('lib').exist?
     end
 
 
-    def setup_site_loader
-      @site_loader.push_dir(@path.join('lib').to_s)
-      @site_loader.enable_reloading
-      @site_loader.setup
+    def setup_website_loader
     end
 
 end

data/lib/flora/version.rb

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

data/lib/flora.rb

@@ -18,4 +18,9 @@ class Flora
     @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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Nick Vladimiroff