flora 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f445572c3d4330b5d1e8f3d6ce42ef45cd11053e17cceee1cbcd0d8860430d2b
-  data.tar.gz: a02c49517eed09e56f8fcba6586646f4b566d78405fe78b61157c75aec8feb53
+  metadata.gz: a11f85e869328faff7d9244556f4b6c27ea30460c1ecbb9a691737d10f24daaa
+  data.tar.gz: 7a43d4c8821ce2e8d6899cdae404bb47a1db66c54032ac5cbc123e18cee394af
 SHA512:
-  metadata.gz: 41e4980576a56a14e468b8d63bcf5cc344ca5ae54525c3676f8ec3a08d5049803fd22848cf0bd9b2472da3f87f2b587fc1773833c96d6d9ca3e0cf0070295469
-  data.tar.gz: 55f9466b3b93a5d39021403f9874b65cca0250dc47e68d353de8da7569edd71da9e9883c9b8268206cb3a01563bef161d246792410eb0781e76713e7ac0f8a59
+  metadata.gz: fc3287be925560cb0ee03df33c04d8cb2de6a811345dc75385359afa94236a5500cac5c5a969b50bfb66b44117d4266e986fd86f624d84e38a83c995ffa503f0
+  data.tar.gz: 4eae0b7459aad9100e813ab916be76ef9c7c0aac7d814ac9524e358a98a06a6fb83f4e869f1bfccca426c2af3c3376cc405d93e3a8fe55950054b5f3a2992dd2

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

@@ -14,7 +14,7 @@ class Flora::Config
 
 
   def extend_view(mod)
-    Kernel.prepend(mod)
+    Kernel.include(mod)
   end
 
 

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/plugins/blog/post.rb

@@ -18,7 +18,7 @@ class Flora::Plugins::Blog::Post
 
 
   def date
-    @frontmatter['date']
+    @frontmatter['date'].to_time
   end
 
 

data/lib/flora/plugins/blog.rb

@@ -13,10 +13,67 @@ module Flora::Plugins::Blog
       @post = Post.new(file, project.dir)
     end
 
+  end
+
+
+  class Feed
+
+    def initialize(posts, config)
+      @posts = posts
+      @config = config
+    end
+
+
+    def render
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.feed(xmlns: 'http://www.w3.org/2005/Atom') do
+          xml.generator('Flora')
+          nokogiri_tag(xml, :title, @config.blog[:title])
+          xml.updated(last_updated.iso8601)
+          nokogiri_tag(xml, :link, href: @config.blog[:url])
+          xml.id(@config.blog[:url])
+          xml.author do
+            xml.name(@config.blog[:author])
+          end
+
+          @posts.each { to_entry(xml, it) }
+        end
+      end
+
+      builder.to_xml
+    end
+
 
     private
 
-      def render_tree
+      def full_url(post)
+        @config.blog[:url] + post.url
+      end
+
+
+      def last_updated
+        @posts[0].date
+      end
+
+
+      def to_entry(xml, post)
+        xml.entry do
+          xml.id(full_url(post))
+          nokogiri_tag(xml, :title, post.title)
+          # TODO: actually support published vs updated.
+          xml.updated(post.date.iso8601)
+          xml.published(post.date.iso8601)
+          nokogiri_tag(xml, :link, rel: 'alternate', href: full_url(post))
+        end
+      end
+
+
+
+      # Nokogiri's builder uses method_missing, and some of Lilac's tags are
+      # named the same as some of the Atom tags we want to use which causes
+      # conflicts. Use this method to get around that!
+      def nokogiri_tag(xml, tag, *args, **opts, &block)
+        xml.method_missing(tag, *args, **opts, &block)
       end
 
   end
@@ -39,4 +96,27 @@ module Flora::Plugins::Blog
 
   end
 
+
+  module FactoryMethods
+
+    def assemble(out_dir)
+      super
+
+      feed = Feed.new(@project.posts, @config)
+      out_dir.join('feed.xml').write(feed.render)
+    end
+
+  end
+
+
+  module Config
+
+    def self.included(base)
+      base.class_eval do
+        attr_accessor(:blog)
+      end
+    end
+
+  end
+
 end

data/lib/flora/project.rb

@@ -14,14 +14,18 @@ class Flora::Project
     @dir = dir
     @loader = loader
     @config = config
+    @mutex = Mutex.new
 
     @blueprints = find_blueprints
   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
 
 
@@ -46,8 +50,4 @@ class Flora::Project
       blueprints
     end
 
-
-    def has_supporting_code?
-    end
-
 end

data/lib/flora/version.rb

@@ -1,3 +1,3 @@
 class Flora
-  VERSION = '0.10.0'
+  VERSION = '0.12.0'
 end

data/lib/flora.rb

@@ -2,20 +2,26 @@ 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.
     #
     # TODO: is there a less disruptive way to do this?
-    Kernel.prepend(Flora::Lilac)
+    Kernel.include(Flora::Lilac)
 
     # The classes that are pluggable get their own instances to avoid conflicting
     # with other instances of Flora in the same process. This is mostly for the
@@ -34,17 +40,23 @@ class Flora
 
     @config = @config_class.new(dir.join('_config.rb'), self)
     @project = @project_class.new(dir, @project_loader, @config)
-    @factory = @factory_class.new(@project, @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
 
 
@@ -58,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.10.0
+  version: 0.12.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: