merb 0.0.3 → 0.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (65) hide show
  1. data/README +68 -58
  2. data/Rakefile +7 -6
  3. data/TODO +18 -0
  4. data/bin/merb +2 -2
  5. data/doc/rdoc/classes/Hash.html +148 -0
  6. data/doc/rdoc/classes/Merb/Config.html +161 -0
  7. data/doc/rdoc/classes/Merb/Controller.html +488 -0
  8. data/doc/rdoc/classes/Merb/RouteMatcher.html +354 -0
  9. data/doc/rdoc/classes/Merb/Server.html +288 -0
  10. data/doc/rdoc/classes/Merb.html +143 -0
  11. data/doc/rdoc/classes/MerbHandler.html +404 -0
  12. data/doc/rdoc/classes/MerbHash.html +457 -0
  13. data/doc/rdoc/classes/Noroutefound.html +172 -0
  14. data/doc/rdoc/classes/Object.html +149 -0
  15. data/doc/rdoc/classes/String.html +200 -0
  16. data/doc/rdoc/classes/Symbol.html +172 -0
  17. data/doc/rdoc/created.rid +1 -0
  18. data/doc/rdoc/files/LICENSE.html +129 -0
  19. data/doc/rdoc/files/README.html +330 -0
  20. data/doc/rdoc/files/TODO.html +154 -0
  21. data/doc/rdoc/files/lib/merb/merb_controller_rb.html +101 -0
  22. data/doc/rdoc/files/lib/merb/merb_daemon_rb.html +113 -0
  23. data/doc/rdoc/files/lib/merb/merb_handler_rb.html +108 -0
  24. data/doc/rdoc/files/lib/merb/merb_router_rb.html +101 -0
  25. data/doc/rdoc/files/lib/merb/merb_utils_rb.html +101 -0
  26. data/doc/rdoc/files/lib/merb/noroutefound_rb.html +101 -0
  27. data/doc/rdoc/files/lib/merb_config_rb.html +101 -0
  28. data/doc/rdoc/files/lib/merb_rb.html +112 -0
  29. data/doc/rdoc/fr_class_index.html +38 -0
  30. data/doc/rdoc/fr_file_index.html +38 -0
  31. data/doc/rdoc/fr_method_index.html +78 -0
  32. data/doc/rdoc/index.html +24 -0
  33. data/doc/rdoc/rdoc-style.css +208 -0
  34. data/examples/sample_app/{app → dist/app}/controllers/posts.rb +8 -8
  35. data/examples/sample_app/{app → dist/app}/controllers/test.rb +8 -5
  36. data/examples/sample_app/{app → dist/app}/controllers/upload.rb +13 -5
  37. data/examples/sample_app/dist/app/models/post.rb +13 -0
  38. data/examples/sample_app/dist/app/views/layout/application.rhtml +6 -0
  39. data/examples/sample_app/dist/app/views/layout/foo.rhtml +6 -0
  40. data/examples/sample_app/dist/app/views/layout/posts.rhtml +6 -0
  41. data/examples/sample_app/{app → dist/app}/views/posts/list.rhtml +1 -7
  42. data/examples/sample_app/{app → dist/app}/views/posts/new.rhtml +1 -7
  43. data/examples/sample_app/{app → dist/app}/views/posts/show.rhtml +1 -8
  44. data/examples/sample_app/dist/app/views/test/foo.rhtml +2 -0
  45. data/examples/sample_app/{app → dist/app}/views/test/hello.rhtml +1 -8
  46. data/examples/sample_app/{app → dist/app}/views/upload/start.rhtml +0 -8
  47. data/examples/sample_app/{app → dist/app}/views/upload/upload.rhtml +0 -0
  48. data/examples/sample_app/{conf → dist/conf}/merb_init.rb +5 -2
  49. data/examples/sample_app/{conf → dist/conf}/router.rb +6 -8
  50. data/examples/sample_app/test/test_helper.rb +1 -0
  51. data/examples/skeleton/dist/conf/merb_init.rb +21 -0
  52. data/examples/skeleton/dist/conf/router.rb +23 -0
  53. data/examples/skeleton/test/test_helper.rb +1 -0
  54. data/lib/merb/merb_controller.rb +54 -15
  55. data/lib/merb/merb_daemon.rb +35 -20
  56. data/lib/merb/merb_handler.rb +49 -38
  57. data/lib/merb/merb_router.rb +25 -28
  58. data/lib/merb/merb_utils.rb +98 -9
  59. data/{examples/sample_app/app/controllers → lib/merb}/noroutefound.rb +1 -1
  60. data/lib/merb.rb +4 -4
  61. data/lib/merb_config.rb +1 -1
  62. data/test/unit/route_matcher_test.rb +12 -31
  63. metadata +109 -28
  64. data/examples/sample_app/app/models/post.rb +0 -2
  65. data/examples/sample_app/app/views/test/foo.rhtml +0 -6
metadata CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
3
3
  specification_version: 1
4
4
  name: merb
5
5
  version: !ruby/object:Gem::Version
6
- version: 0.0.3
7
- date: 2006-10-17 00:00:00 -07:00
6
+ version: 0.0.4
7
+ date: 2006-10-26 00:00:00 -07:00
8
8
  summary: Merb == Mongrel + Erb. Pocket rocket web framework.
9
9
  require_paths:
10
10
  - lib
@@ -32,7 +32,43 @@ files:
32
32
  - LICENSE
33
33
  - README
34
34
  - Rakefile
35
+ - TODO
35
36
  - bin/merb
37
+ - doc/rdoc
38
+ - doc/rdoc/classes
39
+ - doc/rdoc/created.rid
40
+ - doc/rdoc/files
41
+ - doc/rdoc/fr_class_index.html
42
+ - doc/rdoc/fr_file_index.html
43
+ - doc/rdoc/fr_method_index.html
44
+ - doc/rdoc/index.html
45
+ - doc/rdoc/rdoc-style.css
46
+ - doc/rdoc/classes/Hash.html
47
+ - doc/rdoc/classes/Merb
48
+ - doc/rdoc/classes/Merb.html
49
+ - doc/rdoc/classes/MerbHandler.html
50
+ - doc/rdoc/classes/MerbHash.html
51
+ - doc/rdoc/classes/Noroutefound.html
52
+ - doc/rdoc/classes/Object.html
53
+ - doc/rdoc/classes/String.html
54
+ - doc/rdoc/classes/Symbol.html
55
+ - doc/rdoc/classes/Merb/Config.html
56
+ - doc/rdoc/classes/Merb/Controller.html
57
+ - doc/rdoc/classes/Merb/RouteMatcher.html
58
+ - doc/rdoc/classes/Merb/Server.html
59
+ - doc/rdoc/files/lib
60
+ - doc/rdoc/files/LICENSE.html
61
+ - doc/rdoc/files/README.html
62
+ - doc/rdoc/files/TODO.html
63
+ - doc/rdoc/files/lib/merb
64
+ - doc/rdoc/files/lib/merb_config_rb.html
65
+ - doc/rdoc/files/lib/merb_rb.html
66
+ - doc/rdoc/files/lib/merb/merb_controller_rb.html
67
+ - doc/rdoc/files/lib/merb/merb_daemon_rb.html
68
+ - doc/rdoc/files/lib/merb/merb_handler_rb.html
69
+ - doc/rdoc/files/lib/merb/merb_router_rb.html
70
+ - doc/rdoc/files/lib/merb/merb_utils_rb.html
71
+ - doc/rdoc/files/lib/merb/noroutefound_rb.html
36
72
  - test/test_helper.rb
37
73
  - test/unit
38
74
  - test/unit/route_matcher_test.rb
@@ -44,33 +80,67 @@ files:
44
80
  - lib/merb/merb_handler.rb
45
81
  - lib/merb/merb_router.rb
46
82
  - lib/merb/merb_utils.rb
83
+ - lib/merb/noroutefound.rb
47
84
  - examples/sample_app
48
- - examples/sample_app/app
49
- - examples/sample_app/conf
50
- - examples/sample_app/lib
51
- - examples/sample_app/log
52
- - examples/sample_app/public
53
- - examples/sample_app/app/controllers
54
- - examples/sample_app/app/models
55
- - examples/sample_app/app/views
56
- - examples/sample_app/app/controllers/noroutefound.rb
57
- - examples/sample_app/app/controllers/posts.rb
58
- - examples/sample_app/app/controllers/test.rb
59
- - examples/sample_app/app/controllers/upload.rb
60
- - examples/sample_app/app/models/post.rb
61
- - examples/sample_app/app/views/posts
62
- - examples/sample_app/app/views/test
63
- - examples/sample_app/app/views/upload
64
- - examples/sample_app/app/views/posts/list.rhtml
65
- - examples/sample_app/app/views/posts/new.rhtml
66
- - examples/sample_app/app/views/posts/show.rhtml
67
- - examples/sample_app/app/views/test/foo.rhtml
68
- - examples/sample_app/app/views/test/hello.rhtml
69
- - examples/sample_app/app/views/upload/start.rhtml
70
- - examples/sample_app/app/views/upload/upload.rhtml
71
- - examples/sample_app/conf/merb_init.rb
72
- - examples/sample_app/conf/router.rb
73
- - examples/sample_app/public/files
85
+ - examples/skeleton
86
+ - examples/sample_app/dist
87
+ - examples/sample_app/plugins
88
+ - examples/sample_app/scripts
89
+ - examples/sample_app/test
90
+ - examples/sample_app/dist/app
91
+ - examples/sample_app/dist/conf
92
+ - examples/sample_app/dist/lib
93
+ - examples/sample_app/dist/log
94
+ - examples/sample_app/dist/plugins
95
+ - examples/sample_app/dist/public
96
+ - examples/sample_app/dist/app/controllers
97
+ - examples/sample_app/dist/app/models
98
+ - examples/sample_app/dist/app/views
99
+ - examples/sample_app/dist/app/controllers/posts.rb
100
+ - examples/sample_app/dist/app/controllers/test.rb
101
+ - examples/sample_app/dist/app/controllers/upload.rb
102
+ - examples/sample_app/dist/app/models/post.rb
103
+ - examples/sample_app/dist/app/views/layout
104
+ - examples/sample_app/dist/app/views/posts
105
+ - examples/sample_app/dist/app/views/test
106
+ - examples/sample_app/dist/app/views/upload
107
+ - examples/sample_app/dist/app/views/layout/application.rhtml
108
+ - examples/sample_app/dist/app/views/layout/foo.rhtml
109
+ - examples/sample_app/dist/app/views/layout/posts.rhtml
110
+ - examples/sample_app/dist/app/views/posts/list.rhtml
111
+ - examples/sample_app/dist/app/views/posts/new.rhtml
112
+ - examples/sample_app/dist/app/views/posts/show.rhtml
113
+ - examples/sample_app/dist/app/views/test/foo.rhtml
114
+ - examples/sample_app/dist/app/views/test/hello.rhtml
115
+ - examples/sample_app/dist/app/views/upload/start.rhtml
116
+ - examples/sample_app/dist/app/views/upload/upload.rhtml
117
+ - examples/sample_app/dist/conf/merb_init.rb
118
+ - examples/sample_app/dist/conf/router.rb
119
+ - examples/sample_app/dist/public/files
120
+ - examples/sample_app/test/fixtures
121
+ - examples/sample_app/test/spec
122
+ - examples/sample_app/test/test_helper.rb
123
+ - examples/sample_app/test/unit
124
+ - examples/skeleton/dist
125
+ - examples/skeleton/plugins
126
+ - examples/skeleton/scripts
127
+ - examples/skeleton/test
128
+ - examples/skeleton/dist/app
129
+ - examples/skeleton/dist/conf
130
+ - examples/skeleton/dist/lib
131
+ - examples/skeleton/dist/log
132
+ - examples/skeleton/dist/plugins
133
+ - examples/skeleton/dist/public
134
+ - examples/skeleton/dist/app/controllers
135
+ - examples/skeleton/dist/app/models
136
+ - examples/skeleton/dist/app/views
137
+ - examples/skeleton/dist/conf/merb_init.rb
138
+ - examples/skeleton/dist/conf/router.rb
139
+ - examples/skeleton/dist/public/files
140
+ - examples/skeleton/test/fixtures
141
+ - examples/skeleton/test/spec
142
+ - examples/skeleton/test/test_helper.rb
143
+ - examples/skeleton/test/unit
74
144
  test_files: []
75
145
 
76
146
  rdoc_options:
@@ -80,6 +150,7 @@ rdoc_options:
80
150
  - --opname
81
151
  - index.html
82
152
  - --line-numbers
153
+ - TODO
83
154
  - --main
84
155
  - README
85
156
  - --inline-source
@@ -88,6 +159,7 @@ rdoc_options:
88
159
  extra_rdoc_files:
89
160
  - README
90
161
  - LICENSE
162
+ - TODO
91
163
  executables:
92
164
  - merb
93
165
  extensions: []
@@ -104,3 +176,12 @@ dependencies:
104
176
  - !ruby/object:Gem::Version
105
177
  version: 0.0.0
106
178
  version:
179
+ - !ruby/object:Gem::Dependency
180
+ name: erubis
181
+ version_requirement:
182
+ version_requirements: !ruby/object:Gem::Version::Requirement
183
+ requirements:
184
+ - - ">"
185
+ - !ruby/object:Gem::Version
186
+ version: 0.0.0
187
+ version:
data/examples/sample_app/app/models/post.rb DELETED
@@ -1,2 +0,0 @@
1
- class Post < ActiveRecord::Base
2
- end
data/examples/sample_app/app/views/test/foo.rhtml DELETED
@@ -1,6 +0,0 @@
1
- <html>
2
- <body>
3
-
4
- <%= @args.inspect %>
5
- </body>
6
- </html>