zena 1.2.3 → 1.2.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 (98) hide show
  1. data/History.txt +29 -1
  2. data/Rakefile +0 -1
  3. data/app/controllers/documents_controller.rb +1 -1
  4. data/app/controllers/nodes_controller.rb +34 -8
  5. data/app/controllers/sites_controller.rb +8 -1
  6. data/app/controllers/user_sessions_controller.rb +13 -3
  7. data/app/models/acl.rb +16 -0
  8. data/app/models/document.rb +33 -14
  9. data/app/models/idx_nodes_integer.rb +5 -0
  10. data/app/models/image.rb +16 -4
  11. data/app/models/node.rb +16 -3
  12. data/app/models/relation_proxy.rb +3 -3
  13. data/app/models/site.rb +11 -1
  14. data/app/models/string_hash.rb +1 -1
  15. data/app/models/template.rb +1 -1
  16. data/app/models/user.rb +6 -1
  17. data/app/models/virtual_class.rb +36 -1
  18. data/app/views/acls/_form.rhtml +5 -1
  19. data/app/views/acls/_li.rhtml +1 -1
  20. data/app/views/templates/document_create_tabs/_file.rhtml +1 -0
  21. data/app/views/templates/document_create_tabs/_template.rhtml +1 -1
  22. data/app/views/users/_form.rhtml +1 -0
  23. data/app/views/virtual_classes/_form.erb +8 -7
  24. data/bricks/acls/lib/bricks/acls.rb +43 -15
  25. data/bricks/acls/zena/migrate/20130313110443_add_create_kpath_to_acl.rb +13 -0
  26. data/bricks/acls/zena/migrate/20130429073432_fix_create_kpath_default.rb +8 -0
  27. data/bricks/acls/zena/test/integration/acl_integration_test.rb +53 -1
  28. data/bricks/acls/zena/test/sites/erebus/acls.yml +21 -0
  29. data/bricks/acls/zena/test/unit/acl_test.rb +35 -2
  30. data/bricks/math/lib/bricks/math.rb +1 -1
  31. data/bricks/sphinx/zena/tasks.rb +1 -1
  32. data/bricks/spreadsheet/lib/bricks/spreadsheet.rb +1 -1
  33. data/bricks/worker/zena/worker +25 -0
  34. data/config/environment.rb +1 -1
  35. data/config/environments/production.rb +1 -1
  36. data/config/gems.yml +6 -5
  37. data/lib/bricks/requirements_validation.rb +1 -1
  38. data/lib/log_recorder/lib/log_recorder.rb +1 -1
  39. data/lib/tasks/zena.rake +10 -2
  40. data/lib/zena.rb +4 -3
  41. data/lib/zena/app.rb +1 -0
  42. data/lib/zena/deploy/httpd.rhtml +2 -2
  43. data/lib/zena/deploy/template.rb +15 -5
  44. data/lib/zena/info.rb +1 -1
  45. data/lib/zena/parser/zazen_rules.rb +9 -2
  46. data/lib/zena/remote/connection.rb +2 -2
  47. data/lib/zena/remote/interface.rb +8 -2
  48. data/lib/zena/remote/node.rb +1 -1
  49. data/lib/zena/routes.rb +2 -1
  50. data/lib/zena/use/action.rb +8 -2
  51. data/lib/zena/use/ajax.rb +31 -20
  52. data/lib/zena/use/calendar.rb +2 -0
  53. data/lib/zena/use/conditional.rb +15 -14
  54. data/lib/zena/use/dates.rb +5 -2
  55. data/lib/zena/use/display.rb +3 -2
  56. data/lib/zena/use/forms.rb +36 -9
  57. data/lib/zena/use/i18n.rb +8 -2
  58. data/lib/zena/use/image_builder.rb +7 -0
  59. data/lib/zena/use/query_node.rb +24 -8
  60. data/lib/zena/use/relations.rb +2 -6
  61. data/lib/zena/use/rendering.rb +10 -6
  62. data/lib/zena/use/upload.rb +6 -4
  63. data/lib/zena/use/urls.rb +13 -5
  64. data/lib/zena/use/zafu_safe_definitions.rb +1 -1
  65. data/public/javascripts/grid.js +11 -2
  66. data/public/javascripts/upload-progress.js +5 -3
  67. data/public/javascripts/zena.js +6 -2
  68. data/public/stylesheets/upload-progress.css +1 -0
  69. data/test/fixtures/files/TestNode.zafu +2 -2
  70. data/test/fixtures/files/translations_fr.yml +2 -1
  71. data/test/functional/acls_controller_test.rb +6 -0
  72. data/test/functional/nodes_controller_test.rb +1 -1
  73. data/test/functional/sites_controller_test.rb +19 -0
  74. data/test/integration/navigation_test.rb +7 -0
  75. data/test/integration/query_node/filters.yml +10 -0
  76. data/test/integration/zafu_compiler/action.yml +8 -4
  77. data/test/integration/zafu_compiler/ajax.yml +4 -4
  78. data/test/integration/zafu_compiler/calendar.yml +8 -15
  79. data/test/integration/zafu_compiler/context.yml +1 -1
  80. data/test/integration/zafu_compiler/dates.yml +5 -1
  81. data/test/integration/zafu_compiler/display.yml +1 -2
  82. data/test/integration/zafu_compiler/forms.yml +37 -10
  83. data/test/integration/zafu_compiler/query.yml +5 -5
  84. data/test/integration/zafu_compiler/relations.yml +8 -8
  85. data/test/integration/zafu_compiler/safe_definitions.yml +7 -2
  86. data/test/integration/zafu_compiler/urls.yml +24 -3
  87. data/test/integration/zafu_compiler/zazen.yml +9 -1
  88. data/test/selenium/Destroy/destroy1.rsel +2 -1
  89. data/test/selenium/Destroy/destroy2.rsel +17 -0
  90. data/test/unit/document_test.rb +17 -4
  91. data/test/unit/relation_proxy_test.rb +19 -8
  92. data/test/unit/string_hash_test.rb +1 -1
  93. data/test/unit/template_test.rb +3 -3
  94. data/test/unit/virtual_class_test.rb +77 -0
  95. data/test/unit/zena/use/urls_test.rb +9 -1
  96. data/vendor/plugins/selenium-on-rails/lib/selenium_on_rails_config.rb +1 -1
  97. data/zena.gemspec +60 -53
  98. metadata +145 -125
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: 25
4
+ hash: 23
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 2
9
- - 3
10
- version: 1.2.3
9
+ - 4
10
+ version: 1.2.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Gaspard Bucher
@@ -15,121 +15,119 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2013-03-11 00:00:00 +01:00
18
+ date: 2013-06-13 00:00:00 +02:00
19
19
  default_executable: zena
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- name: rails
22
+ name: tzinfo
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: 21
29
+ hash: 3
30
30
  segments:
31
- - 2
32
- - 3
33
- - 11
34
- version: 2.3.11
31
+ - 0
32
+ version: "0"
35
33
  type: :runtime
36
34
  version_requirements: *id001
37
35
  - !ruby/object:Gem::Dependency
38
- name: differ
36
+ name: fast_gettext
39
37
  prerelease: false
40
38
  requirement: &id002 !ruby/object:Gem::Requirement
41
39
  none: false
42
40
  requirements:
43
- - - "="
41
+ - - ~>
44
42
  - !ruby/object:Gem::Version
45
- hash: 31
43
+ hash: 47
46
44
  segments:
47
45
  - 0
48
- - 1
49
- - 2
50
- version: 0.1.2
46
+ - 4
47
+ - 16
48
+ version: 0.4.16
51
49
  type: :runtime
52
50
  version_requirements: *id002
53
51
  - !ruby/object:Gem::Dependency
54
- name: fast_gettext
52
+ name: rubyless
55
53
  prerelease: false
56
54
  requirement: &id003 !ruby/object:Gem::Requirement
57
55
  none: false
58
56
  requirements:
59
- - - ~>
57
+ - - "="
60
58
  - !ruby/object:Gem::Version
61
- hash: 47
59
+ hash: 43
62
60
  segments:
63
61
  - 0
64
- - 4
65
- - 16
66
- version: 0.4.16
62
+ - 8
63
+ - 10
64
+ version: 0.8.10
67
65
  type: :runtime
68
66
  version_requirements: *id003
69
67
  - !ruby/object:Gem::Dependency
70
- name: shoulda
68
+ name: jeweler
71
69
  prerelease: false
72
70
  requirement: &id004 !ruby/object:Gem::Requirement
73
71
  none: false
74
72
  requirements:
75
- - - "="
73
+ - - ">="
76
74
  - !ruby/object:Gem::Version
77
- hash: 33
75
+ hash: 3
78
76
  segments:
79
- - 2
80
- - 10
81
- - 3
82
- version: 2.10.3
77
+ - 0
78
+ version: "0"
83
79
  type: :runtime
84
80
  version_requirements: *id004
85
81
  - !ruby/object:Gem::Dependency
86
- name: open4
82
+ name: json
87
83
  prerelease: false
88
84
  requirement: &id005 !ruby/object:Gem::Requirement
89
85
  none: false
90
86
  requirements:
91
- - - ">="
87
+ - - "="
92
88
  - !ruby/object:Gem::Version
93
- hash: 3
89
+ hash: 1
94
90
  segments:
95
- - 0
96
- version: "0"
91
+ - 1
92
+ - 5
93
+ - 1
94
+ version: 1.5.1
97
95
  type: :runtime
98
96
  version_requirements: *id005
99
97
  - !ruby/object:Gem::Dependency
100
- name: authlogic
98
+ name: shoulda
101
99
  prerelease: false
102
100
  requirement: &id006 !ruby/object:Gem::Requirement
103
101
  none: false
104
102
  requirements:
105
103
  - - "="
106
104
  - !ruby/object:Gem::Version
107
- hash: 13
105
+ hash: 33
108
106
  segments:
109
107
  - 2
110
- - 1
108
+ - 10
111
109
  - 3
112
- version: 2.1.3
110
+ version: 2.10.3
113
111
  type: :runtime
114
112
  version_requirements: *id006
115
113
  - !ruby/object:Gem::Dependency
116
- name: querybuilder
114
+ name: httmultiparty
117
115
  prerelease: false
118
116
  requirement: &id007 !ruby/object:Gem::Requirement
119
117
  none: false
120
118
  requirements:
121
119
  - - "="
122
120
  - !ruby/object:Gem::Version
123
- hash: 29
121
+ hash: 3
124
122
  segments:
125
- - 1
126
- - 2
127
- - 1
128
- version: 1.2.1
123
+ - 0
124
+ - 3
125
+ - 8
126
+ version: 0.3.8
129
127
  type: :runtime
130
128
  version_requirements: *id007
131
129
  - !ruby/object:Gem::Dependency
132
- name: jeweler
130
+ name: gem_plugin
133
131
  prerelease: false
134
132
  requirement: &id008 !ruby/object:Gem::Requirement
135
133
  none: false
@@ -143,39 +141,37 @@ dependencies:
143
141
  type: :runtime
144
142
  version_requirements: *id008
145
143
  - !ruby/object:Gem::Dependency
146
- name: yamltest
144
+ name: daemons
147
145
  prerelease: false
148
146
  requirement: &id009 !ruby/object:Gem::Requirement
149
147
  none: false
150
148
  requirements:
151
- - - "="
149
+ - - ">="
152
150
  - !ruby/object:Gem::Version
153
151
  hash: 3
154
152
  segments:
155
153
  - 0
156
- - 7
157
- - 0
158
- version: 0.7.0
154
+ version: "0"
159
155
  type: :runtime
160
156
  version_requirements: *id009
161
157
  - !ruby/object:Gem::Dependency
162
- name: json
158
+ name: yamltest
163
159
  prerelease: false
164
160
  requirement: &id010 !ruby/object:Gem::Requirement
165
161
  none: false
166
162
  requirements:
167
163
  - - "="
168
164
  - !ruby/object:Gem::Version
169
- hash: 1
165
+ hash: 3
170
166
  segments:
171
- - 1
172
- - 5
173
- - 1
174
- version: 1.5.1
167
+ - 0
168
+ - 7
169
+ - 0
170
+ version: 0.7.0
175
171
  type: :runtime
176
172
  version_requirements: *id010
177
173
  - !ruby/object:Gem::Dependency
178
- name: daemons
174
+ name: open4
179
175
  prerelease: false
180
176
  requirement: &id011 !ruby/object:Gem::Requirement
181
177
  none: false
@@ -189,49 +185,51 @@ dependencies:
189
185
  type: :runtime
190
186
  version_requirements: *id011
191
187
  - !ruby/object:Gem::Dependency
192
- name: property
188
+ name: authlogic
193
189
  prerelease: false
194
190
  requirement: &id012 !ruby/object:Gem::Requirement
195
191
  none: false
196
192
  requirements:
197
193
  - - "="
198
194
  - !ruby/object:Gem::Version
199
- hash: 7
195
+ hash: 13
200
196
  segments:
201
197
  - 2
198
+ - 1
202
199
  - 3
203
- - 2
204
- version: 2.3.2
200
+ version: 2.1.3
205
201
  type: :runtime
206
202
  version_requirements: *id012
207
203
  - !ruby/object:Gem::Dependency
208
- name: versions
204
+ name: safe_yaml
209
205
  prerelease: false
210
206
  requirement: &id013 !ruby/object:Gem::Requirement
211
207
  none: false
212
208
  requirements:
213
209
  - - "="
214
210
  - !ruby/object:Gem::Version
215
- hash: 17
211
+ hash: 63
216
212
  segments:
217
213
  - 0
218
- - 3
219
- - 1
220
- version: 0.3.1
214
+ - 8
215
+ - 0
216
+ version: 0.8.0
221
217
  type: :runtime
222
218
  version_requirements: *id013
223
219
  - !ruby/object:Gem::Dependency
224
- name: simple_xlsx_writer
220
+ name: rails
225
221
  prerelease: false
226
222
  requirement: &id014 !ruby/object:Gem::Requirement
227
223
  none: false
228
224
  requirements:
229
- - - ">="
225
+ - - "="
230
226
  - !ruby/object:Gem::Version
231
- hash: 3
227
+ hash: 39
232
228
  segments:
233
- - 0
234
- version: "0"
229
+ - 2
230
+ - 3
231
+ - 18
232
+ version: 2.3.18
235
233
  type: :runtime
236
234
  version_requirements: *id014
237
235
  - !ruby/object:Gem::Dependency
@@ -249,161 +247,179 @@ dependencies:
249
247
  type: :runtime
250
248
  version_requirements: *id015
251
249
  - !ruby/object:Gem::Dependency
252
- name: gettext
250
+ name: querybuilder
253
251
  prerelease: false
254
252
  requirement: &id016 !ruby/object:Gem::Requirement
255
253
  none: false
256
254
  requirements:
257
255
  - - "="
258
256
  - !ruby/object:Gem::Version
259
- hash: 11
257
+ hash: 27
260
258
  segments:
261
- - 2
262
259
  - 1
263
- - 0
264
- version: 2.1.0
260
+ - 2
261
+ - 2
262
+ version: 1.2.2
265
263
  type: :runtime
266
264
  version_requirements: *id016
267
265
  - !ruby/object:Gem::Dependency
268
- name: ruby-recaptcha
266
+ name: simple_xlsx_writer
269
267
  prerelease: false
270
268
  requirement: &id017 !ruby/object:Gem::Requirement
271
269
  none: false
272
270
  requirements:
273
- - - "="
271
+ - - ">="
274
272
  - !ruby/object:Gem::Version
275
- hash: 17
273
+ hash: 3
276
274
  segments:
277
- - 1
278
275
  - 0
279
- - 3
280
- version: 1.0.3
276
+ version: "0"
281
277
  type: :runtime
282
278
  version_requirements: *id017
283
279
  - !ruby/object:Gem::Dependency
284
- name: tzinfo
280
+ name: property
285
281
  prerelease: false
286
282
  requirement: &id018 !ruby/object:Gem::Requirement
287
283
  none: false
288
284
  requirements:
289
- - - ">="
285
+ - - "="
290
286
  - !ruby/object:Gem::Version
291
- hash: 3
287
+ hash: 7
292
288
  segments:
293
- - 0
294
- version: "0"
289
+ - 2
290
+ - 3
291
+ - 2
292
+ version: 2.3.2
295
293
  type: :runtime
296
294
  version_requirements: *id018
297
295
  - !ruby/object:Gem::Dependency
298
- name: gem_plugin
296
+ name: uuidtools
299
297
  prerelease: false
300
298
  requirement: &id019 !ruby/object:Gem::Requirement
301
299
  none: false
302
300
  requirements:
303
- - - ">="
301
+ - - "="
304
302
  - !ruby/object:Gem::Version
305
- hash: 3
303
+ hash: 15
306
304
  segments:
305
+ - 2
307
306
  - 0
308
- version: "0"
307
+ - 0
308
+ version: 2.0.0
309
309
  type: :runtime
310
310
  version_requirements: *id019
311
311
  - !ruby/object:Gem::Dependency
312
- name: rubyless
312
+ name: syntax
313
313
  prerelease: false
314
314
  requirement: &id020 !ruby/object:Gem::Requirement
315
315
  none: false
316
316
  requirements:
317
317
  - - "="
318
318
  - !ruby/object:Gem::Version
319
- hash: 47
319
+ hash: 23
320
320
  segments:
321
+ - 1
321
322
  - 0
322
- - 8
323
- - 8
324
- version: 0.8.8
323
+ - 0
324
+ version: 1.0.0
325
325
  type: :runtime
326
326
  version_requirements: *id020
327
327
  - !ruby/object:Gem::Dependency
328
- name: syntax
328
+ name: will_paginate
329
329
  prerelease: false
330
330
  requirement: &id021 !ruby/object:Gem::Requirement
331
331
  none: false
332
332
  requirements:
333
- - - "="
333
+ - - ~>
334
334
  - !ruby/object:Gem::Version
335
- hash: 23
335
+ hash: 27
336
336
  segments:
337
- - 1
338
- - 0
339
- - 0
340
- version: 1.0.0
337
+ - 2
338
+ - 3
339
+ - 12
340
+ version: 2.3.12
341
341
  type: :runtime
342
342
  version_requirements: *id021
343
343
  - !ruby/object:Gem::Dependency
344
- name: uuidtools
344
+ name: ruby-recaptcha
345
345
  prerelease: false
346
346
  requirement: &id022 !ruby/object:Gem::Requirement
347
347
  none: false
348
348
  requirements:
349
349
  - - "="
350
350
  - !ruby/object:Gem::Version
351
- hash: 15
351
+ hash: 17
352
352
  segments:
353
- - 2
354
- - 0
353
+ - 1
355
354
  - 0
356
- version: 2.0.0
355
+ - 3
356
+ version: 1.0.3
357
357
  type: :runtime
358
358
  version_requirements: *id022
359
359
  - !ruby/object:Gem::Dependency
360
- name: will_paginate
360
+ name: RedCloth
361
361
  prerelease: false
362
362
  requirement: &id023 !ruby/object:Gem::Requirement
363
363
  none: false
364
364
  requirements:
365
- - - ~>
365
+ - - "="
366
366
  - !ruby/object:Gem::Version
367
- hash: 27
367
+ hash: 15
368
368
  segments:
369
- - 2
370
369
  - 3
371
- - 12
372
- version: 2.3.12
370
+ - 0
371
+ - 4
372
+ version: 3.0.4
373
373
  type: :runtime
374
374
  version_requirements: *id023
375
375
  - !ruby/object:Gem::Dependency
376
- name: httparty
376
+ name: versions
377
377
  prerelease: false
378
378
  requirement: &id024 !ruby/object:Gem::Requirement
379
379
  none: false
380
380
  requirements:
381
381
  - - "="
382
382
  - !ruby/object:Gem::Version
383
- hash: 19
383
+ hash: 17
384
384
  segments:
385
385
  - 0
386
- - 7
387
- - 8
388
- version: 0.7.8
386
+ - 3
387
+ - 1
388
+ version: 0.3.1
389
389
  type: :runtime
390
390
  version_requirements: *id024
391
391
  - !ruby/object:Gem::Dependency
392
- name: RedCloth
392
+ name: differ
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: 15
399
+ hash: 31
400
400
  segments:
401
- - 3
402
401
  - 0
403
- - 4
404
- version: 3.0.4
402
+ - 1
403
+ - 2
404
+ version: 0.1.2
405
405
  type: :runtime
406
406
  version_requirements: *id025
407
+ - !ruby/object:Gem::Dependency
408
+ name: gettext
409
+ prerelease: false
410
+ requirement: &id026 !ruby/object:Gem::Requirement
411
+ none: false
412
+ requirements:
413
+ - - "="
414
+ - !ruby/object:Gem::Version
415
+ hash: 11
416
+ segments:
417
+ - 2
418
+ - 1
419
+ - 0
420
+ version: 2.1.0
421
+ type: :runtime
422
+ version_requirements: *id026
407
423
  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).
408
424
  email: gaspard@teti.ch
409
425
  executables:
@@ -463,6 +479,7 @@ files:
463
479
  - app/models/group.rb
464
480
  - app/models/idx_nodes_datetime.rb
465
481
  - app/models/idx_nodes_float.rb
482
+ - app/models/idx_nodes_integer.rb
466
483
  - app/models/idx_nodes_ml_string.rb
467
484
  - app/models/idx_nodes_string.rb
468
485
  - app/models/idx_project.rb
@@ -680,6 +697,8 @@ files:
680
697
  - bricks/acls/zena/init.rb
681
698
  - bricks/acls/zena/migrate/20110509141600_create_acls.rb
682
699
  - bricks/acls/zena/migrate/20110627193757_add_allowed_mode_and_format_to_acl.rb
700
+ - bricks/acls/zena/migrate/20130313110443_add_create_kpath_to_acl.rb
701
+ - bricks/acls/zena/migrate/20130429073432_fix_create_kpath_default.rb
683
702
  - bricks/acls/zena/test/integration/acl_integration_test.rb
684
703
  - bricks/acls/zena/test/sites/erebus/acls.yml
685
704
  - bricks/acls/zena/test/sites/erebus/groups.yml
@@ -2406,6 +2425,7 @@ files:
2406
2425
  - test/selenium/Add/add3.rsel
2407
2426
  - test/selenium/Destroy/0setup.rsel
2408
2427
  - test/selenium/Destroy/destroy1.rsel
2428
+ - test/selenium/Destroy/destroy2.rsel
2409
2429
  - test/selenium/Drop/0setup.rsel
2410
2430
  - test/selenium/Drop/drop1.rsel
2411
2431
  - test/selenium/Drop/drop2.rsel