zena 0.15.2 → 0.16.0

data/lib/zena/use/urls.rb

@@ -17,20 +17,22 @@ module Zena
 
           return '#' unless node
 
-
-          if sharp = options.delete(:sharp)
-            if sharp =~ /\[(.+)\]/
-              sharp_value = node.safe_read($1)
-            elsif sharp == 'true'
-              sharp_value = "node#{node[:zip]}"
+          if anchor = options.delete(:anchor)
+            if anchor =~ /\[(.+)\]/
+              anchor_value = node.safe_read($1)
+            elsif anchor == 'true'
+              anchor_value = "node#{node[:zip]}"
             else
-              sharp_value = sharp
+              fixed = true
+              anchor_value = anchor
             end
-            if sharp_in = options.delete(:sharp_in)
-              sharp_node = sharp_in.kind_of?(Node) ? sharp_in : (node.find(:first, [sharp_in]) || node)
-              return "#{zen_path(sharp_node, options)}##{sharp_value}"
+            if anchor_in = options.delete(:anchor_in)
+              anchor_node = anchor_in.kind_of?(Node) ? anchor_in : (node.find(:first, [anchor_in]) || node)
+              return "#{zen_path(anchor_node, options)}##{anchor_value}"
+            elsif fixed
+              return "#{zen_path(node, options)}##{anchor_value}"
             else
-              return "##{sharp_value}"
+              return "##{anchor_value}"
             end
           end
 
@@ -43,7 +45,7 @@ module Zena
           abs_url_prefix = host ? "http://#{host}" : ''
 
           if node.kind_of?(Document) && format == node.version.content.ext
-            if node.public? && !current_site.authentication?
+            if node.public? && !visitor.site.authentication?
               # force the use of a cacheable path for the data, even when navigating in '/oo'
               pre = node.version.lang
             end
@@ -60,7 +62,7 @@ module Zena
             opts.delete(:cachestamp) # cachestamp
           end
 
-          path = if !asset && node[:id] == current_site[:root_id] && mode.nil? && format == 'html'
+          path = if !asset && node[:id] == visitor.site[:root_id] && mode.nil? && format == 'html'
             "#{abs_url_prefix}/#{pre}" # index page
           elsif node[:custom_base]
             "#{abs_url_prefix}/#{pre}/" +
@@ -109,7 +111,7 @@ module Zena
         # Url for a node. Options are 'mode' and 'format'
         # ex 'http://test.host/en/document34_print.html'
         def zen_url(node, opts={})
-          zen_path(node,opts.merge(:host => current_site[:host]))
+          zen_path(node,opts.merge(:host => visitor.site[:host]))
         end
 
         # Return the path to a document's data

data/lib/zena/use/zafu.rb

@@ -93,8 +93,15 @@ module Zena
           ""
         end
 
-        # TODO: test
+        # Return the full path from a template's url.
+        # The expected url is of the form '/skin/Klass-mode/partial'
         def fullpath_from_template_url(template_url=params[:t_url])
+          "#{SITES_ROOT}#{template_path_from_template_url(template_url)}"
+        end
+
+        # Return the template path without '.erb' extension in case we need to append '_form'
+        # from a template's url. The expected url is of the form '/skin/Klass-mode/partial'
+        def template_path_from_template_url(template_url=params[:t_url])
           if template_url =~ /\A\.|[^\w\+\._\-\/]/
             raise Zena::AccessViolation.new("'template_url' contains illegal characters : #{template_url.inspect}")
           end
@@ -102,11 +109,12 @@ module Zena
           template_url = template_url[1..-1].split('/')
           path = "/#{template_url[0]}/#{template_url[1]}/#{dev_mode? ? "dev_#{lang}" : lang}/#{template_url[2..-1].join('/')}"
 
-          "#{SITES_ROOT}/#{current_site.host}/zafu#{path}"
+          "/#{current_site.host}/zafu#{path}"
         end
 
         # Make sure some vital templates never get broken
         def valid_template?(content, opts)
+          #puts content
           mode = opts[:mode]
           case mode
           when '+login'
@@ -162,16 +170,14 @@ module Zena
               skin_names_list << name unless skin_names_list.include?(name)
             end
           end
+
           document = skin_name = nil
-          [false, true].each do |rebuild_path|
-            # try to find using cached fullpath first.
-            skin_names_list.each do |skin_name|
-              next unless skin = @skin[skin_name] ||= secure(Skin) { Skin.find_by_name(skin_name) }
-              path = (skin.fullpath(rebuild_path).split('/') + url).join('/')
-              break if document = secure(Document) { Document.find_by_path(path) }
-            end
-            break if document
+          skin_names_list.each do |skin_name|
+            next unless skin = @skin[skin_name] ||= secure(Skin) { Skin.find_by_name(skin_name) }
+            path = (skin.fullpath.split('/') + url).join('/')
+            break if document = secure(Document) { Document.find_by_path(path) }
           end
+
           if format == 'data' && document
             format = document.c_ext
           end
@@ -502,60 +508,7 @@ module Zena
             title
           end
         end
-
-
       end # ViewMethods
-
-      # This will be completely replaced by RubyLess
-      module ModelMethods
-        def self.included(base)
-          zafu_class_methods = <<-END
-            @@_zafu_context   ||= {} # defined for each class (list of methods to change contexts)
-            @@_zafu_known_contexts      ||= {} # full list with inherited attributes
-
-            def self.zafu_context(hash)
-              @@_zafu_context[self] ||= {}
-              @@_zafu_context[self].merge!(hash.stringify_keys)
-            end
-
-            def self.zafu_known_contexts
-              @@_zafu_known_contexts[self] ||= begin
-                res = {}
-                if superclass == ActiveRecord::Base
-                  @@_zafu_context[self] || {}
-                else
-                  superclass.zafu_known_contexts.merge(@@_zafu_context[self] || {})
-                end.each do |k,v|
-                  if v.kind_of?(Hash)
-                    res[k] = v.merge(:node_class => parse_class(v[:node_class]))
-                  else
-                    res[k] = {:node_class => parse_class(v)}
-                  end
-                end
-                res
-              end
-            end
-
-            def self.parse_class(klass)
-              if klass.kind_of?(Array)
-                if klass[0].kind_of?(String)
-                  [Module::const_get(klass[0])]
-                else
-                  klass
-                end
-              else
-                if klass.kind_of?(String)
-                  Module::const_get(klass)
-                else
-                  klass
-                end
-              end
-            end
-          END
-
-          base.send(:class_eval, zafu_class_methods)
-        end
-      end # ModelMethods
     end # Zafu
   end # Use
 end # Zena

data/lib/zena/use/zazen.rb

@@ -77,16 +77,16 @@ module Zena
         def make_link(opts)
           # for latex refs, see http://www.tug.org/applications/hyperref/manual.html
           link_opts = {}
-          if sharp = opts[:sharp]
-            if sharp =~ /\[(.+?)\/(.*)\]/
-              sharp_in, sharp = $1, $2
-              sharp = sharp == '' ? 'true' : "[#{sharp}]"
-              link_opts[:sharp_in] = sharp_in
+          if anchor = opts[:anchor]
+            if anchor =~ /\[(.+?)\/(.*)\]/
+              anchor_in, anchor = $1, $2
+              anchor = anchor == '' ? 'true' : "[#{anchor}]"
+              link_opts[:anchor_in] = anchor_in
             end
-            if ['[id]', '[zip]'].include?(sharp)
-              link_opts[:sharp] = 'true'
+            if ['[id]', '[zip]'].include?(anchor)
+              link_opts[:anchor] = 'true'
             else
-              link_opts[:sharp] = sharp
+              link_opts[:anchor] = anchor
             end
           end
           if opts[:id] =~ /(\d+)(_\w+|)(\.\w+|)/

data/lib/zena/view/test_case.rb

@@ -4,13 +4,12 @@ module Zena
       include Zena::Use::Fixtures
       include Zena::Use::TestHelper
       include Zena::Acts::Secure
+      include ::Authlogic::TestCase
 
-      def self.helper_attr(*args)
-        # Ignore since we include helpers in the TestCase itself
-      end
+      setup :activate_authlogic
 
       def setup
-        login(:anon, 'zena')
+        login :anon
       end
 
       def assert_css(match, target)
@@ -18,6 +17,11 @@ module Zena
         assert !target.search(match).empty?,
           "expected tag, but no tag found matching #{match.inspect} in:\n#{target.inspect}"
       end
+
+      def self.helper_attr(*args)
+        # Ignore since we include helpers in the TestCase itself
+      end
+
     end
   end
 end

data/locale/en/zena.po

@@ -199,7 +199,7 @@ msgstr "<img src='/images/lock.png' alt='closed'/>"
 
 #: app/helpers/application_helper.rb:1073
 msgid "btn_title_open_discussion"
-msgstr "Open the edition window to edit the node's text, title, etc."
+msgstr "Open the edition window to edit the node"
 
 #: app/helpers/application_helper.rb:1076
 #: app/views/comments/_li.rhtml:3
@@ -1661,11 +1661,11 @@ msgstr "<img src='/images/add.png' alt='add'/>"
 
 #: lib/gettext_strings.rb:26
 msgid "btn_title_edit"
-msgstr "Open the edition window to edit the node's text, title, etc."
+msgstr "Open the edition window to edit the node."
 
 #: lib/gettext_strings.rb:27
 msgid "btn_title_drive"
-msgstr "Open the drive window to change the node's location, links, etc."
+msgstr "Open the drive window to change the location, links, etc."
 
 #: lib/gettext_strings.rb:33
 msgid "btn_site_add"

data/public/.htaccess

@@ -0,0 +1,40 @@
+# General Apache options
+AddHandler fastcgi-script .fcgi
+AddHandler cgi-script .cgi
+Options +FollowSymLinks +ExecCGI
+
+# If you don't want Rails to look in certain directories,
+# use the following rewrite rules so that Apache won't rewrite certain requests
+# 
+# Example:
+#   RewriteCond %{REQUEST_URI} ^/notrails.*
+#   RewriteRule .* - [L]
+
+# Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+# 
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+RewriteEngine On
+
+# If your Rails application is accessed via an Alias directive,
+# then you MUST also set the RewriteBase in this htaccess file.
+#
+# Example:
+#   Alias /myrailsapp /path/to/myrailsapp/public
+#   RewriteBase /myrailsapp
+
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+
+# In case Rails experiences terminal errors
+# Instead of displaying this message you can supply a file here which will be rendered instead
+# 
+# Example:
+#   ErrorDocument 500 /500.html
+
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"

data/public/javascripts/upload-progress.js

@@ -3,17 +3,19 @@
 // and to fix some strange Safari bugs.
 
 function submitUploadForm(form, uuid) {
+  if (!$('attachment' + uuid)) return;
   if ($('progress_bar' + uuid)) return;
-  var need_progress = /\w/.exec($('attachment' + uuid).value);
+
   // create iframe and alter form to submit to an iframe
-  if (!$('UploadIFrame')) {
-    $(document.body).insert('<iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>');
+  if (!$('using_iframe')) {
+    if (!$('UploadIFrame')) {
+      $(document.body).insert('<iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>');
+    }
+    $(form).insert("<input id='using_iframe' type='hidden' name='iframe' value='true'/>");
+    $(form).target = 'UploadIFrame';
   }
-  $(form).target = 'UploadIFrame';
-  if (need_progress) {
-    // make sure the POST occurs before (Safari Bug)
-    UploadProgress.monitor(uuid, form);
-	}
+  // make sure the POST occurs before (Safari Bug)
+  UploadProgress.monitor(uuid, form);
   $(form).submit();
 }
 
@@ -69,6 +71,8 @@ var UploadProgress = {
 
 
   buildProgressBar: function() {
+    $('au' + this.uuid).hide();
+    $('af' + this.uuid).show();
     $('attachment' + this.uuid).insert({after:'<div class ="progress_shell" id="progress_shell' + this.uuid + '"><div class="progress_text" id="progress_text' + this.uuid + '">&nbsp;</div><div class="progress_bar" id="progress_bar' + this.uuid + '" style="width:0%;">&nbsp;</div></div>'});
     $('attachment' + this.uuid).hide();
   },
@@ -96,6 +100,11 @@ var UploadProgress = {
 	  Effect.Appear('progress_shell' + this.uuid) ;
   },
 
+  setAsError: function() {
+    $('progress_shell' + this.uuid).remove();
+    $('attachment' + this.uuid).show();
+  },
+
   setAsFinished: function() {
     this.uploading = false ;
     this.watcher.stop() ;

data/public/javascripts/zena.js

@@ -27,7 +27,7 @@ Zena.version_diff = function(id, from, to) {
 Zena.save = function(url, form, close_on_complete) {
   if ($(form).select('[name="attachment"]')[0]) {
     // do not use ajax call
-    eval(form.onsubmit().getAttribute('onsubmit'));
+    eval(form.getAttribute('onsubmit'));
     return true;
   } else {
     if (close_on_complete) {
@@ -504,6 +504,12 @@ Zena.select_tab = function(name) {
   current_tab.style.display = '';
 }
 
+Zena.reloadAndClose = function() {
+  opener.window.location.href = opener.window.location.href;
+  window.close();
+}
+
+// POPUP GALLERY
 Zena.popup_gallery = null;
 
 Zena.popup = function(elem) {
@@ -652,4 +658,4 @@ Zena.popup_close = function() {
       }
     });
   }
-}
+}

data/public/stylesheets/popup.css

@@ -66,6 +66,7 @@ ul.link_box { float:left; display:block; margin:2px; padding:2px;}
 
 #image_tab .toggle_div, #document_tab .toggle_div { margin-top: 1em; margin-bottom:0.5em;}
 #file, #file_form { height:2em;}
+.attach .off { color:grey; }
 #image_tab img {border:1px solid #333; margin-top:4px;}
 #image_tab, #document_tab { padding-left:3em; padding-top:3em; }
 #document_tab a { width:80px; display:block; float:left;}

data/script/about

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/about'

data/script/apache_logging

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '../lib/log_recorder/lib/log_recorder')
+
+# start with :
+# apache_logging 'vhost.com' 'config/database.yml'
+vhost_name  = ARGV[0] || 'test.host'
+config_path = ARGV[1] || File.open(File.dirname(__FILE__) + '/../config/database.yml')
+
+config = {}
+
+YAML::load_documents( config_path ) do |doc|
+  doc.each do |elem|
+    next unless elem[0] == 'development'
+    config = elem[1]
+  end
+end
+
+rec = LogRecorder.new(vhost_name, config)
+
+rec.test
+
+#$stdin.each do |l|
+#  rec.insert_combined_record()
+#end

data/script/breakpointer

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/breakpointer'

data/script/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/console'

data/script/dbconsole

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'

data/script/destroy

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/destroy'

data/script/generate

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/generate'

data/script/performance/benchmarker

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/benchmarker'

data/script/performance/profiler

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/profiler'

data/script/plugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/plugin'