RubyGems - zena - Versions diffs - 1.0.0.rc2 → 1.0.0.rc3 - Mend

zena 1.0.0.rc2 → 1.0.0.rc3

Files changed (274) hide show

data/History.txt +23 -0
data/README.rdoc +1 -1
data/app/controllers/columns_controller.rb +3 -31
data/app/controllers/comments_controller.rb +8 -3
data/app/controllers/data_entries_controller.rb +1 -1
data/app/controllers/documents_controller.rb +2 -2
data/app/controllers/nodes_controller.rb +29 -12
data/app/controllers/relations_controller.rb +2 -2
data/app/controllers/sites_controller.rb +1 -1
data/app/controllers/user_sessions_controller.rb +6 -3
data/app/controllers/users_controller.rb +18 -16
data/app/controllers/versions_controller.rb +20 -18
data/app/controllers/virtual_classes_controller.rb +103 -17
data/app/helpers/users_helper.rb +1 -1
data/app/models/column.rb +19 -50
data/app/models/comment.rb +2 -1
data/app/models/node.rb +45 -22
data/app/models/relation.rb +13 -0
data/app/models/relation_proxy.rb +3 -2
data/app/models/role.rb +213 -4
data/app/models/site.rb +18 -11
data/app/models/template.rb +37 -35
data/app/models/version.rb +1 -1
data/app/models/virtual_class.rb +154 -86
data/app/views/columns/_li.html.erb +1 -1
data/app/views/columns/index.html.erb +1 -9
data/app/views/comments/index.rhtml +10 -8
data/app/views/documents/_crop.rhtml +5 -6
data/app/views/documents/crop_form.rjs +3 -2
data/app/views/groups/index.rhtml +1 -1
data/app/views/iformats/index.rhtml +1 -1
data/app/views/nodes/_import_results.rhtml +1 -1
data/app/views/nodes/_parent.rhtml +1 -2
data/app/views/nodes/update.rjs +3 -4
data/app/views/relations/index.erb +1 -1
data/app/views/sites/index.erb +1 -1
data/app/views/templates/drive_tabs/_drive.rhtml +0 -2
data/app/views/templates/edit_tabs/_image.rhtml +1 -1
data/app/views/templates/edit_tabs/_title.rhtml +0 -6
data/app/views/users/index.rhtml +1 -1
data/app/views/users/preferences.html.erb +2 -2
data/app/views/versions/backup.rjs +1 -1
data/app/views/versions/custom_tab.rhtml +9 -4
data/app/views/versions/destroy.rjs +2 -2
data/app/views/versions/update.rjs +2 -9
data/app/views/virtual_classes/_form.erb +3 -2
data/app/views/virtual_classes/import_prepare.html.erb +13 -0
data/app/views/virtual_classes/index.erb +28 -8
data/app/views/zafu/default/Node-+adminLayout.zafu +1 -13
data/app/views/zafu/default/Node-+login.zafu +1 -0
data/app/views/zafu/default/Node-+notFound.zafu +1 -1
data/app/views/zafu/default/Node-+popupLayout.zafu +1 -2
data/app/views/zafu/default/Node-+search.zafu +1 -1
data/app/views/zafu/default/Node-admin.zafu +205 -0
data/app/views/zafu/default/Node.zafu +11 -11
data/bricks/captcha/lib/bricks/captcha.rb +3 -2
data/bricks/mongrel/zena/init.rb +2 -1
data/bricks/pdf/README +5 -5
data/bricks/pdf/lib/bricks/pdf/engine/prince.rb +2 -2
data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb +2 -2
data/bricks/pdf/lib/bricks/pdf/install.rb +5 -5
data/bricks/pdf/lib/bricks/pdf.rb +11 -11
data/bricks/pdf/test/engines/test_prince.rb +4 -4
data/bricks/pdf/test/engines/test_xhtml2pdf.rb +4 -4
data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb +2 -2
data/bricks/pdf/zena/init.rb +2 -2
data/bricks/pdf/zena/tasks.rb +2 -2
data/bricks/sphinx/lib/bricks/sphinx.rb +6 -2
data/bricks/sphinx/zena/{sphinx.yml → sphinx.yml.erb} +2 -2
data/bricks/sphinx/zena/tasks.rb +28 -2
data/bricks/tags/lib/bricks/tags.rb +16 -1
data/bricks/tags/zena/test/unit/tags_test.rb +15 -0
data/bricks/tags/zena/test/zafu/tags.yml +5 -1
data/bricks/worker/lib/bricks/worker.rb +39 -0
data/bricks/worker/zena/deploy.rb +0 -2
data/bricks/worker/zena/init.rb +1 -0
data/bricks/worker/zena/test/sites/zena/delayed_jobs.yml +16 -0
data/bricks/worker/zena/test/zafu/worker.yml +8 -0
data/bricks/zena/zena/migrate/01_base.rb +36 -60
data/bricks/zena/zena/migrate/02_zerox1_schema.rb +388 -0
data/bricks/zena/zena/migrate/03_zerox1_data.rb +380 -0
data/bricks/zena/zena/migrate/20110315161158_add_reverse_scope_to_roles.rb +9 -0
data/config/database_example.yml +1 -1
data/config/environment.rb +1 -1
data/config/gems.yml +17 -14
data/db/init/base/skins/default/Node-+index.zafu +8 -1
data/db/init/base/skins/default/Node-+login.zafu +1 -0
data/db/init/base/skins/default/Node-+popupLayout.zafu +1 -2
data/db/init/base/skins/default/Node-+search.zafu +2 -2
data/db/init/base/skins/default/Node.zafu +9 -9
data/db/init/base/skins/default/{favicon.png → img/favicon.png} +0 -0
data/db/init/base/skins/default/{style.css → img/style.css} +0 -0
data/db/init/base/skins/default/img/translations.yml +11 -0
data/db/init/base/skins/default/notes.zafu +7 -9
data/doc/zafu_changes.yml +12 -0
data/lib/bricks/loader.rb +38 -15
data/lib/tasks/zena.rake +74 -24
data/lib/zena/acts/enrollable.rb +4 -1
data/lib/zena/acts/secure.rb +2 -48
data/lib/zena/acts/serializable.rb +13 -1
data/lib/zena/app.rb +9 -0
data/lib/zena/code_syntax.rb +154 -151
data/lib/zena/console.rb +141 -0
data/lib/zena/controller/test_case.rb +1 -1
data/lib/zena/db_helper/abstract_db.rb +17 -5
data/lib/zena/db_helper/mysql.rb +14 -12
data/lib/zena/db_helper/postgresql.rb +1 -2
data/lib/zena/db_helper/sqlite3.rb +6 -6
data/lib/zena/deploy/awstats.conf.rhtml +1 -1
data/lib/zena/deploy/httpd.rhtml +6 -1
data/lib/zena/deploy/vhost.rhtml +9 -1
data/lib/zena/deploy.rb +12 -7
data/lib/zena/foxy_parser.rb +3 -1
data/lib/zena/info.rb +1 -1
data/lib/zena/parser/zafu_tags.rb +1 -0
data/lib/zena/parser/zazen_rules.rb +1 -1
data/lib/zena/remote/node.rb +15 -3
data/lib/zena/remote/serializable_array.rb +19 -0
data/lib/zena/remote.rb +1 -0
data/lib/zena/routes.rb +7 -2
data/lib/zena/site_worker.rb +11 -1
data/lib/zena/unit/test_case.rb +68 -0
data/lib/zena/use/action.rb +6 -2
data/lib/zena/use/ajax.rb +127 -53
data/lib/zena/use/ancestry.rb +11 -8
data/lib/zena/use/calendar.rb +265 -129
data/lib/zena/use/conditional.rb +1 -1
data/lib/zena/use/context.rb +5 -5
data/lib/zena/use/dates.rb +172 -60
data/lib/zena/use/display.rb +70 -39
data/lib/zena/use/error_rendering.rb +1 -3
data/lib/zena/use/field_index.rb +4 -1
data/lib/zena/use/forms.rb +94 -72
data/lib/zena/use/fulltext.rb +16 -24
data/lib/zena/use/html_tags.rb +20 -12
data/lib/zena/use/i18n.rb +37 -37
data/lib/zena/use/image_builder.rb +8 -1
data/lib/zena/use/ml_index.rb +16 -16
data/lib/zena/use/prop_eval.rb +10 -5
data/lib/zena/use/query_builder.rb +55 -23
data/lib/zena/use/query_node.rb +51 -25
data/lib/zena/use/refactor.rb +2 -28
data/lib/zena/use/relations.rb +1 -1
data/lib/zena/use/rendering.rb +29 -0
data/lib/zena/use/scope_index.rb +75 -14
data/lib/zena/use/search.rb +5 -10
data/lib/zena/use/test_helper.rb +2 -2
data/lib/zena/use/urls.rb +125 -104
data/lib/zena/use/workflow.rb +2 -1
data/lib/zena/use/zafu_attributes.rb +2 -2
data/lib/zena/use/zafu_safe_definitions.rb +20 -0
data/lib/zena/use/zafu_templates.rb +20 -6
data/lib/zena/use/zazen.rb +31 -20
data/lib/zena/view/test_case.rb +5 -0
data/lib/zena/zafu_compiler.rb +24 -2
data/lib/zena.rb +12 -6
data/locale/de/LC_MESSAGES/zena.mo +0 -0
data/locale/de/zena.po +1345 -1164
data/locale/en/LC_MESSAGES/zena.mo +0 -0
data/locale/en/zena.po +1275 -1129
data/locale/fr/LC_MESSAGES/zena.mo +0 -0
data/locale/fr/zena.mo +0 -0
data/locale/fr/zena.po +1617 -1441
data/locale/log.txt +9 -0
data/locale/zena.pot +957 -748
data/public/javascripts/prototype.js +1 -1
data/public/javascripts/zena.js +99 -44
data/public/stylesheets/admin.css +6 -4
data/public/stylesheets/backend.css +71 -0
data/public/stylesheets/calendar.css +24 -25
data/public/stylesheets/code.css +11 -6
data/public/stylesheets/comment.css +2 -1
data/public/stylesheets/popup.css +7 -8
data/test/custom_queries/complex.host.yml +15 -1
data/test/fixtures/files/Node-test.zafu +29 -28
data/test/fixtures/files/translations_de.yml +12 -1
data/test/fixtures/files/translations_fr.yml +12 -1
data/test/functional/comments_controller_test.rb +9 -0
data/test/functional/iformats_controller_test.rb +1 -1
data/test/functional/nodes_controller_test.rb +124 -35
data/test/functional/users_controller_test.rb +132 -3
data/test/functional/virtual_classes_controller_test.rb +75 -4
data/test/integration/navigation_test.rb +51 -9
data/test/integration/query_node/basic.yml +19 -7
data/test/integration/query_node/complex.yml +1 -1
data/test/integration/query_node/dates.yml +27 -1
data/test/integration/query_node/filters.yml +1 -1
data/test/integration/query_node/relations.yml +13 -4
data/test/integration/query_node_test.rb +4 -0
data/test/integration/xml_api_test.rb +6 -1
data/test/integration/zafu_compiler/action.yml +3 -3
data/test/integration/zafu_compiler/ajax.yml +103 -22
data/test/integration/zafu_compiler/basic.yml +0 -52
data/test/integration/zafu_compiler/calendar.yml +44 -20
data/test/integration/zafu_compiler/comments.yml +53 -0
data/test/integration/zafu_compiler/complex.yml +11 -11
data/test/integration/zafu_compiler/complex_ok.yml +16 -3
data/test/integration/zafu_compiler/conditional.yml +15 -5
data/test/integration/zafu_compiler/context.yml +9 -0
data/test/integration/zafu_compiler/dates.yml +43 -15
data/test/integration/zafu_compiler/display.yml +60 -6
data/test/integration/zafu_compiler/errors.yml +6 -2
data/test/integration/zafu_compiler/forms.yml +45 -6
data/test/integration/zafu_compiler/i18n.yml +8 -1
data/test/integration/zafu_compiler/meta.yml +38 -0
data/test/integration/zafu_compiler/query.yml +43 -4
data/test/integration/zafu_compiler/relations.yml +26 -33
data/test/integration/zafu_compiler/rubyless.yml +10 -0
data/test/integration/zafu_compiler/safe_definitions.yml +21 -1
data/test/integration/zafu_compiler/urls.yml +75 -5
data/test/integration/zafu_compiler/version.yml +2 -2
data/test/integration/zafu_compiler/zafu_attributes.yml +5 -1
data/test/integration/zafu_compiler/zazen.yml +14 -6
data/test/integration/zafu_compiler_test.rb +5 -1
data/test/sites/complex/columns.yml +5 -0
data/test/sites/complex/roles.yml +4 -0
data/test/sites/zena/nodes.yml +13 -2
data/test/sites/zena/roles.yml +13 -5
data/test/sites/zena/versions.yml +27 -9
data/test/unit/column_test.rb +51 -5
data/test/unit/iformat_test.rb +2 -2
data/test/unit/node_test.rb +29 -17
data/test/unit/note_test.rb +1 -1
data/test/unit/relation_proxy_test.rb +4 -5
data/test/unit/relation_test.rb +16 -0
data/test/unit/remote_test.rb +2 -2
data/test/unit/role_test.rb +292 -4
data/test/unit/site_test.rb +12 -0
data/test/unit/template_test.rb +1 -1
data/test/unit/text_document_test.rb +1 -1
data/test/unit/virtual_class_test.rb +200 -83
data/test/unit/zena/acts/enrollable_test.rb +26 -31
data/test/unit/zena/use/calendar_test.rb +90 -37
data/test/unit/zena/use/field_index_test.rb +28 -0
data/test/unit/zena/use/html_tags_test.rb +7 -3
data/test/unit/zena/use/ml_index_test.rb +2 -16
data/test/unit/zena/use/nested_attributes_alias_view_test.rb +2 -2
data/test/unit/zena/use/prop_eval_test.rb +50 -8
data/test/unit/zena/use/query_node_test.rb +11 -0
data/test/unit/zena/use/rendering_test.rb +72 -0
data/test/unit/zena/use/scope_index_test.rb +37 -2
data/test/unit/zena/use/urls_test.rb +10 -0
data/test/unit/zena/use/zazen_test.rb +3 -3
data/vendor/plugins/gettext_i18n_rails/Gemfile +11 -0
data/vendor/plugins/gettext_i18n_rails/Gemfile.lock +92 -0
data/vendor/plugins/gettext_i18n_rails/Rakefile +12 -17
data/vendor/plugins/gettext_i18n_rails/Readme.md +215 -0
data/vendor/plugins/gettext_i18n_rails/VERSION +1 -1
data/vendor/plugins/gettext_i18n_rails/gettext_i18n_rails.gemspec +38 -34
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb +1 -1
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/backend.rb +30 -14
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/haml_parser.rb +1 -1
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/html_safe_translations.rb +29 -0
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb +29 -1
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb +7 -1
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/railtie.rb +10 -0
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/ruby_gettext_extractor.rb +6 -2
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/string_interpolate_fix.rb +20 -0
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb +120 -0
data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails.rb +10 -3
data/vendor/plugins/gettext_i18n_rails/lib/tasks/gettext_rails_i18n.rake +1 -74
data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb +51 -20
data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb +12 -7
data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/string_interpolate_fix_spec.rb +32 -0
data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb +38 -1
data/vendor/plugins/gettext_i18n_rails/spec/rails2/Gemfile +11 -0
data/vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb +1 -8
data/zena.gemspec +2241 -2217
metadata +123 -83
data/.gitignore +0 -36
data/app/views/nodes/_dates.rhtml +0 -13
data/db/init/base/skins/default/Node-+adminLayout.zafu +0 -46
data/db/init/base/skins/default/Node-tree.zafu +0 -19
data/vendor/plugins/gettext_i18n_rails/README.markdown +0 -143

data/lib/zena/zafu_compiler.rb CHANGED Viewed

@@ -1,8 +1,28 @@
 require 'zafu'
 module Zena
-  # FIXME: replace with (and make sure all is ok!)
-  # ZafuCompiler = Zafu.parser_with_rules(Zafu::All + Zena::Use.modules_for('Zafu'))
+  # ZafuCompiler = Zafu.parser_with_rules(
+  #   Zafu::All +
+  #   Zena::Use.modules_for('Zafu')
+  # )
+#puts  Zena::Use.modules_for('Zafu')
+# Missing Conditional, ZafuEval, Recursion, Search
+# Captcha comes first instead of last
+# Bricks::Captcha::ZafuMethods
+# Zena::Use::Action::ZafuMethods
+# Zena::Use::Calendar::ZafuMethods
+# Zena::Use::Context::ZafuMethods
+# Zena::Use::Dates::ZafuMethods
+# Zena::Acts::Enrollable::ZafuMethods
+# Zena::Use::Forms::ZafuMethods
+# Zena::Use::I18n::ZafuMethods
+# Zena::Use::QueryBuilder::ZafuMethods
+# Zena::Use::Display::ZafuMethods
+# Zena::Use::Rendering::ZafuMethods
+# Zena::Use::Ajax::ZafuMethods
+# Zena::Use::Urls::ZafuMethods
+# Zena::Use::ZafuAttributes::ZafuMethods
+# Zena::Use::ZafuSafeDefinitions::ZafuMethods
   ZafuCompiler = Zafu.parser_with_rules([
     Zafu::All,
@@ -14,6 +34,7 @@ module Zena
     Zena::Use::QueryBuilder::ZafuMethods,
     # Has to come after QB
     Zena::Use::Display::ZafuMethods,
+    Zena::Use::Calendar::ZafuMethods,
     Zena::Use::I18n::ZafuMethods,
     Zena::Use::Action::ZafuMethods,
     Zena::Use::Dates::ZafuMethods,
@@ -26,5 +47,6 @@ module Zena
     Zena::Acts::Enrollable::ZafuMethods,
   ])
   Bricks.load_zafu(ZafuCompiler)
 end

data/lib/zena.rb CHANGED Viewed

@@ -32,7 +32,7 @@ module Zena
   class << self
     attr_accessor :tools_enabled
-    # Resolve a fully defined constant like 'Bricks::PDF::Engine::Prince'
+    # Resolve a fully defined constant like 'Bricks::Pdf::Engine::Prince'
     def resolve_const(klass)
       if klass.kind_of?(String)
         constant = nil
@@ -54,9 +54,9 @@ module Zena
       )
       if config
         ["#{Zena::ROOT}/vendor", "#{Zena::ROOT}/lib"].each do |path|
-          ActiveSupport::Dependencies.load_paths      << path
-          ActiveSupport::Dependencies.load_once_paths << path
-          $LOAD_PATH                                  << path
+          ActiveSupport::Dependencies.autoload_paths      << path
+          ActiveSupport::Dependencies.autoload_once_paths << path
+          $LOAD_PATH                                      << path
         end
       else
         paths_to_add.each do |path|
@@ -192,7 +192,6 @@ module Zena
       # do not change this !
       ActiveRecord::Base.default_timezone = :utc
       ENV['TZ'] = 'UTC'
-      Zena::Db.prepare_connection_for_timezone
     end
     def add_inflections
@@ -205,6 +204,7 @@ module Zena
       require 'fast_gettext'
       FastGettext.add_text_domain 'zena', :path => "#{Zena::ROOT}/locale" #File.dirname(__FILE__) + '/../../locale'
+      FastGettext.default_text_domain = 'zena'
       FastGettext.text_domain = 'zena'
     end
@@ -221,12 +221,18 @@ module Zena
       add_load_paths(config)
       config_gems(config)
       set_default_timezone(config)
+      Zena::Db.prepare_connection
       require_ordered_dependencies
+      # This is needed for idx fields taming (lock table content in OR clause).
+      # Must come after 'require_ordered_dependencies' so that AfterCommit is loaded
+      # before first DB usage.
+      Zena::Db.insert_dummy_ids
       load_plugins if RAILS_ROOT != Zena::ROOT
       include_modules
-      Bricks.load_bricks if Zena::Db.migrated_once?
+      Bricks.load_bricks
       add_inflections
       initialize_authlogic
       initialize_gettext

data/locale/de/LC_MESSAGES/zena.mo CHANGED Viewed

Binary file