zena 1.0.0.rc2 → 1.0.0.rc3

data/lib/zena/use/forms.rb

@@ -30,9 +30,9 @@ module Zena
               current_values = relation_proxy.other_ids
               res << "<input type='hidden' name='node[#{role}_ids][]' value=''/>"
               values.each do |value|
-                res << ("<span><input type='checkbox' name='node[#{role}_ids][]' value='#{value.zip}'" +
+                res << ("<p><input type='checkbox' name='node[#{role}_ids][]' value='#{value.zip}'" +
                 (current_values.include?(value.id) ? " checked='checked'/> " : '/> ') +
-                "<span>#{value.prop[attribute]}</span>")
+                "<span>#{value.prop[attribute]}</span></p>")
               end
             end
             res.join('')
@@ -82,7 +82,8 @@ module Zena
         # Enter the context of a newly created object
         def r_new
           return parser_error("missing 'klass' parameter") unless class_name = @params[:klass]
-          return parser_error("invalid 'klass' parameter (not a Node)") unless klass = get_class(class_name)
+          return parser_error("invalid 'klass' parameter") unless klass = get_class(class_name)
+          return parser_error("invalid 'klass' parameter (not a Node)") unless klass <= Node
 
           res  = []
           keys = {:klass => 'klass'}
@@ -157,23 +158,7 @@ module Zena
             end
           else
             super
-          #when 'text', 'summary'
-          #  make_textarea(:name => method)
-          #when :r_show
-          #  make_input(:name => (@params[:attr] || @params[:tattr]), :date => @params[:date])
-          #when :r_text
-          #  make_textarea(:name => 'text')
-          #when :r_summary
-          #  make_textarea(:name => 'summary')
-          #when :r_zazen
-          #  make_textarea(:name => @params[:attr])
-          #else
-          #  if node.will_be?(DataEntry) && @method.to_s =~ /node_/
-          #    # select node_id
-          #    "<%= select_id('#{node.form_name}', '#{@method}_id') %>"
-          #  end
           end
-          #res = "<#{@html_tag || 'div'} class='zazen'>#{res}</#{@html_tag || 'div'}>" if [:r_summary, :r_text].include?(method)
         end
 
         def form_options
@@ -191,11 +176,34 @@ module Zena
           if template_url = @context[:template_url]
             # Ajax
 
+            if edit_or_cancel = descendant('cancel') || descendant('edit')
+              if cancel_text = edit_or_cancel.params[:cancel] ||
+                (edit_or_cancel.method == 'cancel' && edit_or_cancel.params[:text])
+              elsif cancel_text = edit_or_cancel.params[:tcancel] ||
+                (edit_or_cancel.method == 'cancel' && edit_or_cancel.params[:t])
+                cancel_text = RubyLess.translate(self, "t(%Q{#{cancel_text}})")
+                if cancel_text.literal
+                  cancel_text = cancel_text.literal
+                else
+                  cancel_text_ruby = cancel_text
+                  cancel_text = "<%= #{cancel_text} %>"
+                end
+              end
+              cancel_pre  = ''
+              cancel_post = ''
+            else
+              cancel_pre  = "<p class='btn_x'>"
+              cancel_post = "</p>"
+            end
+
+            cancel_text ||= _('btn_x')
+            cancel_text_ruby ||= cancel_text.inspect
+
             if @context[:in_add]
               # Inline form used to create new elements: set values to '' and 'parent_id' from context
               opts[:id]          = "#{node.dom_prefix}_form"
               opts[:form_tag]    = "<% remote_form_for(:#{node.form_name}, #{node}, :url => #{node.form_name.pluralize}_path, :html => {:id => \"#{dom_name}_form_t\"}) do |f| %>"
-              opts[:form_cancel] = "<p class='btn_x'><a href='#' onclick='[\"#{dom_name}_add\", \"#{dom_name}_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></p>\n"
+              opts[:form_cancel] = "#{cancel_pre}<a href='#' onclick='[\"#{dom_name}_add\", \"#{dom_name}_form\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}\n"
             else
               # Saved form
               opts[:id]          = "<%= ndom_id(#{node}) %>"
@@ -206,9 +214,9 @@ module Zena
 
               opts[:form_cancel] = %Q{
 <% if #{node}.new_record? %>
-  <p class='btn_x'><a href='#' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></p>
+  #{cancel_pre}<a href='#' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_form\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}
 <% else %>
-  <p class='btn_x'><%= link_to_remote(#{_('btn_x').inspect}, :url => #{node.form_name}_path(#{node}.zip) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=\#{params[:dom_id]}#{@context[:has_link_id] ? "&link_id=\#{#{node}.link_id}" : ''}\", :method => :get) %></p>
+  #{cancel_pre}<%= link_to_remote(#{cancel_text_ruby}, :url => #{node.form_name}_path(#{node}.zip) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=\#{params[:dom_id]}#{@context[:has_link_id] ? "&link_id=\#{#{node}.link_id}" : ''}\", :method => :get) %>#{cancel_post}
 <% end %>
 }
             end
@@ -281,12 +289,12 @@ module Zena
               # 1. @node
               # 2. var1 = @node.children
               # 3. var1_new = Node.new
-              if node.opts[:new_record]
+              if node.opts[:new_record] || @context[:saved_template]
                 hidden_fields['node[parent_id]'] = "<%= #{@context[:in_add] ? "#{node.up.up}.zip" : "#{node}.parent_zip"} %>"
               end
             elsif node.will_be?(Comment)
               # FIXME: the "... || '@node'" is a hack and I don't understand why it's needed...
-              hidden_fields['node_id'] = "<%= #{node.up || '@node'}.zip %>"
+              hidden_fields['node_id'] = "<%= #{node.get(Node) || '@node'}.zip %>"
             elsif node.will_be?(DataEntry)
               return parser_error("Missing :data_root in context (internal error)") unless data_root = @context[:data_root]
               hidden_fields["data_entry[#{data_root}_id]"] = "<%= #{@context[:in_add] ? node(Node) : "#{node}.#{data_root}"}.zip %>"
@@ -345,7 +353,7 @@ module Zena
             hidden_fields['mode'] = @params[:mode]
           end
 
-          hidden_fields['node[v_status]'] = Zena::Status[:pub].to_s if add_params[:publish] || auto_publish_param
+          hidden_fields['node[v_status]'] = Zena::Status[:pub].to_s if add_params[:publish] || auto_publish_param || @context[:publish_after_save]
 
           # All default values set in the <r:new> field should at least appear as hidden fields
           if new_keys = node.opts[:new_keys]
@@ -365,12 +373,20 @@ module Zena
               hidden_fields["node[#{key}]"] = "<%= #{node}.#{value} %>"
             end
           end
-          # ===
-          # TODO: reject set_fields from hidden_fields
-          # ? what is this ?
-          # ===
+
+          # Read @params
+          @params.each do |key, value|
+            next if [:klass, :done].include?(key)
+            code = ::RubyLess.translate_string(self, value)
+            if code.literal.kind_of?(String)
+              hidden_fields[key] = "#{code.literal}"
+            else
+              hidden_fields[key] = "<%= #{code} %>"
+            end
+          end
 
           hidden_fields.reject! do |k,v|
+            # There is an explicit <input> field for this key, remove hidden value
             set_fields.include?(k)
           end
 
@@ -378,9 +394,26 @@ module Zena
         end
 
         def r_textarea
-          params = @markup.params.merge(@params)
-          res = make_textarea(params)
-          extract_label(res, params, params[:name])
+          html_attributes, attribute = get_input_params()
+          erb_attr = html_attributes.delete(:erb_attr)
+          value = html_attributes.delete(:value)
+
+          return parser_error('Missing name.') unless attribute || html_attributes[:name]
+
+          @markup.tag = 'textarea'
+          @markup.set_dyn_params(html_attributes)
+
+          if @blocks == [] || @blocks == ['']
+            if @context[:in_add]
+              value = ''
+            end
+          else
+            value = expand_with
+          end
+
+          res = @markup.wrap(value)
+
+          extract_label(res, attribute || erb_attr)
         end
 
         # <r:select name='klass' root_class='...'/>
@@ -389,6 +422,7 @@ module Zena
         # TODO: optimization (avoid loading full AR to only use [id, name])
         def r_select
           html_attributes, attribute = get_input_params()
+          erb_attr = html_attributes.delete(:erb_attr)
           # TEMPORARY HACK UNTIL WE FIX get_input_params to return a single hash with
           # {:html => { prepared html attributes }, :raw => {:value => '..', :name => '..', :param => '..'}}
           if param = @params[:param]
@@ -408,7 +442,10 @@ module Zena
             elsif attribute =~ /^(.*)_id$/
               # relation
               selected = "#{node}.rel[#{$1.inspect}].other_zip.to_s"
+            elsif type = node.klass.safe_method_type([attribute])
+              selected = "#{node}.#{type[:method]}.to_s"
             else
+              # ???
               selected = "#{node}.prop[#{attribute.inspect}].to_s"
             end
           end
@@ -424,7 +461,7 @@ module Zena
             class_opts = ''
             class_opts << ", :without => #{@params[:without].inspect}" if @params[:without]
             # do not use 'selected' if the node is not new
-            "#{select_tag}<%= options_for_select(Node.classes_for_form(:class => #{klass.inspect}#{class_opts}), (#{node}.new_record? ? #{selected} : #{node}.klass)) %></select>"
+            "#{select_tag}<%= options_for_select(Node.classes_for_form(:class => #{klass.inspect}#{class_opts}, :class_attr => #{(@params[:attr] || 'name').inspect}), (#{node}.new_record? ? #{selected} : #{node}.klass)) %></select>"
           elsif @params[:type] == 'time_zone'
             # <r:select name='d_tz' type='time_zone'/>
             "#{select_tag}<%= options_for_select(TZInfo::Timezone.all_identifiers, #{selected}) %></select>"
@@ -434,12 +471,13 @@ module Zena
             parser_error("missing 'nodes', 'root_class' or 'values'")
           end
 
-          extract_label(res, @params, attribute)
+          extract_label(res, attribute || erb_attr)
         end
 
 
         def r_input
           html_attributes, attribute = get_input_params()
+          erb_attr = html_attributes.delete(:erb_attr)
           # TODO: get attribute type from get_input_params
           res = case @params[:type]
           when 'select' # FIXME: why is this only for classes ?
@@ -450,7 +488,7 @@ module Zena
             code = ::RubyLess.translate(self, "this.#{attribute}")
             value = @context[:in_add] ? "''" : code
             html_params = [':size => 15']
-            [:style, :class, :onclick, :size].each do |key|
+            [:style, :class, :onclick, :size, :time].each do |key|
               html_params << ":#{key} => #{@params[key].inspect}" if @params[key]
             end
             html_params << ":id=>\"#{dom_id}_#{attribute}\"" if @context[:dom_prefix]
@@ -476,13 +514,12 @@ module Zena
             @markup.set_param(:type, @params[:type] || 'text')
 
             checked = html_attributes.delete(:checked)
-
             @markup.set_dyn_params(html_attributes)
             @markup.append_attribute checked if checked
             wrap('')
           end
 
-          extract_label(res, @params, attribute || html_attributes[:name])
+          extract_label(res, attribute || erb_attr)
         end
 
         # <r:checkbox role='collaborator_for' values='projects' in='site'/>"
@@ -531,7 +568,7 @@ module Zena
             res = "<%= make_checkbox(#{node}, :list => #{finder}, :role => #{meth.inspect}, :attr => #{attribute.inspect}) %>"
           end
 
-          extract_label(res, @params, attribute)
+          extract_label(res, attribute)
         end
 
         alias r_radio r_checkbox
@@ -568,12 +605,10 @@ module Zena
                 attribute = res[:name]
               end
 
-              unless @context[:in_filter] || attribute == 's'
-                if sub_attr
-                  res[:name] = "#{node.form_name}[#{attribute}][#{sub_attr}]"
-                else
-                 res[:name] = "#{node.form_name}[#{attribute}]"
-                end
+              if sub_attr
+                res[:name] = "#{node.form_name}[#{attribute}][#{sub_attr}]"
+              else
+                res[:name] = "#{node.form_name}[#{attribute}]"
               end
             end
 
@@ -622,11 +657,12 @@ module Zena
             #  end
             #end
           elsif node.will_be?(Column)
+            res[:erb_attr] = "<%= #{node}.name %>"
             res[:name]  = "node[<%= #{node}.name %>]"
             res[:value] = "<%= fquote #{node(Node)}.prop[#{node}.name] %>"
           end
 
-          if node.dom_prefix
+          if node.dom_prefix && !params[:param]
             res[:id]   = "#{node.dom_prefix}_#{attribute}"
           else
             res[:id]   = params[:id] if params[:id]
@@ -662,6 +698,17 @@ module Zena
           @html_tag_params.merge!(id_hash)
           out render_html_tag(res)
 =end
+
+        def r_crop
+          return parser_error("Invalid node type #{node.klass} (should be an Image).") unless node.will_be?(Image)
+          @markup.tag ||= 'div'
+          node.dom_prefix = dom_name
+          @markup.set_id(node.dom_id(:list => false))
+          dom = node.dom_id(:erb => false, :list => false)
+          out %Q{<%= render :partial => 'documents/crop', :locals => {:node => #{node(Node)}, :img_id => "img#{dom}"} %>}
+          out %Q{<% js_data << %Q{new Zena.Div_editor("img#{dom}", 'posx', 'posy', 'width', 'height', \#{#{node}.width / #{node}.width(Iformat['edit']).to_f}, Element.viewportOffset('#{dom}').left, Element.viewportOffset('#{dom}').top);} %>}
+        end
+
         protected
 
           # Get current attribute in forms
@@ -676,7 +723,7 @@ module Zena
             end
           end
 
-          # Set v_status parameter value
+          # Set auto publish parameter value
           def auto_publish_param(in_string = false)
             if in_string
               %w{true force}.include?(@params[:publish]) ? "&publish=#{@params[:publish]}" : ''
@@ -700,7 +747,7 @@ module Zena
                 begin
                   finder = build_finder(:all, nodes, @params)
                   klass  = finder[:class].first
-                rescue ::QueryBuilder::SyntaxError => err
+                rescue ::QueryBuilder::Error => err
                   out parser_error(err.message)
                   return nil
                 end
@@ -743,31 +790,6 @@ module Zena
             end
           end
 
-
-          # Transform a 'zazen' tag into a textarea input field.
-          def make_textarea(params)
-            return parser_error("missing 'name'") unless name = params[:name]
-            if name =~ /\A([\w_]+)\[(.*?)\]/
-              attribute = $2
-            else
-              attribute = name
-              name = "#{node.form_name}[#{attribute}]"
-            end
-            return '' if attribute == 'parent_id' # set with 'r_form'
-
-            if @blocks == [] || @blocks == ['']
-              if @context[:in_add]
-                value = ''
-              else
-                value = attribute ? "<%= #{node_attribute(attribute)} %>" : ""
-              end
-            else
-              value = expand_with
-            end
-            html_id = node.dom_prefix ? " id='#{node.dom_prefix}_#{attribute}'" : ''
-            "<textarea#{html_id} name='#{name}'>#{value}</textarea>"
-          end
-
           # Return the default field that will receive focus on form display.
           def default_focus_field
             if (input_fields = descendants('input')) != []

data/lib/zena/use/fulltext.rb

@@ -15,6 +15,7 @@ module Zena
               end
             end
           end
+          base.export_attributes += FULLTEXT_FIELDS
         end
 
         private
@@ -45,38 +46,29 @@ module Zena
 
         def self.included(base)
           base.before_validation :build_fulltext_indices
-          base.alias_method_chain :rebuild_index!, :fulltext
+          base.alias_method_chain :rebuild_index_for_version, :fulltext
         end
 
-        def rebuild_index_with_fulltext!
-          visible_versions.each do |version|
-            build_fulltext_indices(version)
-            fields_to_set = []
-            FULLTEXT_FIELDS.each do |idx_group|
-              next unless version.changes[idx_group]
-              fields_to_set << "#{idx_group}=#{Zena::Db.quote(version[idx_group])}"
-            end
+        def rebuild_index_for_version_with_fulltext(version)
+          # Call PropEval or other modules inserted before
+          rebuild_index_for_version_without_fulltext(version)
 
-            unless fields_to_set.empty?
-              Version.connection.execute "UPDATE versions SET #{fields_to_set.join(',')} WHERE id=#{version.id}"
-            end
+          build_fulltext_indices(true)
+          fields_to_set = []
+          FULLTEXT_FIELDS.each do |idx_group|
+            next unless version.changes[idx_group]
+            fields_to_set << "#{idx_group}=#{Zena::Db.quote(version[idx_group])}"
+          end
+
+          unless fields_to_set.empty?
+            Version.connection.execute "UPDATE versions SET #{fields_to_set.join(',')} WHERE id=#{version.id}"
           end
-          rebuild_index_without_fulltext!
         end
 
         private
           # Prepare roles to add/remove to object.
-          def build_fulltext_indices(rebuild_version = nil)
-            # Make sure roles are loaded because we compile RubyLess.
-
-            if rebuild_version
-              version = rebuild_version
-              # make sure prop corresponds to the correct version content
-              @properties = version.prop
-            else
-              return unless prop.changed?
-              version = self.version
-            end
+          def build_fulltext_indices(force_rebuild = false)
+            return if !force_rebuild && !prop.changed?
 
             if vclass = self.virtual_class
               vclass_prop = vclass.prop

data/lib/zena/use/html_tags.rb

@@ -100,7 +100,7 @@ module Zena
 
         def unique_id
           @counter ||= 0
-          "#{Time.now.to_i}_#{@counter += 1}"
+          "h#{Time.now.to_i}_#{@counter += 1}"
         end
 
         # Display the list of readers (group names).
@@ -158,22 +158,30 @@ module Zena
       module ViewMethods
         include FormTags
         include LinkTags
+        include RubyLess
+
+        safe_method [:flash_messages] => String
+        # TODO: replace 'flash_messages' with a FlashHash context or a list
+        # of Flash messages.
 
-        # Display flash[:notice] or flash[:error] if any. <%= flash <i>[:notice, :error, :both]</i> %>"
         def flash_messages(opts={})
           type = opts[:show] || 'both'
-          "<div id='messages'>" +
+
           if (type == 'notice' || type == 'both') && flash[:notice]
-            "<div id='notice' class='flash' onclick='new Effect.Fade(\"notice\")'>#{flash[:notice]}</div>"
-          else
-            ''
-          end +
+            notice = "<div class='auto_fade notice' onclick='new Effect.Fade(this)'>#{flash[:notice]}</div>"
+          end
+
           if (type == 'error'  || type == 'both') && flash[:error ]
-            "<div id='error' class='flash' onclick='new Effect.Fade(\"error\")'>#{flash[:error]}</div>"
-          else
-            ''
-          end +
-          "</div>"
+            error = "<div class='error' onclick='new Effect.Fade(this)'>#{flash[:error]}</div>"
+          end
+
+          if page = opts[:page]
+            page << %q{$$('#flash_messages .auto_fade').each(function(o) {
+              o.opacity = 100.0;
+              Effect.Fade(o, {duration: 3.0});
+            });}
+          end
+          "<div id='flash_messages'>#{notice}#{error}</div>"
         end
       end # ViewMethods
     end # HtmlTags

data/lib/zena/use/i18n.rb

@@ -8,7 +8,7 @@ module Zena
       ::ENV['LANG'] = 'C'
 
       class TranslationDict
-        attr_reader :last_error
+        attr_reader :last_error, :node_id
 
         include Zena::Acts::Secure
         include RubyLess
@@ -279,21 +279,29 @@ module Zena
           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])
-            return parser_error("dictionary #{dict.inspect} not found") unless base_path
-            # Lazy dictionary used for literal resolution
-            dict = TranslationDict.new(doc.id)
+            if base_path
+              # Lazy dictionary used for literal resolution
+              dict = TranslationDict.new(doc.id)
 
-            if dict.load!(dict_content)
-              # Save dictionary in template for dynamic uses
-              dict_name = get_var_name('dictionary', 'dict')
+              if dict.load!(dict_content)
+                # Save dictionary in template for dynamic uses
+                dict_name = get_var_name('dictionary', 'dict')
 
-              # This is to use in RubyLess translations and static translations in Zafu
-              set_context_var('set_var', 'dictionary', RubyLess::TypedString.new(dict_name, :class => TranslationDict, :literal => dict, :dictionary_id => doc.id))
+                # This is to use in RubyLess translations and static translations in Zafu
+                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}) %>"
+                # Lazy loading (loads file on first request)
+                out "<% #{dict_name} = load_dictionary(#{doc.id}) %>"
+              else
+                return parser_error(dict.last_error)
+              end
             else
-              return parser_error(dict.last_error)
+              # not found
+              if @params[:missing] == 'ignore'
+                # ignore
+              else
+                return parser_error("dictionary #{dict.inspect} not found") unless base_path
+              end
             end
           else
             return parser_error("missing 'dictionary'")
@@ -346,31 +354,6 @@ module Zena
           end
         end
 
-        def r_block
-          # when saving template, add loaded dictionary
-          if @context[:block] == self
-            if @dict
-              # pass loaded dictionary to ajax templates
-
-              # Save dictionary in template for dynamic uses
-              dict_name = get_var_name('dictionary', 'dict')
-
-              # This is to use in RubyLess translations and static translations in Zafu
-              set_context_var('set_var', 'dictionary', @dict)
-
-              # Lazy loading (loads file on first request)
-              out "<% #{dict_name} = load_dictionary(#{@dict.opts[:dictionary_id]}) %>"
-            end
-            super
-          else
-            @dict = get_context_var('set_var', 'dictionary')
-            res = super
-            @dict = nil
-
-            res
-          end
-        end
-
         def r_trans
           # _1 ==> insert this param ==> trans(@params[:text])
           return nil unless method = get_attribute_or_eval
@@ -449,6 +432,23 @@ module Zena
         #  end
         #  res.join(opts[:join] || '')
         #end
+        protected
+
+          # Overwriten from Zafu to insert dictionary in partial if there is one
+          def context_for_partial(cont)
+            cleared_context, prefix = super(cont)
+            prefix = prefix.to_s
+            dict = get_context_var('set_var', 'dictionary')
+            if dict && dict.klass <= TranslationDict
+              # 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}) %>"
+              return cleared_context, prefix
+            else
+              return cleared_context, nil
+            end
+          end
       end
     end # I18n
   end # Use

data/lib/zena/use/image_builder.rb

@@ -35,7 +35,14 @@ module Zena
   module Use
     class ImageBuilder
       DEFAULT_FORMATS = {
-        'tiny' =>   { :name=>'tiny', :size=>:force, :width=>16,  :height=>16 , :gravity=>Magick::CenterGravity   },
+        'tiny'  => { :name=>'tiny', :size=>:force, :width=>16,  :height=>16 , :gravity=>Magick::CenterGravity   },
+        'tipop' => { :name=>'tipop', :size=>:force, :width=>16,  :height=>16 , :gravity=>Magick::CenterGravity,
+          :popup => {
+              :name    => 'std',
+              :options => {'title' => 'link'},
+              :show    => ['navigation','title','summary']
+            }
+        },
         'mini' =>   { :name=>'mini', :size=>:force, :width=>32,  :height=>32 , :gravity=>Magick::CenterGravity   },
         'square' => { :name=>'square', :size=>:limit, :width=>180, :height=>180, :gravity=>Magick::CenterGravity },
         'med'  =>   { :name=>'med',  :size=>:limit, :width=>280, :height=>186, :gravity=>Magick::CenterGravity   },

data/lib/zena/use/ml_index.rb

@@ -7,34 +7,34 @@ module Zena
         end
 
         def rebuild_index_with_multi_lingual!
-          # We call rebuild_index_without_multi_lingual first with our hack
-          # to avoid inclusion order problems with fulltext index.
-
-          # Skip multi lingual indices
-          @index_langs = []
-
-          # Build std index
-          rebuild_index_without_multi_lingual!
-
-          # Skip std index
-          @skip_std_index = true
-
           visible_versions.each do |version|
+            # 1. for each visible version
             self.version = version
             @properties  = version.prop
-            @index_langs = nil # force rebuild
-            # Build ml index for each version
+            # rebuild for each lang
+            @index_langs = nil
+            # Forces a to skip multi lingual indices
+            # @index_langs = []
+
+            # Build std index
+            rebuild_index_for_version(version)
             rebuild_index_without_multi_lingual!
+            # 2. PropEval::rebuild_index!
+            # 3. Fulltext::rebuild_index!
+            # 4. Properties::rebuild_index!
           end
         end
 
+        def rebuild_index_for_version(v)
+          # noop (method chaining in PropEval, Fulltext, etc)
+        end
+
+
         # Hash used to read current values
         def index_reader(group_name)
           if group_name =~ /^ml_/
             return nil if index_langs.empty?
             super.merge(:with => {'lang' => index_langs})
-          elsif @skip_std_index
-            nil
           else
             super
           end

data/lib/zena/use/prop_eval.rb

@@ -9,6 +9,7 @@ module Zena
             property do |p|
               p.string 'prop_eval'
             end
+            self.export_attributes += %w{prop_eval}
           end
         end
 
@@ -42,12 +43,15 @@ module Zena
           base.before_validation  :merge_prop_eval
           base.before_validation  :need_set__id
           base.before_save        :set__id
-          base.alias_method_chain :rebuild_index!, :prop_eval
+          base.alias_method_chain :rebuild_index_for_version, :prop_eval
         end
 
-        def rebuild_index_with_prop_eval!
+        def rebuild_index_for_version_with_prop_eval(version)
+          # Call other modules inserted before
+          rebuild_index_for_version_without_prop_eval(version)
           merge_prop_eval(true)
-          rebuild_index_without_prop_eval!
+          # Only save properties, without changing updated_at date or other callbacks
+          Zena::Db.set_attribute(version, 'properties', encode_properties(@properties)) if version.changed?
         end
 
         def need_set__id
@@ -64,9 +68,10 @@ module Zena
           self._id = self.title if @need_set__id
         end
 
+        # Must happend after 'change_klass'
         def merge_prop_eval(force_rebuild = false)
-          return unless self[:vclass_id]
-          return unless prop.changed? || force_rebuild
+          return unless vclass_id
+          return unless force_rebuild || prop.changed? || klass_changed?
 
           if code = vclass.prop_eval
             hash = safe_eval(code)