glog 0.0.3 → 0.0.4

data/lib/glog/page.rb

@@ -1,5 +1,8 @@
+require 'jadof'
+
 module Glog
   class Page < JADOF::Page
+
     def self.root
       get(Glog.config['root'])
     end
@@ -8,33 +11,8 @@ module Glog
       self.template == false ? super : wrap_with_template(super)
     end
     
-    def template_path
-      if self.template
-        "templates/#{self.template}.haml"
-      else self.parent.size > 0
-        detect_template_from_parent
-      end
-    end
-    
-    def detect_template_from_parent
-      first_match = false
-      segments = self.parent.split(File::SEPARATOR)
-      segments.size.times do |i|
-        template_path = (['templates'] + segments[0..-(i-1)] + ['default.haml']).join(File::SEPARATOR)
-        if File.exists?(template_path)
-          first_match = template_path
-          break
-        end
-        segments.pop
-      end
-      first_match || 'templates/default.haml'
-    end
-    
-    private
-
-    def wrap_with_template(content)
-      locals = { :page => self, :config => Glog.config, :pages => self.class }
-      Haml::Engine.new(File.read(template_path)).to_html(nil, locals)
+    def path_with_parent
+      File.join(parent, name)
     end
     
   end

data/lib/glog/server.rb

@@ -1,40 +1,51 @@
+require 'rack'
+
 module Glog
   class Server
-        
-    def call(env)
-      env['PATH_INFO'] == '/' ? send_root_page : send_path(env['PATH_INFO'])
+
+    def call(rack_env)
+      Glog.env = Env.new(rack_env)
+      Glog.env.path?('/') ? send_root_page : send_path(Glog.env.path)
     end
-    
+
     private
 
     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
       end
     end
-    
+
     def try_dir_index(path)
       File.directory?(File.join('pages', path))
       Page.get(File.join(path, 'index'))
     end
-      
+
     def send_page(page)
-      [200, { 'Content-Type' => 'text/html' }, page.render]
+      [200, { 'Content-Type' => 'text/html' }, render_page(page)]
     end
-    
+
     def send_not_found
       [404, { 'Content-Type' => 'text/html'}, '404 Not Found']
     end
-    
+
     def send_root_page
       Page.root ? send_page(Page.root) : send_not_found
     end
+
+    def render_page(page)
+      locals = { :env => Glog.env, :config => Glog.config, :pages => Page }
+      Template.wrap(page, locals).render
+    end
+
   end # Server
-end # Glog
+end # Glog

data/lib/glog.rb

@@ -1,13 +1,14 @@
 require 'rubygems'
-require 'rack'
-require 'jadof'
-require 'haml'
+
+require 'glog/env'
 require 'glog/page'
+require 'glog/template'
 require 'glog/server'
 
 module Glog
 
   @@config = nil
+  @@env    = nil
 
   def self.config
     @@config ||= YAML.load_file('glog.yaml')
@@ -16,5 +17,13 @@ module Glog
   def self.config=(config)
     @@config = config
   end
+  
+  def self.env
+    @@env
+  end
+  
+  def self.env=(env)
+    @@env = env
+  end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Antono Vasiljev