zafu 0.7.5 → 0.7.6

data/History.txt

@@ -1,3 +1,9 @@
+== 0.7.6
+
+* Enhancements
+  * Enabled empty do (ignore method)
+  * Fixed white-space parsing (replaced all <% .. -%> for <% .. %>)
+
 == 0.7.5 2011-01-15
 
 * Enhancements

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end
 

data/lib/zafu/parser.rb

@@ -13,9 +13,9 @@ module Zafu
     # 'after_wrap' is called by the 'wrap' method from within the method handler, 'after_process' is called
     # at the very end. Example:
     #
-    #   <% if var = Node.all -%>                                  | <---
-    #     <li>...</li>               <--- content for after_wrap  | <---  content for after_process
-    #   <% end -%>                                                | <---
+    #   <% if var = Node.all %>                                  | <---
+    #     <li>...</li>              <--- content for after_wrap  | <---  content for after_process
+    #   <% end %>                                                | <---
     #
 
 

data/lib/zafu/parsing_rules.rb

@@ -50,13 +50,16 @@ module Zafu
       if @params =~ /\A([^>]*?)do\s*=('|")([^\2]*?[^\\])\2([^>]*)\Z/
         #puts $~.to_a.inspect
         # we have a sub 'do'
+        params = $1
+        sub_params = $4
+        sub_method = $3.gsub("\\#{$2}", $2)
 
-        @params = Markup.parse_params($1)
+        @params = Markup.parse_params(params)
 
         # We need this flag to detect cases cases like <r:with part='list' do='other list finder'/>
         @sub_do = true
 
-        opts = {:method=>$3, :params=>$4}
+        opts = {:method => sub_method, :params => sub_params}
 
         # the matching zafu tag will be parsed by the last 'do', we must inform it to halt properly :
         opts[:end_tag] = @end_tag
@@ -193,11 +196,12 @@ module Zafu
         opts.merge!(:text=>'') if $3 != ''
         make(:void, opts)
       #elsif @text =~ /\A<(\w+)([^>]*?)do\s*=('([^>]*?[^\\]|)'|"([^>]*?[^\\]|)")([^>]*?)(\/?)>/
-      elsif @text =~ /\A<(\w+)([^>]*?)do\s*=('|")([^\3]*?[^\\])\3([^>]*?)(\/?)>/
+      elsif @text =~ /\A<(\w+)([^>]*?)do\s*=('|")([^\3]*?[^\\]|)\3([^>]*?)(\/?)>/
         #puts "DO:#{$~.to_a.inspect}" # do tag
         eat $&
-        opts.merge!(:method=> $4, :html_tag=>$1, :html_tag_params=>$2, :params=>$5)
-        opts.merge!(:text=>'') if $6 != ''
+        reg = $~
+        opts.merge!(:method=> reg[4].gsub("\\#{reg[3]}", reg[3]), :html_tag=>reg[1], :html_tag_params=>reg[2], :params=>reg[5])
+        opts.merge!(:text=>'') if reg[6] != ''
         make(:void, opts)
       elsif @options[:form] && @text =~ /\A<(input|select|textarea|form)([^>]*?)(\/?)>/
         eat $&

data/lib/zafu/process/ajax.rb

@@ -33,7 +33,7 @@ module Zafu
 
           # 1. Render inline
           #                                                                                                                 assign [] to var
-          out "<% if (#{var} = #{finder[:method]}) || (#{node}.#{node.will_be?(Comment) ? "can_comment?" : "can_write?"} && #{var}=[]) -%>"
+          out "<% if (#{var} = #{finder[:method]}) || (#{node}.#{node.will_be?(Comment) ? "can_comment?" : "can_write?"} && #{var}=[]) %>"
           # The list is not empty or we have enough rights to add new elements.
           set_dom_prefix
 
@@ -76,7 +76,7 @@ module Zafu
 
             store_block(form_block, cont)
           end
-          out "<% end -%>"
+          out "<% end %>"
         else
           super
         end
@@ -101,17 +101,17 @@ module Zafu
         #else
         #  # no form, render, edit and add are not ajax
         #  if descendant('add') || descendant('add_document')
-        #    out "<% if (#{list_var} = #{list_finder}) || (#{node}.#{node.will_be?(Comment) ? "can_comment?" : "can_write?"} && #{list_var}=[]) -%>"
+        #    out "<% if (#{list_var} = #{list_finder}) || (#{node}.#{node.will_be?(Comment) ? "can_comment?" : "can_write?"} && #{list_var}=[]) %>"
         #  elsif list_finder != 'nil'
-        #    out "<% if #{list_var} = #{list_finder} -%>"
+        #    out "<% if #{list_var} = #{list_finder} %>"
         #  else
-        #    out "<% if nil -%>"
+        #    out "<% if nil %>"
         #  end
         #
         #
         #  out render_html_tag(expand_with(:list=>list_var, :in_if => false))
         #  out expand_with(:in_if=>true, :only=>['elsif', 'else'], :html_tag => @html_tag, :html_tag_params => @html_tag_params)
-        #  out "<% end -%>"
+        #  out "<% end %>"
         #end
       end
 
@@ -159,7 +159,7 @@ module Zafu
 
           link = wrap(make_link(:default_text => _('edit'), :update => each_block, :action => 'edit'))
 
-          out "<% if #{node}.can_write? -%>#{link}<% end -%>"
+          out "<% if #{node}.can_write? %>#{link}<% end %>"
         end
 
         #if @context[:template_url]
@@ -179,9 +179,9 @@ module Zafu
         return '' if @context[:make_form]
 
         if node.will_be?(Comment)
-          out "<% if #{node.up(Node)}.can_comment? -%>"
+          out "<% if #{node.up(Node)}.can_comment? %>"
         else
-          out "<% if #{node.up(Node)}.can_write? -%>"
+          out "<% if #{node.up(Node)}.can_write? %>"
         end
 
         unless descendant('add_btn')
@@ -216,9 +216,9 @@ module Zafu
             # FIXME: BUG if we set <r:form klass='Post'/> the user cannot select class with menu...
 
             # FIXME: inspect '@context[:form]' to see if it contains v_klass ?
-            out "<% if #{new_node} = secure(Node) { Node.new_node('class' => '#{new_node.klass}') } -%>"
+            out "<% if #{new_node} = secure(Node) { Node.new_node('class' => '#{new_node.klass}') } %>"
           else
-            out "<% if #{new_node} = #{new_node.class_name}.new -%>"
+            out "<% if #{new_node} = #{new_node.class_name}.new %>"
           end
 
           form_block = @context[:form]
@@ -236,13 +236,13 @@ module Zafu
             # Node context = new node
             :node         => new_node
           )
-          out "<% end -%>"
+          out "<% end %>"
         else
           # no ajax
           @markup.append_param(:class, 'btn_add') if @markup.tag
           out wrap(expand_with)
         end
-        out "<% end -%>"
+        out "<% end %>"
       end
 
       def r_add_btn

data/lib/zafu/process/conditional.rb

@@ -41,10 +41,10 @@ module Zafu
             @markup.set_dyn_param(k, v)
           end
 
-          out "<% elsif #{cond} -%>#{wrap(res)}" # do not propagate
+          out "<% elsif #{cond} %>#{wrap(res)}" # do not propagate
         else
           @markup.done = true # never wrap else/elsif clause
-          out "<% elsif #{cond} -%>#{res}" # do not propagate
+          out "<% elsif #{cond} %>#{res}" # do not propagate
         end
       end
 
@@ -57,7 +57,7 @@ module Zafu
       # * +alt_markup+ - (optional) alternative markup to use for the 'else', 'elsif' clauses.
       def expand_if(condition, new_node_context = self.node, alt_markup = @markup)
         res = ""
-        res << "<% if #{condition} -%>"
+        res << "<% if #{condition} %>"
 
         with_context(:node => new_node_context) do
           res << wrap(expand_with)
@@ -65,7 +65,7 @@ module Zafu
 
         only = method == 'case' ? %r{^[A-Z]|else|elsif|when} : %w{else elsif when}
         res << expand_with(:in_if => true, :only => only, :markup => alt_markup)
-        res << "<% end -%>"
+        res << "<% end %>"
         res
       end
 

data/lib/zafu/process/context.rb

@@ -7,8 +7,8 @@ module Zafu
       def r_each
         if node.list_context?
           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| -%>"
+            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(self, join)
@@ -28,7 +28,7 @@ module Zafu
               @markup.tag ||= 'div'
             end
           else
-            out "<% #{node}.each do |#{var}| -%>"
+            out "<% #{node}.each do |#{var}| %>"
           end
 
 
@@ -49,7 +49,7 @@ module Zafu
 
             out wrap(expand_with)
           end
-          out "<% end -%>"
+          out "<% end %>"
         else
           out expand_with
         end
@@ -104,7 +104,7 @@ module Zafu
           end
         else
           res = ''
-          res << "<% #{var} = #{finder[:method]} -%>"
+          res << "<% #{var} = #{finder[:method]} %>"
           open_node_context(finder, :node => node.move_to(var, finder[:class], finder), :form => nil) do
             res << wrap(expand_with)
           end

data/lib/zafu/process/forms.rb

@@ -115,7 +115,7 @@ module Zafu
             # f.xxx
             yield(opts.merge(:in_form => true))
           # close form
-          out opts[:form_helper] ? "<% end -%>" : '</form>'
+          out opts[:form_helper] ? "<% end %>" : '</form>'
         end
 
         def form_error_messages(f)

data/lib/zafu/process/html.rb

@@ -116,6 +116,12 @@ module Zafu
         expand_with
       end
 
+      def steal_and_eval_html_params_for(markup, params)
+        markup.steal_keys.each do |key|
+          next unless value = params.delete(key)
+          append_markup_attr(markup, key, value)
+        end
+      end
       #def r_form
       #  res   = "<#{@markup.tag}#{params_to_html(@params)}"
       #  @markup.done = true

data/test/zafu/basic.yml

@@ -1,3 +1,15 @@
+use_block_as_param:
+  src: "<r:raw>this and thatn</r:raw>"
+  tem: "<%= raw(\"this and thatn\") %>"
+
 out_post:
   src: "<r:link post_string='Monday'/>"
-  tem: "<%= make_link(@node) %>Monday"
+  tem: "<%= make_link(@node) %>Monday"
+
+empty_do:
+  src: "this is <li do=''>not</li>good"
+  tem: "this is good"
+
+do_with_escaped_quote:
+  src: "<li do='raw(\'blah\')'>blah</li>"
+  tem: "<li><%= raw(\"blah\") %></li>"

data/test/zafu/markup.yml

@@ -1,4 +1,4 @@
 
 double_do_should_not_propagate_markup:
   src: "<div id='top' do='root' do='link'/>"
-  tem: "<% if var1 = @node.root -%><div id='top'><%= make_link(var1) %></div><% end -%>"
+  tem: "<% if var1 = @node.root %><div id='top'><%= make_link(var1) %></div><% end %>"

data/test/zafu_test.rb

@@ -15,9 +15,12 @@ class ZafuTest < Test::Unit::TestCase
     include RubyLess
     safe_method :hello => String
     safe_method :one => {:class => String, :method => "dummy_one"}
+    safe_context :friend => Dummy
   end
   safe_method :dum  => Dummy
+  safe_method :list => [Dummy]
   safe_method :dum2 => {:class => Dummy, :nil => true}
+  safe_method [:raw, String] => String
 
   context 'Compilation in a model' do
     setup do
@@ -33,12 +36,12 @@ class ZafuTest < Test::Unit::TestCase
     end
 
     should 'change node context by following safe_method types' do
-      assert_equal '<% var1 = dum -%><%= var1.hello %>', zafu_erb("<r:dum do='hello'/>")
+      assert_equal '<% var1 = dum %><%= var1.hello %>', zafu_erb("<r:dum do='hello'/>")
     end
 
     context 'that can be nil' do
       should 'wrap context in if' do
-        assert_equal '<% if var1 = dum2 -%><%= var1.hello %><% end -%>', zafu_erb("<r:dum2 do='hello'/>")
+        assert_equal '<% if var1 = dum2 %><%= var1.hello %><% end %>', zafu_erb("<r:dum2 do='hello'/>")
       end
     end
   end

data/zafu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-01-15}
+  s.date = %q{2011-02-11}
   s.description = %q{Provides a powerful templating language based on xhtml for rails}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zafu
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency