flora 0.9.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3897d7a4e965040ca5a06f0c1a5492ec7762b4643b592e7195b4ac609b434f4
-  data.tar.gz: bd5902bcbea6ade8af011abd7a7d19f0ef313871a208904f84e69f757f630945
+  metadata.gz: 6fa0d4f3614285445c78586bf4d63163cb6419b8944dcb1e614a3e90f5b50925
+  data.tar.gz: 17aaa52cf397c066edb770f98959fa3b9f211e398c1bca87c365d2c157691f5e
 SHA512:
-  metadata.gz: 738688a2f0af78b20327fbbb441d2073e4d8854bd6f906b5777f1def634af7d99c576db25daf95a2b0addac51eaf2fe4a8ba5e411d14940f9bd3aa74df593ed8
-  data.tar.gz: b2b89fb144a7e71b8c1dacb154f8456e3c1b595903a735f7038f3c6ae999fdc47d25c7f09e33549915683abeaa862a713d529164f5494b5daf5c1c65873aafa1
+  metadata.gz: c21a1b6b5ab70780a0e182f99d300239661c36f72cf3d8ea022a6be7edb8374e2b587233648d6939705bd073aeb1234a1e04e041f609f1ea7fcb82b36e99813b
+  data.tar.gz: a92dacb2c646acd722b018eb948d2380567b38438cbf3ee09cc387c689fc0fd2375205e0c0044823f8bd306625ab40a87c34a2764f5969349331b6a9c7e27268

data/README.md

@@ -33,10 +33,10 @@ Lilac is Flora's DSL for writing HTML. Tags are just methods named the same as t
 Looking for a way to make reusable components? Write a function! For example:
 
 ```ruby
-# lib/cool_title.rb
-class CoolTitle
+# lib/my_helpers.rb
+module MyHelpers
 
-  def self.render(text)
+  def cool_title(text)
     div(class: 'title') do
       h1 do
         text
@@ -46,10 +46,13 @@ class CoolTitle
 
 end
 
+# _config.rb
+extend_view(MyHelpers)
+
 # index.rb
 html do
   body do
-    CoolTitle.render('My blog')
+    cool_title('My blog')
   end
 end
 ```

data/lib/flora/app.rb

@@ -12,14 +12,15 @@ class Flora::App
       @app = app
       @dir = Pathname.new(dir)
       @flora = flora
-      @last_built = Time.at(0)
+      @@last_built ||= Time.at(0)
     end
 
 
     def call(env)
       if should_rebuild?
+        @flora.reload_project
         @flora.build(OUT_DIR)
-        @last_built = Time.now.utc
+        @@last_built = Time.now.utc
         # TODO: also trigger a reload in the browser
       end
 
@@ -33,7 +34,7 @@ class Flora::App
         # 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
+          return true if file.stat.mtime > @@last_built
         end
 
         false
@@ -42,22 +43,6 @@ class Flora::App
   end
 
 
-  class Reloader
-
-    def initialize(app, flora)
-      @app = app
-      @flora = flora
-    end
-
-    def call(env)
-      @flora.reload_project
-
-      @app.call(env)
-    end
-
-  end
-
-
   # UGLY. Is there a better way to do this?
   class StaticWithoutHtml
 
@@ -84,7 +69,6 @@ class Flora::App
 
     Rack::Builder.new do
       use Rebuilder, path, flora
-      use Reloader, flora
       use StaticWithoutHtml, OUT_DIR
       use Rack::Static, urls: [''], root: OUT_DIR, index: 'index.html'
 

data/lib/flora/config.rb

@@ -8,11 +8,16 @@ class Flora::Config
   end
 
 
-  def plugin(mod)
+  def use(mod)
     @flora.load_plugin(mod)
   end
 
 
+  def extend_view(mod)
+    Kernel.prepend(mod)
+  end
+
+
   private
 
     def load

data/lib/flora/factory.rb

@@ -1,9 +1,10 @@
 # Factories assemble Projects into Websites.
 class Flora::Factory
 
-  def initialize(project, config)
+  def initialize(project, config, logger)
     @project = project
     @config = config
+    @logger = logger
   end
 
 
@@ -15,6 +16,8 @@ class Flora::Factory
       out_filename = out_dir.join(blueprint.page_name)
       FileUtils.mkdir_p(out_filename.dirname) unless out_filename.dirname.exist?
       out_filename.write(blueprint.render)
+
+      @logger.debug("[Flora] #{blueprint.file} => #{out_filename}")
     end
   end
 

data/lib/flora/project.rb

@@ -10,25 +10,22 @@ class Flora::Project
   IGNORES = ['.git/*', 'lib/**', '**_*.rb']
 
 
-  def initialize(dir, config)
+  def initialize(dir, loader, config)
     @dir = dir
+    @loader = loader
     @config = config
+    @mutex = Mutex.new
 
     @blueprints = find_blueprints
-
-    @loader = Zeitwerk::Loader.new
-    if has_supporting_code?
-      @loader.push_dir(@dir.join('lib').to_s)
-    end
-    @loader.enable_reloading
-    @loader.setup
-    @loader.eager_load
   end
 
 
   def reload
-    @loader.reload
-    @blueprints = find_blueprints
+    # `flora serve` can sometimes hit this multiple times and cause errors.
+    @mutex.synchronize do
+      @loader.reload
+      @blueprints = find_blueprints
+    end
   end
 
 
@@ -53,9 +50,4 @@ class Flora::Project
       blueprints
     end
 
-
-    def has_supporting_code?
-      @dir.join('lib').exist?
-    end
-
 end

data/lib/flora/version.rb

@@ -1,3 +1,3 @@
 class Flora
-  VERSION = '0.9.1'
+  VERSION = '0.11.0'
 end

data/lib/flora.rb

@@ -2,15 +2,21 @@ require 'zeitwerk'
 require 'nokogiri'
 require 'kramdown'
 require 'fileutils'
+require 'logger'
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 
 class Flora
 
+  attr_writer(:logger)
+
+
   def initialize(dir)
     dir = Pathname.new(dir)
 
+    @logger = Logger.new(STDOUT, level: ENV['FLORA_LOG'] || 'info')
+
     # Inject Lilac into the Kernel so it's available everywhere. Just
     # instance_eval isn't enough because it'll be missing in lib/ code.
     #
@@ -24,19 +30,33 @@ class Flora
     @project_class = Class.new(Project)
     @factory_class = Class.new(Factory)
 
+    # This has to be loaded before Config so Config can reference lib/ code.
+    @project_loader = Zeitwerk::Loader.new
+    if dir.join('lib').exist?
+      @project_loader.push_dir(dir.join('lib'))
+    end
+    @project_loader.enable_reloading
+    @project_loader.setup
+
     @config = @config_class.new(dir.join('_config.rb'), self)
-    @project = @project_class.new(dir, @config)
-    @factory = @factory_class.new(@project, @config)
+    @project = @project_class.new(dir, @project_loader, @config)
+    @factory = @factory_class.new(@project, @config, @logger)
   end
 
 
   def build(out)
-    @factory.assemble(Pathname.new(out))
+    duration = bench do
+      @factory.assemble(Pathname.new(out))
+    end
+    @logger.info("[Flora] Built project (#{duration}s)")
   end
 
 
   def reload_project
-    @project.reload
+    duration = bench do
+      @project.reload
+    end
+    @logger.info("[Flora] Reloaded project (#{duration}s)")
   end
 
 
@@ -50,6 +70,15 @@ class Flora
     Flora::Project::Blueprint.include(mod::BlueprintMethods) if defined?(mod::BlueprintMethods)
   end
 
+
+  private
+
+    def bench
+      now = Time.now.utc
+      yield
+      Time.now.utc - now
+    end
+
 end
 
 # Built-in Blueprints need to be explicitly loaded or else they won't show up

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flora
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Nick Vladimiroff
@@ -121,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - nickvladimiroff@hey.com
 executables: