hydeweb 0.1.10 → 0.1.11

data/HISTORY.md

@@ -1,3 +1,10 @@
+v0.1.11
+-------
+
+ - Deprecate in-app caching for rack-cache.
+ - The Hyde server now sends the Last-Modified HTTP header.
+ - New Hyde sites will now use rack-cache (optionally) when used as a Rack site.
+
 v0.1.10
 -------
 

data/data/new_site/config.ru

@@ -4,6 +4,11 @@
 require 'hyde'
 require 'hyde/server'
 
+begin
+  # Add the 'rack-cache' gem if you want to enable caching.
+  require 'rack/cache'
+  use Rack::Cache
+end
+
 Hyde::Project.new File.dirname(__FILE__)
-Hyde::Server.options[:cache] = true
 run Hyde::Server

data/data/new_site/hyde.conf

@@ -9,7 +9,7 @@ output_path:     _output
 # Other paths:
 layouts_path:    _layouts
 extensions_path: _extensions
-partials_path:   _layouts
+partials_path:   .
 
 # Files to be excluded from processing
 ignore:
@@ -17,7 +17,7 @@ ignore:
 - README*
 - config.ru
 - **/.*
-- **/_*.scss
+- **/_*
 
 # Optional options for layout engines
 tilt_options:

data/lib/hyde/cli.rb

@@ -68,13 +68,9 @@ class CLI < Shake
     port   = (params.extract('-p') || 4833).to_i
     host   = (params.extract('-o') || '0.0.0.0')
     daemon = (!! params.delete('-D'))
-    cache  = (!! params.delete('--cache'))
 
     require 'hyde/server'
 
-    # No caching whatsoever.
-    Hyde::Server.options[:cache] = cache
-
     if daemon
       pid = fork { Hyde::Server.run! :Host => host, :Port => port, :quiet => true }
       sleep 2
@@ -91,16 +87,13 @@ class CLI < Shake
   task.help = %{
     Usage:
 
-        #{executable} start [-p PORT] [-o HOST] [--cache] [-D]
+        #{executable} start [-p PORT] [-o HOST] [-D]
     
     Starts an HTTP server so you may rapidly test your project locally.
 
     If the -p and/or -o is specified, it will listen on the specified HOST:PORT.
     Otherwise, the default is 0.0.0.0:4833.
 
-    Hyde doesn't send cache instructions, ensuring that every page load is fresh.
-    You can use --cache to override this behavior.
-
     If -D is specified, it goes into daemon mode.
   }.gsub(/^ {4}/, '').strip.split("\n")
 

data/lib/hyde/server.rb

@@ -48,16 +48,17 @@ class Hyde
         begin
           page = Hyde::Page[env['PATH_INFO']]  or break not_found
 
-          if server.options[:cache]
-            # Fairly aggressive caching. Best for Rack apps.
-            res['Cache-Control'] = 'max-age=86400, public'
-          else
-            res['Cache-Control'] = 'no-cache'
-          end
+          # Make the clients use If-Modified-Since
+          res['Cache-Control'] = 'max-age=86400, public, must-revalidate'
 
+          mtime = [server.options[:last_modified], File.mtime(page.file)].compact.max
+          res['Last-Modified'] = mtime.to_s  if mtime
+
+          # Get the MIME type from Hyde, then fallback to Rack
           type = mime_type_for(page)
           res['Content-Type'] = type  if type
 
+          # Okay, we're done
           res.write page.to_html
           show_status page
         rescue => e
@@ -71,13 +72,9 @@ end
 
 module Hyde::Server
   # Available options:
-  #  - cache      - (bool) sets if we do caching or not. Defaults to false.
+  #   :last_modified  -- timestamp for all files
   def self.options
     @options ||= Hash.new 
-    if @options.empty?
-      @options[:cache] = true
-    end
-    @options
   end
 
   # :Host, :Port

data/lib/hyde.rb

@@ -15,7 +15,7 @@ require 'shake'
 Tilt.mappings['html'] = Tilt.mappings['erb']
 
 class Hyde
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)

data/test/unit/page_test.rb

@@ -41,15 +41,8 @@ class PageTest < TestCase
     assert_equal 'text/html', Page['/about/us.html'].mime_type
     assert_equal 'html', Page['/about/us.html'].default_ext
     assert_equal 'css',  Page['/css/style.css'].default_ext
-
-    assert_equal 'image/jpeg', Page['/images/foo.jpg'].mime_type
   end
 
-  test "ext" do
-    assert_equal '.html', Page['/'].ext
-    assert_equal '.jpg', Page['/images/foo.jpg'].ext
-  end
-  
   test "no layout" do
     page = Page['/hi.html']
     assert_equal false, page.meta.layout

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Rico Sta. Cruz