flutterby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20cc78c87b60aef744ffbc565db9bee17d25733f
-  data.tar.gz: '09966bb3f860d28727e6569e73b105679ac39045'
+  metadata.gz: 8e74e653d62257035937eb6cec35fafae4ae6272
+  data.tar.gz: b0b8918a534bad69247b60e209e5431d31f08731
 SHA512:
-  metadata.gz: 94a9745b04134116f517348ebf0dc3569827226d67ee04fcfd59928781b15c12cf47ac58e4eb1d99b1f3eee4df020caf0857b53a8577f26881d755d2c7886fdf
-  data.tar.gz: d46433b7fd0c1ec835032739bd39afaf320e16f60d8f43248dbfc6b54a35711e76373a13f817cceadc3adc492506b47471ef7de2da974643a212a12b79d28cad
+  metadata.gz: d3a8ac8a2eb8e1c53bdbec7b07742cd82461d8255ffe612ef630eaa7b925c6f657e18769854c559463bbc80f08497e5268d31a29d05adaf0ec4c3c910c1a5054
+  data.tar.gz: 1189422cf9ed293b66e6295ff3c0eb0a8b7eeba09d7efe1ffda75ab0de592197e5c97f75a86211f3dd5d6d6cf1503ecdb3577190a0f6941184fa2b22cfd9bb9c

data/flutterby.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'gem-release'
 
   spec.add_dependency 'commander'
   spec.add_dependency 'slodown'
@@ -33,4 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'slim'
   spec.add_dependency 'toml-rb'
   spec.add_dependency 'rack'
+  spec.add_dependency 'listen'
+  spec.add_dependency 'mime-types'
 end

data/lib/flutterby/cli.rb

@@ -21,6 +21,22 @@ Commander.configure do
     end
   end
 
+  command :serve do |c|
+    c.syntax = 'flutterby serve [options]'
+    c.description = "Serve your website for development."
+
+    c.option '--in DIR', String, "Directory containing your source files"
+
+    c.action do |args, options|
+      options.default in: "./site/"
+
+      root = Flutterby.from(options.in, name: "/")
+      server = Flutterby::Server.new(root)
+      server.run!
+    end
+  end
+
+
   command :test do |c|
     c.syntax = 'flutterby test'
     c.description = 'TEST. Yo.'

data/lib/flutterby/entity.rb

@@ -1,15 +1,16 @@
 module Flutterby
   class Entity
-    attr_reader :name, :ext, :filters, :parent, :fs_path, :path
+    attr_reader :name, :ext, :filters, :parent, :fs_path, :path, :data
 
     def initialize(name, parent: nil, fs_path: nil)
       @parent  = parent
+      @data    = {}
 
       # Extract name, extension, and filters from given name
       parts = name.split(".")
       @name = parts.shift
       @ext  = parts.shift
-      @filters = parts
+      @filters = parts.reverse
 
       # Calculate full path
       @path = parent ? ::File.join(parent.path, full_name) : full_name
@@ -21,6 +22,10 @@ module Flutterby
       end
     end
 
+    def reload!
+      read
+    end
+
     def list(indent: 0)
       puts "#{"   " * indent}[#{self.class}] #{path}"
     end
@@ -33,7 +38,8 @@ module Flutterby
       end
     end
 
-    def process
+    def process_filters(input)
+      input
     end
 
     def url
@@ -44,15 +50,27 @@ module Flutterby
       ::File.expand_path(::File.join(base, full_name))
     end
 
-    def call(env)
-      ['200', {"Content-Type" => "text/html"}, [name]]
-    end
-
     def root
       parent ? parent.root : self
     end
 
-    private
+
+    #
+    #  Serving
+    #
+
+    def call(env)
+      env['rack.request']  ||= Rack::Request.new(env)
+      env['rack.response'] ||= Rack::Response.new([], 200, {})
+      parts = env['rack.request'].path.split("/").reject(&:empty?)
+
+      serve(parts, env['rack.request'], env['rack.response'])
+
+      env['rack.response']
+    end
+
+    def serve(parts, req, res)
+    end
 
     def sibling(name)
       parent && parent.find(name)

data/lib/flutterby/file.rb

@@ -3,14 +3,23 @@ require 'sass'
 require 'tilt'
 require 'slim'
 require 'toml'
+require 'mime-types'
 
 module Flutterby
   class File < Entity
-    attr_reader :contents, :data
+    attr_reader :contents
 
     def read
       @contents = ::File.read(fs_path)
-      @data = parse_frontmatter
+
+      # 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
     end
 
     def parse_frontmatter
@@ -28,16 +37,18 @@ module Flutterby
       data
     end
 
-    def process!
-      # Apply processors
-      while filter = filters.pop do
+    def process_filters(input)
+      # Apply all filters
+      filters.each do |filter|
         meth = "process_#{filter}"
         if respond_to?(meth)
-          send(meth)
+          input = send(meth, input)
         else
           puts "Woops, no #{meth} available :("
         end
       end
+
+      input
     end
 
     def page?
@@ -48,27 +59,27 @@ module Flutterby
       @view ||= View.new(self)
     end
 
-    def process_erb
-      tilt = Tilt["erb"].new { @contents }
-      @contents = tilt.render(view)
+    def process_erb(input)
+      tilt = Tilt["erb"].new { input }
+      tilt.render(view)
     end
 
-    def process_slim
-      tilt = Tilt["slim"].new { @contents }
-      @contents = tilt.render(view)
+    def process_slim(input)
+      tilt = Tilt["slim"].new { input }
+      tilt.render(view)
     end
 
-    def process_md
-      @contents = Slodown::Formatter.new(@contents).complete.to_s
+    def process_md(input)
+      Slodown::Formatter.new(input).complete.to_s
     end
 
-    def process_scss
-      engine = Sass::Engine.new(@contents, syntax: :scss)
-      @contents = engine.render
+    def process_scss(input)
+      engine = Sass::Engine.new(input, syntax: :scss)
+      engine.render
     end
 
-    def apply_layout
-      output = @contents
+    def apply_layout(input)
+      output = input
 
       # collect layouts to apply
       layouts = []
@@ -93,10 +104,23 @@ module Flutterby
     end
 
     def write_static(path)
-      process!
-      output = apply_layout? ? apply_layout : @contents
+      rendered = process_filters(@contents)
+      output = apply_layout? ? apply_layout(rendered) : rendered
 
       ::File.write(path, output)
     end
+
+    def serve(parts, req, res)
+      # TODO: DRY this up
+      rendered = process_filters(@contents)
+      output = apply_layout? ? apply_layout(rendered) : rendered
+
+      # Determine MIME type
+      mime_type = MIME::Types.type_for(ext) || "text/plain"
+
+      # Build response
+      res.headers["Content-Type"] = mime_type
+      res.body = [output]
+    end
   end
 end

data/lib/flutterby/folder.rb

@@ -22,6 +22,7 @@ module Flutterby
     end
 
     def find(name)
+      name = name.split('.').first
       @children.find { |c| c.name == name }
     end
 
@@ -30,5 +31,18 @@ module Flutterby
     def pages
       children.select { |c| c.ext == "html" }
     end
+
+
+
+    def serve(parts, req, res)
+      # If no further parts are requested, let's look for an index
+      # document and serve that instead.
+      if child = find(parts.empty? ? "index" : parts.shift)
+        child.serve(parts, req, res)
+      else
+        res.headers["Content-Type"] = "text/html"
+        res.body = ["404"]
+      end
+    end
   end
 end

data/lib/flutterby/server.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'listen'
 
 module Flutterby
   class Server
@@ -7,7 +8,28 @@ module Flutterby
     end
 
     def run!
-      Rack::Handler::WEBrick.run @root
+      # Set up listener
+      listener = Listen.to(@root.fs_path) do |modified, added, removed|
+        # puts "modified absolute path: #{modified}"
+        # puts "added absolute path: #{added}"
+        # puts "removed absolute path: #{removed}"
+
+        puts "Change detected, reloading everything!"
+        @root.reload!
+      end
+
+      # Set up server
+      server = Rack::Handler::WEBrick
+
+      # Make sure we handle interrupts correctly
+      trap('INT') do
+        listener.stop
+        server.shutdown
+      end
+
+      # Go!
+      listener.start
+      server.run @root
     end
   end
 end

data/lib/flutterby/version.rb

@@ -1,3 +1,3 @@
 module Flutterby
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Hendrik Mans
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  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: mime-types
+  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'
 description: There are many static site generators. This is mine.
 email:
 - hendrik@mans.de