bivouac 0.0.3 → 0.0.4

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.
Files changed (31) hide show
  1. data/README +50 -1
  2. data/bin/bivouac +10 -3
  3. data/doc/rdoc/created.rid +1 -0
  4. data/doc/rdoc/files/AUTHORS.html +95 -0
  5. data/doc/rdoc/files/COPYING.html +519 -0
  6. data/doc/rdoc/files/README.html +262 -0
  7. data/doc/rdoc/index.html +10 -0
  8. data/doc/rdoc/permalink.gif +0 -0
  9. data/doc/rdoc/rdoc-style.css +106 -0
  10. data/doc/rdoc/rubyfr.png +0 -0
  11. data/examples/blog_erb/app/{controllers/blog.rb → blog.rb} +11 -11
  12. data/examples/blog_erb/config/environment.rb +2 -2
  13. data/examples/blog_erb/db/Blog.db +0 -0
  14. data/examples/blog_erb/db/create.rb +1 -1
  15. data/examples/blog_erb/log/Blog.log +51 -106
  16. data/examples/blog_erb/script/server +1 -1
  17. data/examples/blog_goh/app/{controllers/blog.rb → blog.rb} +10 -14
  18. data/examples/blog_goh/config/environment.rb +1 -1
  19. data/examples/blog_goh/db/Blog.db +0 -0
  20. data/examples/blog_goh/db/create.rb +5 -1
  21. data/examples/blog_goh/log/Blog.log +75 -0
  22. data/examples/blog_goh/script/server +1 -1
  23. data/lib/bivouac/template/application/postamble_cgi.rb +2 -2
  24. data/lib/bivouac/template/application/postamble_fastcgi.rb +2 -2
  25. data/lib/bivouac/template/application/postamble_mongrel.rb +16 -1
  26. data/lib/bivouac/template/application/postamble_webrick.rb +4 -3
  27. data/lib/bivouac/template/application_erb.rb +11 -8
  28. data/lib/bivouac/template/application_goh.rb +10 -7
  29. data/lib/bivouac/template/server.rb +1 -1
  30. metadata +20 -5
  31. data/examples/blog_goh/log/camping.log +0 -19
data/examples/blog_erb/log/Blog.log CHANGED
@@ -1,112 +1,57 @@
1
- # Logfile created on Tue Jul 31 18:44:09 +0200 2007 by /
2
- SQL (0.000331) SELECT name FROM sqlite_master WHERE type = 'table'
1
+ # Logfile created on Wed Aug 01 09:49:19 +0200 2007 by /
2
+ SQL (0.000265) SELECT name FROM sqlite_master WHERE type = 'table'
3
3
  SQL (0.000000) SQLite3::SQLException: no such table: sessions: DROP TABLE sessions
4
- SQL (0.110131) CREATE TABLE sessions ("id" INTEGER PRIMARY KEY NOT NULL, "hashid" varchar(32) DEFAULT NULL, "created_at" datetime DEFAULT NULL, "ivars" text DEFAULT NULL) 
5
- SQL (0.000480) SELECT name FROM sqlite_master WHERE type = 'table'
6
- SQL (0.000309) SELECT name FROM sqlite_master WHERE type = 'table'
7
- SQL (0.244545) CREATE TABLE blog_schema_infos ("id" INTEGER PRIMARY KEY NOT NULL, "version" float DEFAULT NULL) 
8
- Blog::Models::SchemaInfo Load (0.000307) SELECT * FROM blog_schema_infos LIMIT 1
9
- SQL (0.087348) CREATE TABLE blog_comments ("id" INTEGER PRIMARY KEY NOT NULL, "post_id" integer NOT NULL, "username" varchar(255) DEFAULT NULL, "body" text DEFAULT NULL) 
10
- SQL (0.068467) CREATE TABLE blog_posts ("id" INTEGER PRIMARY KEY NOT NULL, "user_id" integer NOT NULL, "title" varchar(255) DEFAULT NULL, "body" text DEFAULT NULL) 
11
- SQL (0.078659) CREATE TABLE blog_users ("id" INTEGER PRIMARY KEY NOT NULL, "username" varchar(255) DEFAULT NULL, "password" varchar(255) DEFAULT NULL) 
12
- SQL (0.000478) INSERT INTO blog_users ("username", "password") VALUES('admin', 'bivouac')
13
- SQL (0.000577) INSERT INTO blog_schema_infos ("version") VALUES(1.0)
14
- Camping::Models::Session Load (0.000328) SELECT * FROM sessions WHERE (sessions."hashid" = 'embQk59C3ESMmQvAyXAwvYP3eBTDoegY') LIMIT 1
15
- SQL (0.000611) INSERT INTO sessions ("hashid", "created_at", "ivars") VALUES('qnIE0e112l1pvd5dRiZrGfJgFJvW2y19', '2007-07-31 18:44:18', '--- !map:HashWithIndifferentAccess {}
4
+ SQL (0.092496) CREATE TABLE sessions ("id" INTEGER PRIMARY KEY NOT NULL, "hashid" varchar(32) DEFAULT NULL, "created_at" datetime DEFAULT NULL, "ivars" text DEFAULT NULL) 
5
+ SQL (0.000450) SELECT name FROM sqlite_master WHERE type = 'table'
6
+ SQL (0.000275) SELECT name FROM sqlite_master WHERE type = 'table'
7
+ SQL (0.133069) CREATE TABLE blog_schema_infos ("id" INTEGER PRIMARY KEY NOT NULL, "version" float DEFAULT NULL) 
8
+ Blog::Models::SchemaInfo Load (0.000260) SELECT * FROM blog_schema_infos LIMIT 1
9
+ SQL (0.243340) CREATE TABLE blog_comments ("id" INTEGER PRIMARY KEY NOT NULL, "post_id" integer NOT NULL, "username" varchar(255) DEFAULT NULL, "body" text DEFAULT NULL) 
10
+ SQL (0.068921) CREATE TABLE blog_posts ("id" INTEGER PRIMARY KEY NOT NULL, "user_id" integer NOT NULL, "title" varchar(255) DEFAULT NULL, "body" text DEFAULT NULL) 
11
+ SQL (0.067700) CREATE TABLE blog_users ("id" INTEGER PRIMARY KEY NOT NULL, "username" varchar(255) DEFAULT NULL, "password" varchar(255) DEFAULT NULL) 
12
+ SQL (0.000618) INSERT INTO blog_users ("username", "password") VALUES('admin', 'bivouac')
13
+ SQL (0.000532) INSERT INTO blog_schema_infos ("version") VALUES(1.0)
14
+ Camping::Models::Session Load (0.000319) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
15
+ SQL (0.000543) INSERT INTO sessions ("hashid", "created_at", "ivars") VALUES('TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG', '2007-08-01 09:52:28', '--- !map:HashWithIndifferentAccess {}
16
16
 
17
17
  ')
18
- Blog::Models::Post Load (0.000313) SELECT * FROM blog_posts 
19
- Camping::Models::Session Load (0.000618) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
20
- Camping::Models::Session Load (0.000609) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
21
- Blog::Models::User Load (0.000411) SELECT * FROM blog_users WHERE (username = 'admin' AND password = 'bivouac') LIMIT 1
22
- Camping::Models::Session Update (0.001165) UPDATE sessions SET "created_at" = '2007-07-31 18:44:18', "hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19', "ivars" = '--- !map:HashWithIndifferentAccess
18
+ Blog::Models::Post Load (0.000306) SELECT * FROM blog_posts 
19
+ Camping::Models::Session Load (0.000577) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
20
+ Camping::Models::Session Load (0.000534) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
21
+ Blog::Models::User Load (0.000382) SELECT * FROM blog_users WHERE (username = 'admin' AND password = 'bivouac') LIMIT 1
22
+ Camping::Models::Session Update (0.001286) UPDATE sessions SET "created_at" = '2007-08-01 09:52:28', "hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG', "ivars" = '--- !map:HashWithIndifferentAccess
23
23
  Blog: !map:HashWithIndifferentAccess
24
24
  user_id: 1
25
25
  ' WHERE "id" = 1
26
- Camping::Models::Session Load (0.000592) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
27
- Blog::Models::User Load (0.000456) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
28
- SQL (0.000712) SELECT name FROM sqlite_master WHERE type = 'table'
29
- SQL (0.000409) SELECT name FROM sqlite_master WHERE type = 'table'
30
- SQL (0.000413) SELECT name FROM sqlite_master WHERE type = 'table'
31
- Blog::Models::SchemaInfo Load (0.000246) SELECT * FROM blog_schema_infos LIMIT 1
32
- Camping::Models::Session Load (0.000480) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
33
- Camping::Models::Session Update (0.001387) UPDATE sessions SET "created_at" = '2007-07-31 18:44:18', "hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19', "ivars" = '--- !map:HashWithIndifferentAccess
34
- Blog: !map:HashWithIndifferentAccess
35
- user_id:
36
- ' WHERE "id" = 1
37
- Camping::Models::Session Load (0.000579) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
38
- Camping::Models::Session Load (0.000558) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
39
- Blog::Models::Post Load (0.000286) SELECT * FROM blog_posts 
40
- Camping::Models::Session Load (0.000568) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
41
- Camping::Models::Session Load (0.000529) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
42
- Blog::Models::User Load (0.000490) SELECT * FROM blog_users WHERE (username = 'admin' AND password = 'bivouac') LIMIT 1
43
- Camping::Models::Session Update (0.001054) UPDATE sessions SET "created_at" = '2007-07-31 18:44:18', "hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19', "ivars" = '--- !map:HashWithIndifferentAccess
44
- Blog: !map:HashWithIndifferentAccess
45
- user_id: 1
46
- ' WHERE "id" = 1
47
- Camping::Models::Session Load (0.000549) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
48
- Blog::Models::User Load (0.000566) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
49
- Camping::Models::Session Load (0.000552) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
50
- SQL (0.000572) INSERT INTO blog_posts ("body", "title", "user_id") VALUES('Ca fonctionne aussi avec ERB !!!', 'Blog ERB', 1)
51
- Camping::Models::Session Load (0.000595) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
52
- Blog::Models::Post Load (0.000450) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
53
- Blog::Models::Comment Load (0.000218) SELECT * FROM blog_comments WHERE (post_id = '1') 
54
- Camping::Models::Session Load (0.000537) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
55
- Camping::Models::Session Load (0.000573) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
56
- Blog::Models::Post Load (0.000519) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
57
- Blog::Models::Comment Load (0.000207) SELECT * FROM blog_comments WHERE (post_id = '1') 
58
- Camping::Models::Session Load (0.000449) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
59
- SQL (0.000700) SELECT name FROM sqlite_master WHERE type = 'table'
60
- SQL (0.000420) SELECT name FROM sqlite_master WHERE type = 'table'
61
- SQL (0.000408) SELECT name FROM sqlite_master WHERE type = 'table'
62
- Blog::Models::SchemaInfo Load (0.000292) SELECT * FROM blog_schema_infos LIMIT 1
63
- Camping::Models::Session Load (0.000495) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
64
- Blog::Models::Post Load (0.000400) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
65
- Blog::Models::Comment Load (0.000217) SELECT * FROM blog_comments WHERE (post_id = '1') 
66
- Camping::Models::Session Load (0.000420) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
67
- Camping::Models::Session Load (0.000608) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
68
- Blog::Models::Post Load (0.000464) SELECT * FROM blog_posts 
69
- Camping::Models::Session Load (0.000702) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
70
- Camping::Models::Session Load (0.000590) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
71
- Blog::Models::Post Load (0.000448) SELECT * FROM blog_posts 
72
- Camping::Models::Session Load (0.000525) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
73
- Camping::Models::Session Load (0.000552) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
74
- Blog::Models::Post Load (0.000458) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
75
- Blog::Models::Comment Load (0.000211) SELECT * FROM blog_comments WHERE (post_id = '1') 
76
- Camping::Models::Session Load (0.000472) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
77
- Camping::Models::Session Load (0.000538) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
78
- Blog::Models::User Load (0.000485) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
79
- Blog::Models::Post Load (0.000415) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
80
- Camping::Models::Session Load (0.000452) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
81
- Blog::Models::Post Load (0.000285) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
82
- Blog::Models::Post Update (0.000950) UPDATE blog_posts SET "title" = 'Blog ERB', "body" = 'Ca fonctionne aussi avec ERB !!!', "user_id" = 1 WHERE "id" = 1
83
- Camping::Models::Session Load (0.000620) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
84
- Blog::Models::Post Load (0.000437) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
85
- Blog::Models::Comment Load (0.000189) SELECT * FROM blog_comments WHERE (post_id = '1') 
86
- Camping::Models::Session Load (0.000473) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
87
- Camping::Models::Session Load (0.000583) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
88
- Blog::Models::Post Load (0.000392) SELECT * FROM blog_posts 
89
- Camping::Models::Session Load (0.000540) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
90
- Blog::Models::Post Load (0.000447) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
91
- Blog::Models::Comment Load (0.000188) SELECT * FROM blog_comments WHERE (post_id = '1') 
92
- Camping::Models::Session Load (0.000498) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
93
- SQL (0.000516) INSERT INTO blog_comments ("body", "post_id", "username") VALUES('pipo', 1, 'greg')
94
- Camping::Models::Session Load (0.000517) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
95
- Blog::Models::Post Load (0.000355) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
96
- Blog::Models::Comment Load (0.000337) SELECT * FROM blog_comments WHERE (post_id = '1') 
97
- Camping::Models::Session Load (0.000510) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
98
- SQL (0.000521) INSERT INTO blog_comments ("body", "post_id", "username") VALUES('C''est beau et il faut chaud. Je me sent bien !!!', 1, 'Hello')
99
- Camping::Models::Session Load (0.000513) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
100
- Blog::Models::Post Load (0.000384) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
101
- Blog::Models::Comment Load (0.000513) SELECT * FROM blog_comments WHERE (post_id = '1') 
102
- Camping::Models::Session Load (0.000558) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
103
- Blog::Models::Post Load (0.000403) SELECT * FROM blog_posts 
104
- Camping::Models::Session Load (0.000499) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
105
- Blog::Models::User Load (0.000364) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
106
- Camping::Models::Session Load (0.000519) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
107
- SQL (0.000832) INSERT INTO blog_posts ("body", "title", "user_id") VALUES('Ceci et le second post !', 'Post #2', 1)
108
- Camping::Models::Session Load (0.000521) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
109
- Blog::Models::Post Load (0.000352) SELECT * FROM blog_posts WHERE (blog_posts."id" = 2) 
110
- Blog::Models::Comment Load (0.000184) SELECT * FROM blog_comments WHERE (post_id = '2') 
111
- Camping::Models::Session Load (0.000505) SELECT * FROM sessions WHERE (sessions."hashid" = 'qnIE0e112l1pvd5dRiZrGfJgFJvW2y19') LIMIT 1
112
- Blog::Models::Post Load (0.000476) SELECT * FROM blog_posts 
26
+ Camping::Models::Session Load (0.000677) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
27
+ Blog::Models::User Load (0.000486) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
28
+ Camping::Models::Session Load (0.000516) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
29
+ SQL (0.000519) INSERT INTO blog_posts ("body", "title", "user_id") VALUES('P11', '11', 1)
30
+ Camping::Models::Session Load (0.000606) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
31
+ Blog::Models::Post Load (0.000389) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
32
+ Blog::Models::Comment Load (0.000365) SELECT * FROM blog_comments WHERE (post_id = '1') 
33
+ Camping::Models::Session Load (0.000516) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
34
+ SQL (0.000521) INSERT INTO blog_comments ("body", "post_id", "username") VALUES('HW', 1, 'g')
35
+ Camping::Models::Session Load (0.000570) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
36
+ Blog::Models::Post Load (0.000392) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
37
+ Blog::Models::Comment Load (0.000354) SELECT * FROM blog_comments WHERE (post_id = '1') 
38
+ Camping::Models::Session Load (0.000454) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
39
+ Blog::Models::User Load (0.000313) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
40
+ Blog::Models::Post Load (0.000266) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
41
+ Camping::Models::Session Load (0.000486) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
42
+ Blog::Models::Post Load (0.000366) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
43
+ Blog::Models::Post Update (0.001053) UPDATE blog_posts SET "title" = '112', "body" = 'P112', "user_id" = 1 WHERE "id" = 1
44
+ Camping::Models::Session Load (0.000554) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
45
+ Blog::Models::Post Load (0.000433) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
46
+ Blog::Models::Comment Load (0.000356) SELECT * FROM blog_comments WHERE (post_id = '1') 
47
+ Camping::Models::Session Load (0.000550) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
48
+ Blog::Models::Post Load (0.000414) SELECT * FROM blog_posts 
49
+ Camping::Models::Session Load (0.000543) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
50
+ Blog::Models::User Load (0.000403) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
51
+ Camping::Models::Session Load (0.000501) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
52
+ SQL (0.000908) INSERT INTO blog_posts ("body", "title", "user_id") VALUES('33333333', '333', 1)
53
+ Camping::Models::Session Load (0.000511) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
54
+ Blog::Models::Post Load (0.000356) SELECT * FROM blog_posts WHERE (blog_posts."id" = 2) 
55
+ Blog::Models::Comment Load (0.000185) SELECT * FROM blog_comments WHERE (post_id = '2') 
56
+ Camping::Models::Session Load (0.000488) SELECT * FROM sessions WHERE (sessions."hashid" = 'TZLL5FG1tzSuDkuxtYL3L0x4kvUzcEIG') LIMIT 1
57
+ Blog::Models::Post Load (0.000427) SELECT * FROM blog_posts 
data/examples/blog_erb/script/server CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
2
  require 'rubygems'
3
- app = File.dirname(__FILE__) + "/../app/controllers/blog.rb"
3
+ app = File.dirname(__FILE__) + "/../app/blog.rb"
4
4
 
5
5
  system "ruby #{app}"
data/examples/blog_goh/app/{controllers/blog.rb → blog.rb} RENAMED
@@ -3,7 +3,7 @@
3
3
  #
4
4
  # Project Blog
5
5
  #
6
- # Created using bivouac on Tue Jul 31 11:59:59 +0200 2007.
6
+ # Created using bivouac on Wed Aug 01 09:38:28 +0200 2007.
7
7
  # Copyright (c) 2007 __My__. All rights reserved.
8
8
  #
9
9
 
@@ -17,24 +17,20 @@ include Bivouac
17
17
 
18
18
  Camping.goes :Blog
19
19
 
20
- module Blog
21
- include Camping::Session
22
- end
23
-
24
20
  # Load helpers from app/helpers
25
- files( '../helpers' ) { |file| require( file ) }
21
+ files( 'helpers' ) { |file| require( file ) }
26
22
 
27
23
  # Load models from app/models
28
- files( '../models' ) { |file| require( file ) }
24
+ files( 'models' ) { |file| require( file ) }
29
25
 
30
26
  # Load database schema from db/migrate
31
- files( '../../db/migrate' ) { |file| require( file ) }
27
+ files( '../db/migrate' ) { |file| require( file ) }
32
28
 
33
29
  # Load views from app/views
34
- files( '../views' ) { |file| require( file ) }
30
+ files( 'views' ) { |file| require( file ) }
35
31
 
36
32
  # Load controllers from app/controllers
37
- files( '../controllers', :except => [File.basename(__FILE__)] ) { |file| require( file ) }
33
+ files( 'controllers', :except => [File.basename(__FILE__)] ) { |file| require( file ) }
38
34
 
39
35
  module Blog::Controllers
40
36
  class Public < R '/public/(.+)'
@@ -47,22 +43,22 @@ module Blog::Controllers
47
43
  else
48
44
  type = (MIME::Types.type_for(file)[0] || '/text/plain').to_s
49
45
  @headers['Content-Type'] = type
50
- @headers['X-Sendfile'] = File.join PATH, '..', '..', 'public', file
46
+ @headers['X-Sendfile'] = File.join PATH, '..', 'public', file
51
47
  end
52
48
  end
53
49
  end
54
50
  end
55
51
 
56
52
  # Load create
57
- files( '../../db' ) { |file| require( file ) }
53
+ files( '../db' ) { |file| require( file ) }
58
54
 
59
55
  # WEBrick postamble
60
56
  if __FILE__ == $0
61
57
  require 'webrick/httpserver'
62
58
  require 'camping/webrick'
63
59
 
64
- Blog::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../../db/Blog.db"
65
- Blog::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../../log/camping.log")
60
+ Blog::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../db/Blog.db"
61
+ Blog::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../log/Blog.log")
66
62
  Blog.create if Blog.respond_to? :create
67
63
  s = WEBrick::HTTPServer.new :BindAddress => "0.0.0.0", :Port => 3301
68
64
  s.mount "/", WEBrick::CampingHandler, Blog
data/examples/blog_goh/config/environment.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # Project Blog
3
3
  #
4
- # Created using bivouac on Tue Jul 31 11:59:59 +0200 2007.
4
+ # Created using bivouac on Wed Aug 01 09:38:28 +0200 2007.
5
5
  # Copyright (c) 2007 __My__. All rights reserved.
6
6
  #
7
7
  # DO NOT EDIT THIS FILE, OR YOU REALLY KNOW WHAT YOU ARE DOING !
data/examples/blog_goh/db/Blog.db ADDED
Binary file
data/examples/blog_goh/db/create.rb CHANGED
@@ -1,4 +1,8 @@
1
+ module Blog
2
+ include Camping::Session
3
+ end
4
+
1
5
  def Blog.create
2
6
  Camping::Models::Session.create_schema
3
- Blog::Models.create_schema :assume => (Blog::Models::Post.table_exists? ? 1.0 : 0.0)
7
+ Blog::Models.create_schema :assume => (Blog::Models::Comment.table_exists? ? 1.0 : 0.0)
4
8
  end
data/examples/blog_goh/log/Blog.log ADDED
@@ -0,0 +1,75 @@
1
+ # Logfile created on Wed Aug 01 09:39:05 +0200 2007 by /
2
+ SQL (0.000268) SELECT name FROM sqlite_master WHERE type = 'table'
3
+ SQL (0.000000) SQLite3::SQLException: no such table: sessions: DROP TABLE sessions
4
+ SQL (0.277974) CREATE TABLE sessions ("id" INTEGER PRIMARY KEY NOT NULL, "hashid" varchar(32) DEFAULT NULL, "created_at" datetime DEFAULT NULL, "ivars" text DEFAULT NULL) 
5
+ SQL (0.000459) SELECT name FROM sqlite_master WHERE type = 'table'
6
+ SQL (0.000348) SELECT name FROM sqlite_master WHERE type = 'table'
7
+ SQL (0.090689) CREATE TABLE blog_schema_infos ("id" INTEGER PRIMARY KEY NOT NULL, "version" float DEFAULT NULL) 
8
+ Blog::Models::SchemaInfo Load (0.000262) SELECT * FROM blog_schema_infos LIMIT 1
9
+ SQL (0.088558) CREATE TABLE blog_comments ("id" INTEGER PRIMARY KEY NOT NULL, "post_id" integer NOT NULL, "username" varchar(255) DEFAULT NULL, "body" text DEFAULT NULL) 
10
+ SQL (0.093018) CREATE TABLE blog_posts ("id" INTEGER PRIMARY KEY NOT NULL, "user_id" integer NOT NULL, "title" varchar(255) DEFAULT NULL, "body" text DEFAULT NULL) 
11
+ SQL (0.068089) CREATE TABLE blog_users ("id" INTEGER PRIMARY KEY NOT NULL, "username" varchar(255) DEFAULT NULL, "password" varchar(255) DEFAULT NULL) 
12
+ SQL (0.000583) INSERT INTO blog_users ("username", "password") VALUES('admin', 'bivouac')
13
+ SQL (0.000507) INSERT INTO blog_schema_infos ("version") VALUES(1.0)
14
+ Camping::Models::Session Load (0.000300) SELECT * FROM sessions WHERE (sessions."hashid" = '2BZzk1mWnunHy4FqcP3qX2HR1IU3hFwK') LIMIT 1
15
+ SQL (0.005173) INSERT INTO sessions ("hashid", "created_at", "ivars") VALUES('EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv', '2007-08-01 09:44:15', '--- !map:HashWithIndifferentAccess {}
16
+
17
+ ')
18
+ Blog::Models::Post Load (0.000335) SELECT * FROM blog_posts 
19
+ Camping::Models::Session Load (0.000451) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
20
+ Camping::Models::Session Load (0.000566) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
21
+ Camping::Models::Session Load (0.000493) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
22
+ Camping::Models::Session Load (0.000502) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
23
+ Blog::Models::User Load (0.000374) SELECT * FROM blog_users WHERE (username = 'admin' AND password = 'bivouac') LIMIT 1
24
+ Camping::Models::Session Update (0.005425) UPDATE sessions SET "created_at" = '2007-08-01 09:44:15', "hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv', "ivars" = '--- !map:HashWithIndifferentAccess
25
+ Blog: !map:HashWithIndifferentAccess
26
+ user_id: 1
27
+ ' WHERE "id" = 1
28
+ Camping::Models::Session Load (0.000453) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
29
+ Camping::Models::Session Load (0.000492) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
30
+ Blog::Models::User Load (0.000337) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
31
+ Camping::Models::Session Load (0.000426) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
32
+ Camping::Models::Session Load (0.000516) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
33
+ SQL (0.004818) INSERT INTO blog_posts ("body", "title", "user_id") VALUES('P1
34
+ ', '1', 1)
35
+ Camping::Models::Session Load (0.000516) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
36
+ Blog::Models::Post Load (0.000385) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
37
+ Blog::Models::Comment Load (0.000187) SELECT * FROM blog_comments WHERE (post_id = '1') 
38
+ Camping::Models::Session Load (0.000415) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
39
+ Camping::Models::Session Load (0.000505) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
40
+ SQL (0.004120) INSERT INTO blog_comments ("body", "post_id", "username") VALUES('cg1', 1, 'g')
41
+ Camping::Models::Session Load (0.000514) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
42
+ Blog::Models::Post Load (0.000348) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
43
+ Blog::Models::Comment Load (0.000343) SELECT * FROM blog_comments WHERE (post_id = '1') 
44
+ Camping::Models::Session Load (0.000749) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
45
+ Camping::Models::Session Load (0.000512) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
46
+ Blog::Models::User Load (0.000383) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
47
+ Blog::Models::Post Load (0.000335) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
48
+ Camping::Models::Session Load (0.000482) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
49
+ Camping::Models::Session Load (0.000465) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
50
+ Blog::Models::Post Load (0.000330) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
51
+ Blog::Models::Post Update (0.004381) UPDATE blog_posts SET "title" = '1', "body" = 'P1.01
52
+ ', "user_id" = 1 WHERE "id" = 1
53
+ Camping::Models::Session Load (0.000506) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
54
+ Blog::Models::Post Load (0.000345) SELECT * FROM blog_posts WHERE (blog_posts."id" = 1) 
55
+ Blog::Models::Comment Load (0.000326) SELECT * FROM blog_comments WHERE (post_id = '1') 
56
+ Camping::Models::Session Load (0.000477) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
57
+ Camping::Models::Session Load (0.000517) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
58
+ Blog::Models::User Load (0.000333) SELECT * FROM blog_users WHERE (blog_users."id" = 1) 
59
+ Camping::Models::Session Load (0.000486) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
60
+ Camping::Models::Session Load (0.000488) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
61
+ SQL (0.004740) INSERT INTO blog_posts ("body", "title", "user_id") VALUES('P2', '2', 1)
62
+ Camping::Models::Session Load (0.000523) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
63
+ Blog::Models::Post Load (0.000455) SELECT * FROM blog_posts WHERE (blog_posts."id" = 2) 
64
+ Blog::Models::Comment Load (0.000197) SELECT * FROM blog_comments WHERE (post_id = '2') 
65
+ Camping::Models::Session Load (0.000901) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
66
+ Camping::Models::Session Load (0.000483) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
67
+ Blog::Models::Post Load (0.000415) SELECT * FROM blog_posts 
68
+ Camping::Models::Session Load (0.000438) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
69
+ SQL (0.000724) SELECT name FROM sqlite_master WHERE type = 'table'
70
+ SQL (0.000444) SELECT name FROM sqlite_master WHERE type = 'table'
71
+ SQL (0.000400) SELECT name FROM sqlite_master WHERE type = 'table'
72
+ Blog::Models::SchemaInfo Load (0.000234) SELECT * FROM blog_schema_infos LIMIT 1
73
+ Camping::Models::Session Load (0.000482) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
74
+ Blog::Models::Post Load (0.000481) SELECT * FROM blog_posts 
75
+ Camping::Models::Session Load (0.000456) SELECT * FROM sessions WHERE (sessions."hashid" = 'EhhszLKn3LN0HDKOVcnRlmgF8LDAuHPv') LIMIT 1
data/examples/blog_goh/script/server CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
2
  require 'rubygems'
3
- app = File.dirname(__FILE__) + "/../app/controllers/blog.rb"
3
+ app = File.dirname(__FILE__) + "/../app/blog.rb"
4
4
 
5
5
  system "ruby #{app}"
data/lib/bivouac/template/application/postamble_cgi.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # CGI postamble
2
2
 
3
3
  if __FILE__ == $0
4
- <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../../db/<%= @appname %>.db"
5
- <%= @appname %>::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../../log/<%= @appname %>.log")
4
+ <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../db/<%= @appname %>.db"
5
+ <%= @appname %>::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../log/<%= @appname %>.log")
6
6
  <%= @appname %>.create if <%= @appname %>.respond_to? :create
7
7
  puts <%= @appname %>.run
8
8
  end
data/lib/bivouac/template/application/postamble_fastcgi.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # FastCGI postamble
2
2
  if __FILE__ == $0
3
3
  require 'camping/fastcgi'
4
- <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../../db/<%= @appname %>.db"
5
- <%= @appname %>::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../../log/<%= @appname %>.log")
4
+ <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../db/<%= @appname %>.db"
5
+ <%= @appname %>::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../log/<%= @appname %>.log")
6
6
  <%= @appname %>.create if <%= @appname %>.respond_to? :create
7
7
  Camping::FastCGI.start(<%= @appname %>)
8
8
  end
data/lib/bivouac/template/application/postamble_mongrel.rb CHANGED
@@ -1,4 +1,19 @@
1
1
  # Mongrel postamble
2
2
  if __FILE__ == $0
3
- # Postamble for Mongrel to be ADDED ! - sorry
3
+ require 'mongrel/camping'
4
+
5
+ <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../db/<%= @appname %>.db"
6
+ <%= @appname %>::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../log/<%= @appname %>.log")
7
+ <%= @appname %>.create if <%= @appname %>.respond_to? :create
8
+ <%= @appname %>::Models::Base.threaded_connections = false
9
+
10
+ s = Mongrel::Camping.start("<%= @server_address %>", <%= @server_port %>, "/", <%= @appname %>)
11
+
12
+ # This lets Ctrl+C shut down your server
13
+ trap(:INT) do
14
+ s.stop
15
+ end
16
+
17
+ puts "** <%= @appname %> is running at http://<%= @server_address %>:<%= @server_port %>/"
18
+ s.run.join
4
19
  end
data/lib/bivouac/template/application/postamble_webrick.rb CHANGED
@@ -3,10 +3,10 @@ if __FILE__ == $0
3
3
  require 'webrick/httpserver'
4
4
  require 'camping/webrick'
5
5
 
6
- <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../../db/<%= @appname %>.db"
7
- <%= @appname %>::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../../log/<%= @appname %>.log")
6
+ <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => File.dirname(__FILE__) + "/../db/<%= @appname %>.db"
7
+ <%= @appname %>::Models::Base.logger = Logger.new(File.dirname(__FILE__) + "/../log/<%= @appname %>.log")
8
8
  <%= @appname %>.create if <%= @appname %>.respond_to? :create
9
- s = WEBrick::HTTPServer.new :BindAddress => "0.0.0.0", :Port => 3301
9
+ s = WEBrick::HTTPServer.new :BindAddress => "<%= @server_address %>", :Port => <%= @server_port %>
10
10
  s.mount "/", WEBrick::CampingHandler, <%= @appname %>
11
11
 
12
12
  # This lets Ctrl+C shut down your server
@@ -14,5 +14,6 @@ if __FILE__ == $0
14
14
  s.shutdown
15
15
  end
16
16
 
17
+ puts "** <%= @appname %> is running at http://<%= @server_address %>:<%= @server_port %>/"
17
18
  s.start
18
19
  end
data/lib/bivouac/template/application_erb.rb CHANGED
@@ -7,6 +7,9 @@
7
7
  # Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
8
8
  #
9
9
 
10
+ LIB = File.join File.expand_path(File.dirname(__FILE__)), '..', 'lib'
11
+ $:.unshift( LIB )
12
+
10
13
  require 'rubygems'
11
14
  require 'camping'
12
15
  require 'camping/session'
@@ -26,23 +29,23 @@ Camping.goes :<%= @appname %>
26
29
 
27
30
  module <%= @appname %>
28
31
  def render(m, layout=false)
29
- content = ERB.new(IO.read("#{File.dirname(__FILE__)}/../views/#{m}.html")).result(binding)
30
- content = ERB.new(IO.read("#{File.dirname(__FILE__)}/../views/layout.html")).result(binding) if layout
32
+ content = ERB.new(IO.read("#{File.dirname(__FILE__)}/views/#{m}.html")).result(binding)
33
+ content = ERB.new(IO.read("#{File.dirname(__FILE__)}/views/layout.html")).result(binding) if layout
31
34
  return content
32
35
  end
33
36
  end
34
37
 
35
38
  # Load helpers from app/helpers
36
- files( '../helpers' ) { |file| require( file ) }
39
+ files( 'helpers' ) { |file| require( file ) }
37
40
 
38
41
  # Load models from app/models
39
- files( '../models' ) { |file| require( file ) }
42
+ files( 'models' ) { |file| require( file ) }
40
43
 
41
44
  # Load database schema from db/migrate
42
- files( '../../db/migrate' ) { |file| require( file ) }
45
+ files( '../db/migrate' ) { |file| require( file ) }
43
46
 
44
47
  # Load controllers from app/controllers
45
- files( '../controllers', :except => [File.basename(__FILE__)] ) { |file| require( file ) }
48
+ files( 'controllers', :except => [File.basename(__FILE__)] ) { |file| require( file ) }
46
49
 
47
50
  module <%= @appname %>::Controllers
48
51
  class Public < R '/public/(.+)'
@@ -55,12 +58,12 @@ module <%= @appname %>::Controllers
55
58
  else
56
59
  type = (MIME::Types.type_for(file)[0] || '/text/plain').to_s
57
60
  @headers['Content-Type'] = type
58
- @headers['X-Sendfile'] = File.join PATH, '..', '..', 'public', file
61
+ @headers['X-Sendfile'] = File.join PATH, '..', 'public', file
59
62
  end
60
63
  end
61
64
  end
62
65
  end
63
66
 
64
67
  # Load create
65
- files( '../../db' ) { |file| require( file ) }
68
+ files( '../db' ) { |file| require( file ) }
66
69
 
data/lib/bivouac/template/application_goh.rb CHANGED
@@ -7,6 +7,9 @@
7
7
  # Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
8
8
  #
9
9
 
10
+ LIB = File.join File.expand_path(File.dirname(__FILE__)), '..', 'lib'
11
+ $:.unshift( LIB )
12
+
10
13
  require 'rubygems'
11
14
  require 'camping'
12
15
  require 'camping/session'
@@ -18,19 +21,19 @@ include Bivouac
18
21
  Camping.goes :<%= @appname %>
19
22
 
20
23
  # Load helpers from app/helpers
21
- files( '../helpers' ) { |file| require( file ) }
24
+ files( 'helpers' ) { |file| require( file ) }
22
25
 
23
26
  # Load models from app/models
24
- files( '../models' ) { |file| require( file ) }
27
+ files( 'models' ) { |file| require( file ) }
25
28
 
26
29
  # Load database schema from db/migrate
27
- files( '../../db/migrate' ) { |file| require( file ) }
30
+ files( '../db/migrate' ) { |file| require( file ) }
28
31
 
29
32
  # Load views from app/views
30
- files( '../views' ) { |file| require( file ) }
33
+ files( 'views' ) { |file| require( file ) }
31
34
 
32
35
  # Load controllers from app/controllers
33
- files( '../controllers', :except => [File.basename(__FILE__)] ) { |file| require( file ) }
36
+ files( 'controllers', :except => [File.basename(__FILE__)] ) { |file| require( file ) }
34
37
 
35
38
  module <%= @appname %>::Controllers
36
39
  class Public < R '/public/(.+)'
@@ -43,12 +46,12 @@ module <%= @appname %>::Controllers
43
46
  else
44
47
  type = (MIME::Types.type_for(file)[0] || '/text/plain').to_s
45
48
  @headers['Content-Type'] = type
46
- @headers['X-Sendfile'] = File.join PATH, '..', '..', 'public', file
49
+ @headers['X-Sendfile'] = File.join PATH, '..', 'public', file
47
50
  end
48
51
  end
49
52
  end
50
53
  end
51
54
 
52
55
  # Load create
53
- files( '../../db' ) { |file| require( file ) }
56
+ files( '../db' ) { |file| require( file ) }
54
57
 
data/lib/bivouac/template/server.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
2
  require 'rubygems'
3
- app = File.dirname(__FILE__) + "/../app/controllers/<%= @conf.appdir %>.rb"
3
+ app = File.dirname(__FILE__) + "/../app/<%= @conf.appdir %>.rb"
4
4
 
5
5
  system "ruby #{app}"