blossom 0.0.5 → 0.0.6

data/bin/blossom

@@ -9,8 +9,22 @@ def make_file(name, content)
   File.open(name, "w") { |file| file.write(content) }
 end
 
-case ARGV.length
-when 1
+def print_usage
+  warn "Usage: #$0 PROJECT-NAME"
+end
+
+if ARGV.empty?
+  print_usage
+elsif ARGV[0].start_with? "-"
+  case ARGV[0]
+  when "--version", "-v"
+    puts Blossom::VERSION
+  when "--help", "-h", "-?"
+    print_usage
+  else
+    warn "#$0: unrecognized option: #{ARGV[0]}"
+  end
+else
   name = ARGV.first
   name_symbol = name =~ /\W/ ? ":'#{name}'" : ":#{name}"
   unless File.exist? name
@@ -24,7 +38,7 @@ require "rubygems"
 require "bundler/setup"
 require "blossom"
 
-run Blossom(__FILE__, #{name_symbol})
+run Blossom(__FILE__, #{name_symbol}, :cache => [1, :year])
     end_file
 
     make_file "Gemfile", <<-"end_file"
@@ -65,12 +79,11 @@ This will run your application at <http://localhost:9292/>.\n\
 You can start hacking in \`#{name}.haml\' and \`#{name}.sass\'.\n\
 If you create \`x.haml\', it will show up at <http://localhost:9292/x>.\n\
 Images and other static files go in the \`static/\' directory.\n\
+In production, your pages are cached; configure this in \`config.ru\'.
 Good luck, have fun!\n\
 "
   else
     warn "#$0: error: file already exists: #{name}"
     exit -1
   end
-else
-  warn "Usage: #$0 PROJECT-NAME"
 end

data/lib/blossom.rb

@@ -7,18 +7,18 @@ require "rack/strip-www"
 require "hassle"
 
 module Blossom
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 
-def Blossom(root_file, index = :index)
+def Blossom(root_file, index = :index, options = {})
   Rack::Builder.app do
     use Rack::StripWWW
     use Hassle
-    run Blossom::Base(root_file, index)
+    run Blossom::Base(root_file, index, options)
   end
 end
 
-def Blossom::Base(root_file, index = :index)
+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
@@ -43,17 +43,51 @@ def Blossom::Base(root_file, index = :index)
       end
     
       get "/" do
+        headers blossom_headers
         haml settings.index
       end
   
       get "/:name.css", :file_exists? => :sass do
+        headers blossom_headers
         content_type "text/css", :charset => "utf-8"
         sass params[:name].to_sym
       end
   
       get "/:name", :file_exists? => :haml do
+        headers blossom_headers
         haml params[:name].to_sym
       end
+      
+      define_method :blossom_headers do
+        if blossom_options.include? :cache
+          seconds = get_seconds(*blossom_options[:cache])
+          { 'Cache-Control' => "public, 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
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency