tiny_site 0.1.2 → 0.1.3

data/lib/tiny_site/version.rb

@@ -1,3 +1,3 @@
 class TinySite
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/tiny_site.rb

@@ -5,13 +5,16 @@ require 'haml'
 
 class TextileParts
   def self.parse(tp, image_path='')
-    vars, *parts =  tp.split(/^\+\+\+\+|\+\+\+\+$/)
+    return [{:title => '404 not found'},{}] unless tp
+    
+    vars, *parts = tp.split(/^\+{4}|\+{4}$/)
     
     vars = YAML.load(vars) || {}
+    
     parts = Hash[*parts]
     parts.each{|k,v| parts[k] = textilize(v,image_path)}
     
-    return vars, parts
+    vars.update(parts)
   end
   def self.textilize(string, image_path)
     string.gsub!(%r{!([\w\d\-\._]+)!}){ |a| "!#{image_path}/#{$1}!" }
@@ -68,12 +71,13 @@ end
 class TinySite
   def initialize(opts)
     @file_path    = opts[:file_path]
+    @file_ending  = opts[:file_ending] || '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}.textile"
+    File.join @file_path, "#{filename}.#{@file_ending}"
   end
   
   def render
@@ -83,15 +87,14 @@ class TinySite
             _, page_file    = CachedHttpFile.get remote_file_url_for(@status) if @status != 200
     global_file_fetch_tread.join
     
-    global_vars, global_parts = TextileParts.parse @global_file, @image_path
-    page_vars,   page_parts   = TextileParts.parse page_file,    @image_path
+    global = TextileParts.parse @global_file, @image_path
+    page   = TextileParts.parse page_file,    @image_path
     
-    render_layout :global_vars  => global_vars, :global_parts => global_parts,
-                  :page_vars    => page_vars,   :page_parts   => page_parts
+    render_layout :global => global, :page => page
   end
   
   def render_layout(params)
-    layout = params[:page_vars][:layout] || params[:global_vars][:layout] || 'layout'
+    layout = params[:page][:layout] || params[:global][:layout] || 'layout'
     
     puts "rendering layout '#{layout}'"
     haml = Haml::Engine.new File.open("#{layout}.haml").read, :format => :html5

metadata

@@ -2,7 +2,7 @@
 name: tiny_site
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Niko Dittmann