flutterby 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64a9b696e8df3a189602d85625d18e8443c9fc34
-  data.tar.gz: bdd0f27e2369cfa721796730a0731c8907729924
+  metadata.gz: 871ef039693c35c6a70dbc86544957d084f247a7
+  data.tar.gz: e7d491e74f143bf9a407113a1a24f74a34c7011f
 SHA512:
-  metadata.gz: 8a59e096e19e78c88150a77e69bd3a79e06c1ffaa0a51d99efab9fe623d3e7d0e928814377a25ede59105ab095e29a77b1e0baeb67cb37f9da13cdca14db2506
-  data.tar.gz: a0667f74b94ab8a4e71c6d1c197706111a02118277f333e21d49d1203a6486abe6fe688a617062a9ad968899b4af457c2472039a3aee5d45b8841ac99372bbb1
+  metadata.gz: bf3054184d1c4601fa3c936356269289ce99cd3f0fc03dac4c4c6400f719505dfb6c48e0e832ef5899455e54a40bb232c0a7cc91defa53d7b5987654d84173cb
+  data.tar.gz: 4743c753fd558f18beae2982b166ef349c5072a207ab4ae5ff01711783b197fd1f8a91f8a7517fb34e617bf40ea383df961d3555006e710a7b91842e9cc4b950

data/flutterby.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   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_development_dependency 'awesome_print', '~> 0'
+  spec.add_development_dependency 'gem-release', '~> 0'
 
   spec.add_dependency 'commander', '~> 4.4'
   spec.add_dependency 'slodown', '~> 0.3'

data/lib/flutterby/entity.rb

@@ -50,24 +50,6 @@ module Flutterby
       parent ? parent.root : self
     end
 
-
-    #
-    #  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)
     end

data/lib/flutterby/file.rb

@@ -9,6 +9,11 @@ module Flutterby
   class File < Entity
     attr_reader :contents
 
+    def reload!
+      @filtered_contents = nil
+      super
+    end
+
     def read
       @contents = ::File.read(fs_path)
 
@@ -37,20 +42,22 @@ module Flutterby
       data
     end
 
-    def filter_contents
-      result = @contents
-
-      # Apply all filters
-      filters.each do |filter|
-        meth = "process_#{filter}"
-        if respond_to?(meth)
-          result = send(meth, result)
-        else
-          puts "Woops, no #{meth} available :("
+    def filtered_contents
+      @filtered_contents ||= begin
+        result = @contents
+
+        # Apply all filters
+        filters.each do |filter|
+          meth = "process_#{filter}"
+          if respond_to?(meth)
+            result = send(meth, result)
+          else
+            puts "Woops, no #{meth} available :("
+          end
         end
-      end
 
-      result
+        result
+      end
     end
 
     def page?
@@ -106,21 +113,12 @@ module Flutterby
     end
 
     def render(layout: true)
-      rendered = filter_contents
+      rendered = filtered_contents
       (layout && apply_layout?) ? apply_layout(rendered) : rendered
     end
 
     def write_static(path)
       ::File.write(path, render)
     end
-
-    def serve(parts, req, res)
-      # Determine MIME type
-      mime_type = MIME::Types.type_for(ext) || "text/plain"
-
-      # Build response
-      res.headers["Content-Type"] = mime_type
-      res.body = [render]
-    end
   end
 end

data/lib/flutterby/folder.rb

@@ -34,18 +34,5 @@ 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

@@ -29,7 +29,41 @@ module Flutterby
 
       # Go!
       listener.start
-      server.run @root
+      server.run self
+    end
+
+    def call(env)
+      req  = Rack::Request.new(env)
+      res = Rack::Response.new([], 200, {})
+
+      parts = req.path.split("/").reject(&:empty?)
+
+      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"
+
+          # Build response
+          res.headers["Content-Type"] = mime_type
+          res.body = [current.render]
+          break
+        end
+      end
+
+      res
     end
   end
 end

data/lib/flutterby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Hendrik Mans
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,28 +56,28 @@ dependencies:
   name: awesome_print
   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: 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