zena 0.16.9 → 1.0.0.beta1

data/lib/zena/use/authlogic.rb

@@ -12,15 +12,15 @@ module Zena
       module ControllerMethods
 
         def self.included(base)
-          base.before_filter :set_after_login, :set_visitor, :force_authentication?
+          base.before_filter :set_visitor, :force_authentication?
         end
 
         include Common
 
         private
 
-          def set_after_login
-            Thread.current[:after_login_url] = request.parameters
+          def save_after_login_url
+            session[:after_login_url] = request.parameters
           end
 
           def set_visitor
@@ -32,10 +32,11 @@ module Zena
             ::I18n.locale = site.default_lang
 
             User.send(:with_scope, :find => {:conditions => ['site_id = ?', site.id]}) do
-              Thread.current[:visitor] = registered_visitor || http_visitor(site) || token_visitor || anonymous_visitor(site)
+              Thread.current[:visitor] = token_visitor || registered_visitor || anonymous_visitor(site)
             end
           end
 
+          # Secured in site with scope in set_visitor
           def registered_visitor
             visitor_session && visitor_session.user
           end
@@ -51,7 +52,7 @@ module Zena
           end
 
           def check_is_admin
-            render_404(ActiveRecord::RecordNotFound) unless visitor.is_admin?
+            raise ActiveRecord::RecordNotFound unless visitor.is_admin?
             @admin = true
           end
 
@@ -59,27 +60,42 @@ module Zena
             visitor.lang
           end
 
+          # Secured in site with scope in set_visitor
           def token_visitor
-            if user_token = params[:user_token] && request.format == Mime::XML
+            if user_token = (request.headers['HTTP_X_AUTHENTICATION_TOKEN'] || params[:user_token])
               User.find_by_single_access_token(user_token)
             end
           end
 
+          # Secured in site with scope in set_visitor
           def http_visitor(site)
-            if site.http_auth && request.format == Mime::XML
+            if request.format == Mime::XML
+              # user must be an authentication token
               authenticate_or_request_with_http_basic do |login, password|
-                user = User.find_allowed_user_by_login(login)
-                user if (user && user.valid_password?(password))
+                User.find_by_single_access_token(password)
               end
+            elsif site.http_auth # HTTP_AUTH disabled for now.
+              user = User.find_allowed_user_by_login(login)
+              user if (user && user.valid_password?(password))
             end
           end
 
           def force_authentication?
-            if current_site.authentication? && visitor.is_anon?
-              redirect_to login_url
+            if visitor.is_anon?
+              # Anonymous visitor has more limited access rights.
+
+              if current_site.authentication? || params[:prefix] == AUTHENTICATED_PREFIX
+                # Ask for login
+                save_after_login_url
+                redirect_to login_url
+              elsif request.format == Mime::XML && (self != NodesController || !params[:prefix])
+                # Allow xml without :prefix in NodesController because it is rendered with zafu.
+
+                # Authentication token required for xml.
+                render :xml => 'Authentication token needed.', :status => 401
+              end
             end
           end
-
       end
 
       module ViewMethods

data/lib/zena/use/calendar.rb

@@ -106,7 +106,7 @@ module Zena
           target_zip   ||= params[:s]
           template_url ||= params[:t_url]
           state = node.linked_node ? (node.linked_node.zip ==  target_zip.to_i ? 'on' : 'used') : 'free'
-          title = node.linked_node ? node.linked_node.version.title : _('free')
+          title = node.linked_node ? node.linked_node.title : _('free')
           hour  = date.strftime('%H')
           full_dom_id = "#{node.zip}_#{target_zip}_#{date.to_i}"
           res = "<li id='#{full_dom_id}' class='hour_#{hour} #{state}'>"
@@ -117,7 +117,7 @@ module Zena
             date_format = "%Y-%m-%d+%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.version.title, :target => node.linked_node.version.title}
+              opts[:confirm] = _("Delete relation '%{role}' between '%{source}' and '%{target}' ?") % {:role => role, :source => node.title, :target => node.linked_node.title}
             end
             res << link_to_remote(title, opts)
           end

data/lib/zena/use/conditional.rb

@@ -0,0 +1,41 @@
+module Zena::Use::Conditional
+  module ZafuMethods
+
+    def rubyless_class_scope(class_name)
+      # capital letter ==> class conditional
+      if klass = get_class(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 ?
+          cond     = "#{node}.kpath_match?('#{klass.kpath}')"
+          new_node = node.move_to(node.name, klass)
+        else
+          # render nothing: incompatible classes
+          cond     = 'false'
+          new_node = node.move_to(node.name, klass)
+        end
+      elsif role = Node.get_role(class_name)
+        if node.klass.kpath =~ %r{^#{role.kpath}} || @context[:saved_template]
+          # Saved templates can be rendered with anything...
+          # FIXME: Make sure saved templates from 'block' start with the proper node type ?
+          cond     = "#{node}.has_role?(#{role.id})"
+          new_node = node.move_to(node.name, klass)
+        else
+          # render nothing: incompatible classes
+          cond     = 'false'
+          new_node = node.move_to(node.name, klass)
+        end
+      else
+        return parser_error("Invalid role or class '#{class_name}'")
+      end
+
+      if parent.method == 'case'
+        with_context(:node => new_node) do
+          r_elsif(cond)
+        end
+      else
+        out expand_if(cond, new_node)
+      end
+    end
+  end
+end # Zena::Use::ZafuClass

data/lib/zena/use/context.rb

@@ -0,0 +1,187 @@
+module Zena
+  module Use
+    module Context
+      module ViewMethods
+        include RubyLess
+        safe_method :start => {:method => 'start_node', :class => Node}
+        safe_method :visitor => User
+        safe_method :visitor_node => {:method => 'visitor.contact', :class => BaseContact, :nil => true}
+        safe_method :main => {:method => '@node', :class => Node}
+        safe_method :root => {:method => 'visitor.site.root_node', :class => Node, :nil => true}
+        safe_method :site => {:class => Site, :method => 'visitor.site'}
+
+        # Group an array of records by key.
+        def group_array(list)
+          groups = []
+          h = {}
+          list.each do |e|
+            key = yield(e)
+            unless group_id = h[key]
+              h[key] = group_id = groups.size
+              groups << []
+            end
+            groups[group_id] << e
+          end
+          groups
+        end
+
+        def sort_array(list)
+          list.sort do |a,b|
+            va = yield([a].flatten[0])
+            vb = yield([b].flatten[0])
+            if va && vb
+              va <=> vb
+            elsif va
+              1
+            elsif vb
+              -1
+            else
+              0
+            end
+          end
+        end
+
+        def min_array(list)
+          list.flatten.min do |a,b|
+            va = yield(a)
+            vb = yield(b)
+            if va && vb
+              va <=> vb
+            elsif va
+              1
+            elsif vb
+              -1
+            else
+              0
+            end
+          end
+        end
+
+        def max_array(list)
+          list.flatten.min do |a,b|
+            va = yield(a)
+            vb = yield(b)
+            if va && vb
+              vb <=> va
+            elsif vb
+              1
+            elsif va
+              -1
+            else
+              0
+            end
+          end
+        end
+
+        # main node before ajax stuff (the one in browser url)
+        def start_node
+          @start_node ||= if params[:s]
+            secure(Node) { Node.find_by_zip(params[:s]) }
+          else
+            @node
+          end
+        end
+
+        # Enter page numbers context.
+        #
+        # ==== Parameters
+        #
+        # * +current+     - current page number
+        # * +count+       - total number of pages
+        # * +join_string+ - (optional) string to use to join page numbers
+        # * +max_count+   - (optional) maximum number of pages to display
+        # * +&block+      - block to yield for each page number. Receives |page_number, join_string|.
+        def page_numbers(current, count, join_string = nil, max_count = nil)
+          max_count ||= 10
+          join_string ||= ''
+          join_str = ''
+          if count <= max_count
+            1.upto(count) do |p|
+              yield(p, join_str)
+              join_str = join_string
+            end
+          else
+            # only first pages (centered around current page)
+            if current - (max_count/2) > 0
+              finish = [current + (max_count/2),count].min
+            else
+              finish = [max_count,count].min
+            end
+
+            start  = [finish - max_count + 1,1].max
+
+            start.upto(finish) do |p|
+              yield(p, join_str)
+              join_str = join_string
+            end
+          end
+        end
+      end # ViewMethods
+
+      module ZafuMethods
+
+        # Enter a new context (<r:context find='all' select='pages'>). This is the same as '<r:pages>...</r:pages>'). It is
+        # considered better style to use '<r:pages>...</r:pages>' instead of the more general '<r:context>' because the tags
+        # give a clue on the context at start and end. Another way to open a context is the 'do' syntax: "<div do='pages'>...</div>".
+        def r_context
+          return parser_error("missing 'select' parameter") unless method = @params[:select]
+          querybuilder_eval(method)
+        end
+
+        alias r_find r_context
+
+        # Group elements in a list. Use :order to specify order.
+        def r_group
+          return parser_error("cannot be used outside of a list") unless node.list_context?
+          return parser_error("missing 'by' clause") unless key = @params[:by]
+
+          #sort_key = @params[:sort] || 'node_name'
+          # if node.will_be?(DataEntry) && DataEntry::NodeLinkSymbols.include?(key.to_sym)
+          #   key = "#{key}_id"
+          #   #sort_block = "{|e| (e.#{key} || {})[#{sort_key.to_sym.inspect}]}"
+          #   group_array = "group_array(#{node}) {|e| e.#{key}}"
+          # elsif node.will_be?(Node)
+          #   if ['project', 'parent', 'section'].include?(key)
+          #     #sort_block  = "{|e| (e.#{key} || {})[#{sort_key.to_sym.inspect}]}"
+          #     group_array = "group_array(#{node}) {|e| e.#{key}_id}"
+          #   end
+          # end
+
+          if %w{parent project section}.include?(key)
+            key = "e.#{key}"
+          else
+            key = "e.#{RubyLess.translate(key, node.klass.first)}"
+          end
+
+          #if sort_block
+          #  out "<% grp_#{list_var} = sort_array(#{group_array}) #{sort_block} -%>"
+          #else
+            out "<% #{var} = group_array(#{node}) {|e| #{key}} -%>"
+          #end
+
+          if descendant('each_group')
+            out expand_with(:group => var)
+          else
+            @context[:group] = var
+            r_each_group
+          end
+        end
+
+
+        def r_each_group
+          return parser_error("must be used inside a group context") unless group = @context[:group]
+          if join = @params[:join]
+            join = join.gsub(/&lt;([^%])/, '<\1').gsub(/([^%])&gt;/, '\1>')
+            out "<% #{group}.each_with_index do |#{var}, #{var}_i| -%>"
+            out "<%= #{var}_i > 0 ? #{join.inspect} : '' %>"
+          else
+            out "<% #{group}.each do |#{var}| -%>"
+          end
+
+          out wrap(expand_with(:group => nil, :node => node.move_to(var, node.klass)))
+          out "<% end -%>"
+        end
+      end # ZafuMethods
+    end # Context
+  end # Use
+end # Zena

data/lib/zena/use/dates.rb

@@ -4,9 +4,12 @@ module Zena
       module Common
 
         # This is like strftime but with better support for i18n (translate day names, month abbreviations, etc)
-        def format_date(thedate, theformat = nil, tz_name=nil, lang=visitor.lang)
+        def format_date(thedate, opts = {})
+          return '' unless thedate
+
+          theformat, tz_name, lang = opts[:format], opts[:tz], opts[:lang]
           format = theformat || '%Y-%m-%d %H:%M:%S'
-          return "" unless thedate
+
           if tz_name
             # display time local to event's timezone
             begin
@@ -17,6 +20,7 @@ module Zena
           else
             tz = visitor.tz
           end
+
           if thedate.kind_of?(Time)
             utc_date = thedate
             adate = tz.utc_to_local(thedate)
@@ -38,7 +42,7 @@ module Zena
           # with_locale(lang) do
           # ...
           # end
-          if visitor.lang != lang
+          if lang
             ::I18n.locale = lang
           end
 
@@ -91,7 +95,8 @@ module Zena
           format.gsub!("%a", _(adate.strftime("%a")) )
           format.gsub!("%A", _(adate.strftime("%A")) )
 
-          if visitor.lang != lang
+          if lang
+            # Restore
             ::I18n.locale = visitor.lang
           end
 
@@ -104,40 +109,53 @@ module Zena
         include Common
       end
 
+      module FormTags
+        # Date selection tool.
+        # TODO: make it work with form_helper: <%= f.date_box(:event_at) %>
+      	def date_box(obj, name, opts = {})
+      	  rnd_id = rand(100000000000)
+      	  defaults = {  :id=>"datef#{rnd_id}", :button=>"dateb#{rnd_id}", :display=>"dated#{rnd_id}" }
+      	  opts = defaults.merge(opts)
+      	  date = obj.send(name)
+      	  value = tformat_date(date,'datetime')
+          if opts[:size]
+            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' size='#{opts[:size]}' value='#{value}' />"
+          else
+            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' value='#{value}' />"
+          end
+      		<<-EOL
+      <span class="date_box"><img src="/calendar/iconCalendar.gif" id="#{opts[:button]}" alt='#{_('date selection')}'/>
+      #{fld}
+      	<script type="text/javascript">
+          Calendar.setup({
+              inputField     :    "#{opts[:id]}",      // id of the input field
+              button         :    "#{opts[:button]}",  // trigger for the calendar (button ID)
+              singleClick    :    true,
+              showsTime      :    true
+          });
+      </script></span>
+      		EOL
+      	end
+      end
+
       module ViewMethods
         include Common
+        include FormTags
 
-        # display the time with the format provided by the translation of 'long_time'
-        def long_time(atime)
-          format_date(atime, _("long_time"))
+        # default date used to filter events in templates
+        def main_date
+          # TODO: timezone for @date ?
+          # .to_utc(_('datetime'), visitor.tz)
+          @main_date ||= params[:date] ? DateTime.parse(params[:date]) : DateTime.now
         end
 
-        # display the time with the format provided by the translation of 'short_time'
-        def short_time(atime)
-          format_date(atime, _("short_time"))
-        end
-
-        # display the time with the format provided by the translation of 'full_date'
-        def full_date(adate)
-          format_date(adate, _("full_date"))
-        end
-
-        # display the time with the format provided by the translation of 'long_date'
-        def long_date(adate)
-          format_date(adate, _("long_date"))
-        end
-
-        # display the time with the format provided by the translation of 'short_date'
-        def short_date(adate)
-          format_date(adate, _("short_date"))
-        end
-
-        # format a date with the given format. Translate month and day names.
-        def tformat_date(thedate, fmt)
-          format_date(thedate, _(fmt))
+        def parse_date(string)
+          return nil unless string
+          DateTime.parse(string) rescue nil
         end
       end # ViewMethods
 
+      # FIXME: remove from other models (has been removed from Node) !
       module AddParseDateAttributeMethod
         def parse_date_attribute(*args)
           args.each do |arg|
@@ -227,6 +245,45 @@ module Zena
           res
         end
       end
+
+      module ZafuMethods
+        include RubyLess
+        safe_method_for Time, :year       => {:class => Number, :pre_processor => true}
+        safe_method_for Time, [:strftime, String] => {:class => String, :pre_processor => true}
+        safe_method :date                 => :get_date
+        safe_method [:parse_date, String] => {:class => Time, :nil => true, :accept_nil => true}
+
+        def get_date(signature)
+          if var = get_context_var('set_var', 'date')
+            {:class => var.klass, :method => var, :nil => var.could_be_nil?}
+          else
+            {:class => Time, :method => 'main_date'}
+          end
+        end
+
+        # date_box seizure setup
+        def r_uses_datebox
+          if ZENA_CALENDAR_LANGS.include?(visitor.lang)
+            l = visitor.lang
+          else
+            l = visitor.site[:default_lang]
+          end
+<<-EOL
+<script src="/calendar/calendar.js" type="text/javascript"></script>
+<script src="/calendar/calendar-setup.js" type="text/javascript"></script>
+<script src="/calendar/lang/calendar-#{l}-utf8.js" type="text/javascript"></script>
+<link href="/calendar/calendar-brown.css" media="screen" rel="Stylesheet" type="text/css" />
+<% js_data << %Q{Calendar._TT["DEF_DATE_FORMAT"] = "#{_('datetime')}";} -%>
+<% js_data << %Q{Calendar._TT["FIRST_DAY"] = #{_('week_start_day')};} -%>
+EOL
+        end
+
+        # Select a date for the current context
+        # def r_date
+        #   set_context_var('set_var', 'date', get_attribute_or_eval)
+        # end
+
+      end
     end # Dates
   end # Use
 end # Zena