zena 1.2.1 → 1.2.2

data/lib/zena/core_ext/file_utils.rb

@@ -10,4 +10,16 @@ else
   class << FileUtils
     alias symlink_or_copy cp_r
   end
-end
+end
+
+=begin
+class << FileUtils
+  def symlink_or_copy(from, to)
+    if File.directory?(from)
+      cp_r(from, to)
+    else
+      ln(from, to)
+    end
+  end
+end
+=end

data/lib/zena/core_ext/fixnum.rb

@@ -17,4 +17,8 @@ class Fixnum
     res << "#{seconds} second#{seconds == 1 ? '' : 's'}" if seconds != 0
     res == [] ? '0' : res.join(' ')
   end
+  
+  def fmt(format)
+    # TODO: Better strftime with thousand separator
+  end
 end

data/lib/zena/core_ext/float.rb

@@ -0,0 +1,7 @@
+class Float
+  # Format a float with thousand separator and decimal positions.
+  def fmt(pos=2,sep="'")
+    i = self.to_i.to_s.reverse
+    i.gsub(/(\d\d\d)(?=\d)(?!\d*\.)/,'\1'+sep).reverse
+  end
+end

data/lib/zena/deploy.rb

@@ -40,6 +40,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   self[:balancer]   ||= db_name
   self[:db_user]    ||= db_name
+  self[:db_socket]  ||= "/var/run/mysqld/mysqld.sock"
   self[:runner]     ||= 'root'
   self[:on_stop]    = []
   self[:on_start]   = []
@@ -341,7 +342,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       db_app_config = render("#{templates}/database.rhtml",
                     :db_name     => db_name,
                     :db_user     => db_user,
-                    :db_password => db_password
+                    :db_password => db_password,
+                    :db_socket   => db_socket
                     )
       put(db_app_config, "#{deploy_to}/current/config/database.yml")
     end
@@ -403,7 +405,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         else
           init_name = db_name
         end
-        run "cd /usr/local/bin && test -e /usr/local/bin/#{init_name}"
+        run "cd /usr/local/bin && test -e /usr/local/bin/#{init_name} || ln -sf /usr/local/bin/zena_#{db_name} /usr/local/bin/#{init_name}"
 
         if self[:rvm_ruby_string]
           run "rvm wrapper #{self[:rvm_ruby_string]} init zena_#{db_name}"

data/lib/zena/deploy/app_init.rhtml

@@ -24,7 +24,8 @@ operations = [
   # 'rake sphinx:',
 ]
 
-if %w{stop restart}.include?(cmd)
+# Allways make a clean start
+if %w{stop restart start}.include?(cmd)
   puts "Stopping #{APP_ROOT}..."
   operations.each do |op|
     run "cd #{APP_ROOT} && #{op}stop"

data/lib/zena/deploy/database.rhtml

@@ -18,7 +18,7 @@ test:
 
 production:
   adapter: mysql
-  socket: /var/run/mysqld/mysqld.sock
+  socket: <%= db_socket %>
   database: <%= db_name %>
   encoding: utf8
   username: <%= db_user %>

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.2.1'
+  VERSION        = '1.2.2'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/parser/zazen_rules.rb

@@ -134,7 +134,7 @@ module Zena
               end
             else
               if node.kind_of?(Document)
-                store @helper.make_image(:style=>style, :id=>node[:zip].to_s, :node=>node, :mode=>mode, :title=>title, :link=>link, :images=>@context[:images], :host => @context[:host])
+                store @helper.make_image(:style=>style, :id=>node[:zip].to_s, :node=>node, :mode=>mode, :title=>title, :link=>link, :images=>@context[:images], :host => @context[:host],:target=>@context[:target])
               else
                 store "[#{node.fullpath_as_title.join('/')} is not a document]"
               end
@@ -162,7 +162,7 @@ module Zena
             end
             store "!#{style}#{id}#{other_opts}#{title_opts}!#{link ? ':' + link : ''}"
           else
-            store @helper.make_image(:style=>style, :id=>id, :mode=>mode, :title=>title, :link=>link, :images=>@context[:images], :host => @context[:host])
+            store @helper.make_image(:style=>style, :id=>id, :mode=>mode, :title=>title, :link=>link, :images=>@context[:images], :host => @context[:host],:target=>@context[:target])
           end
         else
           #puts "EAT:[#{$&}]"
@@ -190,7 +190,7 @@ module Zena
               id, anchor = $1, $2
               anchor = 'true' if anchor == ''
             end
-            store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor,:host=>@context[:host])
+            store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor,:host=>@context[:host],:target=>@context[:target])
           end
         elsif @text =~ /\A"([^"]*)":(#{PSEUDO_ID_REGEXP})((_[a-z]+|)(\.[a-z]+|)(#[a-z_\/\[\]]*|))/m
           #puts "SHORTCUT_LINK:[#{$&}]"
@@ -212,7 +212,7 @@ module Zena
                 id, anchor = $1, $2
                 anchor = 'true' if anchor == ''
               end
-              store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor,:node=>node,:host=>@context[:host])
+              store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor,:node=>node,:host=>@context[:host],:target=>@context[:target])
             end
           elsif @translate_ids
             store $&

data/lib/zena/routes.rb

@@ -39,7 +39,7 @@ module Zena
                                      :refuse  => :put,
                                      :remove  => :put,
                                      :redit   => :put,
-                                     :preview => :get,
+                                     :preview => :any,
                                      :link    => :any }
 
         nodes.resources :links

data/lib/zena/test_controller.rb

@@ -109,7 +109,7 @@ module Zena
       end
     end
 
-    def get_template_text(path, base_path)
+    def get_template_text(path, base_path, opts={})
       folder = base_path.blank? ? [] : base_path[1..-1].split('/')
       if path[0..0] == '/'
         # just ignore the 'relative' or 'absolute' tricks.

data/lib/zena/use.rb

@@ -7,7 +7,7 @@ module Zena
     MODULE_NAME  = Hash[*MODULE_NAMES.map {|n| [n, "#{n}#{SUFFIX_NAME}"]}.flatten]
 
     class << self
-      attr_accessor :modules, :extra_routes
+      attr_accessor :modules, :extra_routes, :upgraded_classes
 
       # Declare a module (or list of modules) that should be used in Zena. The module should implement
       # sub-modules named ControllerMethods, ViewMethods or ZafuMethods in order to add features to
@@ -37,6 +37,19 @@ module Zena
         create_module_hash
         self.modules[name] || []
       end
+      
+      def upgrade_class(class_name)
+        self.upgraded_classes ||= {}
+        if !self.upgraded_classes[class_name]
+          self.upgraded_classes[class_name] = true
+          klass = eval "::#{class_name}"
+          klass.class_eval do
+            Zena::Use.each_module_for(class_name) do |mod|
+              include mod
+            end
+          end
+        end
+      end
 
       def routes(rez)
         if self.extra_routes.nil?

data/lib/zena/use/action.rb

@@ -2,7 +2,9 @@ module Zena
   module Use
     module Action
       module Common
-
+        def win_id(node_zip, action)
+          "#{current_site.host.gsub('.', '_')}_#{node_zip}_#{action}"
+        end
         # This method renders an action link without using Rails actions so that we can feed it with
         # erb from Zafu.
         def node_action_link(action, node_zip, opts={})
@@ -25,7 +27,7 @@ module Zena
               url = "/documents/new"
               query << "parent_id=#{node_zip}"
             end
-            id  = "#{current_site.host.gsub('.', '_')}_#{node_zip}_#{action}"
+            id  = win_id(node_zip, action)
 
             url = query.empty? ? url : "#{url}?#{query.join('&')}"
             tag = "<a href='#{url}' target='_blank' title='#{title}' onclick=\"Zena.open_window('#{url}', '#{id}', event);return false;\">"

data/lib/zena/use/ajax.rb

@@ -44,10 +44,10 @@ module Zena
 
           if obj.new_record?
             # A. could not create object: show form with errors
-            page.replace ndom_id, :file => template_path_from_template_url + "_form.erb"
+            page.replace ndom_id, :file => template_path_from_template_url('_form')
           elsif @errors || !obj.errors.empty?
             # B. could not update/delete: show errors
-            form_file = template_path_from_template_url + "_form.erb"
+            form_file = template_path_from_template_url('_form')
             if File.exist?(form_file)
               page.replace ndom_id, :file => form_file
             else
@@ -68,10 +68,10 @@ module Zena
                   end
                 end
               end
-              page.replace params[:udom_id], :file => template_path_from_template_url(params[:u_url]) + ".erb"
+              page.replace params[:udom_id], :file => template_path_from_template_url('', params[:u_url])
               if params[:upd_both]
                 @dom_id = params[:dom_id]
-                page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
+                page.replace params[:dom_id], :file => template_path_from_template_url
               end
               if params[:done] && params[:zadd]
                 page.toggle "#{params[:dom_id]}_0", "#{params[:dom_id]}_add"
@@ -89,25 +89,25 @@ module Zena
 
             case params[:action]
             when 'edit'
-              page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
+              page.replace params[:dom_id], :file => template_path_from_template_url
               page << "$('#{params[:dom_id]}_form_t').focusFirstElement();"
             when 'create'
               pos = params[:position]  || :before
               ref = params[:reference] || "#{params[:dom_id]}_add"
-              page.insert_html pos.to_sym, ref, :file => template_path_from_template_url + ".erb"
+              page.insert_html pos.to_sym, ref, :file => template_path_from_template_url
               if obj.kind_of?(Node)
                 @node = obj.parent.new_child(:class => obj.class)
               else
                 instance_variable_set("@#{base_class.to_s.underscore}", obj.clone)
               end
-              page.replace ndom_id, :file => template_path_from_template_url + "_form.erb"
+              page.replace ndom_id, :file => template_path_from_template_url('_form')
               if params[:done]
                 page << params[:done]
               elsif params[:zadd]
                 page.toggle "#{params[:dom_id]}_0", "#{params[:dom_id]}_add"
               end
             when 'update'
-              page.replace ndom_id, :file => template_path_from_template_url + ".erb"
+              page.replace ndom_id, :file => template_path_from_template_url
               page << params[:done] if params[:done]
             when 'destroy'
               page << %Q{
@@ -129,18 +129,21 @@ module Zena
                 page.visual_effect :highlight, params[:drop], :duration => 0.3
                 page.visual_effect :fade, params[:drop], :duration => 0.3
               end
-              page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
+              page.replace params[:dom_id], :file => template_path_from_template_url
             else
               if position = params[:insert]
-                page.call 'Zena.insert_inner', params[:dom_id], position, render(:file => template_path_from_template_url + ".erb")
+                page.call 'Zena.insert_inner', params[:dom_id], position, render(:file => template_path_from_template_url)
               else
-                page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
+                page.replace params[:dom_id], :file => template_path_from_template_url
               end
             end
           end
           if params[:redir]
             page << "window.location.href = '#{params[:redir]}';"
           end
+          if params[:reload]
+            page << "Zena.reload(#{params[:reload].inspect});"
+          end
           page << render_js(false)
         end
 
@@ -157,7 +160,12 @@ module Zena
 }});"
         end
 
-        def add_toggle_id(dom_id, group_name, role)
+        def add_toggle_id(dom_id, group_name, role, opts = {})
+          arity = opts[:arity] || 'many'
+          if js = opts[:js]
+            js = ", js:function(e) { #{js} }"
+          end
+          
           @toggle_ids ||= {}
           unless list = @toggle_ids[group_name]
             list = @toggle_ids[group_name] = []
@@ -168,13 +176,20 @@ module Zena
               found = []
             end
             url = "/nodes/#{other.zip}"
-            js_data << "#{group_name} = {\"list\":#{found.inspect}, \"url\":#{url.inspect}, \"role\":#{role.inspect}};"
+            js_data << "#{group_name} = {list:#{found.inspect}, url:#{url.inspect}, role:#{role.inspect}, arity:#{arity.inspect}#{js}};"
           end
           list << dom_id
         end
 
-        def filter_form(node, dom_id)
-          js_data << %Q{new Form.Observer('#{dom_id}', 0.3, function(element, value) {new Ajax.Request('#{zafu_node_path(node)}', {asynchronous:true, evalScripts:true, method:'get', parameters:Form.serialize('#{dom_id}')})});}
+        def filter_form(node, dom_id, loading, upd)
+          if loading
+            loading = "\n#{loading}($('#{upd}'));"
+          else
+            loading = ''
+          end
+          js_data << %Q{new Form.Observer('#{dom_id}', 0.3, function(element, value) {#{loading}
+            new Ajax.Request('#{zafu_node_path(node)}', {asynchronous:true, evalScripts:true, method:'get', parameters:Form.serialize('#{dom_id}')})
+          });}
         end
 
         # Include draggable ids in bottom of page Javascript.
@@ -285,28 +300,35 @@ module Zena
 
           # Move up in case we are in a list.
           if self.node.list_context?
-            node = self.node.up(Node)
-          else
-            node = self.node
-          end
-          node.dom_prefix = dom_name
-          dom_id = node.dom_id(:erb => false)
-
-          out %Q{<%= form_remote_tag(:url => zafu_node_path(#{node}), :method => :get, :html => {:id => \"#{dom_id}_f\"}) %>
-          <div class='hidden'>
-            <input type='hidden' name='t_url' value='#{template_url(upd)}'/>
-            <input type='hidden' name='dom_id' value='#{upd}'/>
-            <input type='hidden' name='s' value='<%= start_node_zip %>'/>
-          </div><div class='wrapper'>
-          }
-          if @blocks == []
-            out "<input type='text' name='#{@params[:key] || 'f'}' value='<%= params[#{(@params[:key] || 'f').to_sym.inspect}] %>'/>"
+            base_node = self.node.up(Node)
           else
-            out expand_with(:in_filter => true)
+            base_node = self.node
           end
-          out "</div></form>"
-          if @params[:live] || @params[:update]
-            out "<% filter_form(#{node}, \"#{dom_id}_f\") %>"
+          
+          # Do not alter current node, create our own
+          with_context(:node => base_node.dup) do
+            node.dom_prefix = dom_name
+            dom_id = node.dom_id(:erb => false)
+            
+            # TODO: add 'encode_params' and x='"foobar"' to add any value in the request
+            out %Q{<%= form_remote_tag(:url => zafu_node_path(#{node}), :method => :get, :html => {:id => \"#{dom_id}_f\"}) %>
+            <div class='hidden'>
+              <input type='hidden' name='t_url' value='#{template_url(upd)}'/>
+              <input type='hidden' name='dom_id' value='#{upd}'/>
+              <input type='hidden' name='s' value='<%= start_node_zip %>'/>
+            </div><div class='wrapper'>
+            }
+            if @blocks == []
+              out "<input type='text' name='#{@params[:key] || 'f'}' value='<%= params[#{(@params[:key] || 'f').to_sym.inspect}] %>'/>"
+            else
+              out expand_with(:in_filter => true)
+            end
+            out "</div></form>"
+            loading = @params[:loading]
+            loading = 'Zena.loading' if loading == 'true'
+            if @params[:live] || @params[:update]
+              out "<% filter_form(#{node}, \"#{dom_id}_f\", #{loading.inspect}, '#{upd}') %>"
+            end  
           end
         end
 
@@ -370,7 +392,16 @@ module Zena
           dom_id = node.dom_id(:erb => false)
           markup.set_id(node.dom_id)
           markup.append_param(:class, 'toggle')
-          out "<% add_toggle_id(\"#{dom_id}\", #{var.inspect}, #{RubyLess.translate_string(self, role)}) { #{finder} } %>#{expand_with}"
+          opts = {}
+          if arity = @params.delete(:arity)
+            opts[:arity] = arity
+          end
+          
+          if js = @params.delete(:js)
+            opts[:js] = js
+          end
+          
+          out "<% add_toggle_id(\"#{dom_id}\", #{var.inspect}, #{RubyLess.translate_string(self, role)},#{opts.inspect}) { #{finder} } %>#{expand_with}"
         end
 
         def process_toggle
@@ -400,7 +431,17 @@ module Zena
           markup.tag ||= 'div'
 
           markup.append_param(:class, 'toggle')
-          markup.pre_wrap[:toggle] = "<% add_toggle_id(\"#{dom_id}\", #{"#{var}_tog".inspect}, #{RubyLess.translate_string(self, role)}) { #{finder} } %>"
+          
+          opts = {}
+          if arity = @params.delete(:arity)
+            opts[:arity] = arity
+          end
+          
+          if js = @params.delete(:js)
+            opts[:js] = js
+          end
+          
+          markup.pre_wrap[:toggle] = "<% add_toggle_id(\"#{dom_id}\", #{"#{var}_tog".inspect}, #{RubyLess.translate_string(self, role)},#{opts.inspect}) { #{finder} } %>"
         end
 
         def r_unlink
@@ -453,7 +494,7 @@ module Zena
          #end
         end
 
-        # Add some js at end of document/partial
+        # Execute javascript after page/partial load.
         def r_js
           if @blocks.detect {|b| !b.kind_of?(String)}
             out "<% js_data << capture do %>"
@@ -464,6 +505,13 @@ module Zena
             out "<% js_data << #{txt.inspect} %>"
           end
         end
+        
+        # Only execute javascript on ajax.
+        def r_ajs
+          out "<% if params[:s] %>"
+          r_js
+          out "<% end %>"
+        end
 
         def r_ajax?
           r_if(RubyLess.translate(self, 'ajax?'))

data/lib/zena/use/authlogic.rb

@@ -16,10 +16,14 @@ module Zena
       module ControllerMethods
 
         def self.included(base)
-          base.before_filter :set_visitor, :force_authentication?
+          base.before_filter :set_visitor, :force_authentication?, :redirect_to_https
         end
 
         include Common
+        
+        def ssl_request?
+          request.ssl? || request.headers['X_FORWARDED_PROTO'] == 'https'
+        end
 
         private
 
@@ -132,6 +136,17 @@ module Zena
               end
             end
           end
+          
+          # Force https if ssl_on_auth is enabled. This method is overwriten in UserSessionsController.
+          def redirect_to_https
+            if current_site.ssl_on_auth
+              if !ssl_request? && !visitor.is_anon? && !local_request?
+                redirect_to :protocol => "https://" 
+              elsif ssl_request? && visitor.is_anon?
+                redirect_to :protocol => "http://" 
+              end
+            end
+          end
       end
 
       module ViewMethods