flutterby 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ebc1c85a56b410c6147dd87503c8fd59cd0d74
-  data.tar.gz: 5d65a75d308e436afed08be445828ab94c02396e
+  metadata.gz: 257ac8a84ea41487bbf327f0e7a925f2ec8f3f5c
+  data.tar.gz: 93dfaeda969555a8197f38d794502f3cd7116926
 SHA512:
-  metadata.gz: e4a6a0aee56906711254d63a905a6c95e5cd098cbc76bb8936e522f6eaea97af49f2c8e3bc8f749857090ff40556c77e033cc5aabb86c832ef97f3aec1ce6c1f
-  data.tar.gz: f1918f98a08abb87bfd9e0298abb739dc76f74a3ee01bef2f926f696a8378c2b4b89f589c74b213141877e09a902c2b7f89197935956f4e8ed48208ada0641a0
+  metadata.gz: 5053ceb42b1769afe1e3a4755141bcb7944dc56f44d4ca587623e77c91b759362d9c499c23ecad0b621d8d5facc1c80e9c33e29df8005ac74594ca7971004fac
+  data.tar.gz: d9abe432d2f653ded73dec6b2140e7ca8a718632c81b25b16ba34300d6e66fe902d2a5ec9aa1c22912f55860bfbbe49df3be8c42e99e9042df0fda87b0c54796

data/lib/flutterby/file.rb

@@ -66,7 +66,19 @@ module Flutterby
     end
 
     def view
-      @view ||= View.new(self)
+      @view ||= begin
+        View.new(self).tap do |view|
+          # load additional view code
+          if view_entity = sibling("_view.rb")
+            case view_entity.ext
+            when "rb" then
+              view.instance_eval(view_entity.contents)
+            else
+              raise "Unknown view extension #{view_entity.full_name}"
+            end
+          end
+        end
+      end
     end
 
     def process_erb(input)

data/lib/flutterby/server.rb

@@ -40,29 +40,39 @@ module Flutterby
 
       current = @root
 
-      loop do
-        case current
-        when Flutterby::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
-            res.headers["Content-Type"] = "text/html"
-            res.body = ["404"]
-            break
-          end
-        when Flutterby::File then
-          # Determine MIME type
-          mime_type = MIME::Types.type_for(current.ext) || "text/plain"
+      result = catch :halt do
+        loop do
+          # 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 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
+          when Flutterby::File then
+            # 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]
-          break
+            # Build response
+            res.headers["Content-Type"] = mime_type
+            res.body = [current.render]
+            throw :halt
+          end
         end
       end
 
+      case result
+      when :error_404 then
+        res.status = 404
+        res.headers["Content-Type"] = "text/html"
+        res.body = ["404"]
+      end
+
       res
     end
   end

data/lib/flutterby/version.rb

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

metadata

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