zafu 0.5.0 → 0.6.0

data/lib/zafu/process/context.rb

@@ -6,16 +6,54 @@ module Zafu
     module Context
       def r_each
         if node.klass.kind_of?(Array)
-          out "<% #{node}.each do |#{var}| -%>"
-          out render_html_tag(expand_with_node(var, node.klass.first))
+          if @params[:alt_class] || @params[:join]
+            out "<% #{var}_max_index = #{node}.size - 1 -%>" if @params[:alt_reverse]
+            out "<% #{node}.each_with_index do |#{var},#{var}_index| -%>"
+
+            if join = @params[:join]
+              join = RubyLess.translate_string(join, self)
+              #if join_clause = @params[:join_if]
+              #  set_stored(Node, 'prev', "#{var}_prev")
+              #  cond = get_test_condition(var, :test=>join_clause)
+              #  out "<%= #{var}_prev = #{node}[#{var}_index - 1]; (#{var}_index > 0 && #{cond}) ? #{join.inspect} : '' %>"
+              #else
+                out "<%= #{var}_index > 0 ? #{join} : '' %>"
+              #end
+            end
+
+            if alt_class = @params[:alt_class]
+              alt_class = RubyLess.translate_string(alt_class, self)
+              alt_test = @params[:alt_reverse] == 'true' ? "(#{var}_max_index - #{var}_index) % 2 != 0" : "#{var}_index % 2 != 0"
+              @markup.append_dyn_param(:class, "<%= #{alt_test} ? #{alt_class} : '' %>")
+              @markup.tag ||= 'div'
+            end
+          else
+            out "<% #{node}.each do |#{var}| -%>"
+          end
+
+          with_context(:node => node.move_to(var, node.klass.first)) do
+            steal_and_eval_html_params_for(@markup, @params)
+            @markup.set_id(node.dom_id) if need_dom_id?
+            out @markup.wrap(expand_with)
+          end
           out "<% end -%>"
+        else
+          out expand_with
         end
+
+        # We need to return true for Ajax 'make_form'
+        true
       end
 
       def helper
         @context[:helper]
       end
 
+      # Return true if we need to insert the dom id for this element. This method is overwritten in Ajax.
+      def need_dom_id?
+        false
+      end
+
       # 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)
@@ -23,8 +61,33 @@ module Zafu
         @context[:node].get(klass)
       end
 
-      def expand_with_node(name, klass)
-        expand_with(:node => @context[:node].move_to(name, klass))
+      # Store some contextual value / variable inside a named group. This should be
+      # used to avoid key clashes between different types of elements to store.
+      def set_context_var(group, key, obj)
+        @context["#{group}::#{key}"] = obj
+      end
+
+      # Retrieve a value from a given contextual group. The value must have been
+      # previously set with 'set_context_var' somewhere in the hierarchy.
+      def get_context_var(group, key)
+        @context["#{group}::#{key}"]
+      end
+
+      # Expand blocks in a new context.
+      # This method is partly overwriten in Ajax
+      def expand_with_finder(finder)
+        if finder[:nil]
+          open_node_context(finder) do
+            expand_if("#{var} = #{finder[:method]}", node.move_to(var, finder[:class]))
+          end
+        else
+          res = ''
+          res << "<% #{var} = #{finder[:method]} -%>"
+          open_node_context(finder, :node => node.move_to(var, finder[:class])) do
+            res << @markup.wrap(expand_with)
+          end
+          res
+        end
       end
 
       # def context_with_node(name, klass)
@@ -40,6 +103,40 @@ module Zafu
           @var = "var1"
         end
       end
+
+      # This method is called when we enter a new node context
+      def node_context_vars(finder)
+        # do nothing (this is a hook for other modules like QueryBuilder and RubyLess)
+        {}
+      end
+
+      # Declare a variable that can be used later in the compilation. This method
+      # returns the variable name to use.
+      def set_var(var_list, var_name)
+        var_name = var_name.to_sym
+        out parser_error("'#{var_name}' already defined.") if @context[var_name] || var_list[var_name]
+        var_list[var_name] = "_z#{var_name}"
+      end
+
+      # Change context for a given scope.
+      def with_context(cont)
+        raise "Block missing" unless block_given?
+        cont_bak = @context.dup
+          @context.merge!(cont)
+          res = yield
+        @context = cont_bak
+        res
+      end
+
+      # This should be called when we enter a new node context so that the proper hooks are
+      # triggered (insertion of contextual variables).
+      def open_node_context(finder, cont = {})
+        sub_context = node_context_vars(finder).merge(cont)
+
+        with_context(sub_context) do
+          yield
+        end
+      end
     end # Context
   end # Process
 end # Zafu

data/lib/zafu/process/forms.rb

@@ -0,0 +1,124 @@
+module Zafu
+  module Process
+    module Forms
+      def self.included(base)
+        base.expander :make_form
+      end
+
+      def r_form
+        options = form_options
+
+        @markup.set_id(options[:id]) if options[:id]
+        @markup.set_param(:style, options[:style]) if options[:style]
+
+        if descendant('form_tag')
+          # We have a specific place to insert our form
+          out expand_with(:form_options => options)
+        else
+          r_form_tag(options)
+        end
+      end
+
+      def r_form_tag(options = context[:form_options])
+        if options.blank?
+          # <form> not in <r:form>, just render all
+          markup = Zafu::Markup.new('form')
+          @params.each do |k, v|
+            markup.set_param(k, v)
+          end
+          out markup.wrap(expand_with)
+        else
+          # <form> inside <r:form>
+          form_tag(options) do |opts|
+            # Render error messages tag
+            form_error_messages(opts[:form_helper])
+
+            # Render hidden fields
+            hidden_fields = form_hidden_fields(options)
+            out "<div class='hidden'>"
+            hidden_fields.each do |k,v|
+              if v.kind_of?(String)
+                v = "'#{v}'" unless v.kind_of?(String) && ['"', "'"].include?(v[0..0])
+                out "<input type='hidden' name='#{k}' value=#{v}/>"
+              else
+                # We use ['ffff'] to indicate that the content is already escaped and ready for ERB.
+                out v.first
+              end
+            end
+            out '</div>'
+
+            # Render form elements
+            out expand_with(opts)
+
+            # What is this ?
+            #@blocks = opts[:blocks_bak] if opts[:blocks_bak]
+          end
+        end
+      end
+
+      private
+        def make_form
+          return nil unless @context[:make_form]
+
+          if method == 'each'
+            r_form
+          else
+            nil
+          end
+        end
+
+        # Return id, style, form and cancel parts of the form.
+        def form_options
+          opts = {}
+          opts[:klass] = node.master_class(ActiveRecord::Base)
+          if @context[:in_add]
+            opts[:id]    = "#{node.dom_prefix}_form"
+            opts[:style] = 'display:none;'
+          end
+
+          if @context[:template_url]
+            opts[:form_tag]    = "<% remote_form_for(:#{node.form_name}, #{node}, :html => {:id => \"#{node.dom_prefix}_form_t\"}) do |f| %>"
+            opts[:form_helper] = 'f'
+          else
+            opts[:form_tag]    = "<% form_for(:#{node.form_name}, #{node}, :html => {:id => \"#{node.dom_prefix}_form_t\"}) do |f| %>"
+            opts[:form_helper] = 'f'
+          end
+
+          opts
+        end
+
+        # Return hidden fields that need to be inserted in the form.
+        def form_hidden_fields(opts)
+          if t_url = @context[:template_url]
+            {'t_url' => t_url}
+          else
+            {}
+          end
+        end
+
+        # Render the 'form' tag and set expansion context.
+        def form_tag(options)
+          opts = options.dup
+
+          if descendant('cancel') || descendant('edit')
+            # Pass 'form_cancel' content to expand_with (already in options).
+          else
+            # Insert cancel before form
+            out opts.delete(:form_cancel).to_s
+          end
+
+          # form_for ... do |f|
+          out opts.delete(:form_tag)
+            # f.xxx
+            yield(opts.merge(:in_form => true))
+          # close form
+          out opts[:form_helper] ? "<% end -%>" : '</form>'
+        end
+
+        def form_error_messages(f)
+          out "<%= #{f}.error_messages %>"
+        end
+
+    end # Forms
+  end # Process
+end # Zafu

data/lib/zafu/process/html.rb

@@ -1,30 +1,36 @@
 module Zafu
   module Process
     module HTML
-      attr_accessor :html_tag, :html_tag_params, :name, :sub_do
+      def self.included(base)
+        base.wrap  :wrap_html
+      end
 
       # Replace the 'original' element in the included template with our new version.
       def replace_with(new_obj)
         super
-        html_tag_params    = new_obj.html_tag_params
-        [:class, :id].each do |sym|
-          html_tag_params[sym] = new_obj.params[sym] if new_obj.params.include?(sym)
+        # [self = original_element]. Replace @markup with content of the new_obj (<ul do='with'>...)
+        if new_obj.markup.tag
+          @markup.tag = new_obj.markup.tag
         end
-        @markup.tag = new_obj.html_tag || @markup.tag
-        @markup.params.merge!(html_tag_params)
+
+        @markup.params.merge!(new_obj.markup.params)
+
+        # We do not have to merge dyn_params since these are compiled before processing (and we are in
+        # the pre-processor)
+
         if new_obj.params[:method]
-          @method   = new_obj.params[:method] if new_obj.params[:method]
+          @method   = new_obj.params[:method]
         elsif new_obj.sub_do
           @method = 'void'
         end
       end
 
-      # Pass the caller's 'html_tag' and 'html_tag_params' to the included part.
+      # Pass the caller's 'markup' to the included part.
       def include_part(obj)
-        obj.html_tag = @markup.tag || obj.html_tag
-        obj.html_tag_params = !@markup.params.empty? ? @markup.params : obj.html_tag_params
+        if @markup.tag
+          obj.markup = @markup.dup
+        end
         @markup.tag = nil
-        @markup.params = {}
         super(obj)
       end
 
@@ -32,33 +38,29 @@ module Zafu
         super && @markup.params == {} && @markup.tag.nil?
       end
 
-      def before_process
-        return unless super
-        @markup.done = false
+      def compile_html_params
+        return if @markup.done
         unless @markup.tag
           if @markup.tag = @params.delete(:tag)
-            @markup.params = {}
-            [:id, :class].each do |k|
-              next unless @params[k]
-              @markup.params[k] = @params.delete(k)
-            end
+            @markup.steal_html_params_from(@params)
           end
         end
+
         # Translate dynamic params such as <tt>class='#{visitor.lang}'</tt> in the context
         # of the current parser
         @markup.compile_params(self)
-
-        # [each] is run many times with different roles. Some of these change html_tag_params.
-        @markup_bak = @markup.dup
-        true
       end
 
-      def after_process(text)
-        res = @markup.wrap(super)
-        @markup = @markup_bak
-        res
+      def wrap_html(text)
+        compile_html_params
+        @markup.wrap(text)
       end
 
+      #def restore_markup
+      #  # restore @markup
+      #  @markup = @markup_bak
+      #end
+
       def inspect
         @markup.done = false
         res = super
@@ -66,7 +68,7 @@ module Zafu
           if res =~ /\A\[(\w+)(.*)\/\]\Z/m
             res = "[#{$1}#{$2}]<#{@markup.tag}/>[/#{$1}]"
           elsif res =~ /\A\[([^\]]+)\](.*)\[\/(\w+)\]\Z/m
-            res = "[#{$1}]#{render_html_tag($2)}[/#{$3}]"
+            res = "[#{$1}]#{@markup.wrap($2)}[/#{$3}]"
           end
         end
         res
@@ -77,8 +79,6 @@ module Zafu
         ''
       end
 
-      alias r_ r_ignore
-
       def r_rename_asset
         return expand_with unless @markup.tag
         case @markup.tag
@@ -105,64 +105,59 @@ module Zafu
           type = @markup.tag.to_sym
         end
 
-        src = @params[key]
-        if src && src[0..0] != '/' && src[0..6] != 'http://'
-          @params[key] = helper.send(:template_url_for_asset, :src => src, :base_path => @options[:base_path], :type => type)
-        end
-
-        res   = "<#{@markup.tag}#{params_to_html(@params)}"
-        @markup.done = true
-        inner = expand_with
-        if inner == ''
-          res + "/>"
-        else
-          res + ">#{inner}"
-        end
-      end
-
-      def r_form
-        res   = "<#{@markup.tag}#{params_to_html(@params)}"
-        @markup.done = true
-        inner = expand_with
-        if inner == ''
-          res + "/>"
-        else
-          res + ">#{inner}"
+        src = @params.delete(key)
+        if src && src[0..6] != 'http://'
+          @markup.params[key] = helper.send(:template_url_for_asset, :src => src, :base_path => @options[:base_path], :type => type)
         end
-      end
 
-      def r_select
-        res   = "<#{@markup.tag}#{params_to_html(@params)}"
-        @markup.done = true
-        inner = expand_with
-        if inner == ''
-          res + "></#{@markup.tag}>"
-        else
-          res + ">#{inner}"
-        end
-      end
+        @markup.steal_html_params_from(@params)
 
-      def r_input
-        res   = "<#{@markup.tag}#{params_to_html(@params)}"
-        @markup.done = true
-        inner = expand_with
-        if inner == ''
-          res + "/>"
-        else
-          res + ">#{inner}"
-        end
+        expand_with
       end
 
-      def r_textarea
-        res   = "<#{@markup.tag}#{params_to_html(@params)}"
-        @markup.done = true
-        inner = expand_with
-        if inner == ''
-          res + "/>"
-        else
-          res + ">#{inner}"
-        end
-      end
+      #def r_form
+      #  res   = "<#{@markup.tag}#{params_to_html(@params)}"
+      #  @markup.done = true
+      #  inner = expand_with
+      #  if inner == ''
+      #    res + "/>"
+      #  else
+      #    res + ">#{inner}"
+      #  end
+      #end
+      #
+      #def r_select
+      #  res   = "<#{@markup.tag}#{params_to_html(@params)}"
+      #  @markup.done = true
+      #  inner = expand_with
+      #  if inner == ''
+      #    res + "></#{@markup.tag}>"
+      #  else
+      #    res + ">#{inner}"
+      #  end
+      #end
+      #
+      #def r_input
+      #  res   = "<#{@markup.tag}#{params_to_html(@params)}"
+      #  @markup.done = true
+      #  inner = expand_with
+      #  if inner == ''
+      #    res + "/>"
+      #  else
+      #    res + ">#{inner}"
+      #  end
+      #end
+      #
+      #def r_textarea
+      #  res   = "<#{@markup.tag}#{params_to_html(@params)}"
+      #  @markup.done = true
+      #  inner = expand_with
+      #  if inner == ''
+      #    res + "/>"
+      #  else
+      #    res + ">#{inner}"
+      #  end
+      #end
     end # HTML
   end # Process
 end # Zafu