tiny_site 0.1.7 → 0.2.1

data/lib/tiny_site/version.rb

@@ -1,3 +1,3 @@
 class TinySite
-  VERSION = "0.1.7"
+  VERSION = "0.2.1"
 end

data/lib/tiny_site.rb

@@ -1,22 +1,28 @@
 require 'open-uri' 
+require 'forwardable'
 require 'RedCloth'
 require 'yaml'
 require 'haml'
 
 class TextileParts
-  def self.parse(tp, image_path='', file_path_postfix='')
+  def self.parse(tp, app)
+    @app = app
+    
     return {:title => '404 not found'} unless tp
     
     vars, *parts = tp.split(/^\+{4}([\w\d\-_]+)\+{4}$/)
     vars = YAML.load(vars) || {}
     
     parts = Hash[*parts]
-    parts.each{|k,v| parts[k] = textilize(v,image_path,file_path_postfix)}
+    parts.each{|k,v| parts[k] = textilize(v)}
     
     vars.update(parts)
   end
-  def self.textilize(string, image_path, file_path_postfix='')
-    string.gsub!(%r{!([\w\d\-\._]+)!}){ |a| "!#{image_path}/#{$1}#{file_path_postfix}!" }
+  def self.image_url_for(img_name)
+    @app.image_url_for img_name
+  end
+  def self.textilize(string)
+    string.gsub!(%r{!([\w\d\-\._]+)!}){ |a| "!#{image_url_for $1}!" }
     
     RedCloth.new(string).to_html
   end
@@ -68,37 +74,56 @@ class CachedHttpFile
 end
 
 class TinySite
+  class View
+    extend Forwardable
+    def_delegators :@app, :request_path, :query_string, :global, :page, :file_url_for, :image_url_for
+    
+    def initialize(app) ; @app = app ; end
+  end
+end
+
+class TinySite
+  attr_reader :file_path, :file_path_postfix, :file_extension, :image_path, :request_path, :query_string,
+              :request_path, :query_string
+  
   def initialize(opts)
     @file_path         = opts[:file_path]
     @file_path_postfix = opts[:file_path_postfix] || ''
-    @file_extension    = opts[:file_extension] || 'textile'
-    @image_path        = opts[:image_path] || File.join(@file_path, 'images')
-    @cache_buster      = opts[:cache_buster] || 'bust'
+    @file_extension    = opts[:file_extension]    || 'textile'
+    @image_path        = opts[:image_path]        || File.join(@file_path, 'images')
+    @cache_buster      = opts[:cache_buster]      || 'bust'
   end
   
-  def remote_file_url_for(filename)
-    File.join @file_path, "#{filename}.#{@file_extension}#{@file_path_postfix}"
+  def global
+          _, global_file = CachedHttpFile.get page_content_url_for('__global')
+    TextileParts.parse global_file, self
   end
   
-  def render
-    global_file_fetch_tread = Thread.new{
-            _, @global_file = CachedHttpFile.get remote_file_url_for('__global') } # get __global in background
-      @status, page_file    = CachedHttpFile.get remote_file_url_for(@path)
-            _, page_file    = CachedHttpFile.get remote_file_url_for(@status) if @status != 200
-    global_file_fetch_tread.join
-    
-    global = TextileParts.parse @global_file, @image_path, @file_path_postfix
-    page   = TextileParts.parse page_file,    @image_path, @file_path_postfix
-    
-    render_layout :global => global, :page => page, :env => {:path => @path, :query_string => @query_string}
+  def page
+    @status, page_file   = CachedHttpFile.get page_content_url_for(@request_path)
+          _, page_file   = CachedHttpFile.get page_content_url_for(@status.to_s)        if @status != 200
+    TextileParts.parse page_file, self
   end
   
-  def render_layout(params)
-    layout = params[:page][:layout] || params[:global][:layout] || 'layout'
-    
-    puts "rendering layout '#{layout}'"
-    haml = Haml::Engine.new File.open("#{layout}.haml").read, :format => :html5
-    haml.render Object.new, params
+  def status
+    @status or page && @status
+  end
+  
+  def image_url_for(img_name)
+    file_url_for img_name, @image_path
+  end
+  def file_url_for(filename, path=file_path)
+    File.join path, "#{filename}#{file_path_postfix}"
+  end
+  def page_content_url_for(filename)
+    file_url_for "#{filename.gsub(%r{^/$},'/index')}.#{file_extension}"
+  end
+  
+  def layout
+    page[:layout] || global[:layout] || 'layout'
+  end
+  def body
+    Haml::Engine.new(File.open("#{layout}.haml").read, :format => :html5).render view
   end
   
   def caching_header
@@ -107,14 +132,15 @@ class TinySite
     CachedHttpFile.bust and return { 'Cache-Control' => 'no-cache' }
   end
   
+  def view
+    @view ||= View.new self
+  end
+  
   def call(env)
-    @path, @query_string = env['PATH_INFO'], env['QUERY_STRING']
-    @path = '/index' if @path == '/'
-    
-    return [301, {'Location' => @path}, ''] if @path.gsub!(/\/$/,'')
+    @request_path, @query_string = env['PATH_INFO'], env['QUERY_STRING']
     
-    body = render # render the body first to set @status
-    [@status, caching_header, body]
+    return [301, {'Location' => @request_path}, ''] if @request_path.gsub!(/(.)\/$/,'\\1')
+    [status, caching_header, body]
   rescue => e
     puts "#{e.class}: #{e.message} #{e.backtrace}"
     [500, {}, 'Sorry, but something went wrong']

metadata

@@ -2,7 +2,7 @@
 name: tiny_site
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.2.1
 platform: ruby
 authors: 
 - Niko Dittmann
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +01:00
+date: 2011-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency