flutterby 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c1bd44e0401ad1f8046a70b01ca191d8d8661c
-  data.tar.gz: 74e111066e2dcdf84c50db61daab894e069d7376
+  metadata.gz: 2c87a6c4e67963aa5d66c2225d60b9e228a2d852
+  data.tar.gz: 896782e01a481af93bc5da7d9a277bc9252d9f29
 SHA512:
-  metadata.gz: f0a76a23bd09f814804040af24d20df03e7ddcbfa3f1c88833019b356db31ec8f3c228c85a592e86f237d41a71bfd10a9c21af7bc92ff26ad4f6f5d15fb7f73e
-  data.tar.gz: 7bde567d6c410cab6bee564921f6598b0549ed45b322fb96f0daab9fbb11dfbde57f8abc7a8ca46b316fa99f51e17f0a34fffed592f85d9bc0a476384fc0bf3d
+  metadata.gz: 52dcaab598ca23c831ff348a3fdeb56124a4ce663c45c36ba47d4211370d602f8b1e0389de27fc9ec830b79abe0761dcbfe5c64a47834de46f17b75418424e72
+  data.tar.gz: 760b7537767012d5b6d044c537d461bfd52514c2feeb5bf114d4213de1805add17e09eaff1225cb2af0381076f1c6f4f2f99201a644a638dce558ebee55d5392

data/exe/flutterby

@@ -1,3 +1,9 @@
 #!/usr/bin/env ruby
-require 'rubygems'
+if File.file?("Gemfile")
+  require "bundler"
+  Bundler.require
+else
+  require 'rubygems'
+end
+
 require 'flutterby/cli'

data/lib/flutterby.rb

@@ -14,7 +14,11 @@ require "flutterby/server"
 
 
 module Flutterby
-  def Flutterby.from(fs_path, name: nil, parent: nil)
+  extend self
+
+  attr_writer :logger
+
+  def from(fs_path, name: nil, parent: nil)
     name ||= ::File.basename(fs_path)
 
     if ::File.exist?(fs_path)
@@ -23,4 +27,8 @@ module Flutterby
       raise "Path #{fs_path} could not be found."
     end
   end
+
+  def logger
+    @logger ||= Logger.new(STDOUT)
+  end
 end

data/lib/flutterby/cli.rb

@@ -1,5 +1,8 @@
 require 'commander'
 require 'flutterby'
+require 'benchmark'
+
+Flutterby.logger.level = Logger::INFO
 
 Commander.configure do
   program :name, 'Flutterby'
@@ -16,8 +19,23 @@ Commander.configure do
     c.action do |args, options|
       options.default in: "./site/", out: "./_build/"
 
-      root = Flutterby.from(options.in, name: "/")
-      root.export(into: options.out)
+      # Simplify logger output
+      Flutterby.logger.formatter = proc do |severity, datetime, progname, msg|
+        " • #{msg}\n"
+      end
+
+      time = Benchmark.realtime do
+        # Import site
+        say color("📚  Importing site...", :bold)
+        root = Flutterby.from(options.in, name: "/")
+        say color("🌲  Read #{root.tree_size} nodes.", :green, :bold)
+
+        # Export site
+        say color("💾  Exporting site...", :bold)
+        root.export(into: options.out)
+      end
+
+      say color("✅  Done. (took #{sprintf "%.2f", time}s)", :green, :bold)
     end
   end
   alias_command :b, :build
@@ -32,7 +50,11 @@ Commander.configure do
     c.action do |args, options|
       options.default in: "./site/", port: 4004
 
+      say color("📚  Importing site...", :bold)
       root = Flutterby.from(options.in, name: "/")
+      say color("🌲  Read #{root.tree_size} nodes.", :green, :bold)
+
+      say color("🌤  Serving your site on port #{options.port}. Enjoy!", :bold)
       server = Flutterby::Server.new(root, port: options.port)
       server.run!
     end

data/lib/flutterby/node.rb

@@ -1,3 +1,5 @@
+require 'benchmark'
+
 module Flutterby
   class Node
     attr_accessor :parent, :ext, :source, :body
@@ -32,21 +34,24 @@ module Flutterby
 
     def reset_children!
       @children = []
-      me = self
+    end
+
+    def add_child(node)
+      node.parent = self
+      children << node
+    end
 
-      # Inject some extra methods into this array because this is dirty old Ruby
-      @children.define_singleton_method(:<<) do |c|
-        c.parent = me
-        super(c)
+    def find_child(name)
+      if name.include?(".")
+        @children.find { |c| c.full_name == name }
+      else
+        @children.find { |c| c.name == name }
       end
+    end
 
-      @children.define_singleton_method(:find_by_name) do |name|
-        # Look for a fully qualified name (index.html), or a simple name (index)?
-        if name.include?(".")
-          find { |c| c.full_name == name }
-        else
-          find { |c| c.name == name }
-        end
+    def tree_size
+      children.inject(children.length) do |count, child|
+        count + child.tree_size
       end
     end
 
@@ -81,6 +86,10 @@ module Flutterby
       parent ? parent.root : self
     end
 
+    def root?
+      root == self
+    end
+
     def sibling(name)
       parent && parent.find(name)
     end
@@ -99,7 +108,7 @@ module Flutterby
       when %r{^/} then
         root.find($')
       when %r{^([^/]+)/?} then
-        child = @children.find_by_name($1)
+        child = find_child($1)
         $'.empty? ? child : child.find($')
       end
     end
@@ -120,6 +129,16 @@ module Flutterby
       blk.call(self, val)
     end
 
+    # Walk the entire tree, top to bottom.
+    #
+    def walk_tree(val = nil, &blk)
+      val = blk.call(self, val)
+      children.each do |child|
+        val = child.walk_tree(val, &blk)
+      end
+
+      val
+    end
 
     #
     # Reading from filesystem
@@ -129,11 +148,13 @@ module Flutterby
       @body = nil
       reset_children!
 
+      # Load contents from filesystem
+      #
       if @fs_path
         if ::File.directory?(fs_path)
           Dir[::File.join(fs_path, "*")].each do |entry|
-            if node = Flutterby.from(entry)
-              children << node
+            if node = Flutterby.from(entry, parent: self)
+              add_child(node)
             end
           end
         else
@@ -153,8 +174,23 @@ module Flutterby
           send(meth) if respond_to?(meth)
         end
       end
+
+      # If this node is the root node, perform some preprocessing
+      if root?
+        preprocess!
+      end
+    end
+
+    def preprocess!
+      walk_tree do |node|
+        node.render_body! if node.should_preprocess?
+      end
     end
 
+    def should_preprocess?
+      should_publish? && !folder? &&
+        (filters.include?("json") || filters.include?("yaml"))
+    end
 
     #
     # Rendering
@@ -164,8 +200,16 @@ module Flutterby
       @view ||= View.for(self)
     end
 
+    def render_body!
+      time = Benchmark.realtime do
+        Filters.apply!(self)
+      end
+
+      logger.info "Rendered #{url} in #{sprintf "%.1f", time * 1000}ms"
+    end
+
     def body
-      Filters.apply!(self) if @body.nil?
+      render_body! if @body.nil?
       @body
     end
 
@@ -196,8 +240,11 @@ module Flutterby
 
     def export(into:)
       if should_publish?
-        puts "* #{url}"
-        write_static(into: into)
+        time = Benchmark.realtime do
+          write_static(into: into)
+        end
+
+        logger.info "Exported #{url}"
       end
     end
 
@@ -243,11 +290,11 @@ module Flutterby
     end
 
     def read_json
-      data.merge!(JSON.parse(@source))
+      data.merge!(JSON.parse(body))
     end
 
     def read_yaml
-      data.merge!(YAML.load(@source))
+      data.merge!(YAML.load(body))
     end
 
 
@@ -270,5 +317,9 @@ module Flutterby
     def page?
       !folder? && ext == "html"
     end
+
+    def logger
+      Flutterby.logger
+    end
   end
 end

data/lib/flutterby/server.rb

@@ -15,7 +15,7 @@ module Flutterby
         # puts "added absolute path: #{added}"
         # puts "removed absolute path: #{removed}"
 
-        puts "Change detected, reloading everything!"
+        Flutterby.logger.info "Change detected, reloading everything!"
         @root.reload!
       end
 
@@ -30,7 +30,7 @@ module Flutterby
 
       # Go!
       listener.start
-      server.run self, Port: @port
+      server.run self, Port: @port, Logger: Flutterby.logger
     end
 
     def call(env)

data/lib/flutterby/version.rb

@@ -1,3 +1,3 @@
 module Flutterby
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/flutterby/view.rb

@@ -25,8 +25,8 @@ module Flutterby
         view = new(file)
 
         # walk the tree up to dynamically extend the view
-        file.parent.walk_down do |e|
-          if view_node = e.find("_view.rb")
+        file.walk_down do |e|
+          if view_node = e.sibling("_view.rb")
             case view_node.ext
             when "rb" then
               mod = Module.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Hendrik Mans
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-08 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler