flora 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1025da710c673e347a8e739d8d378b986386040ec9bdbe97e92ea5639d4a792
-  data.tar.gz: 5aa256a0a55e2b4d345af8e63e6cb19f3627f723d24706091505f54d58bdafb0
+  metadata.gz: 0eeada6a7e97d9c1dded199028b8dac045682a23beef3481d219abecbbc07e2e
+  data.tar.gz: b892ba7503c36ec84ef5ae621b6029206def27c2e1d920314ac89793dedf0cbb
 SHA512:
-  metadata.gz: b261bf5ab0e0d8c5203de5950792d5f272a7a7fb7da9055ea06a543018387534d7964f6d5dfc4550ed0cbcb6e529240176466c66f720d62445adfd09d87fb168
-  data.tar.gz: e275dad3c3090f5aa53a5df129ea0fc3f2a3921ea3c4a35bf335764ae34c902cb3a07f4987dd8f8163f7f02654ad94c922d521a8f515c268293fbd2827afcc38
+  metadata.gz: 363719a84dfa9e6041a1db5e9ddcdec99218e30fb8c2c86b3b9b83a9a971cab3efb70a564a215b6263c6168d14a329fe34efb50746039f5fc206454cebe7ab21
+  data.tar.gz: cef5b21e8a2cea97cf180b5ca3e4d49e79aad9428ee6bd8b3bb8981e15674860f2223bb848386f9a133b97e6a4737f974ac8e520bd2161d4d350a83e38e7a09f

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
@@ -10,14 +10,14 @@ module Flora::Project::Blueprint::Html
     h1 h2 h3 h4 h5 h6 head header hr html i iframe img input ins
     kbd keygen
     label legend li link
-    main map mark menu meter
+    main map mark menu meta meter
     nav
     object ol optgroup option output
     p param pre progress
     q
     rp rt ruby
-    s samp section select small source span strong sub summary sup
-    table tbody td textarea tfoot th thead time tr track
+    s samp script section select small source span strong style sub summary sup
+    table tbody td textarea title tfoot th thead time tr track
     u ul
     var video
     wbr

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

@@ -1,9 +1,31 @@
 module Flora::Plugins::Blog
 
+  class BlogPost < Flora::Project::Blueprint::Markdown
+
+    def self.recognize(file, config)
+      file.fnmatch?('posts/*.md')
+    end
+
+
+    def initialize(file, project)
+      super(file, project)
+
+      @post = Post.new(file, project.dir)
+    end
+
+
+    private
+
+      def render_tree
+      end
+
+  end
+
+
   module ProjectMethods
 
     def posts
-      @dir.glob('posts/**').map { Post.new(it, @dir) }
+      @dir.glob('posts/**.md').map { Post.new(it, @dir) }.sort_by(&:date).reverse
     end
 
   end

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

@@ -10,9 +10,9 @@ 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)
+        raw_html(Kramdown::Document.new(skipping_frontmatter(@file.read), input: 'GFM').to_html)
       end
     end
 
@@ -25,4 +25,10 @@ class Flora::Project::Blueprint::Markdown < Flora::Project::Blueprint
       $VERBOSE = old_verbose
     end
 
+
+    # TODO: Maybe just make frontmatter fully supported by Markdown?
+    def skipping_frontmatter(str)
+      str.gsub(/---\n(.*)---\n/m, '')
+    end
+
 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.8.0'
 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.8.0
 platform: ruby
 authors:
 - Nick Vladimiroff
@@ -65,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kramdown-parser-gfm
+  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'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +123,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