flutterby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871ef039693c35c6a70dbc86544957d084f247a7
-  data.tar.gz: e7d491e74f143bf9a407113a1a24f74a34c7011f
+  metadata.gz: 46ebc1c85a56b410c6147dd87503c8fd59cd0d74
+  data.tar.gz: 5d65a75d308e436afed08be445828ab94c02396e
 SHA512:
-  metadata.gz: bf3054184d1c4601fa3c936356269289ce99cd3f0fc03dac4c4c6400f719505dfb6c48e0e832ef5899455e54a40bb232c0a7cc91defa53d7b5987654d84173cb
-  data.tar.gz: 4743c753fd558f18beae2982b166ef349c5072a207ab4ae5ff01711783b197fd1f8a91f8a7517fb34e617bf40ea383df961d3555006e710a7b91842e9cc4b950
+  metadata.gz: e4a6a0aee56906711254d63a905a6c95e5cd098cbc76bb8936e522f6eaea97af49f2c8e3bc8f749857090ff40556c77e033cc5aabb86c832ef97f3aec1ce6c1f
+  data.tar.gz: f1918f98a08abb87bfd9e0298abb739dc76f74a3ee01bef2f926f696a8378c2b4b89f589c74b213141877e09a902c2b7f89197935956f4e8ed48208ada0641a0

data/lib/flutterby.rb

@@ -5,6 +5,7 @@ require "flutterby/folder"
 require "flutterby/view"
 require "flutterby/server"
 
+
 module Flutterby
   def Flutterby.from(fs_path, name: nil, parent: nil)
     name ||= ::File.basename(fs_path)

data/lib/flutterby/cli.rb

@@ -35,15 +35,4 @@ Commander.configure do
       server.run!
     end
   end
-
-
-  command :test do |c|
-    c.syntax = 'flutterby test'
-    c.description = 'TEST. Yo.'
-    c.action do |args, options|
-      root = Flutterby.from("./in", name: "/")
-      root.list
-      root.export("./out/")
-    end
-  end
 end

data/lib/flutterby/entity.rb

@@ -1,10 +1,11 @@
 module Flutterby
   class Entity
-    attr_reader :name, :ext, :filters, :parent, :fs_path, :path, :data
+    attr_accessor :parent
+    attr_reader :name, :ext, :filters, :fs_path, :data, :children
 
     def initialize(name, parent: nil, fs_path: nil)
-      @parent  = parent
       @data    = {}
+      reset_children!
 
       # Extract name, extension, and filters from given name
       parts = name.split(".")
@@ -12,8 +13,7 @@ module Flutterby
       @ext  = parts.shift
       @filters = parts.reverse
 
-      # Calculate full path
-      @path = parent ? ::File.join(parent.path, full_name) : full_name
+      self.parent = parent
 
       # If a filesystem path was given, read the entity from disk
       if fs_path
@@ -22,30 +22,53 @@ module Flutterby
       end
     end
 
-    def reload!
-      read
+    #
+    # Children
+    #
+
+    def reset_children!
+      @children = []
+      me = self
+
+      # Inject some extra methods into this array because this is dirty old Ruby
+      @children.define_singleton_method(:<<) do |c|
+        c.parent = me
+        super(c)
+      end
+
+      @children.define_singleton_method(:find_by_name) do |name|
+        name = name.split('.').first
+        find { |c| c.name == name }
+      end
     end
 
-    def list(indent: 0)
-      puts "#{"   " * indent}[#{self.class}] #{path}"
+    # Returns all children that will compile to a HTML page.
+    #
+    def pages
+      children.select { |c| c.ext == "html" }
     end
 
-    def export(out_path)
-      if should_publish?
-        out_path = full_path(out_path)
-        puts "* #{@name}: #{out_path}"
-        write_static(out_path)
-      end
+    #
+    # Path Algebra
+    #
+
+    def path
+      parent ? ::File.join(parent.path, full_name) : full_name
     end
 
     def url
       @url ||= ::File.join(parent ? parent.url : "/", full_name)
     end
 
-    def full_path(base)
+    def full_fs_path(base:)
       ::File.expand_path(::File.join(base, full_name))
     end
 
+
+    #
+    # Tree Walking
+    #
+
     def root
       parent ? parent.root : self
     end
@@ -54,13 +77,51 @@ module Flutterby
       parent && parent.find(name)
     end
 
-    def full_name
-      @full_name ||= [name, ext].compact.join(".")
+    def find(path)
+      return self if path.nil? || path.empty?
+
+      # remove duplicate slashes
+      path.gsub!(%r{//}, "/")
+
+      case path
+      when %r{^\.\./?} then
+        parent ? parent.find($') : nil
+      when %r{^\.} then
+        self
+      when %r{^/} then
+        root.find($')
+      when %r{^([^/]+)/?} then
+        child = @children.find_by_name($1)
+        $'.empty? ? child : child.find($')
+      end
+    end
+
+
+    #
+    # Reading from filesystem
+    #
+
+    def reload!
+      reset_children!
+      read
     end
 
     def read
     end
 
+
+    #
+    # Exporting
+    #
+
+    def export(out_path)
+      if should_publish?
+        out_path = full_fs_path(base: out_path)
+        puts "* #{@name}: #{out_path}"
+        write_static(out_path)
+      end
+    end
+
     def write_static(path)
     end
 
@@ -68,6 +129,20 @@ module Flutterby
       !name.start_with?("_")
     end
 
+
+
+    #
+    # Misc
+    #
+
+    def to_s
+      "<#{self.class} #{self.path}>"
+    end
+
+    def full_name
+      @full_name ||= [name, ext].compact.join(".")
+    end
+
     def page?
       false
     end

data/lib/flutterby/file.rb

@@ -29,14 +29,15 @@ module Flutterby
 
     def parse_frontmatter
       data = {}
-      @contents.sub!(/\A\-\-\-\n(.+)\n\-\-\-\n/m) do
+
+      # YAML Front Matter
+      if @contents.sub!(/\A\-\-\-\n(.+)\n\-\-\-\n/m, "")
         data.merge! YAML.load($1)
-        ""
       end
 
-      @contents.sub!(/\A\+\+\+\n(.+)\n\+\+\+\n/m) do
+      # TOML Front Matter
+      if @contents.sub!(/\A\+\+\+\n(.+)\n\+\+\+\n/m, "")
         data.merge! TOML.parse($1)
-        ""
       end
 
       data

data/lib/flutterby/folder.rb

@@ -1,38 +1,19 @@
 module Flutterby
   class Folder < Entity
-    attr_reader :children
-
-    def list(indent: 0)
-      super
-      children.each { |c| c.list(indent: indent + 1) }
-    end
-
     def read
-      @children = Dir[::File.join(fs_path, "*")].map do |entry|
-        Flutterby.from(entry, parent: self)
-      end.compact
+      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|
+      children.each do |child|
         child.export(path)
       end
     end
-
-    def find(path)
-      (name, slash, rest) = path.partition("/")
-
-      name = name.split('.').first
-      child = @children.find { |c| c.name == name }
-      rest.empty? ? child : child.find(rest)
-    end
-
-    # Returns all children that will compile to a HTML page.
-    #
-    def pages
-      children.select { |c| c.ext == "html" }
-    end
   end
 end

data/lib/flutterby/version.rb

@@ -1,3 +1,3 @@
 module Flutterby
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/flutterby/view.rb

@@ -1,6 +1,7 @@
 module Flutterby
   class View
     attr_reader :entity
+    alias_method :page, :entity
 
     def initialize(entity)
       @entity = entity
@@ -9,5 +10,13 @@ module Flutterby
     def date_format(date, fmt)
       date.strftime(fmt)
     end
+
+    def render(expr, *args)
+      find(expr).render(*args)
+    end
+
+    def find(expr)
+      entity.find(expr) or raise "No entity found for #{expr}"
+    end
   end
 end

metadata

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