zena 1.2.2 → 1.2.3

Sign up to get free protection for your applications and to get access to all the features.
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
data/zena.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{zena}
8
- s.version = "1.2.2"
8
+ s.version = "1.2.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Gaspard Bucher"]
12
- s.date = %q{2012-08-30}
12
+ s.date = %q{2013-03-11}
13
13
  s.default_executable = %q{zena}
14
14
  s.description = %q{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).}
15
15
  s.email = %q{gaspard@teti.ch}
@@ -195,6 +195,7 @@ Gem::Specification.new do |s|
195
195
  "app/views/nodes/edit.html.erb",
196
196
  "app/views/nodes/edit.rjs",
197
197
  "app/views/nodes/import.rhtml",
198
+ "app/views/nodes/render_error.rhtml",
198
199
  "app/views/nodes/save_text.rjs",
199
200
  "app/views/nodes/search.rjs",
200
201
  "app/views/nodes/show.rjs",
@@ -398,6 +399,7 @@ Gem::Specification.new do |s|
398
399
  "bricks/zena/zena/migrate/20111214112233_add_comment_to_relations.rb",
399
400
  "bricks/zena/zena/migrate/20120605091558_add_ssl_login_to_site.rb",
400
401
  "bricks/zena/zena/migrate/20120630123551_add_auto_publish_to_group.rb",
402
+ "bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb",
401
403
  "config/boot.rb",
402
404
  "config/bricks.yml",
403
405
  "config/database_example.yml",
@@ -626,6 +628,7 @@ Gem::Specification.new do |s|
626
628
  "lib/zena/deploy/stats.vhost.rhtml",
627
629
  "lib/zena/deploy/template.rb",
628
630
  "lib/zena/deploy/vhost.rhtml",
631
+ "lib/zena/deploy/vhost_ssl_redir.rhtml",
629
632
  "lib/zena/deploy/vhost_www.rhtml",
630
633
  "lib/zena/fix_rails_layouts.rb",
631
634
  "lib/zena/foxy_parser.rb",
@@ -676,6 +679,7 @@ Gem::Specification.new do |s|
676
679
  "lib/zena/use/prop_eval.rb",
677
680
  "lib/zena/use/query_builder.rb",
678
681
  "lib/zena/use/query_comment.rb",
682
+ "lib/zena/use/query_link.rb",
679
683
  "lib/zena/use/query_node.rb",
680
684
  "lib/zena/use/recursion.rb",
681
685
  "lib/zena/use/refactor.rb",
@@ -1837,6 +1841,7 @@ Gem::Specification.new do |s|
1837
1841
  "public/javascripts/effects.js",
1838
1842
  "public/javascripts/grid.js",
1839
1843
  "public/javascripts/prototype.js",
1844
+ "public/javascripts/raphael.js",
1840
1845
  "public/javascripts/scriptaculous.js",
1841
1846
  "public/javascripts/slider.js",
1842
1847
  "public/javascripts/sound.js",
@@ -1935,7 +1940,6 @@ Gem::Specification.new do |s|
1935
1940
  "test/functional/groups_controller_test.rb",
1936
1941
  "test/functional/iformats_controller_test.rb",
1937
1942
  "test/functional/links_controller_test.rb",
1938
- "test/functional/nodes_controller_commit_test.rb",
1939
1943
  "test/functional/nodes_controller_test.rb",
1940
1944
  "test/functional/note_controller_test.rb",
1941
1945
  "test/functional/pings_controller_test.rb",
@@ -2023,6 +2027,8 @@ Gem::Specification.new do |s|
2023
2027
  "test/selenium/Filter/0setup.rsel",
2024
2028
  "test/selenium/Filter/filter1.rsel",
2025
2029
  "test/selenium/Filter/filter2.rsel",
2030
+ "test/selenium/Filter/filter3.rsel",
2031
+ "test/selenium/Filter/filter4.rsel",
2026
2032
  "test/selenium/Form/0setup.rsel",
2027
2033
  "test/selenium/Form/form1.rsel",
2028
2034
  "test/selenium/Form/form2.rsel",
@@ -2467,84 +2473,84 @@ Gem::Specification.new do |s|
2467
2473
  s.specification_version = 3
2468
2474
 
2469
2475
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
2470
- s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
2471
- s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
2472
2476
  s.add_runtime_dependency(%q<rails>, ["= 2.3.11"])
2473
- s.add_runtime_dependency(%q<httparty>, ["= 0.7.8"])
2474
- s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
2475
- s.add_runtime_dependency(%q<rubyless>, ["= 0.8.6"])
2476
- s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
2477
- s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
2478
- s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
2479
- s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
2477
+ s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
2480
2478
  s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
2481
- s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
2482
- s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
2479
+ s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
2480
+ s.add_runtime_dependency(%q<open4>, [">= 0"])
2481
+ s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
2482
+ s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.1"])
2483
+ s.add_runtime_dependency(%q<jeweler>, [">= 0"])
2483
2484
  s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
2484
2485
  s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
2485
- s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
2486
- s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
2487
- s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
2488
- s.add_runtime_dependency(%q<jeweler>, [">= 0"])
2489
2486
  s.add_runtime_dependency(%q<daemons>, [">= 0"])
2487
+ s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
2488
+ s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
2489
+ s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
2490
2490
  s.add_runtime_dependency(%q<hpricot>, [">= 0"])
2491
- s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
2491
+ s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
2492
+ s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
2493
+ s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
2494
+ s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
2495
+ s.add_runtime_dependency(%q<rubyless>, ["= 0.8.8"])
2496
+ s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
2497
+ s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
2498
+ s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
2499
+ s.add_runtime_dependency(%q<httparty>, ["= 0.7.8"])
2492
2500
  s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
2493
- s.add_runtime_dependency(%q<open4>, [">= 0"])
2494
- s.add_runtime_dependency(%q<querybuilder>, ["= 1.1.3"])
2495
2501
  else
2496
- s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
2497
- s.add_dependency(%q<tzinfo>, [">= 0"])
2498
2502
  s.add_dependency(%q<rails>, ["= 2.3.11"])
2499
- s.add_dependency(%q<httparty>, ["= 0.7.8"])
2500
- s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
2501
- s.add_dependency(%q<rubyless>, ["= 0.8.6"])
2502
- s.add_dependency(%q<property>, ["= 2.3.2"])
2503
- s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
2504
- s.add_dependency(%q<authlogic>, ["= 2.1.3"])
2505
- s.add_dependency(%q<shoulda>, ["= 2.10.3"])
2503
+ s.add_dependency(%q<differ>, ["= 0.1.2"])
2506
2504
  s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
2507
- s.add_dependency(%q<syntax>, ["= 1.0.0"])
2508
- s.add_dependency(%q<gem_plugin>, [">= 0"])
2505
+ s.add_dependency(%q<shoulda>, ["= 2.10.3"])
2506
+ s.add_dependency(%q<open4>, [">= 0"])
2507
+ s.add_dependency(%q<authlogic>, ["= 2.1.3"])
2508
+ s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
2509
+ s.add_dependency(%q<jeweler>, [">= 0"])
2509
2510
  s.add_dependency(%q<yamltest>, ["= 0.7.0"])
2510
2511
  s.add_dependency(%q<json>, ["= 1.5.1"])
2511
- s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
2512
- s.add_dependency(%q<gettext>, ["= 2.1.0"])
2513
- s.add_dependency(%q<versions>, ["= 0.3.1"])
2514
- s.add_dependency(%q<jeweler>, [">= 0"])
2515
2512
  s.add_dependency(%q<daemons>, [">= 0"])
2513
+ s.add_dependency(%q<property>, ["= 2.3.2"])
2514
+ s.add_dependency(%q<versions>, ["= 0.3.1"])
2515
+ s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
2516
2516
  s.add_dependency(%q<hpricot>, [">= 0"])
2517
- s.add_dependency(%q<differ>, ["= 0.1.2"])
2517
+ s.add_dependency(%q<gettext>, ["= 2.1.0"])
2518
+ s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
2519
+ s.add_dependency(%q<tzinfo>, [">= 0"])
2520
+ s.add_dependency(%q<gem_plugin>, [">= 0"])
2521
+ s.add_dependency(%q<rubyless>, ["= 0.8.8"])
2522
+ s.add_dependency(%q<syntax>, ["= 1.0.0"])
2523
+ s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
2524
+ s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
2525
+ s.add_dependency(%q<httparty>, ["= 0.7.8"])
2518
2526
  s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
2519
- s.add_dependency(%q<open4>, [">= 0"])
2520
- s.add_dependency(%q<querybuilder>, ["= 1.1.3"])
2521
2527
  end
2522
2528
  else
2523
- s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
2524
- s.add_dependency(%q<tzinfo>, [">= 0"])
2525
2529
  s.add_dependency(%q<rails>, ["= 2.3.11"])
2526
- s.add_dependency(%q<httparty>, ["= 0.7.8"])
2527
- s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
2528
- s.add_dependency(%q<rubyless>, ["= 0.8.6"])
2529
- s.add_dependency(%q<property>, ["= 2.3.2"])
2530
- s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
2531
- s.add_dependency(%q<authlogic>, ["= 2.1.3"])
2532
- s.add_dependency(%q<shoulda>, ["= 2.10.3"])
2530
+ s.add_dependency(%q<differ>, ["= 0.1.2"])
2533
2531
  s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
2534
- s.add_dependency(%q<syntax>, ["= 1.0.0"])
2535
- s.add_dependency(%q<gem_plugin>, [">= 0"])
2532
+ s.add_dependency(%q<shoulda>, ["= 2.10.3"])
2533
+ s.add_dependency(%q<open4>, [">= 0"])
2534
+ s.add_dependency(%q<authlogic>, ["= 2.1.3"])
2535
+ s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
2536
+ s.add_dependency(%q<jeweler>, [">= 0"])
2536
2537
  s.add_dependency(%q<yamltest>, ["= 0.7.0"])
2537
2538
  s.add_dependency(%q<json>, ["= 1.5.1"])
2538
- s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
2539
- s.add_dependency(%q<gettext>, ["= 2.1.0"])
2540
- s.add_dependency(%q<versions>, ["= 0.3.1"])
2541
- s.add_dependency(%q<jeweler>, [">= 0"])
2542
2539
  s.add_dependency(%q<daemons>, [">= 0"])
2540
+ s.add_dependency(%q<property>, ["= 2.3.2"])
2541
+ s.add_dependency(%q<versions>, ["= 0.3.1"])
2542
+ s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
2543
2543
  s.add_dependency(%q<hpricot>, [">= 0"])
2544
- s.add_dependency(%q<differ>, ["= 0.1.2"])
2544
+ s.add_dependency(%q<gettext>, ["= 2.1.0"])
2545
+ s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
2546
+ s.add_dependency(%q<tzinfo>, [">= 0"])
2547
+ s.add_dependency(%q<gem_plugin>, [">= 0"])
2548
+ s.add_dependency(%q<rubyless>, ["= 0.8.8"])
2549
+ s.add_dependency(%q<syntax>, ["= 1.0.0"])
2550
+ s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
2551
+ s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
2552
+ s.add_dependency(%q<httparty>, ["= 0.7.8"])
2545
2553
  s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
2546
- s.add_dependency(%q<open4>, [">= 0"])
2547
- s.add_dependency(%q<querybuilder>, ["= 1.1.3"])
2548
2554
  end
2549
2555
  end
2550
2556