flutterby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92409201cdf6f744cf869271e0361b75b771dc6c
-  data.tar.gz: 274684a4a805f04b6b8f3739a5c8fcaf5f148f97
+  metadata.gz: aa91b42f64b52a8f3a568cd3a95ac7d366d997ea
+  data.tar.gz: 6ee2175701e8b15dae84f1a8665f0473678851fa
 SHA512:
-  metadata.gz: b6b3cf80130ea4afdb07faa75e04ba6e680883a7c5f3f6ada5cd2b426a73c5ee23fa9e413dbd3587614e7c78a54c6cef7041f240360f446698102570d06bf806
-  data.tar.gz: 28596862f6dce075e164ef713c38497e494d2b7e132b75fe1930e9710c116ffcde346c234c19f94c1e53e971b2962c01704d680b65b25bdd604ed4c2ddab55cf
+  metadata.gz: e4b993b640531755f04c6115ee949c26d7cb1d0f4ff2adaac173397cf1b94b688ef3e051369880f369ab9dd9e779ac4d11dabb9924d843ad71bb5be0277eb912
+  data.tar.gz: ca707746919b8e08c0563506d67ecc9a32fa9d32c8c373164b9f2ae18102abfef51680c3506fd3e7a1c3106325f0a342e6a8caa4e93701ddfafb4d522c7d86dd

data/lib/flutterby/cli.rb

@@ -17,7 +17,7 @@ Commander.configure do
       options.default in: "./site/", out: "./_build/"
 
       root = Flutterby.from(options.in, name: "/")
-      root.export(options.out)
+      root.export(into: options.out)
     end
   end
   alias_command :b, :build

data/lib/flutterby/{entity.rb → node.rb}

@@ -1,13 +1,11 @@
 module Flutterby
-  class Entity
-    attr_accessor :parent, :ext
+  class Node
+    attr_accessor :parent, :ext, :source, :body
     attr_reader :name, :filters, :fs_path, :data, :children
-    alias_method :folder, :parent
 
     def initialize(name, parent: nil, fs_path: nil)
       @parent  = parent
       @data    = {}
-      reset_children!
 
       # Extract name, extension, and filters from given name
       parts    = name.split(".")
@@ -23,8 +21,9 @@ module Flutterby
       # If a filesystem path was given, read the entity from disk
       if fs_path
         @fs_path = ::File.expand_path(fs_path)
-        read
       end
+
+      reload!
     end
 
     #
@@ -127,27 +126,95 @@ module Flutterby
     #
 
     def reload!
+      @body = nil
       reset_children!
-      read
+
+      if @fs_path
+        if ::File.directory?(fs_path)
+          Dir[::File.join(fs_path, "*")].each do |entry|
+            if entity = Flutterby.from(entry)
+              children << entity
+            end
+          end
+        else
+          @source = ::File.read(fs_path)
+
+          # Extract date from name
+          if name =~ %r{^(\d\d\d\d\-\d\d?\-\d\d?)\-}
+            @data['date'] = Time.parse($1)
+          end
+
+          # Read remaining data from frontmatter. Data in frontmatter
+          # will always have precedence!
+          @data.merge! parse_frontmatter
+
+          # Do some extra processing depending on extension
+          meth = "read_#{ext}"
+          send(meth) if respond_to?(meth)
+        end
+      end
     end
 
-    def read
+
+    #
+    # Rendering
+    #
+
+    def view
+      @view ||= View.for(self)
+    end
+
+    def body
+      Filters.apply!(self) if @body.nil?
+      @body
     end
 
+    def render(layout: true)
+      (layout && apply_layout?) ? apply_layout(body) : body
+    end
+
+    def apply_layout(input)
+      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
+    end
+
+    def apply_layout?
+      page?
+    end
+
+
 
     #
     # Exporting
     #
 
-    def export(out_path)
+    def export(into:)
       if should_publish?
-        out_path = full_fs_path(base: out_path)
-        puts "* #{@name}: #{out_path}"
-        write_static(out_path)
+        puts "* #{url}"
+        write_static(into: into)
       end
     end
 
-    def write_static(path)
+    def write_static(into:)
+      if folder?
+        # write children, acting as a directory
+
+        path = full_fs_path(base: into)
+        Dir.mkdir(path) unless ::File.exists?(path)
+
+        children.each do |child|
+          child.export(into: path)
+        end
+      else
+        # write a file
+        ::File.write(full_fs_path(base: into), render)
+      end
     end
 
     def should_publish?
@@ -155,6 +222,34 @@ module Flutterby
     end
 
 
+    #
+    # Front Matter Parsing
+    #
+
+    def parse_frontmatter
+      data = {}
+
+      # YAML Front Matter
+      if @source.sub!(/\A\-\-\-\n(.+)\n\-\-\-\n/m, "")
+        data.merge! YAML.load($1)
+      end
+
+      # TOML Front Matter
+      if @source.sub!(/\A\+\+\+\n(.+)\n\+\+\+\n/m, "")
+        data.merge! TOML.parse($1)
+      end
+
+      data
+    end
+
+    def read_json
+      data.merge!(JSON.parse(@source))
+    end
+
+    def read_yaml
+      data.merge!(YAML.load(@source))
+    end
+
 
     #
     # Misc
@@ -168,8 +263,12 @@ module Flutterby
       [name, ext].compact.join(".")
     end
 
+    def folder?
+      children.any?
+    end
+
     def page?
-      false
+      !folder? && ext == "html"
     end
   end
 end

data/lib/flutterby/server.rb

@@ -46,8 +46,7 @@ module Flutterby
           # halt if we're not supposed to serve current entity
           throw :halt, :error_404 unless current.should_publish?
 
-          case current
-          when Flutterby::Folder then
+          if current.folder? then
             # If no further parts are requested, let's look for an index
             # document and serve that instead.
             if child = current.find(parts.empty? ? "index" : parts.shift)
@@ -55,7 +54,7 @@ module Flutterby
             else
               throw :halt, :error_404
             end
-          when Flutterby::File then
+          else
             # Determine MIME type
             mime_type = MIME::Types.type_for(current.ext) || "text/plain"
 

data/lib/flutterby/version.rb

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

data/lib/flutterby/view.rb

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

data/lib/flutterby.rb

@@ -1,7 +1,13 @@
+require 'slodown'
+require 'sass'
+require 'tilt'
+require 'slim'
+require 'toml'
+require 'mime-types'
+require 'json'
+
 require "flutterby/version"
-require "flutterby/entity"
-require "flutterby/file"
-require "flutterby/folder"
+require "flutterby/node"
 require "flutterby/filters"
 require "flutterby/view"
 require "flutterby/server"
@@ -11,10 +17,8 @@ module Flutterby
   def Flutterby.from(fs_path, name: nil, parent: nil)
     name ||= ::File.basename(fs_path)
 
-    if ::File.directory?(fs_path)
-      Folder.new(name, fs_path: fs_path, parent: parent)
-    elsif ::File.file?(fs_path)
-      File.new(name, fs_path: fs_path, parent: parent)
+    if ::File.exist?(fs_path)
+      Node.new(name, fs_path: fs_path, parent: parent)
     else
       raise "Path #{fs_path} could not be found."
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Hendrik Mans
@@ -243,10 +243,8 @@ files:
 - flutterby.gemspec
 - lib/flutterby.rb
 - lib/flutterby/cli.rb
-- lib/flutterby/entity.rb
-- lib/flutterby/file.rb
 - lib/flutterby/filters.rb
-- lib/flutterby/folder.rb
+- lib/flutterby/node.rb
 - lib/flutterby/server.rb
 - lib/flutterby/version.rb
 - lib/flutterby/view.rb

data/lib/flutterby/file.rb

@@ -1,95 +0,0 @@
-require 'slodown'
-require 'sass'
-require 'tilt'
-require 'slim'
-require 'toml'
-require 'mime-types'
-require 'json'
-
-module Flutterby
-  class File < Entity
-    attr_accessor :source, :body
-
-    def reload!
-      @body = nil
-      super
-    end
-
-    def read
-      @source = ::File.read(fs_path)
-
-      # Extract date from name
-      if name =~ %r{^(\d\d\d\d\-\d\d?\-\d\d?)\-}
-        @data['date'] = Time.parse($1)
-      end
-
-      # Read remaining data from frontmatter. Data in frontmatter
-      # will always have precedence!
-      @data.merge! parse_frontmatter
-
-      # Do some extra processing depending on extension
-      meth = "read_#{ext}"
-      send(meth) if respond_to?(meth)
-    end
-
-    def parse_frontmatter
-      data = {}
-
-      # YAML Front Matter
-      if @source.sub!(/\A\-\-\-\n(.+)\n\-\-\-\n/m, "")
-        data.merge! YAML.load($1)
-      end
-
-      # TOML Front Matter
-      if @source.sub!(/\A\+\+\+\n(.+)\n\+\+\+\n/m, "")
-        data.merge! TOML.parse($1)
-      end
-
-      data
-    end
-
-    def body
-      Filters.apply!(self) if @body.nil?
-      @body
-    end
-
-    def page?
-      ext == "html"
-    end
-
-    def view
-      @view ||= View.for(self)
-    end
-
-    def read_json
-      data.merge!(JSON.parse(@source))
-    end
-
-    def read_yaml
-      data.merge!(YAML.load(@source))
-    end
-
-    def apply_layout(input)
-      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
-    end
-
-    def apply_layout?
-      page?
-    end
-
-    def render(layout: true)
-      (layout && apply_layout?) ? apply_layout(body) : body
-    end
-
-    def write_static(path)
-      ::File.write(path, render)
-    end
-  end
-end

data/lib/flutterby/folder.rb

@@ -1,19 +0,0 @@
-module Flutterby
-  class Folder < Entity
-    def read
-      Dir[::File.join(fs_path, "*")].each do |entry|
-        if entity = Flutterby.from(entry)
-          children << entity
-        end
-      end
-    end
-
-    def write_static(path)
-      Dir.mkdir(path) unless ::File.exists?(path)
-
-      children.each do |child|
-        child.export(path)
-      end
-    end
-  end
-end