blossom 0.0.7 → 0.0.8

data/bin/blossom

@@ -38,7 +38,7 @@ require "rubygems"
 require "bundler/setup"
 require "blossom"
 
-run Blossom(__FILE__, #{name_symbol}, :cache => [1, :year])
+run Blossom(__FILE__, #{name_symbol}, :cache => [1, :day])
     end_file
 
     make_file "Gemfile", <<-"end_file"

data/lib/blossom.rb

@@ -7,18 +7,46 @@ require "rack/strip-www"
 require "hassle"
 
 module Blossom
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
+end
+
+def Blossom.get_seconds(value, unit)
+  days = 60 * 60 * 24
+  case unit
+  when :seconds, :second
+    value
+  when :minutes, :minute
+    value * 60
+  when :hours, :hour
+    value * 60 * 60
+  when :days, :day
+    value * days
+  when :weeks, :week
+    value * days * 7
+  when :months, :month
+    value * days * 30
+  when :years, :year
+    value * days * 365
+  else
+    raise ArgumentError, "Unrecognized unit: #{unit}"
+  end
 end
 
 def Blossom(root_file, index = :index, options = {})
   Rack::Builder.app do
-    use Rack::StripWWW
+    cache = options[:cache]
     use Hassle
+    use Rack::StripWWW
+    defined? Rack::Coffee and use Rack::Coffee,
+      :static => false,
+      :urls => "/",
+      :cache => !!cache,
+      :ttl => cache && Blossom.get_seconds(*cache)
     run Blossom::Base(root_file, index, options)
   end
 end
 
-def Blossom::Base(root_file, index = :index, blossom_options = {})
+def Blossom.Base(root_file, index = :index, blossom_options = {})
   root = File.dirname(root_file)
   Class.new(Sinatra::Base).tap do |app|
     app.class_eval do
@@ -62,34 +90,12 @@ def Blossom::Base(root_file, index = :index, blossom_options = {})
       
       define_method :blossom_headers do
         if blossom_options.include? :cache
-          seconds = get_seconds(*blossom_options[:cache])
-          { 'Cache-Control' => "public, max-age=#{seconds}" }
+          seconds = Blossom.get_seconds(*blossom_options[:cache])
+          { 'Cache-Control' => "max-age=#{seconds}" }
         else
           {}
         end
       end
-
-      def get_seconds(value, unit)
-        days = 60 * 60 * 24
-        case unit
-        when :seconds, :second
-          value
-        when :minutes, :minute
-          value * 60
-        when :hours, :hour
-          value * 60 * 60
-        when :days, :day
-          value * days
-        when :weeks, :week
-          value * days * 7
-        when :months, :month
-          value * days * 30
-        when :years, :year
-          value * days * 365
-        else
-          raise ArgumentError, "Unrecognized unit: #{unit}"
-        end
-      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +01:00
+date: 2010-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency