flutterby 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6269342eafe0fdbe1eddad019ecd44ebd5aea360
-  data.tar.gz: 6e9c64dda3163516e527b48247546226e943be0f
+  metadata.gz: 92409201cdf6f744cf869271e0361b75b771dc6c
+  data.tar.gz: 274684a4a805f04b6b8f3739a5c8fcaf5f148f97
 SHA512:
-  metadata.gz: d850ecf93387945baf0e1d7fdb8cf7368cd474c8c24f2d536a9a7ae6d53b0fa2b6c363a078a3ab561af88c333f66af7feb306a6a297ca337af53d3e44917e05e
-  data.tar.gz: 46c17e31c18fbd87c86e5795f15fdd35b3edcccf365d84305e5e828e5228b21022a2a7b4faa55961059bdad3ecf521dd52ee10956aa9d90a3e6b5eb3d9065797
+  metadata.gz: b6b3cf80130ea4afdb07faa75e04ba6e680883a7c5f3f6ada5cd2b426a73c5ee23fa9e413dbd3587614e7c78a54c6cef7041f240360f446698102570d06bf806
+  data.tar.gz: 28596862f6dce075e164ef713c38497e494d2b7e132b75fe1930e9710c116ffcde346c234c19f94c1e53e971b2962c01704d680b65b25bdd604ed4c2ddab55cf

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.2.6
   - 2.3.3
+  - 2.4.0
 before_install: gem install bundler -v 1.13.6
+script: bundle exec rake

data/README.md

@@ -1,8 +1,13 @@
+[![Gem Version](https://badge.fury.io/rb/flutterby.svg)](https://badge.fury.io/rb/flutterby) [![Build Status](https://travis-ci.org/hmans/flutterby.svg?branch=master)](https://travis-ci.org/hmans/flutterby) ![Status](https://img.shields.io/badge/status-active-brightgreen.svg)
+
 # Flutterby
 
-A currently highly experimental static site generator. Yes, there are many like it;
-but this one is mine. (Actually, there are none like it. Ha! I'm very serious about
-the _experimental_ bit, though. Use with care, if at all!)
+### A currently highly experimental static site generator. Yes, there are many like it; but this one is mine. (Actually, there are none like it. Ha! I'm very serious about the _experimental_ bit, though. Use with care, if at all!)
+
+
+## Example
+
+Even though Flutterby is still very much in flux, I'm already building a bunch of sites with it; one of them is [my blog](http://hmans.io/), the source code for which you can find [here](https://github.com/hmans/hmans_me).
 
 
 ## Actual Features

data/lib/flutterby/cli.rb

@@ -27,12 +27,13 @@ Commander.configure do
     c.description = "Serve your website for development."
 
     c.option '--in DIR', String, "Directory containing your source files"
+    c.option '--port NUM', String, "Port to serve on (default: 4004)"
 
     c.action do |args, options|
-      options.default in: "./site/"
+      options.default in: "./site/", port: 4004
 
       root = Flutterby.from(options.in, name: "/")
-      server = Flutterby::Server.new(root)
+      server = Flutterby::Server.new(root, port: options.port)
       server.run!
     end
   end

data/lib/flutterby/entity.rb

@@ -2,6 +2,7 @@ module Flutterby
   class Entity
     attr_accessor :parent, :ext
     attr_reader :name, :filters, :fs_path, :data, :children
+    alias_method :folder, :parent
 
     def initialize(name, parent: nil, fs_path: nil)
       @parent  = parent
@@ -12,7 +13,12 @@ module Flutterby
       parts    = name.split(".")
       @name    = parts.shift
       @filters = parts.reverse
-      @ext     = @filters.last || "html"
+
+      # We're assuming the extension is the name of the final filter
+      # that will be applied. This may not be always correct, since filters
+      # can also change a file's extension.
+      #
+      @ext     = @filters.last
 
       # If a filesystem path was given, read the entity from disk
       if fs_path
@@ -99,6 +105,22 @@ module Flutterby
       end
     end
 
+    # Walk the tree up, invoking the passed block for every entity
+    # found on the way, passing the entity as its only argument.
+    #
+    def walk_up(val = nil, &blk)
+      val = blk.call(self, val)
+      parent ? parent.walk_up(val, &blk) : val
+    end
+
+    # Walk the graph from the root to this entity. Just like walk_up,
+    # except the block will be called on higher level entities first.
+    #
+    def walk_down(val = nil, &blk)
+      val = parent ? parent.walk_up(val, &blk) : val
+      blk.call(self, val)
+    end
+
 
     #
     # Reading from filesystem

data/lib/flutterby/file.rb

@@ -58,11 +58,7 @@ module Flutterby
     end
 
     def view
-      @view ||= begin
-        View.new(self).tap do |view|
-          parent.extend_view!(view) if parent
-        end
-      end
+      @view ||= View.for(self)
     end
 
     def read_json
@@ -74,24 +70,14 @@ module Flutterby
     end
 
     def apply_layout(input)
-      output = input
-
-      # collect layouts to apply
-      layouts = []
-      current = self
-      while current = current.parent
-        if layout = current.find("_layout")
-          layouts << layout
+      walk_up(input) do |e, current|
+        if layout = e.sibling("_layout")
+          tilt = Tilt[layout.ext].new { layout.source }
+          tilt.render(view) { current }
+        else
+          current
         end
       end
-
-      # Apply all layouts in order
-      layouts.each do |layout|
-        tilt = Tilt[layout.ext].new { layout.source }
-        output = tilt.render(view) { output }
-      end
-
-      output
     end
 
     def apply_layout?

data/lib/flutterby/filters.rb

@@ -7,6 +7,14 @@ module Flutterby
       file.filters.each do |filter|
         meth = "process_#{filter}"
 
+        # Set the file's extension to the requested filter. The filter
+        # itself can, of course, override this (eg. the "md" filter can default
+        # the extension to "html".)
+        #
+        file.ext = filter
+
+        # Now apply the actual filter!
+        #
         if Filters.respond_to?(meth)
           body = Filters.send(meth, body, file)
         end

data/lib/flutterby/folder.rb

@@ -15,22 +15,5 @@ module Flutterby
         child.export(path)
       end
     end
-
-    def extend_view!(view)
-      # Load the view extension available in this folder into the given view.
-      #
-      if view_entity = find("_view.rb")
-        case view_entity.ext
-        when "rb" then
-          view.instance_eval(view_entity.source)
-        else
-          raise "Unknown view extension #{view_entity.full_name}"
-        end
-      end
-
-      # Then pass the whole thing up the stack.
-      #
-      parent ? parent.extend_view!(view) : view
-    end
   end
 end

data/lib/flutterby/server.rb

@@ -3,8 +3,9 @@ require 'listen'
 
 module Flutterby
   class Server
-    def initialize(root)
+    def initialize(root, port: 4004)
       @root = root
+      @port = port
     end
 
     def run!
@@ -29,7 +30,7 @@ module Flutterby
 
       # Go!
       listener.start
-      server.run self
+      server.run self, Port: @port
     end
 
     def call(env)

data/lib/flutterby/version.rb

@@ -1,3 +1,3 @@
 module Flutterby
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/flutterby/view.rb

@@ -18,5 +18,27 @@ module Flutterby
     def find(expr)
       entity.find(expr) or raise "No entity found for #{expr}"
     end
+
+    class << self
+      def for(file)
+        # create a new view instance
+        view = new(file)
+
+        # walk the tree up to dynamically extend the view
+        file.folder.walk_down do |e|
+          if view_entity = e.find("_view.rb")
+            case view_entity.ext
+            when "rb" then
+              view.instance_eval(view_entity.source)
+            else
+              raise "Unknown view extension #{view_entity.full_name}"
+            end
+          end
+        end
+
+        # return the finished view object
+        view
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Hendrik Mans