flutterby 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa91b42f64b52a8f3a568cd3a95ac7d366d997ea
-  data.tar.gz: 6ee2175701e8b15dae84f1a8665f0473678851fa
+  metadata.gz: a2c1bd44e0401ad1f8046a70b01ca191d8d8661c
+  data.tar.gz: 74e111066e2dcdf84c50db61daab894e069d7376
 SHA512:
-  metadata.gz: e4b993b640531755f04c6115ee949c26d7cb1d0f4ff2adaac173397cf1b94b688ef3e051369880f369ab9dd9e779ac4d11dabb9924d843ad71bb5be0277eb912
-  data.tar.gz: ca707746919b8e08c0563506d67ecc9a32fa9d32c8c373164b9f2ae18102abfef51680c3506fd3e7a1c3106325f0a342e6a8caa4e93701ddfafb4d522c7d86dd
+  metadata.gz: f0a76a23bd09f814804040af24d20df03e7ddcbfa3f1c88833019b356db31ec8f3c228c85a592e86f237d41a71bfd10a9c21af7bc92ff26ad4f6f5d15fb7f73e
+  data.tar.gz: 7bde567d6c410cab6bee564921f6598b0549ed45b322fb96f0daab9fbb11dfbde57f8abc7a8ca46b316fa99f51e17f0a34fffed592f85d9bc0a476384fc0bf3d

data/lib/flutterby/node.rb

@@ -18,7 +18,7 @@ module Flutterby
       #
       @ext     = @filters.last
 
-      # If a filesystem path was given, read the entity from disk
+      # If a filesystem path was given, read the node from disk
       if fs_path
         @fs_path = ::File.expand_path(fs_path)
       end
@@ -104,16 +104,16 @@ 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.
+    # Walk the tree up, invoking the passed block for every node
+    # found on the way, passing the node 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.
+    # Walk the graph from the root to this node. Just like walk_up,
+    # except the block will be called on higher level nodes first.
     #
     def walk_down(val = nil, &blk)
       val = parent ? parent.walk_up(val, &blk) : val
@@ -132,8 +132,8 @@ module Flutterby
       if @fs_path
         if ::File.directory?(fs_path)
           Dir[::File.join(fs_path, "*")].each do |entry|
-            if entity = Flutterby.from(entry)
-              children << entity
+            if node = Flutterby.from(entry)
+              children << node
             end
           end
         else

data/lib/flutterby/server.rb

@@ -39,31 +39,8 @@ module Flutterby
 
       parts = req.path.split("/").reject(&:empty?)
 
-      current = @root
-
       result = catch :halt do
-        loop do
-          # halt if we're not supposed to serve current entity
-          throw :halt, :error_404 unless current.should_publish?
-
-          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)
-              current = child
-            else
-              throw :halt, :error_404
-            end
-          else
-            # Determine MIME type
-            mime_type = MIME::Types.type_for(current.ext) || "text/plain"
-
-            # Build response
-            res.headers["Content-Type"] = mime_type
-            res.body = [current.render]
-            throw :halt
-          end
-        end
+        serve(@root, parts, req, res)
       end
 
       case result
@@ -75,5 +52,31 @@ module Flutterby
 
       res
     end
+
+    def serve(node, parts, req, res)
+      # halt if we're not supposed to serve current node
+      throw :halt, :error_404 unless node.should_publish?
+
+      # If there are parts left, find them and delegate to the next
+      # node in the chain; otherwise, render this specific node.
+      #
+      if parts.any?
+        if child = node.find(parts.shift)
+          serve(child, parts, req, res)
+        else
+          throw :halt, :error_404
+        end
+      elsif child = node.find("index")
+        serve(child, parts, req, res)
+      else
+        # Determine MIME type
+        mime_type = MIME::Types.type_for(node.ext) || "text/plain"
+
+        # Build response
+        res.headers["Content-Type"] = mime_type
+        res.body = [node.render]
+        throw :halt
+      end
+    end
   end
 end

data/lib/flutterby/version.rb

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

data/lib/flutterby/view.rb

@@ -1,10 +1,10 @@
 module Flutterby
   class View
-    attr_reader :entity
-    alias_method :page, :entity
+    attr_reader :node
+    alias_method :page, :node
 
-    def initialize(entity)
-      @entity = entity
+    def initialize(node)
+      @node = node
     end
 
     def date_format(date, fmt)
@@ -16,7 +16,7 @@ module Flutterby
     end
 
     def find(expr)
-      entity.find(expr) or raise "No entity found for #{expr}"
+      node.find(expr) or raise "No node found for #{expr}"
     end
 
     class << self
@@ -26,12 +26,14 @@ module Flutterby
 
         # walk the tree up to dynamically extend the view
         file.parent.walk_down do |e|
-          if view_entity = e.find("_view.rb")
-            case view_entity.ext
+          if view_node = e.find("_view.rb")
+            case view_node.ext
             when "rb" then
-              view.instance_eval(view_entity.source)
+              mod = Module.new
+              mod.class_eval(view_node.source)
+              view.extend mod
             else
-              raise "Unknown view extension #{view_entity.full_name}"
+              raise "Unknown view extension #{view_node.full_name}"
             end
           end
         end

metadata

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