flora 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1025da710c673e347a8e739d8d378b986386040ec9bdbe97e92ea5639d4a792
-  data.tar.gz: 5aa256a0a55e2b4d345af8e63e6cb19f3627f723d24706091505f54d58bdafb0
+  metadata.gz: 5aad0573cb2ab398c995d0c4b52df0c85b6ddad503cf25ae3a69f9c84ee59068
+  data.tar.gz: ff36bfc9b1a12ff134c568abfa0abb0c37f75425dcb2bd75d475b47af3d46000
 SHA512:
-  metadata.gz: b261bf5ab0e0d8c5203de5950792d5f272a7a7fb7da9055ea06a543018387534d7964f6d5dfc4550ed0cbcb6e529240176466c66f720d62445adfd09d87fb168
-  data.tar.gz: e275dad3c3090f5aa53a5df129ea0fc3f2a3921ea3c4a35bf335764ae34c902cb3a07f4987dd8f8163f7f02654ad94c922d521a8f515c268293fbd2827afcc38
+  metadata.gz: 2c333e1169af9dcaccf7d0c9492e07659db5dde8fbbf43b1107d1e8e48beb7ca75a2606f53f0c8a7ef54a812f287e5b928729215a41390c2fe69fa3f11b76e16
+  data.tar.gz: 8f08d99a5eccb379f715bebd480151e1a29db0ea524bd29b5c3bdef0f416934143de5103b1ed521b203f118cb18d58183d59386e391f2dd6353bc0cec7665149

data/README.md

@@ -26,6 +26,33 @@ end
 
 Install everything with `bundle install`, and then run `bundle exec flora serve` and open up http://localhost:3000!
 
+## Lilac
+
+Lilac is Flora's DSL for writing HTML. Tags are just methods named the same as the tag, and children of tags are put inside blocks.
+
+Looking for a way to make reusable components? Write a function! For example:
+
+```ruby
+# lib/cool_title.rb
+class CoolTitle
+
+  def self.render(text)
+    div(class: 'title') do
+      h1 do
+        text
+      end
+    end
+  end
+
+end
+
+# index.rb
+html do
+  body do
+    CoolTitle.render('My blog')
+  end
+end
+```
 
 ## The Flora way
 

data/lib/flora/app.rb

@@ -50,7 +50,7 @@ class Flora::App
     end
 
     def call(env)
-      @flora.reload_blueprint
+      @flora.reload_project
 
       @app.call(env)
     end

data/lib/flora/{project/blueprint/html.rb → lilac.rb}

@@ -1,4 +1,4 @@
-module Flora::Project::Blueprint::Html
+module Flora::Lilac
 
   TAGS = %i[
     a abbr address area article aside audio

data/lib/flora/plugins/blog/post.rb

@@ -17,8 +17,13 @@ class Flora::Plugins::Blog::Post
   end
 
 
+  def date
+    @frontmatter['date']
+  end
+
+
   def method_missing(name, ...)
-    return @frontmatter[name] if @frontmatter[name]
+    return @frontmatter[name.to_s] if @frontmatter[name.to_s]
 
     super(name, ...)
   end
@@ -32,7 +37,7 @@ class Flora::Plugins::Blog::Post
       return {} unless page_data.start_with?('---')
       /(?<=---\n)(?<yaml>.*)(?=---\n)/m =~ @page.read
 
-      YAML.load(yaml)
+      YAML.load(yaml, permitted_classes: [Date])
     end
 
 end

data/lib/flora/plugins/blog.rb

@@ -3,7 +3,7 @@ module Flora::Plugins::Blog
   module ProjectMethods
 
     def posts
-      @dir.glob('posts/**').map { Post.new(it, @dir) }
+      @dir.glob('posts/**').map { Post.new(it, @dir) }.sort_by(&:date).reverse
     end
 
   end

data/lib/flora/project/blueprint/markdown.rb

@@ -10,7 +10,7 @@ class Flora::Project::Blueprint::Markdown < Flora::Project::Blueprint
 
   private
 
-    def render_tree
+    def render_lilac
       silence_warnings do
         raw_html(Kramdown::Document.new(@file.read).to_html)
       end

data/lib/flora/project/blueprint/nestable.rb

@@ -1,5 +1,5 @@
-# A Blueprint that includes Nestable is something that can best nested into
-# Flora's HTML DSL layouts.
+# A Blueprint that includes Nestable is something that can be nested into a
+# Lilac-based layout.
 module Flora::Project::Blueprint::Nestable
 
   def render
@@ -8,10 +8,10 @@ module Flora::Project::Blueprint::Nestable
 
     layouts = find_layouts
     tree = render_internal(layouts, layouts.size) do
-      render_tree
+      render_lilac
     end
 
-    Flora::Project::Blueprint::Html.to_html(tree)
+    Flora::Lilac.to_html(tree)
   end
 
 
@@ -25,6 +25,11 @@ module Flora::Project::Blueprint::Nestable
         layouts << maybe_layout if maybe_layout.exist?
       end
 
+      # Ascend doesn't go to the top level directory.
+      # TODO: Make this code less brittle.
+      maybe_layout = Pathname.new('./_layout.rb')
+      layouts << maybe_layout if maybe_layout.exist?
+
       layouts
     end
 

data/lib/flora/project/blueprint/ruby_html.rb

@@ -10,7 +10,7 @@ class Flora::Project::Blueprint::RubyHtml < Flora::Project::Blueprint
 
   private
 
-    def render_tree
+    def render_lilac
       instance_eval(@file.read)
     end
 

data/lib/flora/version.rb

@@ -1,3 +1,3 @@
 class Flora
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/flora.rb

@@ -10,11 +10,11 @@ class Flora
   def initialize(dir)
     dir = Pathname.new(dir)
 
-    # Inject HTML helpers into Kernel so they're available everywhere. Just
-    # instance_eval isn't enough because they'll be missing in lib/ code.
+    # 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::Project::Blueprint::Html)
+    Kernel.prepend(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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flora
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nick Vladimiroff
@@ -109,13 +109,13 @@ files:
 - lib/flora/cli.rb
 - lib/flora/config.rb
 - lib/flora/factory.rb
+- lib/flora/lilac.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/project.rb
 - lib/flora/project/blueprint.rb
-- lib/flora/project/blueprint/html.rb
 - lib/flora/project/blueprint/markdown.rb
 - lib/flora/project/blueprint/nestable.rb
 - lib/flora/project/blueprint/ruby_html.rb