glog 0.1.0 → 0.2.0

data/lib/glog.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 
+require 'yaml'
 require 'glog/env'
 require 'glog/page'
 require 'glog/template'
@@ -11,8 +12,9 @@ module Glog
   @@env    = nil
 
   def self.config
-    if File.exist?('glog.yaml')
-      @@config ||= YAML.load_file('glog.yaml')
+    return @@config if @@config
+    if File.exist?('./glog.yaml')
+      @@config ||= YAML.load_file('./glog.yaml')
     else
       @@config = { 'root' => 'root' }
     end

data/lib/glog/page.rb

@@ -15,5 +15,8 @@ module Glog
       File.join(parent, name)
     end
 
+    def content_type
+      self.ctype ? self.ctype : 'text/html'
+    end
   end
 end

data/lib/glog/server.rb

@@ -27,11 +27,11 @@ module Glog
     end
 
     def send_page(page)
-      [200, { 'Content-Type' => 'text/html' }, render_page(page)]
+      [200, { 'Content-Type' => ( page.content_type || 'text/html' ) }, [ render_page(page) ]]
     end
 
     def send_not_found
-      [404, { 'Content-Type' => 'text/html'}, '404 Not Found']
+      [404, { 'Content-Type' => 'text/html' }, [ '404 Not Found' ]]
     end
 
     def send_root_page

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Antono Vasiljev
@@ -21,6 +21,7 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: jadof
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ dependencies:
   name: maruku
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -77,6 +81,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -91,6 +96,7 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -125,6 +131,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -132,6 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -141,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: JADOF+Rack =  bogging/cms engine