zena 1.2.1 → 1.2.2

data/lib/zena/use/i18n.rb

@@ -8,7 +8,7 @@ module Zena
       ::ENV['LANG'] = 'C'
 
       class TranslationDict
-        attr_reader :last_error, :node_id
+        attr_reader :last_error, :node_id, :static
 
         include Zena::Acts::Secure
         include RubyLess
@@ -16,8 +16,9 @@ module Zena
         # never returns nil
         safe_method [:get, String] => {:class => String, :accept_nil => true}
 
-        def initialize(node_id)
+        def initialize(node_id, static = nil)
           @node_id = node_id
+          @static  = static
         end
 
         def get(key, use_global = true)
@@ -31,21 +32,30 @@ module Zena
 
         def load!(text = nil)
           unless text
-            unless dict = secure(Node) { Node.find(:first, :conditions => {:id => @node_id}) }
-              @dict = {}
-              error("missing 'dictionary'")
-              return false
+            if @node_id
+              if dict = secure(Node) { Node.find(:first, :conditions => {:id => @node_id}) }
+                text = dict.prop['text']
+              else
+                @dict = {}
+                error("missing 'dictionary'")
+                return false
+              end
+            else
+              text, ignore = ::Skin.text_from_fs_skin(@static[:brick_name], @static[:skin_name], @static[:path], :ext => 'yml')
+              unless text
+                @dict = {}
+                error("missing 'dictionary'")
+                return false
+              end
             end
-            text = dict.prop['text']
           end
-
+          
           begin
             definitions = YAML::load(text)
             if translations = definitions['translations']
               if translations.kind_of?(Hash)
                 # ok
                 @dict = translations
-                true
               else
                 return error("bad 'translations' content (should be a dictionary)")
               end
@@ -218,8 +228,8 @@ module Zena
           ApplicationController.send(:_, str)
         end
 
-        def load_dictionary(node_id)
-          Zena::Use::I18n::TranslationDict.new(node_id)
+        def load_dictionary(node_id, static=nil)
+          Zena::Use::I18n::TranslationDict.new(node_id, static)
         end
 
         # show language selector
@@ -284,10 +294,19 @@ module Zena
         def r_load
           if dict = @params[:dictionary]
             # FIXME: replace @options[:base_path] by @options[:skin_id]
-            dict_content, absolute_url, base_path, doc = @options[:helper].send(:get_template_text, dict, @options[:base_path])
-            if base_path
+            dict_content, absolute_url, base_path, doc = @options[:helper].send(:get_template_text, dict, @options[:base_path], :ext => 'yml')
+            if dict_content
               # Lazy dictionary used for literal resolution
-              dict = TranslationDict.new(doc.id)
+              if doc
+                dict = TranslationDict.new(doc.id)
+              else
+                if absolute_url =~ /^\$([a-zA-Z_]+)-([a-zA-Z_]+)\/(.+)$/
+                  static = {:brick_name => $1, :skin_name => $2, :path => $3}
+                else
+                  return parser_error("Invalid absolute_url for static asset ('#{absolute_url}')")
+                end
+                dict = TranslationDict.new(nil, static)
+              end
 
               if dict.load!(dict_content)
                 # Save dictionary in template for dynamic uses
@@ -297,7 +316,11 @@ module Zena
                 set_context_var('set_var', 'dictionary', RubyLess::TypedString.new(dict_name, :class => TranslationDict, :literal => dict))
 
                 # Lazy loading (loads file on first request)
-                out "<% #{dict_name} = load_dictionary(#{doc.id}) %>"
+                if doc
+                  out "<% #{dict_name} = load_dictionary(#{doc.id}) %>"
+                else
+                  out "<% #{dict_name} = load_dictionary(nil, #{static.inspect}) %>"
+                end
               else
                 return parser_error(dict.last_error)
               end
@@ -390,7 +413,8 @@ module Zena
               # Lazy loading (loads file on first request)
               dict_name = get_var_name('dictionary', 'dict', cleared_context)
               set_context_var('set_var', 'dictionary', dict, cleared_context)
-              prefix += "<% #{dict_name} = load_dictionary(#{dict.literal.node_id}) %>"
+              d = dict.literal
+              prefix += "<% #{dict_name} = load_dictionary(#{d.node_id.inspect},#{d.static.inspect}) %>"
               return cleared_context, prefix
             else
               return cleared_context, nil

data/lib/zena/use/query_builder.rb

@@ -458,12 +458,6 @@ module Zena
             finders = [parts.join(' from ')]
             if params[:or]
               finders << params[:or]
-
-              key_counter = 1
-              while sub_or = params["or#{key_counter}".to_sym]
-                key_counter += 1
-                finders << sub_or
-              end
             else
               or_clause = nil
             end

data/lib/zena/use/query_node.rb

@@ -80,11 +80,11 @@ module Zena
           visitor.site.host
         end
 
-        def sfind(sqliss)
+        def sfind(sqliss, arity=:all)
           query = Node.build_query(:all, sqliss,
             :default => {:scope => 'site'}
           )
-          Node.do_find(:all, eval(query.to_s(:find)))
+          Node.do_find(arity, eval(query.to_s(arity == :count ? :count : :find)))
         end
 
         # Find a node and propagate visitor
@@ -205,7 +205,13 @@ module Zena
         def process_field(field_name)
           if fld = @query.attributes_alias[field_name]
             # use custom query alias value defined in select clause: 'custom_a AS validation'
-            return processing_filter? ? "(#{fld})" : fld
+            if processing_filter?
+              # We need to use the full original clause, except when the clause contains group functions (MAX, MIN, etc).
+              # If the clause is too complex, we need to use something simpler or it will break (custom queries).
+              "(#{fld})"
+            else
+              fld
+            end
           elsif processing_filter? && map_def = self.class.filter_fields[field_name]
             # Special filter fields such as 'role', 'tag' or 'class'
             if map_def.kind_of?(String)
@@ -378,7 +384,7 @@ module Zena
         # ******** And maybe overwrite these **********
         def parse_custom_query_argument(key, value)
           return nil unless value
-          super.gsub(/(RELATION_ID|NODE_ATTR|SECURE_TABLE)\(([^)]+)\)|(REF_DATE|NODE_ID|VISITOR_LANG)/) do
+          super.gsub(/(RELATION_ID|KPATH_VALUE|NODE_ATTR|SECURE_TABLE)\(([^)]+)\)|(REF_DATE|NODE_ID|VISITOR_LANG)/) do
             type, value = $1, $2
             type ||= $3
             case type
@@ -389,6 +395,13 @@ module Zena
               else
                 raise ::QueryBuilder::Error.new("Custom query: could not find Relation '#{role}'")
               end
+            when 'KPATH_VALUE'
+              klass_name = value
+              if rel = VirtualClass[klass_name]
+                rel.kpath
+              else
+                raise ::QueryBuilder::Error.new("Custom query kpath: could not find VirtualClass '#{role}'")
+              end
             when 'SECURE_TABLE'
               table_name = value
               add_filter "\#{secure_scope('#{table_name}')}"

data/lib/zena/use/relations.rb

@@ -370,9 +370,7 @@ module Zena
 
           # Destroy all links related to this node
           def destroy_links
-            Link.find(:all, :conditions => ["source_id = ? OR target_id = ?", self[:id], self[:id]]).each do |l|
-              l.destroy
-            end
+            Zena::Db.execute "DELETE FROM #{Link.table_name} WHERE source_id = #{self[:id].to_i} OR target_id = #{self[:id].to_i}"
           end
       end # ModelMethods
     end # Relations

data/lib/zena/use/rendering.rb

@@ -207,14 +207,16 @@ module Zena
             headers['Cache-Control'] = (!current_site.authentication? && @node.public?) ? 'public' : 'private'
           end
 
-          return unless perform_caching && caching_allowed(:authenticated => opts.delete(:authenticated))
-          url = page_cache_file(opts.delete(:url))
-          opts = {:expire_after  => nil,
-                  :path          => (current_site.public_path + url),
-                  :content_data  => response.body,
-                  :node_id       => @node[:id]
-                  }.merge(opts)
-          secure!(CachedPage) { CachedPage.create(opts) }
+          if perform_caching && caching_allowed(:authenticated => opts.delete(:authenticated))
+          
+            url = page_cache_file(opts.delete(:url))
+            opts = {:expire_after  => nil,
+                    :path          => (current_site.public_path + url),
+                    :content_data  => response.body,
+                    :node_id       => @node[:id]
+                    }.merge(opts)
+            secure!(CachedPage) { CachedPage.create(opts) }
+          end
         end
 
         # Return true if we can cache the current page

data/lib/zena/use/scope_index.rb

@@ -135,6 +135,7 @@ module Zena
           keys.each do |group_key|
             next unless list = groups[group_key]
             next unless should_clear_group?(group_key, deleted_node)
+            attrs["#{group_key}_id"] = nil
             list.each do |key|
               attrs["#{group_key}_#{key}"] = nil
             end
@@ -160,7 +161,7 @@ module Zena
         def set_site_id
           self[:site_id] = current_site.id
         end
-      end # ModelMethods
+      end # IndexMethods
 
       module ModelMethods
         def self.included(base)
@@ -232,6 +233,9 @@ module Zena
             update_scope_indices_on_prop_change(true)
             # How can we handle this ?
             # update_scope_indices_on_link_change
+            if s = scope_index
+              s.destroy
+            end
           end
 
           def update_scope_indices_on_prop_change(deleted=false)

data/lib/zena/use/search.rb

@@ -76,9 +76,10 @@ module Zena
 
         # Execute a fulltext search using default fulltext support from the database (MyISAM on MySQL).
         def search_text(query, options = {})
+          options[:order] ||= 'zip desc'
           if offset = options[:offset]
             limit = options[:limit] || 20
-            Node.find(:all, match_query(query).merge(:offset => offset, :limit => limit))
+            Node.find(:all, match_query(query).merge(:offset => offset, :limit => limit, :order => options[:order]))
           else
             # :default argument not used here
             options.delete(:default)

data/lib/zena/use/urls.rb

@@ -395,7 +395,7 @@ module Zena
           steal_and_eval_html_params_for(markup, @params)
 
           href = make_href(remote_target, options)
-
+          
           # This is to make sure live_id is set *inside* the <a> tag.
           if @live_param
             text = add_live_id(text_for_link, markup)
@@ -405,9 +405,9 @@ module Zena
           end
 
           http_method = http_method_from_action(options[:action])
-
-          if http_method == 'delete'
-            confirm ||= '#{t("Destroy ?")} "#{title}"'
+            
+          if http_method == 'delete' && method != 'unlink'
+            confirm ||= '#{t("Destroy")} #{h title} ?'
           end
 
           if confirm
@@ -426,9 +426,64 @@ module Zena
             # Add href to non-ajax method.
             markup.set_dyn_param(:href, "<%= #{make_href(nil, options.merge(:update => false))} %>")
 
+            if true
+              # Use onclick with Ajax.
+              if confirm
+                markup.set_dyn_param(:onclick, "if(confirm(\"<%= #{confirm} %>\")) {new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method}\"});} return false;")
+              else
+                markup.set_dyn_param(:onclick, "new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method}\"}); return false;")
+              end
+            else
+              #### FIXME: We need the 'update' parameter to trigger a js response for delete but we ignore
+              ####        the content.
+              
+              
+              if remote_target.kind_of?(String)
+                # YUCK. We should have a way to have dom_ids that do not need
+                # us to look for remote_target !
+                remote_target = find_target(remote_target)
+              end
+              # Experimental new model for javascript actions.
+              # Works for 'swap' but needs more adaptations for 'edit' or other links
+            
+              hash_params = []
+              (options[:query_params] || @params).each do |key, value|
+                next if [:update, :href, :eval, :text, :attr, :t, :host].include?(key)
+                case key
+                when :anchor
+                  # Get anchor and force string interpolation
+                  value = "%Q{#{get_anchor_name(value)}}"
+                when :publish
+                  if value == 'true'
+                    key = 'node[v_status]'
+                    value = Zena::Status::Pub
+                  else
+                    next
+                  end
+                when :encode_params, :format, :mode, :insert, :states
+                  # Force string interpolation
+                  value = "%Q{#{value}}"
+                else
+                  if value.blank?
+                    value = "''"
+                  end
+                end
+                hash_params << "#{key.inspect} => #{value}"
+              end
 
-            # Use onclick with Ajax.
-            markup.set_dyn_param(:onclick, "new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method}\"}); return false;")
+              if host = param(:host)
+                hash_params << ":host => %Q{#{host}}"
+              end
+            
+              if !hash_params.blank?
+                query = RubyLess.translate(self, "{#{hash_params.join(', ')}}.to_json")
+              else
+                query = ''
+              end
+            
+              dom_id, dom_prefix = get_dom_id(remote_target)
+              markup.set_dyn_param(:onclick, %Q{return Zena.#{http_method}("<%= #{dom_id} %>",<%= #{query} %>)})
+            end
           else
             markup.set_dyn_param(:href, "<%= #{href} %>")
 
@@ -581,7 +636,7 @@ module Zena
               method = 'zafu_node_path'
             elsif NODE_ACTIONS[opts[:action]]
               method = "#{opts[:action]}_node_path"
-            elsif remote_target
+            elsif remote_target && opts[:action] != 'destroy'
               method = 'zafu_node_path'
             else
               method = 'zen_path'
@@ -593,10 +648,10 @@ module Zena
             if href = @params[:href]
               method_args << href
             elsif node.will_be?(Version)
-              method_args << "node"
+              method_args << "this.node"
               hash_params << ":lang => this.lang"
             else
-              method_args << 'this'
+              method_args << '@node'
             end
 
             insert_ajax_args(remote_target, hash_params, opts[:action]) if remote_target
@@ -632,30 +687,16 @@ module Zena
             unless hash_params.empty?
               method_args << hash_params.join(', ')
             end
-
+            
             method = "#{method}(#{method_args.join(', ')})"
-
+            
             ::RubyLess.translate(self, method)
           end
 
           def insert_ajax_args(target, hash_params, action)
             hash_params << ":s => start_id"
             hash_params << ":link_id => this.link_id" if @context[:has_link_id] && node.will_be?(Node)
-            if target == '_page'
-              # reload full page
-              hash_params << ":udom_id => '_page'"
-              return
-            elsif target.kind_of?(String)
-              # named target
-              if target_block = find_target(target)
-                target = target_block
-              else
-                out parser_error("Could not find target name '#{target}'.")
-                return nil
-              end
-            end
-
-
+            
             # FIXME: when we have proper markup.dyn_params[:id] support,
             # we should not need this crap anymore.
             case action
@@ -667,63 +708,28 @@ module Zena
               hash_params << ":t_url  => %Q{#{form_url(node.dom_prefix)}}"
               # To enable link edit fix the following line:
               # hash_params << "'node[link_id]' => link_id"
-            when 'unlink', 'delete'
+            when 'unlink', 'destroy'
               @insert_dom_id = %Q{"#{node.dom_id(:erb => false)}"}
               hash_params << ":dom_id => insert_dom_id"
               hash_params << ":t_url  => %Q{#{template_url(node.dom_prefix)}}"
             else #drop, #swap
+              if target == '_page'
+                # reload full page
+                hash_params << ":udom_id => '_page'"
+                return
+              elsif target.kind_of?(String)
+                # named target
+                if target_block = find_target(target)
+                  target = target_block
+                else
+                  out parser_error("Could not find target name '#{target}'.")
+                  return nil
+                end
+              end
               @insert_dom_id, dom_prefix = get_dom_id(target)
               hash_params << ":dom_id => insert_dom_id"
               hash_params << ":t_url  => %Q{#{template_url(dom_prefix)}}"
             end
-
-            # method = opts[:method] || :get
-            #
-            # html_params = opts[:html_params] || {}
-            # node_id = opts[:node_id] || self.node_id
-            #
-            # url    = opts[:url]    || "/#{base_class.to_s.pluralize.underscore}/\#{#{node_id}}#{method == :get ? '/zafu' : ''}"
-            # opts[:cond]   ||= "#{node}.can_write?" if method != :get
-            #
-            # query_params = [opts[:query_params]].flatten.compact
-            #
-            # if method == :get
-            #   if target
-            #     query_params << "t_url=#{CGI.escape(target.template_url)}"
-            #     query_params << "dom_id=#{target.dom_id}"
-            #   else
-            #     query_params << "dom_id=_page"
-            #   end
-            # else
-            #   query_params << "t_url=#{CGI.escape(template_url)}" if method != :delete
-            #
-            #   query_params << "dom_id=#{dom_id}"
-            #   if target != self
-            #     if target
-            #       query_params << "u_url=#{CGI.escape(target.template_url)}"
-            #       query_params << "udom_id=#{target.dom_id}"
-            #     else
-            #       query_params << "udom_id=_page"
-            #     end
-            #   end
-            # end
-            #
-            # query_params << "node[v_status]=#{Zena::Status::Pub}" if @params[:publish] # FIXME: this acts like publish = 'force'
-            # query_params << start_node_s_param(:string)
-            #
-            # res = ''
-            # res += "<% if #{opts[:cond]} %>" if opts[:cond]
-            # res += "<%= tag_to_remote({:url => \"#{url}?#{query_params.join('&')}\", :method => #{method.inspect}}#{params_to_erb(html_params)}) %>"
-            # res += text_for_link(opts[:default_text])
-            # res += "</a>"
-            # if opts[:cond]
-            #   if opts[:else] != :void
-            #     res += "<% else %>"
-            #     res += text_for_link(opts[:default_text])
-            #   end
-            #   res += "<% end %>"
-            # end
-            # res
           end
 
           # <r:link page='next'/> <r:link page='previous'/> <r:link page='list'/>
@@ -792,13 +798,12 @@ module Zena
               end
 
               if !descendant('else')
-                else_tag = {:method => 'else', :text => '<r:this/>'}
+                else_tag = {:method => 'else', :text => "#{@markup.space_before}<r:this/>"}
                 else_tag[:tag] = tag if tag
                 add_block else_tag
                 # Clear cached descendants
                 @all_descendants = nil
               end
-
               out "<% page_numbers(#{curr_page}, #{page_count}, #{(@params[:join] || ' ').inspect}, #{@params[:page_count] ? @params[:page_count].to_i : 'nil'}) do |#{page_number}, #{page_join}, #{page_name}| %>"
               out "<%= #{page_join} %>"
               with_context(:node => node.move_to(page_number, Number)) do