glog 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/glog.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'rubygems'
2
2
 
3
+ require 'yaml'
3
4
  require 'glog/env'
4
5
  require 'glog/page'
5
6
  require 'glog/template'
@@ -11,8 +12,9 @@ module Glog
11
12
  @@env = nil
12
13
 
13
14
  def self.config
14
- if File.exist?('glog.yaml')
15
- @@config ||= YAML.load_file('glog.yaml')
15
+ return @@config if @@config
16
+ if File.exist?('./glog.yaml')
17
+ @@config ||= YAML.load_file('./glog.yaml')
16
18
  else
17
19
  @@config = { 'root' => 'root' }
18
20
  end
data/lib/glog/page.rb CHANGED
@@ -15,5 +15,8 @@ module Glog
15
15
  File.join(parent, name)
16
16
  end
17
17
 
18
+ def content_type
19
+ self.ctype ? self.ctype : 'text/html'
20
+ end
18
21
  end
19
22
  end
data/lib/glog/server.rb CHANGED
@@ -27,11 +27,11 @@ module Glog
27
27
  end
28
28
 
29
29
  def send_page(page)
30
- [200, { 'Content-Type' => 'text/html' }, render_page(page)]
30
+ [200, { 'Content-Type' => ( page.content_type || 'text/html' ) }, [ render_page(page) ]]
31
31
  end
32
32
 
33
33
  def send_not_found
34
- [404, { 'Content-Type' => 'text/html'}, '404 Not Found']
34
+ [404, { 'Content-Type' => 'text/html' }, [ '404 Not Found' ]]
35
35
  end
36
36
 
37
37
  def send_root_page
metadata CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
4
4
  prerelease: false
5
5
  segments:
6
6
  - 0
7
- - 1
7
+ - 2
8
8
  - 0
9
- version: 0.1.0
9
+ version: 0.2.0
10
10
  platform: ruby
11
11
  authors:
12
12
  - Antono Vasiljev
@@ -21,6 +21,7 @@ dependencies:
21
21
  name: rack
22
22
  prerelease: false
23
23
  requirement: &id001 !ruby/object:Gem::Requirement
24
+ none: false
24
25
  requirements:
25
26
  - - ">="
26
27
  - !ruby/object:Gem::Version
@@ -35,6 +36,7 @@ dependencies:
35
36
  name: jadof
36
37
  prerelease: false
37
38
  requirement: &id002 !ruby/object:Gem::Requirement
39
+ none: false
38
40
  requirements:
39
41
  - - ">="
40
42
  - !ruby/object:Gem::Version
@@ -49,6 +51,7 @@ dependencies:
49
51
  name: haml
50
52
  prerelease: false
51
53
  requirement: &id003 !ruby/object:Gem::Requirement
54
+ none: false
52
55
  requirements:
53
56
  - - ">="
54
57
  - !ruby/object:Gem::Version
@@ -63,6 +66,7 @@ dependencies:
63
66
  name: maruku
64
67
  prerelease: false
65
68
  requirement: &id004 !ruby/object:Gem::Requirement
69
+ none: false
66
70
  requirements:
67
71
  - - ">="
68
72
  - !ruby/object:Gem::Version
@@ -77,6 +81,7 @@ dependencies:
77
81
  name: rspec
78
82
  prerelease: false
79
83
  requirement: &id005 !ruby/object:Gem::Requirement
84
+ none: false
80
85
  requirements:
81
86
  - - ">="
82
87
  - !ruby/object:Gem::Version
@@ -91,6 +96,7 @@ dependencies:
91
96
  name: rack-test
92
97
  prerelease: false
93
98
  requirement: &id006 !ruby/object:Gem::Requirement
99
+ none: false
94
100
  requirements:
95
101
  - - ">="
96
102
  - !ruby/object:Gem::Version
@@ -125,6 +131,7 @@ rdoc_options:
125
131
  require_paths:
126
132
  - lib
127
133
  required_ruby_version: !ruby/object:Gem::Requirement
134
+ none: false
128
135
  requirements:
129
136
  - - ">="
130
137
  - !ruby/object:Gem::Version
@@ -132,6 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
132
139
  - 0
133
140
  version: "0"
134
141
  required_rubygems_version: !ruby/object:Gem::Requirement
142
+ none: false
135
143
  requirements:
136
144
  - - ">="
137
145
  - !ruby/object:Gem::Version
@@ -141,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
141
149
  requirements: []
142
150
 
143
151
  rubyforge_project:
144
- rubygems_version: 1.3.6
152
+ rubygems_version: 1.3.7
145
153
  signing_key:
146
154
  specification_version: 3
147
155
  summary: JADOF+Rack = bogging/cms engine