glog 0.0.4 → 0.0.5

data/lib/glog/server.rb

@@ -12,13 +12,9 @@ module Glog
 
     def send_path(path)
       path = path[1..-1] # /my/page => my/page
-      # First trying to load page
       if page = Page.get(path)
-        puts page
         send_page(page)
-      # Then trying to load directory index if any
       elsif page = try_dir_index(path)
-        puts page
         send_page(page)
       else
         send_not_found

data/lib/glog/template.rb

@@ -0,0 +1,56 @@
+require 'haml'
+
+module Glog
+  class Template
+
+    include Haml
+    
+    attr_accessor :page, :locals, :template
+
+    def self.wrap(page, locals = {})
+      new(page, locals)
+    end
+
+    def initialize(page, locals = nil)
+      @page      = page
+      @locals    = locals
+      if page.template
+        @template = File.read(build_template_path(page.template))
+      else
+        @template = find_for(page.path_with_parent)
+      end
+    end
+
+    def render(path = nil, locals = {})
+      template = path ? File.read("templates" + File::SEPARATOR + path + '.haml') : @template
+      render_string(template, locals)
+    end
+
+    private
+
+    def render_string(string, locals = {})
+      Engine.new(string).render(self, @locals.merge(locals))
+    end
+
+    def find_for(page_path)
+      template_path = possible_paths_for(page_path).detect { |path| File.exist?(path) }
+      File.read template_path || 'templates/default.haml'
+    end
+
+    def possible_paths_for(page_path)
+      return [] if page_path.nil?
+      segments = page_path.split(File::SEPARATOR)
+      paths = [] << build_template_path(segments) # twin template
+      segments.size.downto(1) do |ix|
+        segments.pop
+        paths.push build_template_path(segments[0..ix] + ['default'])
+      end
+      paths
+    end
+
+    def build_template_path(path)
+      ["templates", path].flatten.join(File::SEPARATOR) + '.haml'
+    end
+
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Antono Vasiljev
@@ -113,6 +113,7 @@ files:
 - lib/glog.rb
 - lib/glog/page.rb
 - lib/glog/server.rb
+- lib/glog/template.rb
 has_rdoc: true
 homepage: http://github.com/antono/glog
 licenses: []