zena 1.0.0.rc2 → 1.0.0.rc3

data/lib/zena/use/ancestry.rb

@@ -7,8 +7,10 @@ module Zena
           %Q{INNER JOIN idx_nodes_ml_strings AS id1 ON id1.node_id = nodes.id AND id1.key = 'title' AND id1.lang = '#{visitor.lang}'}
         end
 
-        # (slow). Find a node by it's path. This is used during node importation when stored as zml files.
-        def find_by_path(path, parent_id = current_site.root_id)
+        TITLE_ML_JOIN = %Q{INNER JOIN idx_nodes_ml_strings AS id1 ON id1.node_id = nodes.id AND id1.key = 'title'}
+
+        # (slow). Find a node by it's path. This is used during node importation when stored as zml files or to resolve custom_base url until we have an "alias" table.
+        def find_by_path(path, parent_id = current_site.root_id, multilingual = false)
           res  = nil
           path = path.split('/') unless path.kind_of?(Array)
           last = path.size - 1
@@ -16,7 +18,7 @@ module Zena
             klass = i == last ? self : Node
             unless p = klass.find(:first,
                 :select     => i == last ? 'nodes.*' : 'nodes.id',
-                :joins      => title_join,
+                :joins      => multilingual ? title_join : TITLE_ML_JOIN,
                 :conditions => ["parent_id = ? AND id1.value = ? AND #{secure_scope('nodes')}", parent_id, title]
               )
               # Block as soon as we cannot find an element
@@ -62,7 +64,7 @@ module Zena
       module ModelMethods
         include RubyLess
         safe_context       :ancestors => {:class => ['Node'], :method => 'z_ancestors'}
-        safe_method        :fullpath => String, :short_path => String
+        safe_method        :fullpath => String, :short_path => [String]
 
         def self.included(base)
           base.class_eval do
@@ -81,7 +83,7 @@ module Zena
         end
 
         # Return true if the current node is an ancestor for the given child
-        def ancestor?(child)
+        def is_ancestor?(child)
           child.fullpath =~ %r{\A#{fullpath}}
         end
 
@@ -107,7 +109,7 @@ module Zena
 
         # (slow). Return an array with the node title and the last two parents' titles.
         def short_path
-          path = fullpath.split('/')
+          path = (fullpath || '').split('/')
           if path.size > 2
             ['..'] + fullpath_as_title(path[-2..-1])
           else
@@ -129,9 +131,10 @@ module Zena
         # (slow). Transform a list of zips into a fullpath.
         def fullpath_as_title(path = fullpath)
           if path == self.fullpath
-            @fullpath_as_title ||= secure(Node) { Node.fullpath_map(path, :title) }
+            # secure returns nil instead of [] so we fix this.
+            @fullpath_as_title ||= secure(Node) { Node.fullpath_map(path, :title) } || []
           else
-            secure(Node) { Node.fullpath_map(path, :title) }
+            secure(Node) { Node.fullpath_map(path, :title) } || []
           end
         end
 

data/lib/zena/use/calendar.rb

@@ -1,15 +1,16 @@
 module Zena
   module Use
     module Calendar
+      DAY_FORMAT = '%Y-%m-%d'
 
       module ViewMethods
-        def cal_day_names(size)
+        def cal_day_names(size, week_start_day)
           if size == :tiny
             day_names = Date::ABBR_DAYNAMES
           else
             day_names = Date::DAYNAMES
           end
-          week_start_day = _('week_start_day').to_i
+
           res = ""
           0.upto(6) do |i|
             j = (i+week_start_day) % 7
@@ -18,14 +19,15 @@ module Zena
             elsif j == 6
               html_class = " class='sat'"
             end
-            res << "<td#{html_class}>#{_(day_names[j])}</td>"
+            res << "<th#{html_class}>#{_(day_names[j])}</th>"
           end
           res
         end
 
         # find start and end dates for a calendar showing a specified date
-        def cal_start_end(date, type=:month)
-          week_start_day = _('week_start_day').to_i
+        def cal_start_end(utc_date, type, tz, week_start_day)
+          # We need to compute start/end in local tz
+          date = tz.utc_to_local(utc_date)
 
           case type
           when :week
@@ -34,16 +36,24 @@ module Zena
             end_date    = date
           else
             # month
-            start_date  = Date.civil(date.year, date.mon, 1)
-            end_date    = Date.civil(date.year, date.mon, -1)
+            # From 2000-10-01 00:00
+            start_date  = Time.utc(date.year, date.mon, 1)
+            # To   2000-11-01 00:00
+            end_date    = start_date.advance(:months => 1)
           end
-          start_date -= (start_date.wday + 7 - week_start_day) % 7
-          end_date   += (6 + week_start_day - end_date.wday) % 7
-          [start_date, end_date]
+
+          start_date = start_date.advance(:days => -((start_date.wday + 7 - week_start_day) % 7))
+          # end_date.wday - 1 because at 00:00 this is considered to be the next day but we do not
+          # show this day.
+          end_date = end_date.advance(:days => (6 + week_start_day - (end_date.wday - 1)) % 7)
+          # convert back to UTC
+          [tz.local_to_utc(start_date.to_time), tz.local_to_utc(end_date)]
         end
 
-        def cal_class(date, ref)
-          @today ||= Date.today
+        # Get day class. The first parameter is an UTC Date. The second is a local Time.
+        def cal_class(utc_date, local_ref, tz)
+          date = tz.utc_to_local(utc_date.to_time)
+          @cal_today ||= tz.utc_to_local(Time.now).strftime(DAY_FORMAT)
           case date.wday
           when 6
             s = "sat"
@@ -52,15 +62,15 @@ module Zena
           else
             s = ""
           end
-          s +=  'other' if date.mon != ref.mon
+          s +=  'other' if date.mon != local_ref.mon
           s = s == '' ? [] : [s]
-          s <<  'today' if date == @today
-          s <<  'ref' if date == ref
+          s <<  'today' if date.strftime(DAY_FORMAT) == @today
+          s <<  'ref'   if date.strftime(DAY_FORMAT) == local_ref.strftime(DAY_FORMAT)
           s == [] ? '' : " class='#{s.join(' ')}'"
         end
 
         # Yield block for every week between 'start_date' and 'end_date' with a hash of days => events.
-        def cal_weeks(date_attr, list, start_date, end_date, hours = nil)
+        def cal_weeks(date_attr, list, start_date, end_date, tz, hours = nil)
           # build event hash
           cal_hash = {}
           if hours
@@ -69,13 +79,19 @@ module Zena
             #            12 => dates from 12:00 to 23:59
 
             (list || []).each do |n|
-              d = n.send(date_attr)
-              next unless d
+              # d is an UTC date
+              utc_d = n.send(date_attr) rescue nil
+              next unless utc_d && utc_d.kind_of?(Time)
+              d = tz.utc_to_local(utc_d)
               hours.reverse_each do |h|
                 if d.hour >= h
-                  d = d - (d.hour - h) * 3600 # too bad Time does not have an hour= method, we could have written d.hour = h
-                  n.send("#{date_attr}=", d) # we need this to properly display hour class in ajax return
-                  h_list = cal_hash[d.strftime("%Y-%m-%d %H")] ||= []
+                  # too bad Time does not have an hour= method, we could have written d.hour = h
+                  # d = d - (d.hour - h) * 3600
+                  # # we need this to properly display hour class in ajax return ?
+                  # n.send("#{date_attr}=", d)
+
+                  # d = local date
+                  h_list = cal_hash[d.strftime('%Y-%m-%d %H')] ||= []
                   h_list << n
                   break
                 end
@@ -84,15 +100,17 @@ module Zena
 
           else
             (list || []).each do |n|
-              d = n.send(date_attr)
-              next unless d
-              cal_hash[d.strftime("%Y-%m-%d 00")] ||= []
-              cal_hash[d.strftime("%Y-%m-%d 00")] << n
+              utc_d = n.send(date_attr)
+              next unless utc_d
+              d = tz.utc_to_local(utc_d)
+              h_list = cal_hash[d.strftime('%Y-%m-%d 00')] ||= []
+              h_list << n
             end
           end
 
-          start_date.step(end_date,7) do |week|
-            # each week
+          # Date#step includes the last date [first, last] but we need [first, last[
+          start_date.to_datetime.step(end_date.to_datetime.advance(:seconds => -1),7) do |week|
+            # each week (UTC Date)
             yield(week, cal_hash)
           end
         end
@@ -114,7 +132,7 @@ module Zena
           if state == 'used' && remove_used.nil?
             res << title
           else
-            date_format = "%Y-%m-%d+%H"
+            date_format = "%Y-%m-%dT%H"
             opts = {:url => "/nodes/#{node.zip}?node[rel][#{role}][date]=#{date.strftime(date_format)}&node[rel][#{role}][other_id]=#{state == 'free' ? target_zip : ''}&s=#{target_zip}&dom_id=#{full_dom_id}&t_url=#{CGI.escape(template_url)}&date=#{date.strftime(date_format)}", :method => :put}
             if state == 'used' && remove_used == 'warn'
               opts[:confirm] = _("Delete relation '%{role}' between '%{source}' and '%{target}' ?") % {:role => role, :source => node.title, :target => node.linked_node.title}
@@ -127,77 +145,245 @@ module Zena
       end # ViewMethods
 
       module ZafuMethods
-        # Calendar methods need a rewrite...
-=begin
+
+        # Display calendar content
         def r_calendar
-          if @context[:block] == self
-            # called from self (storing template / rendering)
-            if role = @params[:assign_as]
-              assign_calendar(role)
+          # Should work like r_block (storage/rendering)
+          display_calendar
+          #if @context[:block] == self
+          #  # called from self (storing template / rendering)
+          #  if role = @params[:assign_as]
+          #    assign_calendar(role)
+          #  else
+          #    display_calendar
+          #  end
+          #else
+          #  # This is called first to prepare calendar
+          #  if @params[:assign_as]
+          #    fld = 'date'
+          #    table_name = 'links'
+          #  else
+          #    fld = @params[:date] || 'event_at'
+          #    if ['log_at', 'created_at', 'updated_at', 'event_at'].include?(fld) # TODO: use rubyless to learn type
+          #      table_name = 'nodes'
+          #    elsif fld == 'l_date'
+          #      fld = 'date'
+          #      table_name = 'links'
+          #    else
+          #      return parser_error("Invalid 'date' value for calendar (#{fld.inspect}).")
+          #    end
+          #  end
+          #
+          #  @date_scope = "TABLE_NAME[#{table_name}].#{fld} >= '\#{start_date.strftime('%Y-%m-%d')}' AND TABLE_NAME[#{table_name}].#{fld} <= '\#{end_date.strftime('%Y-%m-%d')}'"
+          #
+          #  new_dom_scope
+          #
+          #  # SAVED TEMPLATE
+          #  template = expand_block(self, :block => self, :saved_template => true)
+          #  out helper.save_erb_to_url(template, template_url)
+          #
+          #  # INLINE
+          #  out expand_block(self, :block => self, :saved_template => false)
+          #end
+        end
+
+        private
+          def display_calendar
+            opts = {
+              :size => (@params[:size]  || 'large').to_sym
+            }
+            return parser_error("Missing 'select' parameter.") unless opts[:select] = @params[:select]
+
+            if header_block = descendant('header')
+            elsif @params[:type] == 'week'
+              add_block(%q{<h3 do='header'>
+                <r:link date='#{date.advance(:days =&gt; -1).strftime("%Y-%m-%d", tz)}' t='img_prev_page'/>
+                <r:date format='%B'/>
+                <r:link date='#{date.advance(:days =&gt; 1).strftime("%Y-%m-%d", tz)}' t='img_next_page'/>
+              </h3>}, true)
+              header_block = descendant('header')
             else
-              display_calendar
+              add_block(%q{<h3 do='header'>
+                <r:link date='#{date.advance(:months =&gt; -1).strftime("%Y-%m-%d", tz)}' t='img_prev_page'/>
+                <r:date format='%B'/>
+                <r:link date='#{date.advance(:months =&gt; 1).strftime("%Y-%m-%d", tz)}' t='img_next_page'/>
+              </h3>}, true)
+              header_block = descendant('header')
             end
-          else
-            # This is called first to prepare calendar
-            if @params[:assign_as]
-              fld = 'date'
-              table_name = 'links'
+
+            if cell_block = descendant('cell')
             else
-              fld = @params[:date] || 'event_at'
-              if ['log_at', 'created_at', 'updated_at', 'event_at'].include?(fld) # TODO: use rubyless to learn type
-                table_name = 'nodes'
-              elsif fld == 'l_date'
-                fld = 'date'
-                table_name = 'links'
+              # add a default <r:link/> block
+              if opts[:size] == :tiny
+                add_block %Q{<r:cell><em do='link' date='#{format_date(date, "%Y-%m-%d")}' do='date' format='%e'/></r:cell>}
               else
-                return parser_error("Invalid 'date' value for calendar (#{fld.inspect}).")
+                add_block "<r:cell><p do='date' format='%e'/><ol><li do='each' do='link' eval='title.limit(10)'/></ol></r:cell>"
               end
+              cell_block = descendant('cell')
             end
 
-            @date_scope = "TABLE_NAME[#{table_name}].#{fld} >= '\#{start_date.strftime('%Y-%m-%d')}' AND TABLE_NAME[#{table_name}].#{fld} <= '\#{end_date.strftime('%Y-%m-%d')}'"
+            if !cell_block.descendant('else')
+              cell_block.add_block %q{<r:else do='date' format='%e'/>}
+            end
 
-            new_dom_scope
+            opts[:cell] = cell_block
+            opts[:header] = header_block
+            opts[:current_date] = get_var_name('calendar', 'c_date')
+            make_calendar(opts)
+          end
 
-            # SAVED TEMPLATE
-            template = expand_block(self, :block => self, :saved_template => true)
-            out helper.save_erb_to_url(template, template_url)
+          def make_calendar(opts)
+            current_date = opts[:current_date]
+            type = params[:type] ? params[:type].to_sym : :month
 
-            # INLINE
-            out expand_block(self, :block => self, :saved_template => false)
-          end
-        end
+            size = opts[:size]
 
-        private
-          def display_calendar
-            size     = (params[:size]  || 'large').to_sym
-            finder   = params[:select] || 'notes in project'
+            if params[:assign_as]
+              date_attr = 'l_date'
+            else
+              return parser_error("Missing 'attr' attribute.") unless date_attr = params[:attr]
+            end
 
-            if @blocks == []
-              # add a default <r:link/> block
-              if size == :tiny
-                @blocks = [make(:void, :method=>'void', :text=>"<em do='link' date='current_date' do='[current_date]' format='%d'/><r:else do='[current_date]' format='%d'/>")]
+            day_var   = get_var_name('calendar', 'day')
+
+            week_var  = get_var_name('calendar', 'week')
+
+            if tz_name = @params[:tz]
+              tz_result, tz_var = set_tz_var(tz_name)
+              return tz_result unless tz_var
+              set_tz = tz_result
+            else
+              tz_var    = get_var_name('calendar', 'tz')
+              set_tz = "<% #{tz_var} = visitor.tz %>"
+            end
+
+            cell_date = get_var_name('calendar', 'date')
+            cal_start = get_var_name('calendar', 'cal_start')
+            cal_end   = get_var_name('calendar', 'cal_end')
+
+            # To avoid wrapping in each cell
+            markup = @markup
+              @markup = Zafu::Markup.new(nil) # dummy to avoid cell wrapping
+
+              # Declare calendar var 'cal_start' and 'cal_end' (can be used in header)
+              set_context_var('set_var', 'cal_start', RubyLess::TypedString.new(
+                cal_start,
+                :class => Time
+              ))
+
+              set_context_var('set_var', 'cal_end', RubyLess::TypedString.new(
+                cal_end,
+                :class => Time
+              ))
+
+              set_context_var('set_var', 'tz', RubyLess::TypedString.new(
+                tz_var,
+                :class => TZInfo::Timezone
+              ))
+
+
+              if date_code = @params[:date]
+                c_date_code = RubyLess.translate(self, date_code)
+                if !c_date_code.klass <= Time
+                  return parser_error("Invalid 'date' parameter. Should be a Time (found #{current_date.klass})")
+                end
               else
-                @blocks = [make(:void, :method=>'void', :text=>"<span do='show' date='current_date' format='%d'/><ul><li do='each' do='link' attr='name'/></ul><r:else do='[current_date]' format='%d'/>")]
+                # Get current date from url for the current time_zone
+                c_date_code = RubyLess.translate(self, 'date(tz)')
               end
-              remove_instance_variable(:@all_descendants)
-            elsif !descendant('else')
-              @blocks += [make(:void, :method=>'void', :text=>"<r:else do='[current_date]' format='%d'/>")]
-              remove_instance_variable(:@all_descendants)
-            end
+              set_current_date = "#{current_date} = #{c_date_code}"
 
-            @html_tag_done = false
-            @html_tag_params[:id] = erb_dom_id
-            @html_tag_params[:class] ||= "#{size}cal"
-            @html_tag ||= 'div'
+              # 'current date' for the whole calendar
+              set_context_var('set_var', 'date', RubyLess::TypedString.new(
+                current_date,
+                :class => Time
+              ))
+
+              # BUILD FINDER
+              return unless finder = build_finder(:all, opts[:select])
+
+              klass = finder[:query].main_class
+              return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
+
+              if type = klass.safe_method_type([date_attr])
+                if type[:class] <= Time
+                  # OK
+                else
+                  return parser_error("Invalid attribute '#{date_attr}': type is '#{type[:class]}' should be Time")
+                end
+              else
+                return parser_error("Invalid attribute '#{date_attr}' for #{klass}")
+              end
+              # HACK to overwrite 'header' method...
+              h = opts[:header]
+              h.method = 'void'
+              header_code = expand_block(h)
+              h.method = 'header'
+
+              # Date for the cell
+              set_context_var('set_var', 'date', RubyLess::TypedString.new(
+                cell_date,
+                :class => Time
+              ))
 
-            finder, klass = build_finder_for(:all, finder, @params, [@date_scope])
-            return unless finder
-            return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
 
-            cell_code = "<% if #{list_var} = nodes_#{list_var}[cal_#{list_var}.strftime('%Y-%m-%d %H')] %>#{expand_with(:in_if => true, :list => list_var, :date => "cal_#{list_var}", :saved_template => nil, :dom_prefix => nil, :in_calendar => true)}<% end %>"
+              # HACK to render sub-elements...
+              bak = @blocks
+                @blocks = opts[:cell].blocks
+                cell_code   = expand_if(var, node.move_to(var, [klass]))
+              @blocks = bak
+            @markup = markup
 
-            render_html_tag(calendar_code(finder, "", cell_code, "", params))
+            # Reference date (the one in the url) as seen by the calendar's timezone.
+            local_ref = get_var_name('calendar', 'local_ref')
+            set_local_ref = "<% #{local_ref} = #{tz_var}.utc_to_local(#{current_date}) %>"
+
+            week_start_day = param(:start_day) || _('week_start_day').to_i
+
+            # List of events for each day/hour (hour is 00 when not used)
+            # The time is encoded in the visitor's timezone.
+            # '%Y-%m-%d %H' => [...]
+            events_hash  = get_var_name('calendar', 'nodes')
+
+            base_class = node.real_class <= Node ? Node : node.real_class
+
+            if hours = @params[:split_hours]
+              hours = hours.split(',').map{|l| l.to_i}
+              hours << 0
+              hours = hours.uniq.sort
+              # I feel all this would be much better if we could use "each_group" but then how do we access hours ?
+
+              hour_var = get_var_name('calendar', 'hour')
+
+              week_code = "<% #{week_var}.step(#{week_var}+6,1) do |#{day_var}| %>
+              <td<%= cal_class(#{day_var},#{local_ref}, #{tz_var}) %>>#{opts[:cell_prefix_code]}<% #{hours.inspect}.each do |#{hour_var}|; #{cell_date} = #{day_var}.to_time.advance(:hours => #{hour_var}); #{var} = #{events_hash}[#{cell_date}).strftime_tz('%Y-%m-%d %H',#{tz_var})] %>#{cell_code}<% end %>#{opts[:cell_postfix_code]}</td>
+              <% end %>"
+              (@context[:vars] ||= []) << "hour"
+            else
+              hours = nil
+              week_code = "<% #{week_var}.step(#{week_var}+6,1) do |#{day_var}| %>
+              <td<%= cal_class(#{day_var},#{local_ref}, #{tz_var}) %>><% #{cell_date} = #{day_var}.to_time; #{var} = #{events_hash}[#{cell_date}.strftime_tz('%Y-%m-%d 00',#{tz_var})] %>#{opts[:cell_prefix_code]}#{cell_code}#{opts[:cell_postfix_code]}</td>
+              <% end %>"
+            end
+
+
+            out "#{set_tz}<% if #{set_current_date} %>"
+            out wrap %Q{#{set_local_ref}#{header_code}
+              <table cellspacing='0' class='#{size}cal#{@params[:assign_as] ? " assign" : ''}'>
+                <tr><%= cal_day_names(#{size.inspect}, #{week_start_day}) %></tr>
+                  <% #{cal_start}, #{cal_end} = cal_start_end(#{current_date}, #{type.inspect}, #{tz_var}, #{week_start_day}) %>
+                  <% cal_weeks(#{date_attr.inspect}, #{finder[:method]}, #{cal_start}, #{cal_end}, #{tz_var}, #{hours.inspect}) do |#{week_var}, #{events_hash}| %>
+                  <tr class='body'>
+                    #{week_code}
+                  </tr>
+                <% end %>
+              </table>}
+            out "<% end %>"
+          rescue ::QueryBuilder::Error => err
+            out parser_error(err.message)
           end
+        # Calendar methods need a rewrite...
+=begin
 
           # manage links from @node ---- reference ----> ...
           # <div do='calendar' assign='reference' to='main' split_hours='12' />
@@ -232,56 +418,6 @@ module Zena
             render_html_tag(calendar_code(finder, cell_prefix_code, cell_code, cell_postfix_code, params))
           end
 
-          def calendar_code(finder, cell_prefix_code, cell_code, cell_postfix_code, params)
-            type = params[:type] ? params[:type].to_sym : :month
-            size = (params[:size] || 'large').to_sym
-            ref_date = params[:assign_as] ? 'l_date' : (params[:date] || 'event_at')
-
-            case type
-            when :month
-              title = "\"\#{_(Date::MONTHNAMES[main_date.mon])} \#{main_date.year}\""
-              prev_date = "\#{main_date.advance(:months => -1).strftime(\"%Y-%m-%d\")}"
-              next_date = "\#{main_date.advance(:months =>  1).strftime(\"%Y-%m-%d\")}"
-            when :week
-              title = "\"\#{_(Date::MONTHNAMES[main_date.mon])} \#{main_date.year}\""
-              prev_date = "\#{main_date.advance(:days => -7).strftime(\"%Y-%m-%d\")}"
-              next_date = "\#{main_date.advance(:days => +7).strftime(\"%Y-%m-%d\")}"
-            else
-              return parser_error("invalid type (should be 'month' or 'week')")
-            end
-
-            if hours = @params[:split_hours]
-              hours = hours.split(',').map{|l| l.to_i}
-              hours << 0
-              hours = hours.uniq.sort
-              # I feel all this would be much better if we could use "each_group" but then how do we access hours ?
-              week_code = "<% week.step(week+6,1) do |day_#{list_var}| %>
-              <td<%= cal_class(day_#{list_var},#{current_date}) %>>#{cell_prefix_code}<% #{hours.inspect}.each do |set_hour|; cal_#{list_var} = Time.utc(day_#{list_var}.year,day_#{list_var}.month,day_#{list_var}.day,set_hour) %>#{cell_code}<% end %>#{cell_postfix_code}</td>
-              <% end %>"
-              (@context[:vars] ||= []) << "hour"
-            else
-              hours = nil
-              week_code = "<% week.step(week+6,1) do |day_#{list_var}| %>
-              <td<%= cal_class(day_#{list_var},#{current_date}) %>><% cal_#{list_var} = Time.utc(day_#{list_var}.year,day_#{list_var}.month,day_#{list_var}.day) %>#{cell_prefix_code}#{cell_code}#{cell_postfix_code}</td>
-              <% end %>"
-            end
-
-            res = %Q{
-              <h3 class='title'>
-              <span><%= link_to_remote(#{_('img_prev_page').inspect}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=#{dom_id}&date=#{prev_date}&#{start_node_s_param(:string)}\", :method => :get) %></span>
-              <span class='date'><%= link_to_remote(#{title}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=#{dom_id}&#{start_node_s_param(:string)}\", :method => :get) %></span>
-              <span><%= link_to_remote(#{_('img_next_page').inspect}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=#{dom_id}&date=#{next_date}&#{start_node_s_param(:string)}\", :method => :get) %></span>
-              </h3>
-              <table cellspacing='0' class='#{size}cal#{@params[:assign_as] ? " assign" : ''}'>
-                <tr class='head'><%= cal_day_names(#{size.inspect}) %></tr>
-                  <% start_date, end_date = cal_start_end(#{current_date}, #{type.inspect}) %>
-                  <% cal_weeks(#{ref_date.to_sym.inspect}, #{finder}, start_date, end_date, #{hours.inspect}) do |week, nodes_#{list_var}| %>
-                  <tr class='body'>
-                    #{week_code}
-                  </tr>
-                <% end %>
-              </table>}
-          end
 =end
       end # ZafuMethods
     end # Calendar

data/lib/zena/use/conditional.rb

@@ -4,7 +4,7 @@ module Zena::Use::Conditional
     def rubyless_class_scope(class_name)
       return parser_error("Cannot scope class in list (use each before filtering).") if node.list_context?
       # capital letter ==> class conditional
-      if klass = get_class(class_name)
+      if klass = VirtualClass[class_name]
         if klass.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
           # Saved templates can be rendered with anything...
           # FIXME: Make sure saved templates from 'block' start with the proper node type ?

data/lib/zena/use/context.rb

@@ -143,12 +143,12 @@ module Zena
       end # ViewMethods
 
       module ZafuMethods
+        # Uses Enrollable::ZafuMethods::get_class
 
-        # Resolve class for @post ==> Post, etc.
-        def get_class(class_name)
-          VirtualClass[class_name] || super
-        rescue
-          nil
+        # Return the node context for a given class (looks up into the hierarchy) or the
+        # current node context if klass is nil.
+        def node(klass = nil)
+          super(klass && klass.kind_of?(VirtualClass) ? klass.real_class : klass)
         end
 
         # Enter a new context (<r:context find='all' select='pages'>). This is the same as '<r:pages>...</r:pages>'). It is