zena 1.2.2 → 1.2.3

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 (143) hide show
  1. data/History.txt +25 -0
  2. data/app/controllers/documents_controller.rb +3 -25
  3. data/app/controllers/nodes_controller.rb +34 -24
  4. data/app/controllers/user_sessions_controller.rb +5 -4
  5. data/app/controllers/versions_controller.rb +44 -17
  6. data/app/models/acl.rb +2 -7
  7. data/app/models/group.rb +6 -2
  8. data/app/models/link.rb +14 -0
  9. data/app/models/node.rb +2 -2
  10. data/app/models/site.rb +13 -4
  11. data/app/models/text_document.rb +1 -1
  12. data/app/models/user.rb +11 -2
  13. data/app/models/virtual_class.rb +1 -1
  14. data/app/views/groups/_form.rhtml +6 -6
  15. data/app/views/nodes/render_error.rhtml +15 -0
  16. data/app/views/templates/document_create_tabs/_file.rhtml +1 -1
  17. data/app/views/templates/document_create_tabs/_import.rhtml +1 -1
  18. data/app/views/templates/document_create_tabs/_template.rhtml +1 -1
  19. data/app/views/templates/document_create_tabs/_text_document.rhtml +1 -1
  20. data/app/views/templates/edit_tabs/_title.rhtml +1 -1
  21. data/app/views/zafu/default/Node-admin.zafu +1 -1
  22. data/bricks/acls/zena/test/integration/acl_integration_test.rb +2 -2
  23. data/bricks/acls/zena/test/unit/acl_test.rb +2 -1
  24. data/bricks/fs_skin/zena/migrate/20110702010330_add_fs_skin_to_idx_templates.rb +1 -0
  25. data/bricks/fs_skin/zena/skins/blog/img/style.css +4 -4
  26. data/bricks/grid/lib/bricks/grid.rb +9 -3
  27. data/bricks/passenger/zena/deploy.rb +2 -1
  28. data/bricks/pdf/lib/bricks/pdf.rb +1 -1
  29. data/bricks/tags/zena/test/zafu/tags.yml +5 -1
  30. data/bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb +13 -0
  31. data/config/bricks.yml +10 -10
  32. data/config/deploy.rb +1 -5
  33. data/config/gems.yml +2 -2
  34. data/db/init/base/skins/default/Node.zafu +7 -3
  35. data/db/init/base/skins/default/notes.zafu +3 -1
  36. data/lib/zafu/all.rb +0 -9
  37. data/lib/zafu/compiler.rb +0 -4
  38. data/lib/zafu/controller_methods.rb +0 -2
  39. data/lib/zafu/handler.rb +0 -5
  40. data/lib/zafu/markup.rb +4 -6
  41. data/lib/zafu/ordered_hash.rb +3 -2
  42. data/lib/zafu/parsing_rules.rb +1 -3
  43. data/lib/zafu/process/ajax.rb +4 -2
  44. data/lib/zafu/process/context.rb +34 -4
  45. data/lib/zafu/process/forms.rb +2 -2
  46. data/lib/zafu/process/ruby_less_processing.rb +5 -10
  47. data/lib/zafu/template.rb +0 -2
  48. data/lib/zafu/test_helper.rb +0 -2
  49. data/lib/zafu/view_methods.rb +0 -1
  50. data/lib/zafu.rb +1 -1
  51. data/lib/zena/acts/secure_node.rb +5 -4
  52. data/lib/zena/console.rb +19 -17
  53. data/lib/zena/core_ext/string.rb +3 -2
  54. data/lib/zena/deploy/app_init.rhtml +6 -1
  55. data/lib/zena/deploy/httpd.rhtml +16 -13
  56. data/lib/zena/deploy/stats.vhost.rhtml +1 -1
  57. data/lib/zena/deploy/vhost.rhtml +31 -11
  58. data/lib/zena/deploy/vhost_ssl_redir.rhtml +12 -0
  59. data/lib/zena/deploy/vhost_www.rhtml +1 -1
  60. data/lib/zena/deploy.rb +55 -11
  61. data/lib/zena/info.rb +1 -1
  62. data/lib/zena/parser/zazen_rules.rb +18 -9
  63. data/lib/zena/routes.rb +1 -3
  64. data/lib/zena/site_worker.rb +8 -1
  65. data/lib/zena/use/ajax.rb +29 -3
  66. data/lib/zena/use/ancestry.rb +2 -1
  67. data/lib/zena/use/authlogic.rb +12 -18
  68. data/lib/zena/use/context.rb +1 -1
  69. data/lib/zena/use/dates.rb +28 -18
  70. data/lib/zena/use/display.rb +49 -7
  71. data/lib/zena/use/forms.rb +51 -18
  72. data/lib/zena/use/html_tags.rb +6 -6
  73. data/lib/zena/use/i18n.rb +13 -4
  74. data/lib/zena/use/image_builder.rb +2 -0
  75. data/lib/zena/use/query_builder.rb +39 -14
  76. data/lib/zena/use/query_link.rb +57 -0
  77. data/lib/zena/use/query_node.rb +68 -32
  78. data/lib/zena/use/relations.rb +25 -15
  79. data/lib/zena/use/rendering.rb +66 -15
  80. data/lib/zena/use/upload.rb +34 -5
  81. data/lib/zena/use/urls.rb +28 -25
  82. data/lib/zena/use/version_hash.rb +14 -2
  83. data/lib/zena/use/zafu_safe_definitions.rb +72 -3
  84. data/lib/zena/use/zazen.rb +16 -4
  85. data/lib/zena.rb +1 -0
  86. data/public/javascripts/grid.js +213 -64
  87. data/public/javascripts/raphael.js +10 -0
  88. data/public/javascripts/zena.js +146 -22
  89. data/public/stylesheets/reset.css +12 -12
  90. data/public/stylesheets/zena.css +1 -1
  91. data/test/custom_queries/complex.host.yml +19 -0
  92. data/test/fixtures/files/TestNode.zafu +40 -4
  93. data/test/functional/nodes_controller_test.rb +84 -39
  94. data/test/functional/versions_controller_test.rb +2 -2
  95. data/test/integration/navigation_test.rb +61 -35
  96. data/test/integration/query_node/basic.yml +7 -7
  97. data/test/integration/query_node/comments.yml +1 -1
  98. data/test/integration/query_node/complex.yml +3 -3
  99. data/test/integration/query_node/filters.yml +32 -8
  100. data/test/integration/query_node/idx_key_value.yml +10 -10
  101. data/test/integration/query_node/idx_scope.yml +7 -7
  102. data/test/integration/query_node/relations.yml +4 -4
  103. data/test/integration/zafu_compiler/ajax.yml +19 -11
  104. data/test/integration/zafu_compiler/apphelper.yml +1 -1
  105. data/test/integration/zafu_compiler/asset.yml +2 -2
  106. data/test/integration/zafu_compiler/comments.yml +1 -1
  107. data/test/integration/zafu_compiler/dates.yml +1 -1
  108. data/test/integration/zafu_compiler/display.yml +49 -21
  109. data/test/integration/zafu_compiler/eval.yml +4 -4
  110. data/test/integration/zafu_compiler/forms.yml +25 -11
  111. data/test/integration/zafu_compiler/i18n.yml +5 -0
  112. data/test/integration/zafu_compiler/meta.yml +3 -3
  113. data/test/integration/zafu_compiler/query.yml +27 -9
  114. data/test/integration/zafu_compiler/relations.yml +9 -9
  115. data/test/integration/zafu_compiler/roles.yml +6 -6
  116. data/test/integration/zafu_compiler/rubyless.yml +7 -2
  117. data/test/integration/zafu_compiler/safe_definitions.yml +33 -4
  118. data/test/integration/zafu_compiler/security.yml +46 -1
  119. data/test/integration/zafu_compiler/urls.yml +28 -13
  120. data/test/integration/zafu_compiler/user.yml +12 -7
  121. data/test/integration/zafu_compiler/zafu_attributes.yml +1 -1
  122. data/test/integration/zafu_compiler/zazen.yml +5 -5
  123. data/test/integration/zafu_compiler_test.rb +18 -0
  124. data/test/selenium/Filter/filter3.rsel +20 -0
  125. data/test/selenium/Filter/filter4.rsel +20 -0
  126. data/test/sites/zena/versions.yml +2 -0
  127. data/test/unit/exif_data_test.rb +6 -1
  128. data/test/unit/group_test.rb +18 -3
  129. data/test/unit/node_test.rb +0 -7
  130. data/test/unit/project_test.rb +4 -0
  131. data/test/unit/relation_proxy_test.rb +2 -2
  132. data/test/unit/remote_test.rb +0 -9
  133. data/test/unit/role_test.rb +1 -1
  134. data/test/unit/string_hash_test.rb +1 -1
  135. data/test/unit/text_document_test.rb +13 -13
  136. data/test/unit/zena/use/html_tags_test.rb +6 -6
  137. data/test/unit/zena/use/rendering_test.rb +20 -10
  138. data/test/unit/zena/use/urls_test.rb +21 -18
  139. data/test/unit/zena/use/zafu_template_test.rb +0 -5
  140. data/test/unit/zena/use/zazen_test.rb +25 -25
  141. data/zena.gemspec +63 -57
  142. metadata +136 -130
  143. data/test/functional/nodes_controller_commit_test.rb +0 -67
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zena
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
4
+ hash: 25
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 2
9
- - 2
10
- version: 1.2.2
9
+ - 3
10
+ version: 1.2.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Gaspard Bucher
@@ -15,73 +15,75 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-08-30 00:00:00 +02:00
18
+ date: 2013-03-11 00:00:00 +01:00
19
19
  default_executable: zena
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- name: ruby-recaptcha
22
+ name: rails
23
23
  prerelease: false
24
24
  requirement: &id001 !ruby/object:Gem::Requirement
25
25
  none: false
26
26
  requirements:
27
27
  - - "="
28
28
  - !ruby/object:Gem::Version
29
- hash: 17
29
+ hash: 21
30
30
  segments:
31
- - 1
32
- - 0
31
+ - 2
33
32
  - 3
34
- version: 1.0.3
33
+ - 11
34
+ version: 2.3.11
35
35
  type: :runtime
36
36
  version_requirements: *id001
37
37
  - !ruby/object:Gem::Dependency
38
- name: tzinfo
38
+ name: differ
39
39
  prerelease: false
40
40
  requirement: &id002 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
- - - ">="
43
+ - - "="
44
44
  - !ruby/object:Gem::Version
45
- hash: 3
45
+ hash: 31
46
46
  segments:
47
47
  - 0
48
- version: "0"
48
+ - 1
49
+ - 2
50
+ version: 0.1.2
49
51
  type: :runtime
50
52
  version_requirements: *id002
51
53
  - !ruby/object:Gem::Dependency
52
- name: rails
54
+ name: fast_gettext
53
55
  prerelease: false
54
56
  requirement: &id003 !ruby/object:Gem::Requirement
55
57
  none: false
56
58
  requirements:
57
- - - "="
59
+ - - ~>
58
60
  - !ruby/object:Gem::Version
59
- hash: 21
61
+ hash: 47
60
62
  segments:
61
- - 2
62
- - 3
63
- - 11
64
- version: 2.3.11
63
+ - 0
64
+ - 4
65
+ - 16
66
+ version: 0.4.16
65
67
  type: :runtime
66
68
  version_requirements: *id003
67
69
  - !ruby/object:Gem::Dependency
68
- name: httparty
70
+ name: shoulda
69
71
  prerelease: false
70
72
  requirement: &id004 !ruby/object:Gem::Requirement
71
73
  none: false
72
74
  requirements:
73
75
  - - "="
74
76
  - !ruby/object:Gem::Version
75
- hash: 19
77
+ hash: 33
76
78
  segments:
77
- - 0
78
- - 7
79
- - 8
80
- version: 0.7.8
79
+ - 2
80
+ - 10
81
+ - 3
82
+ version: 2.10.3
81
83
  type: :runtime
82
84
  version_requirements: *id004
83
85
  - !ruby/object:Gem::Dependency
84
- name: simple_xlsx_writer
86
+ name: open4
85
87
  prerelease: false
86
88
  requirement: &id005 !ruby/object:Gem::Requirement
87
89
  none: false
@@ -95,213 +97,205 @@ dependencies:
95
97
  type: :runtime
96
98
  version_requirements: *id005
97
99
  - !ruby/object:Gem::Dependency
98
- name: rubyless
100
+ name: authlogic
99
101
  prerelease: false
100
102
  requirement: &id006 !ruby/object:Gem::Requirement
101
103
  none: false
102
104
  requirements:
103
105
  - - "="
104
106
  - !ruby/object:Gem::Version
105
- hash: 51
107
+ hash: 13
106
108
  segments:
107
- - 0
108
- - 8
109
- - 6
110
- version: 0.8.6
109
+ - 2
110
+ - 1
111
+ - 3
112
+ version: 2.1.3
111
113
  type: :runtime
112
114
  version_requirements: *id006
113
115
  - !ruby/object:Gem::Dependency
114
- name: property
116
+ name: querybuilder
115
117
  prerelease: false
116
118
  requirement: &id007 !ruby/object:Gem::Requirement
117
119
  none: false
118
120
  requirements:
119
121
  - - "="
120
122
  - !ruby/object:Gem::Version
121
- hash: 7
123
+ hash: 29
122
124
  segments:
125
+ - 1
123
126
  - 2
124
- - 3
125
- - 2
126
- version: 2.3.2
127
+ - 1
128
+ version: 1.2.1
127
129
  type: :runtime
128
130
  version_requirements: *id007
129
131
  - !ruby/object:Gem::Dependency
130
- name: uuidtools
132
+ name: jeweler
131
133
  prerelease: false
132
134
  requirement: &id008 !ruby/object:Gem::Requirement
133
135
  none: false
134
136
  requirements:
135
- - - "="
137
+ - - ">="
136
138
  - !ruby/object:Gem::Version
137
- hash: 15
139
+ hash: 3
138
140
  segments:
139
- - 2
140
141
  - 0
141
- - 0
142
- version: 2.0.0
142
+ version: "0"
143
143
  type: :runtime
144
144
  version_requirements: *id008
145
145
  - !ruby/object:Gem::Dependency
146
- name: authlogic
146
+ name: yamltest
147
147
  prerelease: false
148
148
  requirement: &id009 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - "="
152
152
  - !ruby/object:Gem::Version
153
- hash: 13
153
+ hash: 3
154
154
  segments:
155
- - 2
156
- - 1
157
- - 3
158
- version: 2.1.3
155
+ - 0
156
+ - 7
157
+ - 0
158
+ version: 0.7.0
159
159
  type: :runtime
160
160
  version_requirements: *id009
161
161
  - !ruby/object:Gem::Dependency
162
- name: shoulda
162
+ name: json
163
163
  prerelease: false
164
164
  requirement: &id010 !ruby/object:Gem::Requirement
165
165
  none: false
166
166
  requirements:
167
167
  - - "="
168
168
  - !ruby/object:Gem::Version
169
- hash: 33
169
+ hash: 1
170
170
  segments:
171
- - 2
172
- - 10
173
- - 3
174
- version: 2.10.3
171
+ - 1
172
+ - 5
173
+ - 1
174
+ version: 1.5.1
175
175
  type: :runtime
176
176
  version_requirements: *id010
177
177
  - !ruby/object:Gem::Dependency
178
- name: fast_gettext
178
+ name: daemons
179
179
  prerelease: false
180
180
  requirement: &id011 !ruby/object:Gem::Requirement
181
181
  none: false
182
182
  requirements:
183
- - - ~>
183
+ - - ">="
184
184
  - !ruby/object:Gem::Version
185
- hash: 47
185
+ hash: 3
186
186
  segments:
187
187
  - 0
188
- - 4
189
- - 16
190
- version: 0.4.16
188
+ version: "0"
191
189
  type: :runtime
192
190
  version_requirements: *id011
193
191
  - !ruby/object:Gem::Dependency
194
- name: syntax
192
+ name: property
195
193
  prerelease: false
196
194
  requirement: &id012 !ruby/object:Gem::Requirement
197
195
  none: false
198
196
  requirements:
199
197
  - - "="
200
198
  - !ruby/object:Gem::Version
201
- hash: 23
199
+ hash: 7
202
200
  segments:
203
- - 1
204
- - 0
205
- - 0
206
- version: 1.0.0
201
+ - 2
202
+ - 3
203
+ - 2
204
+ version: 2.3.2
207
205
  type: :runtime
208
206
  version_requirements: *id012
209
207
  - !ruby/object:Gem::Dependency
210
- name: gem_plugin
208
+ name: versions
211
209
  prerelease: false
212
210
  requirement: &id013 !ruby/object:Gem::Requirement
213
211
  none: false
214
212
  requirements:
215
- - - ">="
213
+ - - "="
216
214
  - !ruby/object:Gem::Version
217
- hash: 3
215
+ hash: 17
218
216
  segments:
219
217
  - 0
220
- version: "0"
218
+ - 3
219
+ - 1
220
+ version: 0.3.1
221
221
  type: :runtime
222
222
  version_requirements: *id013
223
223
  - !ruby/object:Gem::Dependency
224
- name: yamltest
224
+ name: simple_xlsx_writer
225
225
  prerelease: false
226
226
  requirement: &id014 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
- - - "="
229
+ - - ">="
230
230
  - !ruby/object:Gem::Version
231
231
  hash: 3
232
232
  segments:
233
233
  - 0
234
- - 7
235
- - 0
236
- version: 0.7.0
234
+ version: "0"
237
235
  type: :runtime
238
236
  version_requirements: *id014
239
237
  - !ruby/object:Gem::Dependency
240
- name: json
238
+ name: hpricot
241
239
  prerelease: false
242
240
  requirement: &id015 !ruby/object:Gem::Requirement
243
241
  none: false
244
242
  requirements:
245
- - - "="
243
+ - - ">="
246
244
  - !ruby/object:Gem::Version
247
- hash: 1
245
+ hash: 3
248
246
  segments:
249
- - 1
250
- - 5
251
- - 1
252
- version: 1.5.1
247
+ - 0
248
+ version: "0"
253
249
  type: :runtime
254
250
  version_requirements: *id015
255
251
  - !ruby/object:Gem::Dependency
256
- name: will_paginate
252
+ name: gettext
257
253
  prerelease: false
258
254
  requirement: &id016 !ruby/object:Gem::Requirement
259
255
  none: false
260
256
  requirements:
261
- - - ~>
257
+ - - "="
262
258
  - !ruby/object:Gem::Version
263
- hash: 27
259
+ hash: 11
264
260
  segments:
265
261
  - 2
266
- - 3
267
- - 12
268
- version: 2.3.12
262
+ - 1
263
+ - 0
264
+ version: 2.1.0
269
265
  type: :runtime
270
266
  version_requirements: *id016
271
267
  - !ruby/object:Gem::Dependency
272
- name: gettext
268
+ name: ruby-recaptcha
273
269
  prerelease: false
274
270
  requirement: &id017 !ruby/object:Gem::Requirement
275
271
  none: false
276
272
  requirements:
277
273
  - - "="
278
274
  - !ruby/object:Gem::Version
279
- hash: 11
275
+ hash: 17
280
276
  segments:
281
- - 2
282
277
  - 1
283
278
  - 0
284
- version: 2.1.0
279
+ - 3
280
+ version: 1.0.3
285
281
  type: :runtime
286
282
  version_requirements: *id017
287
283
  - !ruby/object:Gem::Dependency
288
- name: versions
284
+ name: tzinfo
289
285
  prerelease: false
290
286
  requirement: &id018 !ruby/object:Gem::Requirement
291
287
  none: false
292
288
  requirements:
293
- - - "="
289
+ - - ">="
294
290
  - !ruby/object:Gem::Version
295
- hash: 17
291
+ hash: 3
296
292
  segments:
297
293
  - 0
298
- - 3
299
- - 1
300
- version: 0.3.1
294
+ version: "0"
301
295
  type: :runtime
302
296
  version_requirements: *id018
303
297
  - !ruby/object:Gem::Dependency
304
- name: jeweler
298
+ name: gem_plugin
305
299
  prerelease: false
306
300
  requirement: &id019 !ruby/object:Gem::Requirement
307
301
  none: false
@@ -315,93 +309,99 @@ dependencies:
315
309
  type: :runtime
316
310
  version_requirements: *id019
317
311
  - !ruby/object:Gem::Dependency
318
- name: daemons
312
+ name: rubyless
319
313
  prerelease: false
320
314
  requirement: &id020 !ruby/object:Gem::Requirement
321
315
  none: false
322
316
  requirements:
323
- - - ">="
317
+ - - "="
324
318
  - !ruby/object:Gem::Version
325
- hash: 3
319
+ hash: 47
326
320
  segments:
327
321
  - 0
328
- version: "0"
322
+ - 8
323
+ - 8
324
+ version: 0.8.8
329
325
  type: :runtime
330
326
  version_requirements: *id020
331
327
  - !ruby/object:Gem::Dependency
332
- name: hpricot
328
+ name: syntax
333
329
  prerelease: false
334
330
  requirement: &id021 !ruby/object:Gem::Requirement
335
331
  none: false
336
332
  requirements:
337
- - - ">="
333
+ - - "="
338
334
  - !ruby/object:Gem::Version
339
- hash: 3
335
+ hash: 23
340
336
  segments:
337
+ - 1
341
338
  - 0
342
- version: "0"
339
+ - 0
340
+ version: 1.0.0
343
341
  type: :runtime
344
342
  version_requirements: *id021
345
343
  - !ruby/object:Gem::Dependency
346
- name: differ
344
+ name: uuidtools
347
345
  prerelease: false
348
346
  requirement: &id022 !ruby/object:Gem::Requirement
349
347
  none: false
350
348
  requirements:
351
349
  - - "="
352
350
  - !ruby/object:Gem::Version
353
- hash: 31
351
+ hash: 15
354
352
  segments:
355
- - 0
356
- - 1
357
353
  - 2
358
- version: 0.1.2
354
+ - 0
355
+ - 0
356
+ version: 2.0.0
359
357
  type: :runtime
360
358
  version_requirements: *id022
361
359
  - !ruby/object:Gem::Dependency
362
- name: RedCloth
360
+ name: will_paginate
363
361
  prerelease: false
364
362
  requirement: &id023 !ruby/object:Gem::Requirement
365
363
  none: false
366
364
  requirements:
367
- - - "="
365
+ - - ~>
368
366
  - !ruby/object:Gem::Version
369
- hash: 15
367
+ hash: 27
370
368
  segments:
369
+ - 2
371
370
  - 3
372
- - 0
373
- - 4
374
- version: 3.0.4
371
+ - 12
372
+ version: 2.3.12
375
373
  type: :runtime
376
374
  version_requirements: *id023
377
375
  - !ruby/object:Gem::Dependency
378
- name: open4
376
+ name: httparty
379
377
  prerelease: false
380
378
  requirement: &id024 !ruby/object:Gem::Requirement
381
379
  none: false
382
380
  requirements:
383
- - - ">="
381
+ - - "="
384
382
  - !ruby/object:Gem::Version
385
- hash: 3
383
+ hash: 19
386
384
  segments:
387
385
  - 0
388
- version: "0"
386
+ - 7
387
+ - 8
388
+ version: 0.7.8
389
389
  type: :runtime
390
390
  version_requirements: *id024
391
391
  - !ruby/object:Gem::Dependency
392
- name: querybuilder
392
+ name: RedCloth
393
393
  prerelease: false
394
394
  requirement: &id025 !ruby/object:Gem::Requirement
395
395
  none: false
396
396
  requirements:
397
397
  - - "="
398
398
  - !ruby/object:Gem::Version
399
- hash: 21
399
+ hash: 15
400
400
  segments:
401
- - 1
402
- - 1
403
401
  - 3
404
- version: 1.1.3
402
+ - 0
403
+ - 4
404
+ version: 3.0.4
405
405
  type: :runtime
406
406
  version_requirements: *id025
407
407
  description: zena is a Ruby on Rails CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).
@@ -590,6 +590,7 @@ files:
590
590
  - app/views/nodes/edit.html.erb
591
591
  - app/views/nodes/edit.rjs
592
592
  - app/views/nodes/import.rhtml
593
+ - app/views/nodes/render_error.rhtml
593
594
  - app/views/nodes/save_text.rjs
594
595
  - app/views/nodes/search.rjs
595
596
  - app/views/nodes/show.rjs
@@ -793,6 +794,7 @@ files:
793
794
  - bricks/zena/zena/migrate/20111214112233_add_comment_to_relations.rb
794
795
  - bricks/zena/zena/migrate/20120605091558_add_ssl_login_to_site.rb
795
796
  - bricks/zena/zena/migrate/20120630123551_add_auto_publish_to_group.rb
797
+ - bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb
796
798
  - config/boot.rb
797
799
  - config/bricks.yml
798
800
  - config/database_example.yml
@@ -1021,6 +1023,7 @@ files:
1021
1023
  - lib/zena/deploy/stats.vhost.rhtml
1022
1024
  - lib/zena/deploy/template.rb
1023
1025
  - lib/zena/deploy/vhost.rhtml
1026
+ - lib/zena/deploy/vhost_ssl_redir.rhtml
1024
1027
  - lib/zena/deploy/vhost_www.rhtml
1025
1028
  - lib/zena/fix_rails_layouts.rb
1026
1029
  - lib/zena/foxy_parser.rb
@@ -1071,6 +1074,7 @@ files:
1071
1074
  - lib/zena/use/prop_eval.rb
1072
1075
  - lib/zena/use/query_builder.rb
1073
1076
  - lib/zena/use/query_comment.rb
1077
+ - lib/zena/use/query_link.rb
1074
1078
  - lib/zena/use/query_node.rb
1075
1079
  - lib/zena/use/recursion.rb
1076
1080
  - lib/zena/use/refactor.rb
@@ -2232,6 +2236,7 @@ files:
2232
2236
  - public/javascripts/effects.js
2233
2237
  - public/javascripts/grid.js
2234
2238
  - public/javascripts/prototype.js
2239
+ - public/javascripts/raphael.js
2235
2240
  - public/javascripts/scriptaculous.js
2236
2241
  - public/javascripts/slider.js
2237
2242
  - public/javascripts/sound.js
@@ -2330,7 +2335,6 @@ files:
2330
2335
  - test/functional/groups_controller_test.rb
2331
2336
  - test/functional/iformats_controller_test.rb
2332
2337
  - test/functional/links_controller_test.rb
2333
- - test/functional/nodes_controller_commit_test.rb
2334
2338
  - test/functional/nodes_controller_test.rb
2335
2339
  - test/functional/note_controller_test.rb
2336
2340
  - test/functional/pings_controller_test.rb
@@ -2418,6 +2422,8 @@ files:
2418
2422
  - test/selenium/Filter/0setup.rsel
2419
2423
  - test/selenium/Filter/filter1.rsel
2420
2424
  - test/selenium/Filter/filter2.rsel
2425
+ - test/selenium/Filter/filter3.rsel
2426
+ - test/selenium/Filter/filter4.rsel
2421
2427
  - test/selenium/Form/0setup.rsel
2422
2428
  - test/selenium/Form/form1.rsel
2423
2429
  - test/selenium/Form/form2.rsel
data/test/functional/nodes_controller_commit_test.rb DELETED
@@ -1,67 +0,0 @@
1
- require 'test_helper'
2
-
3
- class NodesControllerCommitTest < ActionController::TestCase
4
- self.use_transactional_fixtures = false
5
- include Zena::Use::TestHelper
6
-
7
- tests NodesController
8
-
9
- def teardown
10
- # avoids NodesController tests from breaking when run after this suite
11
- Zena::Use::Fixtures.reset_data_folder
12
- end
13
-
14
- def test_import_xhtml
15
- login(:tiger)
16
-
17
- if defined?(@controller)
18
- @controller.class_eval do
19
- def set_visitor
20
- # do nothing
21
- end
22
- end
23
- end
24
-
25
- without_files('/test.host/data') do
26
- without_files('/test.host/zafu') do
27
- post 'import', :id => nodes(:zena_skins).zip, :node => {:klass => 'Skin', :v_status => Zena::Status::Pub}, :attachment => uploaded_archive('jet_30.zip')
28
-
29
- node_list = assigns(:nodes)
30
- nodes = {}
31
- node_list.each do |n|
32
- nodes[n.title] = n
33
- end
34
- assert skin = nodes['jet30']
35
- assert_kind_of Skin, skin
36
- assert zafu = nodes['Node']
37
- assert_kind_of Template, zafu
38
- assert_equal 'html', zafu.format
39
- assert_equal 'Node', zafu.target_klass
40
- assert_equal 'N', zafu.tkpath
41
- assert style = nodes['style']
42
- assert_kind_of TextDocument, style
43
- assert navBar = nodes['navBar']
44
- assert_kind_of Image, navBar
45
- assert xhtmlBgHover = nodes['xhtmlBgHover']
46
- assert_kind_of Image, xhtmlBgHover
47
- assert topIcon = nodes['topIcon']
48
- assert_kind_of Image, topIcon
49
- ['lftPic1', 'lftPic2', 'lftPic3'].each do |p|
50
- assert nodes[p]
51
- assert_kind_of Image, nodes[p]
52
- end
53
- assert_match %r{#header ul\{\s*background:url\('/en/image#{navBar.zip}.gif\?#{navBar.updated_at.to_i}'\)}m, style.text
54
- assert_match %r{a\.xht:hover\{\s*background:url\('/en/image#{xhtmlBgHover.zip}.gif\?#{xhtmlBgHover.updated_at.to_i}'\)}, style.text
55
-
56
- # use this template
57
- status = nodes(:zena_status)
58
- status.visitor = Thread.current[:visitor]
59
- assert status.update_attributes(:skin_id => skin.id, :inherit => 0)
60
- get 'show', 'prefix'=>'oo', 'path'=>['projects', 'cleanWater', "page#{status.zip}.html"]
61
- assert_response :success
62
-
63
- assert_match %r{posuere eleifend arcu</p>\s*<img [^>]*src\s*=\s*./en/image#{topIcon.zip}.gif}, @response.body
64
- end
65
- end
66
- end
67
- end