zafu 0.7.8 → 0.7.9

data/History.txt

@@ -1,3 +1,12 @@
+== 0.7.9 2011-05-26
+
+* Enhancements
+  * Fixed bad ERB on 'klass' error.
+  * Should steal html params from [with] ("<r:with class='foo'>").
+  * Removed auto-transform of 'input', 'form' and other native tags.
+  * Added 'wrap_in_block' and 'add_block' helpers.
+  * Freezing RubyLess evaluated code (Ruby parser bug altering input string).
+
 == 0.7.8 2011-05-10
 
 * Enhancements

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
 end
 

data/lib/zafu/markup.rb

@@ -7,7 +7,7 @@ module Zafu
     EMPTY_TAGS   = %w{meta input link img}
     STEAL_PARAMS = {
       'link'   => [:href, :charset, :rel, :type, :media, :rev, :target],
-      'a'      => [:title, :onclick],
+      'a'      => [:title, :onclick, :target],
       'script' => [:type, :charset, :defer],
       :other   => [:class, :id, :style],
     }

data/lib/zafu/parsing_rules.rb

@@ -27,7 +27,10 @@ module Zafu
       @markup = Markup.new(@options.delete(:html_tag))
 
       # html_tag
-      @markup.params = @options.delete(:html_tag_params)
+      if html_params = @options.delete(:html_tag_params)
+        # FIXME: make a better parser so that we do not have to worry with '>' at all.
+        @markup.params = html_params.gsub('>', '>')
+      end
 
       # end_tag is used to know when to close parsing in sub-do
       # Example:
@@ -43,10 +46,6 @@ module Zafu
       # code indentation
       @markup.space_before = @options.delete(:space_before) # @space_before
 
-      # form capture (input, select, textarea, form)
-      # FIXME: what is this ???
-      @options[:form] ||= true if @method == 'form'
-
       if @params =~ /\A([^>]*?)do\s*=('|")([^\2]*?[^\\])\2([^>]*)\Z/
         #puts $~.to_a.inspect
         # we have a sub 'do'
@@ -208,13 +207,6 @@ module Zafu
         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 $&
-        method = $1 == 'form' ? 'form_tag' : $1 # <form> ==> r_form_tag, <r:form> ==> r_form
-        opts.merge!(:method=>method, :params=>$2)
-        opts.merge!(:text=>'') if $3 != ''
-        opts.merge!(:end_tag=>'form') if method == 'form_tag'
-        make(:void, opts)
       elsif @text =~ /\A<(\w+)(([^>]*?)\#\{([^>]*?))(\/?)>/
         # html tag with dynamic params
         #puts "OTHER_DYN:[#{$&}]"
@@ -316,5 +308,21 @@ module Zafu
       # Force descendants rebuild
       @all_descendants = nil
     end
+
+    # Helper during compilation to wrap current content in a new block
+    def wrap_in_block(text_or_opts)
+      # avoid wrapping objects in [void][/void]
+      bak = @blocks
+      @blocks = []
+      if text_or_opts.kind_of?(String)
+        wrapper = make(:void, :method => 'void', :text => text_or_opts)
+      else
+        wrapper = make(:void, text_or_opts)
+      end
+      wrapper.blocks = bak
+      @blocks = [wrapper]
+      # Force descendants rebuild
+      @all_descendants = nil
+    end
   end # ParsingRules
 end # Zafu

data/lib/zafu/process/ajax.rb

@@ -35,7 +35,7 @@ module Zafu
           #                                                                                                                 assign [] to var
           out "<% if (#{var} = #{finder[:method]}) || (#{node}.#{finder[:class].first <= Comment ? "can_comment?" : "can_write?"} && #{var}=[]) %>"
           # The list is not empty or we have enough rights to add new elements.
-          set_dom_prefix
+          node.dom_prefix = dom_name
 
           # New node context.
           open_node_context(finder, :node => self.node.move_to(var, finder[:class])) do
@@ -58,9 +58,9 @@ module Zafu
 
             # Render 'else' clauses
             else_clauses = expand_with(
-                :in_if => true,
-                :only  => ['elsif', 'else'],
-                :markup => @markup
+              :in_if => true,
+              :only  => ['elsif', 'else'],
+              :markup => @markup
             )
 
             # 2. Save 'each' template
@@ -124,7 +124,7 @@ module Zafu
         end
 
         # Since we are using ajax, we will need this object to have an ID set.
-        set_dom_prefix
+        node.dom_prefix = dom_name
 
         @markup.done = false
 
@@ -224,7 +224,12 @@ module Zafu
           out wrap("#{expand_with(:onclick=>"[\"#{node.dom_prefix}_add\", \"#{node.dom_prefix}_form\"].each(Element.toggle);#{focus}return false;")}")
 
           if klass = @context[:klass]
-            return parser_error("Invalid class '#{klass}'") unless klass = get_class(klass)
+            unless klass = get_class(klass)
+              out parser_error("Invalid class '#{@context[:klass]}'")
+              # Clean close ERB
+              out "<% end -%>"
+              return
+            end
           else
             klass = Array(node.klass).first
           end
@@ -274,6 +279,7 @@ module Zafu
       def r_each
         if @context[:saved_template]
           # render to start a saved template
+          node.propagate_dom_scope!
           options = form_options
           @markup.set_id(options[:id]) if options[:id]
           @markup.set_param(:style, options[:style]) if options[:style]
@@ -308,14 +314,6 @@ module Zafu
         @context[:form] || descendant('unlink') || descendant('drop')
       end
 
-      # Set a unique DOM prefix to build unique ids in the page.
-      def set_dom_prefix(node = self.node)
-        @name ||= unique_name
-        # TODO: should rebuild descendants list in parents...
-        #puts [parent.method, method, @context[:name], @name].inspect
-        node.dom_prefix = @name
-      end
-
       # Unique template_url, ending with dom_id
       def template_url(dom_prefix = node.dom_prefix)
         "#{root.options[:root]}/#{dom_prefix}"
@@ -325,9 +323,16 @@ module Zafu
         template_url(dom_prefix) + '_form'
       end
 
+      # Return object id (or name). Sets name when needed.
+      # Context is passed when the parent needs to set dom_name on a child
+      # before @context is passed down.
+      def dom_name(context = @context)
+        @name ||= unique_name(context)
+      end
+
       # Return a different name on each call
-      def unique_name
-        base = @name || @context[:name] || 'list'
+      def unique_name(context = @context)
+        base = @name || context[:name] || 'list'
         root.get_unique_name(base, base == @name).gsub(/[^\d\w\/]/,'_')
       end
 
@@ -379,10 +384,12 @@ module Zafu
 
         def store_block(block, cont = {})
           cont, prefix = context_for_partial(cont)
+          # Keep dom prefix
+          dom_prefix = node.dom_prefix
 
           # Create new node context
           node = cont[:node].as_main(ActiveRecord::Base)
-          node.dom_prefix = @name
+          node.dom_prefix = dom_prefix
 
           cont[:template_url] = template_url(node.dom_prefix)
           cont[:node]  = node

data/lib/zafu/process/forms.rb

@@ -24,38 +24,26 @@ module Zafu
       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
-        else
-          # <form> inside <r:form>
-          form_tag(options) do |opts|
-            # Render error messages tag
-            form_error_messages(opts[:form_helper])
-
-            # Render form elements
-            out expand_with(opts)
-
-            # Render hidden fields (these must go after normal elements so that focusFirstElement works)
-            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
+        form_tag(options) do |opts|
+          # Render error messages tag
+          form_error_messages(opts[:form_helper])
+
+          # Render form elements
+          out expand_with(opts)
+
+          # Render hidden fields (these must go after normal elements so that focusFirstElement works)
+          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
-            out '</div>'
-
-            # What is this ?
-            #@blocks = opts[:blocks_bak] if opts[:blocks_bak]
           end
+          out '</div>'
         end
       end
 

data/lib/zafu/process/html.rb

@@ -11,6 +11,9 @@ module Zafu
         # [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
+        else
+          # Steal 'class' param
+          @markup.steal_html_params_from(new_obj.params)
         end
 
         @markup.params.merge!(new_obj.markup.params)

data/lib/zafu/process/ruby_less_processing.rb

@@ -60,16 +60,18 @@ module Zafu
       end
 
       # TEMPORARY METHOD DURING HACKING...
-      def r_erb
-        "<pre><%= @erb.gsub('<','&lt;').gsub('>','&gt;') %></pre>"
-      end
+      # def r_erb
+      #   "<pre><%= @erb.gsub('<','&lt;').gsub('>','&gt;') %></pre>"
+      # end
 
       def rubyless_render(method, params)
         # We need to set this here because we cannot pass options to RubyLess or get them back
         # when we evaluate the method to see if we can use blocks as arguments.
         @rendering_block_owner = true
         code = method_with_arguments(method, params)
-        rubyless_expand RubyLess.translate(self, code)
+        # It is strange that we need to freeze code... But if we don't, we
+        # get double ##{} on some systems (Linux).
+        rubyless_expand RubyLess.translate(self, code.freeze)
       ensure
         @rendering_block_owner = false
       end
@@ -98,10 +100,18 @@ module Zafu
         elsif attribute = @params[:attr]
           code = "this.#{attribute}"
         elsif code = @params[:eval] || @params[:test]
+        elsif code = @params[:param]
+          code = "params[:#{code}]"
         elsif text = @params[:text]
           code = "%Q{#{text}}"
         elsif text = @params[:t]
           code = "t(%Q{#{text}})"
+        # elsif var = @params[:var]
+        #   if code = get_context_var('set_var', var)
+        #     return code
+        #   else
+        #     return parser_continue("Var #{var.inspect} not declared.")
+        #   end
         elsif use_string_block && @blocks.size == 1 && @blocks.first.kind_of?(String)
           return RubyLess::TypedString.new(@blocks.first.inspect, :class => String, :literal => @blocks.first)
         else
@@ -262,6 +272,7 @@ module Zafu
         # Find a class or behavior based on a name. The returned class should implement
         # 'safe_method_type'.
         def get_class(class_name)
+          deb class_name
           Module.const_get(class_name)
         rescue
           nil

data/test/ruby_less_test.rb

@@ -44,5 +44,21 @@ class ZafuRubyLessTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context 'With an invalid string' do
+    subject do
+      'contact where id #{params[:foo]} in site'
+    end
+
+    should 'not alter string on error' do
+      str = subject.dup
+      begin
+        x = RubyLess.translate(self, str)
+      rescue RubyLess::Error => err
+        assert_equal subject, str
+      end
+    end
+  end # With an invalid string
+  
 
 end

data/test/zafu/meta.yml

@@ -13,6 +13,11 @@ include_with_part_change_class:
   src: "<r:include template='/some/template'><div class='foobar' do='with' part='b'>new b</div></r:include>"
   tem: "<div id='a'>a</div><div id='b' class='foobar'><%= make_link(@node) %></div>"
 
+include_with_part_change_class_no_div:
+  # part 'a' is moved around
+  src: "<r:include template='/some/template'><r:with part='b' class='foo'>new b</div></r:include>"
+  tem: "<div id='a'>a</div><div id='b' class='foo'><%= make_link(@node) %></div>"
+
 include_missing_part:
   # part 'a' is moved around
   src: "<r:include template='/some/template' part='bad'/>"

data/zafu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.7.8"
+  s.version = "0.7.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-05-26}
   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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +02:00
+date: 2011-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency