zena 1.0.0.rc2 → 1.0.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (274) hide show
  1. data/History.txt +23 -0
  2. data/README.rdoc +1 -1
  3. data/app/controllers/columns_controller.rb +3 -31
  4. data/app/controllers/comments_controller.rb +8 -3
  5. data/app/controllers/data_entries_controller.rb +1 -1
  6. data/app/controllers/documents_controller.rb +2 -2
  7. data/app/controllers/nodes_controller.rb +29 -12
  8. data/app/controllers/relations_controller.rb +2 -2
  9. data/app/controllers/sites_controller.rb +1 -1
  10. data/app/controllers/user_sessions_controller.rb +6 -3
  11. data/app/controllers/users_controller.rb +18 -16
  12. data/app/controllers/versions_controller.rb +20 -18
  13. data/app/controllers/virtual_classes_controller.rb +103 -17
  14. data/app/helpers/users_helper.rb +1 -1
  15. data/app/models/column.rb +19 -50
  16. data/app/models/comment.rb +2 -1
  17. data/app/models/node.rb +45 -22
  18. data/app/models/relation.rb +13 -0
  19. data/app/models/relation_proxy.rb +3 -2
  20. data/app/models/role.rb +213 -4
  21. data/app/models/site.rb +18 -11
  22. data/app/models/template.rb +37 -35
  23. data/app/models/version.rb +1 -1
  24. data/app/models/virtual_class.rb +154 -86
  25. data/app/views/columns/_li.html.erb +1 -1
  26. data/app/views/columns/index.html.erb +1 -9
  27. data/app/views/comments/index.rhtml +10 -8
  28. data/app/views/documents/_crop.rhtml +5 -6
  29. data/app/views/documents/crop_form.rjs +3 -2
  30. data/app/views/groups/index.rhtml +1 -1
  31. data/app/views/iformats/index.rhtml +1 -1
  32. data/app/views/nodes/_import_results.rhtml +1 -1
  33. data/app/views/nodes/_parent.rhtml +1 -2
  34. data/app/views/nodes/update.rjs +3 -4
  35. data/app/views/relations/index.erb +1 -1
  36. data/app/views/sites/index.erb +1 -1
  37. data/app/views/templates/drive_tabs/_drive.rhtml +0 -2
  38. data/app/views/templates/edit_tabs/_image.rhtml +1 -1
  39. data/app/views/templates/edit_tabs/_title.rhtml +0 -6
  40. data/app/views/users/index.rhtml +1 -1
  41. data/app/views/users/preferences.html.erb +2 -2
  42. data/app/views/versions/backup.rjs +1 -1
  43. data/app/views/versions/custom_tab.rhtml +9 -4
  44. data/app/views/versions/destroy.rjs +2 -2
  45. data/app/views/versions/update.rjs +2 -9
  46. data/app/views/virtual_classes/_form.erb +3 -2
  47. data/app/views/virtual_classes/import_prepare.html.erb +13 -0
  48. data/app/views/virtual_classes/index.erb +28 -8
  49. data/app/views/zafu/default/Node-+adminLayout.zafu +1 -13
  50. data/app/views/zafu/default/Node-+login.zafu +1 -0
  51. data/app/views/zafu/default/Node-+notFound.zafu +1 -1
  52. data/app/views/zafu/default/Node-+popupLayout.zafu +1 -2
  53. data/app/views/zafu/default/Node-+search.zafu +1 -1
  54. data/app/views/zafu/default/Node-admin.zafu +205 -0
  55. data/app/views/zafu/default/Node.zafu +11 -11
  56. data/bricks/captcha/lib/bricks/captcha.rb +3 -2
  57. data/bricks/mongrel/zena/init.rb +2 -1
  58. data/bricks/pdf/README +5 -5
  59. data/bricks/pdf/lib/bricks/pdf/engine/prince.rb +2 -2
  60. data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb +2 -2
  61. data/bricks/pdf/lib/bricks/pdf/install.rb +5 -5
  62. data/bricks/pdf/lib/bricks/pdf.rb +11 -11
  63. data/bricks/pdf/test/engines/test_prince.rb +4 -4
  64. data/bricks/pdf/test/engines/test_xhtml2pdf.rb +4 -4
  65. data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb +2 -2
  66. data/bricks/pdf/zena/init.rb +2 -2
  67. data/bricks/pdf/zena/tasks.rb +2 -2
  68. data/bricks/sphinx/lib/bricks/sphinx.rb +6 -2
  69. data/bricks/sphinx/zena/{sphinx.yml → sphinx.yml.erb} +2 -2
  70. data/bricks/sphinx/zena/tasks.rb +28 -2
  71. data/bricks/tags/lib/bricks/tags.rb +16 -1
  72. data/bricks/tags/zena/test/unit/tags_test.rb +15 -0
  73. data/bricks/tags/zena/test/zafu/tags.yml +5 -1
  74. data/bricks/worker/lib/bricks/worker.rb +39 -0
  75. data/bricks/worker/zena/deploy.rb +0 -2
  76. data/bricks/worker/zena/init.rb +1 -0
  77. data/bricks/worker/zena/test/sites/zena/delayed_jobs.yml +16 -0
  78. data/bricks/worker/zena/test/zafu/worker.yml +8 -0
  79. data/bricks/zena/zena/migrate/01_base.rb +36 -60
  80. data/bricks/zena/zena/migrate/02_zerox1_schema.rb +388 -0
  81. data/bricks/zena/zena/migrate/03_zerox1_data.rb +380 -0
  82. data/bricks/zena/zena/migrate/20110315161158_add_reverse_scope_to_roles.rb +9 -0
  83. data/config/database_example.yml +1 -1
  84. data/config/environment.rb +1 -1
  85. data/config/gems.yml +17 -14
  86. data/db/init/base/skins/default/Node-+index.zafu +8 -1
  87. data/db/init/base/skins/default/Node-+login.zafu +1 -0
  88. data/db/init/base/skins/default/Node-+popupLayout.zafu +1 -2
  89. data/db/init/base/skins/default/Node-+search.zafu +2 -2
  90. data/db/init/base/skins/default/Node.zafu +9 -9
  91. data/db/init/base/skins/default/{favicon.png → img/favicon.png} +0 -0
  92. data/db/init/base/skins/default/{style.css → img/style.css} +0 -0
  93. data/db/init/base/skins/default/img/translations.yml +11 -0
  94. data/db/init/base/skins/default/notes.zafu +7 -9
  95. data/doc/zafu_changes.yml +12 -0
  96. data/lib/bricks/loader.rb +38 -15
  97. data/lib/tasks/zena.rake +74 -24
  98. data/lib/zena/acts/enrollable.rb +4 -1
  99. data/lib/zena/acts/secure.rb +2 -48
  100. data/lib/zena/acts/serializable.rb +13 -1
  101. data/lib/zena/app.rb +9 -0
  102. data/lib/zena/code_syntax.rb +154 -151
  103. data/lib/zena/console.rb +141 -0
  104. data/lib/zena/controller/test_case.rb +1 -1
  105. data/lib/zena/db_helper/abstract_db.rb +17 -5
  106. data/lib/zena/db_helper/mysql.rb +14 -12
  107. data/lib/zena/db_helper/postgresql.rb +1 -2
  108. data/lib/zena/db_helper/sqlite3.rb +6 -6
  109. data/lib/zena/deploy/awstats.conf.rhtml +1 -1
  110. data/lib/zena/deploy/httpd.rhtml +6 -1
  111. data/lib/zena/deploy/vhost.rhtml +9 -1
  112. data/lib/zena/deploy.rb +12 -7
  113. data/lib/zena/foxy_parser.rb +3 -1
  114. data/lib/zena/info.rb +1 -1
  115. data/lib/zena/parser/zafu_tags.rb +1 -0
  116. data/lib/zena/parser/zazen_rules.rb +1 -1
  117. data/lib/zena/remote/node.rb +15 -3
  118. data/lib/zena/remote/serializable_array.rb +19 -0
  119. data/lib/zena/remote.rb +1 -0
  120. data/lib/zena/routes.rb +7 -2
  121. data/lib/zena/site_worker.rb +11 -1
  122. data/lib/zena/unit/test_case.rb +68 -0
  123. data/lib/zena/use/action.rb +6 -2
  124. data/lib/zena/use/ajax.rb +127 -53
  125. data/lib/zena/use/ancestry.rb +11 -8
  126. data/lib/zena/use/calendar.rb +265 -129
  127. data/lib/zena/use/conditional.rb +1 -1
  128. data/lib/zena/use/context.rb +5 -5
  129. data/lib/zena/use/dates.rb +172 -60
  130. data/lib/zena/use/display.rb +70 -39
  131. data/lib/zena/use/error_rendering.rb +1 -3
  132. data/lib/zena/use/field_index.rb +4 -1
  133. data/lib/zena/use/forms.rb +94 -72
  134. data/lib/zena/use/fulltext.rb +16 -24
  135. data/lib/zena/use/html_tags.rb +20 -12
  136. data/lib/zena/use/i18n.rb +37 -37
  137. data/lib/zena/use/image_builder.rb +8 -1
  138. data/lib/zena/use/ml_index.rb +16 -16
  139. data/lib/zena/use/prop_eval.rb +10 -5
  140. data/lib/zena/use/query_builder.rb +55 -23
  141. data/lib/zena/use/query_node.rb +51 -25
  142. data/lib/zena/use/refactor.rb +2 -28
  143. data/lib/zena/use/relations.rb +1 -1
  144. data/lib/zena/use/rendering.rb +29 -0
  145. data/lib/zena/use/scope_index.rb +75 -14
  146. data/lib/zena/use/search.rb +5 -10
  147. data/lib/zena/use/test_helper.rb +2 -2
  148. data/lib/zena/use/urls.rb +125 -104
  149. data/lib/zena/use/workflow.rb +2 -1
  150. data/lib/zena/use/zafu_attributes.rb +2 -2
  151. data/lib/zena/use/zafu_safe_definitions.rb +20 -0
  152. data/lib/zena/use/zafu_templates.rb +20 -6
  153. data/lib/zena/use/zazen.rb +31 -20
  154. data/lib/zena/view/test_case.rb +5 -0
  155. data/lib/zena/zafu_compiler.rb +24 -2
  156. data/lib/zena.rb +12 -6
  157. data/locale/de/LC_MESSAGES/zena.mo +0 -0
  158. data/locale/de/zena.po +1345 -1164
  159. data/locale/en/LC_MESSAGES/zena.mo +0 -0
  160. data/locale/en/zena.po +1275 -1129
  161. data/locale/fr/LC_MESSAGES/zena.mo +0 -0
  162. data/locale/fr/zena.mo +0 -0
  163. data/locale/fr/zena.po +1617 -1441
  164. data/locale/log.txt +9 -0
  165. data/locale/zena.pot +957 -748
  166. data/public/javascripts/prototype.js +1 -1
  167. data/public/javascripts/zena.js +99 -44
  168. data/public/stylesheets/admin.css +6 -4
  169. data/public/stylesheets/backend.css +71 -0
  170. data/public/stylesheets/calendar.css +24 -25
  171. data/public/stylesheets/code.css +11 -6
  172. data/public/stylesheets/comment.css +2 -1
  173. data/public/stylesheets/popup.css +7 -8
  174. data/test/custom_queries/complex.host.yml +15 -1
  175. data/test/fixtures/files/Node-test.zafu +29 -28
  176. data/test/fixtures/files/translations_de.yml +12 -1
  177. data/test/fixtures/files/translations_fr.yml +12 -1
  178. data/test/functional/comments_controller_test.rb +9 -0
  179. data/test/functional/iformats_controller_test.rb +1 -1
  180. data/test/functional/nodes_controller_test.rb +124 -35
  181. data/test/functional/users_controller_test.rb +132 -3
  182. data/test/functional/virtual_classes_controller_test.rb +75 -4
  183. data/test/integration/navigation_test.rb +51 -9
  184. data/test/integration/query_node/basic.yml +19 -7
  185. data/test/integration/query_node/complex.yml +1 -1
  186. data/test/integration/query_node/dates.yml +27 -1
  187. data/test/integration/query_node/filters.yml +1 -1
  188. data/test/integration/query_node/relations.yml +13 -4
  189. data/test/integration/query_node_test.rb +4 -0
  190. data/test/integration/xml_api_test.rb +6 -1
  191. data/test/integration/zafu_compiler/action.yml +3 -3
  192. data/test/integration/zafu_compiler/ajax.yml +103 -22
  193. data/test/integration/zafu_compiler/basic.yml +0 -52
  194. data/test/integration/zafu_compiler/calendar.yml +44 -20
  195. data/test/integration/zafu_compiler/comments.yml +53 -0
  196. data/test/integration/zafu_compiler/complex.yml +11 -11
  197. data/test/integration/zafu_compiler/complex_ok.yml +16 -3
  198. data/test/integration/zafu_compiler/conditional.yml +15 -5
  199. data/test/integration/zafu_compiler/context.yml +9 -0
  200. data/test/integration/zafu_compiler/dates.yml +43 -15
  201. data/test/integration/zafu_compiler/display.yml +60 -6
  202. data/test/integration/zafu_compiler/errors.yml +6 -2
  203. data/test/integration/zafu_compiler/forms.yml +45 -6
  204. data/test/integration/zafu_compiler/i18n.yml +8 -1
  205. data/test/integration/zafu_compiler/meta.yml +38 -0
  206. data/test/integration/zafu_compiler/query.yml +43 -4
  207. data/test/integration/zafu_compiler/relations.yml +26 -33
  208. data/test/integration/zafu_compiler/rubyless.yml +10 -0
  209. data/test/integration/zafu_compiler/safe_definitions.yml +21 -1
  210. data/test/integration/zafu_compiler/urls.yml +75 -5
  211. data/test/integration/zafu_compiler/version.yml +2 -2
  212. data/test/integration/zafu_compiler/zafu_attributes.yml +5 -1
  213. data/test/integration/zafu_compiler/zazen.yml +14 -6
  214. data/test/integration/zafu_compiler_test.rb +5 -1
  215. data/test/sites/complex/columns.yml +5 -0
  216. data/test/sites/complex/roles.yml +4 -0
  217. data/test/sites/zena/nodes.yml +13 -2
  218. data/test/sites/zena/roles.yml +13 -5
  219. data/test/sites/zena/versions.yml +27 -9
  220. data/test/unit/column_test.rb +51 -5
  221. data/test/unit/iformat_test.rb +2 -2
  222. data/test/unit/node_test.rb +29 -17
  223. data/test/unit/note_test.rb +1 -1
  224. data/test/unit/relation_proxy_test.rb +4 -5
  225. data/test/unit/relation_test.rb +16 -0
  226. data/test/unit/remote_test.rb +2 -2
  227. data/test/unit/role_test.rb +292 -4
  228. data/test/unit/site_test.rb +12 -0
  229. data/test/unit/template_test.rb +1 -1
  230. data/test/unit/text_document_test.rb +1 -1
  231. data/test/unit/virtual_class_test.rb +200 -83
  232. data/test/unit/zena/acts/enrollable_test.rb +26 -31
  233. data/test/unit/zena/use/calendar_test.rb +90 -37
  234. data/test/unit/zena/use/field_index_test.rb +28 -0
  235. data/test/unit/zena/use/html_tags_test.rb +7 -3
  236. data/test/unit/zena/use/ml_index_test.rb +2 -16
  237. data/test/unit/zena/use/nested_attributes_alias_view_test.rb +2 -2
  238. data/test/unit/zena/use/prop_eval_test.rb +50 -8
  239. data/test/unit/zena/use/query_node_test.rb +11 -0
  240. data/test/unit/zena/use/rendering_test.rb +72 -0
  241. data/test/unit/zena/use/scope_index_test.rb +37 -2
  242. data/test/unit/zena/use/urls_test.rb +10 -0
  243. data/test/unit/zena/use/zazen_test.rb +3 -3
  244. data/vendor/plugins/gettext_i18n_rails/Gemfile +11 -0
  245. data/vendor/plugins/gettext_i18n_rails/Gemfile.lock +92 -0
  246. data/vendor/plugins/gettext_i18n_rails/Rakefile +12 -17
  247. data/vendor/plugins/gettext_i18n_rails/Readme.md +215 -0
  248. data/vendor/plugins/gettext_i18n_rails/VERSION +1 -1
  249. data/vendor/plugins/gettext_i18n_rails/gettext_i18n_rails.gemspec +38 -34
  250. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb +1 -1
  251. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/backend.rb +30 -14
  252. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/haml_parser.rb +1 -1
  253. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/html_safe_translations.rb +29 -0
  254. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb +29 -1
  255. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb +7 -1
  256. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/railtie.rb +10 -0
  257. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/ruby_gettext_extractor.rb +6 -2
  258. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/string_interpolate_fix.rb +20 -0
  259. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb +120 -0
  260. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails.rb +10 -3
  261. data/vendor/plugins/gettext_i18n_rails/lib/tasks/gettext_rails_i18n.rake +1 -74
  262. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb +51 -20
  263. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb +12 -7
  264. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/string_interpolate_fix_spec.rb +32 -0
  265. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb +38 -1
  266. data/vendor/plugins/gettext_i18n_rails/spec/rails2/Gemfile +11 -0
  267. data/vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb +1 -8
  268. data/zena.gemspec +2241 -2217
  269. metadata +123 -83
  270. data/.gitignore +0 -36
  271. data/app/views/nodes/_dates.rhtml +0 -13
  272. data/db/init/base/skins/default/Node-+adminLayout.zafu +0 -46
  273. data/db/init/base/skins/default/Node-tree.zafu +0 -19
  274. data/vendor/plugins/gettext_i18n_rails/README.markdown +0 -143
metadata CHANGED
@@ -1,14 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zena
3
3
  version: !ruby/object:Gem::Version
4
- hash: 977940575
5
- prerelease: true
4
+ hash: 15424051
5
+ prerelease: 6
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
9
  - 0
10
- - rc2
11
- version: 1.0.0.rc2
10
+ - rc
11
+ - 3
12
+ version: 1.0.0.rc3
12
13
  platform: ruby
13
14
  authors:
14
15
  - Gaspard Bucher
@@ -16,7 +17,7 @@ autorequire:
16
17
  bindir: bin
17
18
  cert_chain: []
18
19
 
19
- date: 2011-02-14 00:00:00 +01:00
20
+ date: 2011-05-26 00:00:00 +02:00
20
21
  default_executable: zena
21
22
  dependencies:
22
23
  - !ruby/object:Gem::Dependency
@@ -41,14 +42,14 @@ dependencies:
41
42
  requirement: &id002 !ruby/object:Gem::Requirement
42
43
  none: false
43
44
  requirements:
44
- - - ">="
45
+ - - "="
45
46
  - !ruby/object:Gem::Version
46
- hash: 11
47
+ hash: 39
47
48
  segments:
48
49
  - 0
49
50
  - 3
50
- - 12
51
- version: 0.3.12
51
+ - 26
52
+ version: 0.3.26
52
53
  type: :runtime
53
54
  version_requirements: *id002
54
55
  - !ruby/object:Gem::Dependency
@@ -59,21 +60,37 @@ dependencies:
59
60
  requirements:
60
61
  - - "="
61
62
  - !ruby/object:Gem::Version
62
- hash: 19
63
+ hash: 21
63
64
  segments:
64
65
  - 2
65
66
  - 3
66
- - 8
67
- version: 2.3.8
67
+ - 11
68
+ version: 2.3.11
68
69
  type: :runtime
69
70
  version_requirements: *id003
70
71
  - !ruby/object:Gem::Dependency
71
- name: rubyless
72
+ name: httparty
72
73
  prerelease: false
73
74
  requirement: &id004 !ruby/object:Gem::Requirement
74
75
  none: false
75
76
  requirements:
76
- - - ">="
77
+ - - "="
78
+ - !ruby/object:Gem::Version
79
+ hash: 5
80
+ segments:
81
+ - 0
82
+ - 6
83
+ - 1
84
+ version: 0.6.1
85
+ type: :runtime
86
+ version_requirements: *id004
87
+ - !ruby/object:Gem::Dependency
88
+ name: rubyless
89
+ prerelease: false
90
+ requirement: &id005 !ruby/object:Gem::Requirement
91
+ none: false
92
+ requirements:
93
+ - - "="
77
94
  - !ruby/object:Gem::Version
78
95
  hash: 59
79
96
  segments:
@@ -82,14 +99,14 @@ dependencies:
82
99
  - 2
83
100
  version: 0.8.2
84
101
  type: :runtime
85
- version_requirements: *id004
102
+ version_requirements: *id005
86
103
  - !ruby/object:Gem::Dependency
87
104
  name: property
88
105
  prerelease: false
89
- requirement: &id005 !ruby/object:Gem::Requirement
106
+ requirement: &id006 !ruby/object:Gem::Requirement
90
107
  none: false
91
108
  requirements:
92
- - - ">="
109
+ - - "="
93
110
  - !ruby/object:Gem::Version
94
111
  hash: 15
95
112
  segments:
@@ -98,11 +115,11 @@ dependencies:
98
115
  - 2
99
116
  version: 2.1.2
100
117
  type: :runtime
101
- version_requirements: *id005
118
+ version_requirements: *id006
102
119
  - !ruby/object:Gem::Dependency
103
120
  name: uuidtools
104
121
  prerelease: false
105
- requirement: &id006 !ruby/object:Gem::Requirement
122
+ requirement: &id007 !ruby/object:Gem::Requirement
106
123
  none: false
107
124
  requirements:
108
125
  - - "="
@@ -114,11 +131,11 @@ dependencies:
114
131
  - 0
115
132
  version: 2.0.0
116
133
  type: :runtime
117
- version_requirements: *id006
134
+ version_requirements: *id007
118
135
  - !ruby/object:Gem::Dependency
119
136
  name: authlogic
120
137
  prerelease: false
121
- requirement: &id007 !ruby/object:Gem::Requirement
138
+ requirement: &id008 !ruby/object:Gem::Requirement
122
139
  none: false
123
140
  requirements:
124
141
  - - "="
@@ -130,27 +147,27 @@ dependencies:
130
147
  - 3
131
148
  version: 2.1.3
132
149
  type: :runtime
133
- version_requirements: *id007
150
+ version_requirements: *id008
134
151
  - !ruby/object:Gem::Dependency
135
152
  name: zafu
136
153
  prerelease: false
137
- requirement: &id008 !ruby/object:Gem::Requirement
154
+ requirement: &id009 !ruby/object:Gem::Requirement
138
155
  none: false
139
156
  requirements:
140
- - - ">="
157
+ - - "="
141
158
  - !ruby/object:Gem::Version
142
- hash: 15
159
+ hash: 17
143
160
  segments:
144
161
  - 0
145
162
  - 7
146
- - 6
147
- version: 0.7.6
163
+ - 9
164
+ version: 0.7.9
148
165
  type: :runtime
149
- version_requirements: *id008
166
+ version_requirements: *id009
150
167
  - !ruby/object:Gem::Dependency
151
168
  name: shoulda
152
169
  prerelease: false
153
- requirement: &id009 !ruby/object:Gem::Requirement
170
+ requirement: &id010 !ruby/object:Gem::Requirement
154
171
  none: false
155
172
  requirements:
156
173
  - - "="
@@ -162,11 +179,11 @@ dependencies:
162
179
  - 3
163
180
  version: 2.10.3
164
181
  type: :runtime
165
- version_requirements: *id009
182
+ version_requirements: *id010
166
183
  - !ruby/object:Gem::Dependency
167
184
  name: fast_gettext
168
185
  prerelease: false
169
- requirement: &id010 !ruby/object:Gem::Requirement
186
+ requirement: &id011 !ruby/object:Gem::Requirement
170
187
  none: false
171
188
  requirements:
172
189
  - - ~>
@@ -178,11 +195,11 @@ dependencies:
178
195
  - 16
179
196
  version: 0.4.16
180
197
  type: :runtime
181
- version_requirements: *id010
198
+ version_requirements: *id011
182
199
  - !ruby/object:Gem::Dependency
183
200
  name: syntax
184
201
  prerelease: false
185
- requirement: &id011 !ruby/object:Gem::Requirement
202
+ requirement: &id012 !ruby/object:Gem::Requirement
186
203
  none: false
187
204
  requirements:
188
205
  - - "="
@@ -194,14 +211,14 @@ dependencies:
194
211
  - 0
195
212
  version: 1.0.0
196
213
  type: :runtime
197
- version_requirements: *id011
214
+ version_requirements: *id012
198
215
  - !ruby/object:Gem::Dependency
199
216
  name: yamltest
200
217
  prerelease: false
201
- requirement: &id012 !ruby/object:Gem::Requirement
218
+ requirement: &id013 !ruby/object:Gem::Requirement
202
219
  none: false
203
220
  requirements:
204
- - - ">="
221
+ - - "="
205
222
  - !ruby/object:Gem::Version
206
223
  hash: 3
207
224
  segments:
@@ -210,27 +227,27 @@ dependencies:
210
227
  - 0
211
228
  version: 0.7.0
212
229
  type: :runtime
213
- version_requirements: *id012
230
+ version_requirements: *id013
214
231
  - !ruby/object:Gem::Dependency
215
232
  name: json
216
233
  prerelease: false
217
- requirement: &id013 !ruby/object:Gem::Requirement
234
+ requirement: &id014 !ruby/object:Gem::Requirement
218
235
  none: false
219
236
  requirements:
220
- - - ">="
237
+ - - "="
221
238
  - !ruby/object:Gem::Version
222
239
  hash: 1
223
240
  segments:
224
241
  - 1
242
+ - 5
225
243
  - 1
226
- - 9
227
- version: 1.1.9
244
+ version: 1.5.1
228
245
  type: :runtime
229
- version_requirements: *id013
246
+ version_requirements: *id014
230
247
  - !ruby/object:Gem::Dependency
231
248
  name: will_paginate
232
249
  prerelease: false
233
- requirement: &id014 !ruby/object:Gem::Requirement
250
+ requirement: &id015 !ruby/object:Gem::Requirement
234
251
  none: false
235
252
  requirements:
236
253
  - - ~>
@@ -242,30 +259,30 @@ dependencies:
242
259
  - 12
243
260
  version: 2.3.12
244
261
  type: :runtime
245
- version_requirements: *id014
262
+ version_requirements: *id015
246
263
  - !ruby/object:Gem::Dependency
247
264
  name: gettext
248
265
  prerelease: false
249
- requirement: &id015 !ruby/object:Gem::Requirement
266
+ requirement: &id016 !ruby/object:Gem::Requirement
250
267
  none: false
251
268
  requirements:
252
- - - ">="
269
+ - - "="
253
270
  - !ruby/object:Gem::Version
254
- hash: 355
271
+ hash: 11
255
272
  segments:
273
+ - 2
256
274
  - 1
257
- - 93
258
275
  - 0
259
- version: 1.93.0
276
+ version: 2.1.0
260
277
  type: :runtime
261
- version_requirements: *id015
278
+ version_requirements: *id016
262
279
  - !ruby/object:Gem::Dependency
263
280
  name: versions
264
281
  prerelease: false
265
- requirement: &id016 !ruby/object:Gem::Requirement
282
+ requirement: &id017 !ruby/object:Gem::Requirement
266
283
  none: false
267
284
  requirements:
268
- - - ">="
285
+ - - "="
269
286
  - !ruby/object:Gem::Version
270
287
  hash: 17
271
288
  segments:
@@ -274,11 +291,11 @@ dependencies:
274
291
  - 1
275
292
  version: 0.3.1
276
293
  type: :runtime
277
- version_requirements: *id016
294
+ version_requirements: *id017
278
295
  - !ruby/object:Gem::Dependency
279
296
  name: jeweler
280
297
  prerelease: false
281
- requirement: &id017 !ruby/object:Gem::Requirement
298
+ requirement: &id018 !ruby/object:Gem::Requirement
282
299
  none: false
283
300
  requirements:
284
301
  - - ">="
@@ -288,11 +305,11 @@ dependencies:
288
305
  - 0
289
306
  version: "0"
290
307
  type: :runtime
291
- version_requirements: *id017
308
+ version_requirements: *id018
292
309
  - !ruby/object:Gem::Dependency
293
310
  name: hpricot
294
311
  prerelease: false
295
- requirement: &id018 !ruby/object:Gem::Requirement
312
+ requirement: &id019 !ruby/object:Gem::Requirement
296
313
  none: false
297
314
  requirements:
298
315
  - - ">="
@@ -302,27 +319,27 @@ dependencies:
302
319
  - 0
303
320
  version: "0"
304
321
  type: :runtime
305
- version_requirements: *id018
322
+ version_requirements: *id019
306
323
  - !ruby/object:Gem::Dependency
307
324
  name: differ
308
325
  prerelease: false
309
- requirement: &id019 !ruby/object:Gem::Requirement
326
+ requirement: &id020 !ruby/object:Gem::Requirement
310
327
  none: false
311
328
  requirements:
312
- - - ">="
329
+ - - "="
313
330
  - !ruby/object:Gem::Version
314
- hash: 25
331
+ hash: 31
315
332
  segments:
316
333
  - 0
317
334
  - 1
318
- - 1
319
- version: 0.1.1
335
+ - 2
336
+ version: 0.1.2
320
337
  type: :runtime
321
- version_requirements: *id019
338
+ version_requirements: *id020
322
339
  - !ruby/object:Gem::Dependency
323
340
  name: RedCloth
324
341
  prerelease: false
325
- requirement: &id020 !ruby/object:Gem::Requirement
342
+ requirement: &id021 !ruby/object:Gem::Requirement
326
343
  none: false
327
344
  requirements:
328
345
  - - "="
@@ -334,23 +351,23 @@ dependencies:
334
351
  - 4
335
352
  version: 3.0.4
336
353
  type: :runtime
337
- version_requirements: *id020
354
+ version_requirements: *id021
338
355
  - !ruby/object:Gem::Dependency
339
356
  name: querybuilder
340
357
  prerelease: false
341
- requirement: &id021 !ruby/object:Gem::Requirement
358
+ requirement: &id022 !ruby/object:Gem::Requirement
342
359
  none: false
343
360
  requirements:
344
- - - ">="
361
+ - - "="
345
362
  - !ruby/object:Gem::Version
346
- hash: 49
363
+ hash: 23
347
364
  segments:
365
+ - 1
348
366
  - 0
349
- - 9
350
- - 5
351
- version: 0.9.5
367
+ - 0
368
+ version: 1.0.0
352
369
  type: :runtime
353
- version_requirements: *id021
370
+ version_requirements: *id022
354
371
  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).
355
372
  email: gaspard@teti.ch
356
373
  executables:
@@ -361,7 +378,6 @@ extra_rdoc_files:
361
378
  - README.rdoc
362
379
  - TODO
363
380
  files:
364
- - .gitignore
365
381
  - CREDITS
366
382
  - Capfile
367
383
  - DEVELOPERS
@@ -507,7 +523,6 @@ files:
507
523
  - app/views/links/destroy.rjs
508
524
  - app/views/links/show.rjs
509
525
  - app/views/nodes/500.html
510
- - app/views/nodes/_dates.rhtml
511
526
  - app/views/nodes/_edit_attribute.rhtml
512
527
  - app/views/nodes/_gallery.rhtml
513
528
  - app/views/nodes/_groups.rhtml
@@ -594,6 +609,7 @@ files:
594
609
  - app/views/virtual_classes/create.rjs
595
610
  - app/views/virtual_classes/destroy.rjs
596
611
  - app/views/virtual_classes/edit.html.erb
612
+ - app/views/virtual_classes/import_prepare.html.erb
597
613
  - app/views/virtual_classes/index.erb
598
614
  - app/views/virtual_classes/new.erb
599
615
  - app/views/virtual_classes/show.rjs
@@ -604,6 +620,7 @@ files:
604
620
  - app/views/zafu/default/Node-+notFound.zafu
605
621
  - app/views/zafu/default/Node-+popupLayout.zafu
606
622
  - app/views/zafu/default/Node-+search.zafu
623
+ - app/views/zafu/default/Node-admin.zafu
607
624
  - app/views/zafu/default/Node.zafu
608
625
  - bin/zena
609
626
  - bricks/captcha/MIT-LICENSE
@@ -644,7 +661,7 @@ files:
644
661
  - bricks/sphinx/zena/deploy.rb
645
662
  - bricks/sphinx/zena/init.rb
646
663
  - bricks/sphinx/zena/migrate/20091102171258_add_delta_for_sphinx.rb
647
- - bricks/sphinx/zena/sphinx.yml
664
+ - bricks/sphinx/zena/sphinx.yml.erb
648
665
  - bricks/sphinx/zena/tasks.rb
649
666
  - bricks/tags/README
650
667
  - bricks/tags/lib/bricks/tags.rb
@@ -654,12 +671,18 @@ files:
654
671
  - bricks/tags/zena/test/zafu/tags.yml
655
672
  - bricks/toto.zip
656
673
  - bricks/worker/README
674
+ - bricks/worker/lib/bricks/worker.rb
657
675
  - bricks/worker/zena/deploy.rb
658
676
  - bricks/worker/zena/init.rb
659
677
  - bricks/worker/zena/migrate/20091104191643_create_delayed_jobs_table.rb
660
678
  - bricks/worker/zena/tasks.rb
679
+ - bricks/worker/zena/test/sites/zena/delayed_jobs.yml
680
+ - bricks/worker/zena/test/zafu/worker.yml
661
681
  - bricks/worker/zena/worker
662
682
  - bricks/zena/zena/migrate/01_base.rb
683
+ - bricks/zena/zena/migrate/02_zerox1_schema.rb
684
+ - bricks/zena/zena/migrate/03_zerox1_data.rb
685
+ - bricks/zena/zena/migrate/20110315161158_add_reverse_scope_to_roles.rb
663
686
  - config/boot.rb
664
687
  - config/bricks.yml
665
688
  - config/database_example.yml
@@ -780,18 +803,17 @@ files:
780
803
  - db/init/base/help.fr.zml
781
804
  - db/init/base/skins.zml
782
805
  - db/init/base/skins/default.zml
783
- - db/init/base/skins/default/Node-+adminLayout.zafu
784
806
  - db/init/base/skins/default/Node-+index.zafu
785
807
  - db/init/base/skins/default/Node-+login.zafu
786
808
  - db/init/base/skins/default/Node-+notFound.zafu
787
809
  - db/init/base/skins/default/Node-+popupLayout.zafu
788
810
  - db/init/base/skins/default/Node-+search.zafu
789
- - db/init/base/skins/default/Node-tree.zafu
790
811
  - db/init/base/skins/default/Node.zafu
791
812
  - db/init/base/skins/default/Project.zafu
792
- - db/init/base/skins/default/favicon.png
813
+ - db/init/base/skins/default/img/favicon.png
814
+ - db/init/base/skins/default/img/style.css
815
+ - db/init/base/skins/default/img/translations.yml
793
816
  - db/init/base/skins/default/notes.zafu
794
- - db/init/base/skins/default/style.css
795
817
  - doc/README_FOR_APP
796
818
  - doc/fixtures.graffle
797
819
  - doc/fixtures.pdf
@@ -837,6 +859,7 @@ files:
837
859
  - lib/zena/app.rb
838
860
  - lib/zena/base_additions.rb
839
861
  - lib/zena/code_syntax.rb
862
+ - lib/zena/console.rb
840
863
  - lib/zena/controller/test_case.rb
841
864
  - lib/zena/core_ext/date_time.rb
842
865
  - lib/zena/core_ext/dir.rb
@@ -879,6 +902,7 @@ files:
879
902
  - lib/zena/remote/klass.rb
880
903
  - lib/zena/remote/mock.rb
881
904
  - lib/zena/remote/node.rb
905
+ - lib/zena/remote/serializable_array.rb
882
906
  - lib/zena/routes.rb
883
907
  - lib/zena/site_worker.rb
884
908
  - lib/zena/test_controller.rb
@@ -939,6 +963,7 @@ files:
939
963
  - locale/fr/LC_MESSAGES/zena.mo
940
964
  - locale/fr/zena.mo
941
965
  - locale/fr/zena.po
966
+ - locale/log.txt
942
967
  - locale/zena.pot
943
968
  - misc/zena
944
969
  - misc/zena_init
@@ -2072,6 +2097,7 @@ files:
2072
2097
  - public/javascripts/zena.js
2073
2098
  - public/robots.txt
2074
2099
  - public/stylesheets/admin.css
2100
+ - public/stylesheets/backend.css
2075
2101
  - public/stylesheets/calendar.css
2076
2102
  - public/stylesheets/code.css
2077
2103
  - public/stylesheets/comment.css
@@ -2169,9 +2195,11 @@ files:
2169
2195
  - test/integration/zafu_compiler/asset.yml
2170
2196
  - test/integration/zafu_compiler/basic.yml
2171
2197
  - test/integration/zafu_compiler/calendar.yml
2198
+ - test/integration/zafu_compiler/comments.yml
2172
2199
  - test/integration/zafu_compiler/complex.yml
2173
2200
  - test/integration/zafu_compiler/complex_ok.yml
2174
2201
  - test/integration/zafu_compiler/conditional.yml
2202
+ - test/integration/zafu_compiler/context.yml
2175
2203
  - test/integration/zafu_compiler/data.yml
2176
2204
  - test/integration/zafu_compiler/dates.yml
2177
2205
  - test/integration/zafu_compiler/display.yml
@@ -2181,6 +2209,7 @@ files:
2181
2209
  - test/integration/zafu_compiler/i18n.yml
2182
2210
  - test/integration/zafu_compiler/idx_scope.yml
2183
2211
  - test/integration/zafu_compiler/later.yml
2212
+ - test/integration/zafu_compiler/meta.yml
2184
2213
  - test/integration/zafu_compiler/off/off.yml
2185
2214
  - test/integration/zafu_compiler/query.yml
2186
2215
  - test/integration/zafu_compiler/recursion.yml
@@ -2199,6 +2228,7 @@ files:
2199
2228
  - test/integration/zafu_compiler/zazen.yml
2200
2229
  - test/integration/zafu_compiler_test.rb
2201
2230
  - test/sites/README
2231
+ - test/sites/complex/columns.yml
2202
2232
  - test/sites/complex/complex.png
2203
2233
  - test/sites/complex/groups.yml
2204
2234
  - test/sites/complex/links.yml
@@ -2290,6 +2320,7 @@ files:
2290
2320
  - test/unit/zena/use/dates_string_methods_test.rb
2291
2321
  - test/unit/zena/use/dates_test.rb
2292
2322
  - test/unit/zena/use/dates_view_methods_test.rb
2323
+ - test/unit/zena/use/field_index_test.rb
2293
2324
  - test/unit/zena/use/fulltext_test.rb
2294
2325
  - test/unit/zena/use/html_tags_test.rb
2295
2326
  - test/unit/zena/use/i18n_test.rb
@@ -2404,8 +2435,10 @@ files:
2404
2435
  - vendor/plugins/ar_mysql_full_text/README
2405
2436
  - vendor/plugins/ar_mysql_full_text/init.rb
2406
2437
  - vendor/plugins/ar_mysql_full_text/lib/ar_mysql_full_text.rb
2407
- - vendor/plugins/gettext_i18n_rails/README.markdown
2438
+ - vendor/plugins/gettext_i18n_rails/Gemfile
2439
+ - vendor/plugins/gettext_i18n_rails/Gemfile.lock
2408
2440
  - vendor/plugins/gettext_i18n_rails/Rakefile
2441
+ - vendor/plugins/gettext_i18n_rails/Readme.md
2409
2442
  - vendor/plugins/gettext_i18n_rails/VERSION
2410
2443
  - vendor/plugins/gettext_i18n_rails/gettext_i18n_rails.gemspec
2411
2444
  - vendor/plugins/gettext_i18n_rails/init.rb
@@ -2414,14 +2447,20 @@ files:
2414
2447
  - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb
2415
2448
  - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/backend.rb
2416
2449
  - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/haml_parser.rb
2450
+ - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/html_safe_translations.rb
2417
2451
  - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb
2418
2452
  - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb
2453
+ - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/railtie.rb
2419
2454
  - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/ruby_gettext_extractor.rb
2455
+ - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/string_interpolate_fix.rb
2456
+ - vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb
2420
2457
  - vendor/plugins/gettext_i18n_rails/lib/tasks/gettext_rails_i18n.rake
2421
2458
  - vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/action_controller_spec.rb
2422
2459
  - vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb
2423
2460
  - vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb
2461
+ - vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/string_interpolate_fix_spec.rb
2424
2462
  - vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb
2463
+ - vendor/plugins/gettext_i18n_rails/spec/rails2/Gemfile
2425
2464
  - vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb
2426
2465
  - vendor/plugins/responds_to_parent/MIT-LICENSE
2427
2466
  - vendor/plugins/responds_to_parent/README
@@ -2441,8 +2480,8 @@ homepage: http://zenadmin.org
2441
2480
  licenses: []
2442
2481
 
2443
2482
  post_install_message:
2444
- rdoc_options:
2445
- - --charset=UTF-8
2483
+ rdoc_options: []
2484
+
2446
2485
  require_paths:
2447
2486
  - lib
2448
2487
  required_ruby_version: !ruby/object:Gem::Requirement
@@ -2468,7 +2507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
2468
2507
  requirements: []
2469
2508
 
2470
2509
  rubyforge_project: zena
2471
- rubygems_version: 1.3.7
2510
+ rubygems_version: 1.6.1
2472
2511
  signing_key:
2473
2512
  specification_version: 3
2474
2513
  summary: CMS with super natural powers, based on Ruby on Rails
@@ -2558,6 +2597,7 @@ test_files:
2558
2597
  - test/unit/zena/use/dates_string_methods_test.rb
2559
2598
  - test/unit/zena/use/dates_test.rb
2560
2599
  - test/unit/zena/use/dates_view_methods_test.rb
2600
+ - test/unit/zena/use/field_index_test.rb
2561
2601
  - test/unit/zena/use/fulltext_test.rb
2562
2602
  - test/unit/zena/use/html_tags_test.rb
2563
2603
  - test/unit/zena/use/i18n_test.rb
data/.gitignore DELETED
@@ -1,36 +0,0 @@
1
- .DS_Store
2
- *.swp
3
- *.gem
4
- restart.txt
5
- config/deploy_config.rb
6
- config/database.yml
7
- config/mysql.yml
8
- config/psql.yml
9
- config/sqlite3.yml
10
- config/*.sphinx.conf
11
- coverage
12
- db/*.sqlite3
13
- db/development_structure.sql
14
- db/schema.rb
15
- db/sphinx
16
- db/development_structure.sql
17
- doc/coverage
18
- log/
19
- pkg/*
20
- public/images/ext/*_pv.png
21
- public/images/ext/*_std.png
22
- public/images/ext/*_tiny.png
23
- public/images/ext/*_mini.png
24
- REVISION
25
- sandbox
26
- sites/*
27
- test/fixtures/*.yml
28
- tmp/*
29
- vendor/apache2_upload_progress/*
30
- zena_console.rb
31
- vendor/plugins/property
32
- vendor/plugins/querybuilder
33
- vendor/plugins/rubyless
34
- vendor/plugins/versions
35
- vendor/plugins/yamltest
36
- vendor/plugins/zafu
@@ -1,13 +0,0 @@
1
- <div class='drive' id='dates'>
2
- <div id='dates_errors' class='errors'></div>
3
- <ul>
4
- <%= form_remote_tag(:url => node_path(@node[:zip]), :html => { :method => :put, :rnd => rnd } ) %>
5
- <div class='hidden'><input type='hidden' name='drive' value='dates'/></div>
6
- <li><label for='node_event_at'><%= _('event date') %></label><%= date_box(@node, 'event_at', :size=>15) %></li>
7
- <li><label for='node_log_at'><%= _('log date') %></label><%= date_box(@node, 'log_at', :size=>15) %></li>
8
- <li><label for='node_custom_a'><%= _('custom a') %></label><%= text_field('node', 'custom_a', :size=>15) %></li>
9
- <li><label for='node_custom_b'><%= _('custom b') %></label><%= text_field('node', 'custom_b', :size=>15) %></li>
10
- <li class='submit'><%= submit_tag _('change') %></li>
11
- </form>
12
- </ul>
13
- </div>
@@ -1,46 +0,0 @@
1
- <r:include template='Node'>
2
- <r:with part='stylesheets'>
3
- <r:stylesheets list='reset,zena,comment,admin,code,search,window'/>
4
- <link href="style.css" rel="Stylesheet" type="text/css"/>
5
- </r:with>
6
-
7
- <r:with part='context'>
8
- <ol class='admin_links' do='admin_links'>
9
- <li do='each' do='show'><a href='#'>do this</a></li>
10
- </ol>
11
- </r:with>
12
- <r:with part='title'/>
13
- <r:with part='content' do='content_for_layout'>
14
- <r:include template='Node' part='title'/>
15
- <div id='related' do='visitor'>
16
- <r:to_publish>
17
- <h3 class='group' do='trans'>to publish</h3>
18
- <ol>
19
- <li do='each' status='true'><r:link/></li>
20
- </ol>
21
- </r:to_publish>
22
-
23
- <r:comments_to_publish>
24
- <h3 class='group' do='trans'>comments to publish</h3>
25
- <ol>
26
- <li do='each'><r:show attr='title'/></li>
27
- </ol>
28
- </r:comments_to_publish>
29
-
30
- <r:proposed>
31
- <h3 class='group' do='trans'>waiting for publication</h3>
32
- <ol>
33
- <li do='each' status='true'><r:link/></li>
34
- </ol>
35
- </r:proposed>
36
-
37
- <r:redactions>
38
- <h3 class='group' do='trans'>redactions</h3>
39
- <ol>
40
- <li do='each' status='true'><r:link/></li>
41
- </ol>
42
- </r:redactions>
43
- </div>
44
- <r:include template='Node' part='main'/>
45
- </r:with>
46
- </r:include>