zena 1.2.7 → 1.2.8

data/lib/zena/use/forms.rb

@@ -81,6 +81,10 @@ module Zena
           end
           base
         end
+        
+        def profile_users
+          secure(User) {User.find_all_by_is_profile(true) } || []
+        end
       end # ViewMethods
 
       module ZafuMethods
@@ -449,7 +453,7 @@ module Zena
 
           extract_label(res, attribute || erb_attr)
         end
-
+        
         # <r:select name='klass' root_class='...'/>
         # <r:select name='parent_id' nodes='projects in site'/>
         # <r:select name='parent_id' values='a,b,c'/>
@@ -524,6 +528,9 @@ module Zena
           elsif @params[:type] == 'time_zone'
             # <r:select name='d_tz' type='time_zone'/>
             select_tag.wrap "<%= options_for_select(TZInfo::Timezone.all_identifiers, #{selected}) %>"
+          elsif @params[:type] == 'profile'
+            # <r:select name='auth[model]' type='model'/>
+            select_tag.wrap "<%= options_for_select(profile_users.map{|u| u.login}.sort, #{selected}) %>"
           elsif options_list = get_options_for_select
             select_tag.wrap "<%= options_for_select(#{options_list}, #{selected}) %>"
           else
@@ -599,14 +606,27 @@ module Zena
           else
             # 'text', 'hidden', 'checkbox', ...
             return parser_error('Missing name.') unless attribute || html_attributes[:name]
-            @markup.tag = 'input'
-            @markup.set_param(:type, @params[:type] || 'text')
-
+            
+            if @markup.tag != 'input'
+              # Do not rewrite tag, use another one.
+              markup = Zafu::Markup.new('input')
+            else
+              markup = @markup
+            end
+            
+            markup.tag = 'input'
+            markup.set_param(:type, @params[:type] || 'text')
+            
             checked = html_attributes.delete(:checked)
-            @markup.set_dyn_params(html_attributes)
-            @markup.append_attribute checked if checked
-            @markup.done = false
-            wrap('')
+            markup.set_dyn_params(html_attributes)
+            markup.append_attribute checked if checked
+            markup.done = false
+            
+            if markup == @markup
+              wrap('')
+            else
+              markup.wrap('')
+            end
           end
 
           if @params[:type] == 'checkbox'

data/lib/zena/use/html_tags.rb

@@ -163,19 +163,28 @@ module Zena
         include LinkTags
         include RubyLess
 
-        safe_method [:flash_messages] => {:class => String, :method => 'flash_messages', :html_safe => true}
-        # TODO: replace 'flash_messages' with a FlashHash context or a list
-        # of Flash messages.
+        safe_method :flash          => {:class => StringHash, :method => 'zafu_flash'}
+        safe_method :flash_messages => {:class => String,     :html_safe => true}
+        
+        def zafu_flash
+          @zafu_flash ||= if flash[:notice] || flash[:error]
+            flash.stringify_keys
+          else
+            {}
+          end
+        end
 
         def flash_messages(opts={})
           type = opts[:show] || 'both'
 
-          if (type == 'notice' || type == 'both') && flash[:notice]
-            notice = "<div class='auto_fade notice' onclick='new Effect.Fade(this)'>#{::ERB::Util.html_escape(flash[:notice])}</div>"
+          if (type == 'notice' || type == 'both') && (msg = flash[:notice])
+            msg = ::ERB::Util.html_escape(msg) unless msg.html_safe?
+            notice = "<div class='auto_fade notice' onclick='new Effect.Fade(this)'>#{msg}</div>"
           end
 
-          if (type == 'error'  || type == 'both') && flash[:error ]
-            error = "<div class='error' onclick='new Effect.Fade(this)'>#{::ERB::Util.html_escape(flash[:error])}</div>"
+          if (type == 'error'  || type == 'both') && (msg = flash[:error ])
+            msg = ::ERB::Util.html_escape(msg) unless msg.html_safe?
+            error = "<div class='error' onclick='new Effect.Fade(this)'>#{msg}</div>"
           end
 
           if page = opts[:page]

data/lib/zena/use/i18n.rb

@@ -181,7 +181,7 @@ module Zena
 
         # Redirect on lang change "...?lang=de"
         def check_lang
-          if params[:lang]
+          if params[:lang] && params[:controller] != 'user_sessions'
             # redirects other controllers (users controller, etc)
             redirect_url = params
             redirect_url.delete(:lang)

data/lib/zena/use/prop_eval.rb

@@ -74,7 +74,7 @@ module Zena
 
         # TODO: decide if we need to keep this (Zena::Remote makes a much better console the MySQL console...)
         def set__id
-          self._id = self.title if @need_set__id
+          self._id = self.title.limit(39) if @need_set__id
         end
 
         # Must happend after 'change_klass'
@@ -85,6 +85,11 @@ module Zena
           if code = vclass.prop_eval
             hash = safe_eval(code)
             if hash.kind_of?(Hash)
+              if hash.has_key?('title') && hash['title'].blank?
+                # Avoid blank title
+                hash['title'] = vclass.name
+              end
+                
               # forces a check on valid properties
               self.attributes = hash
               true

data/lib/zena/use/query_node.rb

@@ -125,11 +125,15 @@ module Zena
         end
 
         class << self
-          attr_accessor :filter_fields
+          attr_accessor :filter_fields, :fulltext_fields
 
           def add_filter_field(key, fld_def)
             self.filter_fields[key] = fld_def
           end
+          
+          def add_fulltext_field(key, &block)
+            self.fulltext_fields[key] = block
+          end
         end
 
         # Enables filters like "where id = 45" or "where parent_id = #{params[:parent_id]}"
@@ -140,6 +144,42 @@ module Zena
           'section_id' => {:key => 'zip', :table => ['jnode', 'nodes', 'nodes', 'TABLE2.id = TABLE1.section_id AND TABLE2.site_id = TABLE1.site_id']},
           'now'        => Zena::Db::NOW,
         }
+        
+        self.fulltext_fields = {
+          # Default fulltext search
+          'fulltext' => Proc.new {|processor, table, right|
+            # We use the add_key_value_table rule to avoid inserting the
+            # same index access twice.
+            tbl = processor.send(:add_key_value_table, 'versions', 'versions', 'idx_text_high') do |tbl_name|
+              # This block is only executed once
+              on_clause = "#{tbl_name}.node_id = #{table}.id"
+              # lang
+              on_clause << " AND #{tbl_name}.lang = #{processor.send(:quote, visitor.lang)}"
+              # published
+              on_clause << " AND #{tbl_name}.status >= #{Zena::Status::Pub}"
+              
+              # 1=1 relation, no need for distinct
+              on_clause
+            end
+            
+            case right[0]
+            when :string, :dstring, :real, :integer
+              str = "%#{right[1]}%"
+            when :rubyless
+              str = "%\#{#{right[1]}}%"
+            else
+              raise ::QueryBuilder::Error.new("Can only match against literal or rubyless values.")
+            end
+            
+            value = RubyLess.translate_string(processor.instance_variable_get(:@rubyless_helper), str)
+            if value.literal
+              value = processor.send(:quote, value.literal)
+            else
+              value = processor.send(:insert_bind, value)
+            end
+            "#{tbl}.idx_text_high LIKE #{value}"
+          }
+        }
 
         # Scope current context with previous context.
         # For example:
@@ -160,6 +200,19 @@ module Zena
             nil
           end
         end
+        
+        def apply_scope(scope)
+          case scope
+          when 'sub_nodes'
+            context[:processing] = :scope
+            add_filter("#{field_or_attr('fullpath')} LIKE CONCAT(#{field_or_attr('fullpath', table(main_table, -1))},'/%')")
+          when 'home'
+            context[:processing] = :scope
+            add_filter("#{field_or_attr('fullpath')} LIKE CONCAT(#{insert_bind('current_site.home_node.fullpath')},'/%')")
+          else
+            super
+          end
+        end
 
         def process_attr(attribute)
           case attribute
@@ -328,13 +381,25 @@ module Zena
             if klass = Node.get_class(right[1])
               "#{field_or_attr('kpath')} #{is_not ? 'NOT ' : ''}LIKE #{quote(klass.kpath + '%')}"
             else
-              raise ::QueryBuilder::QueryException.new("Unknown class #{right.last.inspect}.")
+              raise ::QueryBuilder::Error.new("Unknown class #{right.last.inspect}.")
             end
           else
             process_op(:like, left, right)
           end
         end
         
+        def process_match(left, right)
+          if left[0] == :field
+            if proc = self.class.fulltext_fields[left[1]]
+              proc.call(self, table, right)
+            else
+              raise ::QueryBuilder::Error.new("Unknown matching field #{left[1].inspect}.")
+            end
+          else  
+            raise ::QueryBuilder::Error.new("Left argument for 'match' should be a fulltext index type.")
+          end
+        end
+        
         # [:like, [:field, "class"], [:field, "Image"]]
         def process_not(arg)
           if (arg[1] == [:field, 'class'] || arg[1] == [:field, 'klass']) && arg[0] == :like
@@ -553,7 +618,7 @@ module Zena
               # Special pseudo-context
               add_table(main_table)
               set_main_class(current_site.home_node.vclass)
-              add_filter "#{table}.id = #{current_site.home_id}"
+              add_filter "#{table}.id = #{insert_bind('current_site.home_id')}"
               return true
             #when 'author', 'traductions', 'versions'
             #  # TODO: not implemented yet...
@@ -583,7 +648,7 @@ module Zena
                 set_main_class(klass)
                 kpath_filter = ".kpath LIKE #{quote("#{klass.kpath}%")}" unless klass.kpath == 'N'
               else
-                raise ::QueryBuilder::QueryException.new("Unknown class #{klass} in scope '#{class_name}:#{scope}'.")
+                raise ::QueryBuilder::Error.new("Unknown class #{klass} in scope '#{class_name}:#{scope}'.")
               end
             else
               klass = nil

data/lib/zena/use/recursion.rb

@@ -10,7 +10,7 @@ module Zena
         # recursion
         def r_include
           return '' if @context[:saved_template]
-          return super if @params[:template] || !@params[:part]
+          return parser_error("missing 'template' or 'part' parameter") if !@params[:part]
           recursion = get_context_var('recursion', @params[:part])
           return parser_error("no parent named '#{@params[:part]}'") unless recursion
           klass = recursion[:klass]

data/lib/zena/use/refactor.rb

@@ -23,7 +23,8 @@ module Zena
       module ViewMethods
 
         include Common
-
+        include RubyLess
+        safe_method [:fsize, Number] => String
 
         # TODO: see if this is still needed. Creates a pseudo random string to avoid browser side ajax caching
         def rnd
@@ -61,7 +62,9 @@ module Zena
         # TODO: use number_to_human_size instead
         def fsize(size)
           size = size.to_f
-          if size >= 1024 * 1024 * 1024
+          if size >= 1024 * 1024 * 1024 * 1024
+            sprintf("%.2f Tb", size/(1024*1024*1024*1024))
+          elsif size >= 1024 * 1024 * 1024
             sprintf("%.2f Gb", size/(1024*1024*1024))
           elsif size >= 1024 * 1024
             sprintf("%.1f Mb", size/(1024*1024))

data/lib/zena/use/relations.rb

@@ -94,6 +94,7 @@ module Zena
 
         # Return an array of accessor methods for the matched relation alias.
         def relation_alias(match)
+          return nil if respond_to?("#{match[0]}=") # native method
           return nil if match[0] == 'parent_id'
           role     = match[1]
           field    = match[2]

data/lib/zena/use/rendering.rb

@@ -169,7 +169,7 @@ module Zena
               opts[:cache] = false
               
               render :inline => result[:data]
-              
+            
             else
               
               if disposition = zafu_headers.delete('Content-Disposition')
@@ -195,9 +195,9 @@ module Zena
                 return
               end
 
-              if data = result.delete(:data)
+              if data = result[:data]
                 send_data(data , result)
-              elsif file = result.delete(:file)
+              elsif file = result[:file]
                 send_file(file , result)
               else
                 # Should never happen
@@ -279,7 +279,10 @@ module Zena
 
         # Return true if we can cache the current page
         def caching_allowed(opts = {})
-          return false if current_site.authentication? || (query_params != {} && !@cache_query)
+          return false if current_site.authentication? ||
+                          (query_params != {} && !@cache_query) ||
+                          flash[:notice] ||
+                          flash[:error]
           # Cache even if authenticated (public content).
           #                       Content viewed by anonymous user should be cached anyway.
           opts[:authenticated] || visitor.is_anon?

data/lib/zena/use/test_helper.rb

@@ -7,10 +7,11 @@ module Zena
       include Zena::Use::Upload::UploadedFile
 
       # Set visitor for unit testing
-      def login(fixture, site_name = nil)
-        user = users(fixture)
-        if site_name
-          site = Site.setup_master(Site.find_by_name(site_name))
+      def login(fixture, host = nil)
+        user = fixture.kind_of?(Fixnum) ? User.find(fixture) : users(fixture)
+        if host
+          raise 'FIXME' unless host =~ /\./
+          site = Site.setup_master(Site.find_by_host(host))
         else
           # Not an alias
           site = user.site
@@ -19,6 +20,9 @@ module Zena
         user.ip = '10.0.0.44'
         $_test_site = site.name
         ::I18n.locale = user.lang
+      rescue => err
+        puts "#{host.inspect}"
+        puts err.backtrace
       end
 
       # Show object's errors

data/lib/zena/use/upload.rb

@@ -31,6 +31,11 @@ module Zena
 
       module ControllerMethods
         include UploadedFile
+        
+        def self.included(base)
+          base.send(:helper_method, :fetch_html)
+        end
+        
         protected
           include ActionView::Helpers::NumberHelper # number_to_human_size
           def get_attachment
@@ -44,6 +49,14 @@ module Zena
             [att, error]
           end
           
+          def fetch_html(uri_str)
+            response, error = fetch_response(uri_str)
+            if response
+              response.body
+            else
+              ''
+            end
+          end
 
         private
           def fetch_uri(uri_str, max_file_size = 10)
@@ -176,6 +189,7 @@ module Zena
 
       module ViewMethods
         include RubyLess
+        safe_method [:fetch_html, String] => String
 
         def upload_form_tag(url_opts, html_opts = {})
           @uuid = UUIDTools::UUID.random_create.to_s.gsub('-','')

data/lib/zena/use/urls.rb

@@ -88,6 +88,7 @@ module Zena
 
           pre    = opts.delete(:prefix) || (visitor.is_anon? && opts.delete(:lang)) || prefix
           mode   = opts.delete(:mode)
+          mode   = nil if mode.blank?
           if ep = opts[:encode_params]
             ep = ep.split(',').map(&:strip)
             if ep.delete('mode')
@@ -122,36 +123,50 @@ module Zena
             stamp = make_cachestamp(node, mode)
           end
 
-          path = if !asset && node[:id] == visitor.site[:root_id] && mode.nil? && format == 'html'
+          path = if !asset && node[:id] == visitor.site.home_id && mode.nil? && format == 'html'
             "#{abs_url_prefix}/#{pre}" # index page
           elsif node[:custom_base]
             "#{abs_url_prefix}/#{pre}/" +
-            basepath_as_url(node.basepath) +
-            (mode  ? "_#{mode}"  : '') +
-            (asset ? "=#{asset}" : '') +
-            (stamp ? ".#{stamp}" : '') +
+            basepath_as_url(node, true) +
+            (mode  ? "_#{mode}"  : '')  +
+            (asset ? "=#{asset}" : '')  +
+            (stamp ? ".#{stamp}" : '')  +
             (format == 'html' ? '' : ".#{format}")
           else
             "#{abs_url_prefix}/#{pre}/" +
-            (node.basepath.blank? ? '' : "#{basepath_as_url(node.basepath)}/") +
-            (node.klass.downcase   ) +
-            (node[:zip].to_s       ) +
-            (mode  ? "_#{mode}"  : '') +
-            (asset ? "=#{asset}" : '') +
-            (stamp ? ".#{stamp}" : '') +
+            basepath_as_url(node, false)+
+            (node.klass.downcase   )    +
+            (node[:zip].to_s       )    +
+            (mode  ? "_#{mode}"  : '')  +
+            (asset ? "=#{asset}" : '')  +
+            (stamp ? ".#{stamp}" : '')  +
             ".#{format}"
           end
           append_query_params(path, opts)
         end
 
-        def basepath_as_url(path)
-          path.split('/').map do |zip|
-            if n = secure(Node) { Node.find_by_zip(zip) }
-              n.title.url_name
-            else
-              nil
+        def basepath_as_url(node, is_end)
+          path = node.basepath
+          if !path.blank?
+            @home_base ||= begin
+              p = Zena::Use::Ancestry.basepath_from_fullpath(current_site.home_node.fullpath)
+              %r{^#{p}/?}
             end
-          end.compact.join('/')
+            path = path.sub(@home_base, '')
+            return '' if path.blank?
+            path = path.split('/').map do |zip|
+              if n = secure(Node) { Node.find_by_zip(zip) }
+                n.title.url_name
+              else
+                nil
+              end
+            end.compact.join('/')
+          end
+          if is_end
+            path
+          else
+            path.blank? ? '' : "#{path}/"
+          end
         end
 
         def append_query_params(path, opts)
@@ -438,6 +453,7 @@ module Zena
 
             if true
               # Use onclick with Ajax.
+              # FIXME: Use Zena.do so that we can use ajax stamp. This means that we write a variant of "make_href" which returns json for query parameters.
               if confirm
                 markup.set_dyn_param(:onclick, "if(confirm(this.getAttribute(\"data-confirm\"))) {new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method}\"});} return false;")
               else
@@ -536,10 +552,10 @@ module Zena
           # Build the 'href' part of a link.
           def make_href(remote_target = nil, opts = {})
             anchor = @params[:anchor]
-            if anchor && !@params[:href]
-              # Link on same page
-              return ::RubyLess.translate(self, "%Q{##{get_anchor_name(anchor)}}")
-            end
+            # if anchor && !@params[:href]
+            #   # Link on same page (? Why would this be of any use ? We can write <a href='#xxx'>....</a>.)
+            #   return ::RubyLess.translate(self, "%Q{##{get_anchor_name(anchor)}}")
+            # end
 
             if opts[:action] == 'edit' && remote_target
               method = 'zafu_node_path'
@@ -598,7 +614,7 @@ module Zena
             end
             
             method = "#{method}(#{method_args.join(', ')})"
-            
+
             ::RubyLess.translate(self, method)
           end