zafu 0.7.9 → 0.8.0

data/History.txt

@@ -1,3 +1,11 @@
+== 0.8.0 2011-06-15
+
+* Enhancements
+  * Include with 'part' can now replace method.
+  * Fixed 'merge' for OrderedHash.
+  * Fixed dom_scope from block in each (was not using propagated dom scope).
+  * Added support for comments (started with '//!').
+
 == 0.7.9 2011-05-26
 
 * Enhancements

data/lib/zafu/info.rb

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

data/lib/zafu/node_context.rb

@@ -13,6 +13,9 @@ module Zafu
     # it has a name or dom id defined ('main', 'related', 'list', etc).
     attr_writer :dom_prefix
 
+    # This is used to force a given dom_id (in saved templates for example).
+    attr_accessor :saved_dom_id
+
     # Any kind of information that the compiler might need to use (QueryBuilder query used
     # to fetch the node for example).
     attr_reader :opts
@@ -48,7 +51,9 @@ module Zafu
     # ivar name (see #master_class).
     def as_main(after_class = nil)
       klass = after_class ? master_class(after_class) : single_class
-      self.class.new("@#{klass.to_s.underscore}", single_class)
+      res = self.class.new("@#{klass.to_s.underscore}", single_class, nil, :new_record => @opts[:new_record])
+      res.dom_prefix = self.dom_prefix
+      res
     end
 
     # Find the class just afer 'after_class' in the class hierarchy.
@@ -64,25 +69,36 @@ module Zafu
     end
 
     # Generate a unique DOM id for this element based on dom_scopes defined in parent contexts.
+    # :code option returns ruby
+    # :erb  option returns either string content or "<%= ... %>"
+    #       default returns something to insert in interpolated string such as '#{xxx}'
     def dom_id(opts = {})
       dom_prefix = opts[:dom_prefix] || self.dom_prefix
       options = {:list => true, :erb => true}.merge(opts)
 
-      if options[:erb]
-        dom = dom_id(options.merge(:erb => false))
+      if options[:erb] || options[:code]
+        dom = dom_id(options.merge(:erb => false, :code => false))
+
         if dom =~ /^#\{([^\{]+)\}$/
-          "<%= #{$1} %>"
+          code = $1
         elsif dom =~ /#\{/
-          "<%= %Q{#{dom}} %>"
+          code = "%Q{#{dom}}"
         else
-          dom
+          str  = dom
+          code = dom.inspect
         end
-      else
-        if @up
-          [dom_prefix] + @up.dom_scopes + (options[:list] ? [make_scope_id] : [])
+
+        if options[:code]
+          code
         else
-          [dom_prefix] + (options[:list] ? [make_scope_id] : [])
-        end.compact.uniq.join('_')
+          str || "<%= #{code} %>"
+        end
+      else
+        @saved_dom_id || (
+          [dom_prefix] +
+          dom_scopes   +
+          (options[:list] ? [make_scope_id] : [])
+        ).compact.uniq.join('_')
       end
     end
 

data/lib/zafu/ordered_hash.rb

@@ -17,6 +17,12 @@ module Zafu
         super
       end
 
+      def merge(hash)
+        res = dup
+        res.merge!(hash)
+        res
+      end
+
       alias o_keys keys
       def get_keys
         @keys ||= o_keys

data/lib/zafu/parsing_rules.rb

@@ -93,9 +93,10 @@ module Zafu
     end
 
     def extract_name
-      super ||
+      @options[:name] ||
       (%w{input select textarea}.include?(@method) ? nil : @params[:name]) ||
-      @markup.params[:id]
+      @markup.params[:id] ||
+      @params[:id]
     end
 
     def remove_erb(text)
@@ -125,7 +126,12 @@ module Zafu
     # scan rules
     def scan
       # puts "SCAN(#{@method}): [#{@text}]"
-      if @text =~ /\A([^<]*?)(^ *|)</m
+      if @text =~ %r{\A([^<]*?)(\s*)//!}m
+        # comment
+        flush $1
+        eat $2
+        scan_comment
+      elsif @text =~ /\A([^<]*?)(^ *|)</m
         flush $1
         eat $2
         if @text[1..1] == '/'
@@ -191,6 +197,16 @@ module Zafu
       end
     end
 
+    def scan_comment
+      if @text =~ %r{\A//!.*(\n|\Z)}
+        # zafu html escaped
+        eat $&
+      else
+        # error
+        flush
+      end
+    end
+
     def scan_tag(opts={})
       #puts "TAG(#{@method}): [#{@text}]"
       if @text =~ /\A<r:([\w_]+\??)([^>]*?)(\/?)>/

data/lib/zafu/process/ajax.rb

@@ -8,6 +8,7 @@ module Zafu
 
       # This method process a list and handles building the necessary templates for ajax 'add'.
       def expand_with_finder(finder)
+        @context.delete(:make_form) # Do not propagate.
         return super unless finder[:class].kind_of?(Array)
 
         # reset scope
@@ -25,8 +26,14 @@ module Zafu
                              (edit_block && edit_block.params[:publish])
 
         # class name for create form
-        klass       = (add_block  &&  add_block.params[:klass]) ||
-                      (form_block && form_block.params[:klass])
+        if class_name = (add_block  &&  add_block.params[:klass]) ||
+                        (form_block && form_block.params[:klass])
+          unless klass = get_class(class_name)
+            return parser_error("Invalid class '#{class_name}'")
+          end
+        else
+          klass = finder[:class].first
+        end
 
         if need_ajax?(each_block)
           # We need to build the templates for ajax rendering.
@@ -35,6 +42,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.
+
           node.dom_prefix = dom_name
 
           # New node context.
@@ -71,7 +79,10 @@ module Zafu
               :saved_template     => form_url(node.dom_prefix),
               :klass              => klass,
               :make_form          => each_block == form_block,
+              # Used to get parameters like 'publish', 'done', 'after'
+              :add                => add_block,
               :publish_after_save => publish_after_save,
+              :node               => node.move_to("@node", klass, :new_record => true)
             }
 
             store_block(form_block, cont)
@@ -174,10 +185,11 @@ module Zafu
           # TODO: show 'reply' instead of 'edit' in comments if visitor != author
           block = ancestor(%w{each block})
 
-          # 'publish' is detected by r_block and set in form.
-          # removed so it does not polute link
-          @params.delete('publish')
-          @params.delete('cancel')
+          # These parameters are detected by r_block and set in form.
+          # removed so they do not polute link
+          @params.delete(:publish)
+          @params.delete(:cancel)
+          @params.delete(:tcancel)
 
           link = wrap(make_link(:default_text => _('edit'), :update => block, :action => 'edit'))
 
@@ -223,16 +235,7 @@ module Zafu
           # Expand 'add' block
           out wrap("#{expand_with(:onclick=>"[\"#{node.dom_prefix}_add\", \"#{node.dom_prefix}_form\"].each(Element.toggle);#{focus}return false;")}")
 
-          if klass = @context[: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
+          klass = @context[:klass] || node.single_class
 
           # New object to render form.
           new_node = node.move_to("#{var}_new", klass, :new_record => true)
@@ -252,7 +255,10 @@ module Zafu
           out expand_block(form_block,
             # Needed in form to be able to return the result
             :template_url => template_url(node.dom_prefix),
-            # ??
+            # Used to avoid wrong dom_id in hidden form. Should not be
+            # necessary but it's hard to fix when node changes a lot (drop in add).
+            :dom_prefix   => node.dom_prefix,
+            # Used to add needed hidden fields in form
             :in_add       => true,
             # Used to get parameters like 'publish' or 'klass'
             :add          => self,
@@ -279,9 +285,11 @@ module Zafu
       def r_each
         if @context[:saved_template]
           # render to start a saved template
+          node.saved_dom_id = "\#{ndom_id(#{node})}"
           node.propagate_dom_scope!
+          @markup.set_id(node.dom_id)
+
           options = form_options
-          @markup.set_id(options[:id]) if options[:id]
           @markup.set_param(:style, options[:style]) if options[:style]
 
           out wrap(expand_with)
@@ -384,12 +392,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 = dom_prefix
+
+          # The dom_id will be calculated from the Ajax params in the view.
+          node.saved_dom_id = "\#{ndom_id(#{node})}"
 
           cont[:template_url] = template_url(node.dom_prefix)
           cont[:node]  = node

data/lib/zafu/process/conditional.rb

@@ -29,22 +29,28 @@ module Zafu
 
         # We use 'elsif' just in case there are more then one 'else' clause
         if markup = @context[:markup]
-          # Copy markup tag
-          @markup.tag ||= markup.tag
-          @markup.steal_html_params_from(@params)
-          markup.params.each do |k, v|
-            next if @markup.params[k]
-            @markup.set_param(k, v)
-          end
+          if @markup.tag.blank?
+            # Copy markup tag
+            @markup.tag = markup.tag
+            @markup.steal_html_params_from(@params)
+            markup.params.each do |k, v|
+              next if @markup.params[k]
+              @markup.set_param(k, v)
+            end
 
-          markup.dyn_params.each do |k, v|
-            next if @markup.params[k] || @markup.dyn_params[k]
-            @markup.set_dyn_param(k, v)
+            markup.dyn_params.each do |k, v|
+              next if @markup.params[k] || @markup.dyn_params[k]
+              @markup.set_dyn_param(k, v)
+            end
+            inner = wrap(res)
+          else
+            markup.done = false
+            # Wrap with both markup (ours and the else/elsif clause).
+            inner = markup.wrap(wrap(res))
           end
-
-          out "<% elsif #{cond} %>#{wrap(res)}" # do not propagate
+          out "<% elsif #{cond} %>#{inner}" # do not propagate
         else
-          @markup.done = true # never wrap else/elsif clause
+          #@markup.done = true # never wrap else/elsif clause
           out "<% elsif #{cond} %>#{res}" # do not propagate
         end
       end
@@ -72,7 +78,11 @@ module Zafu
       private
         def get_condition
           if in_tag = @params[:in]
-            ancestor(in_tag) ? 'true' : 'false'
+            if in_tag == 'form' && @context[:make_form]
+              'true'
+            else
+              ancestor(in_tag) ? 'true' : 'false'
+            end
           else
             get_attribute_or_eval(false)
           end

data/lib/zafu/process/forms.rb

@@ -10,6 +10,8 @@ module Zafu
           return ''
         end
 
+        return parser_error('Cannot render update form in list context.') if node.list_context?
+
         options = form_options
 
         @markup.set_id(options[:id]) if options[:id]

data/lib/zafu/process/html.rb

@@ -34,6 +34,13 @@ module Zafu
           obj.markup = @markup.dup
         end
         @markup.tag = nil
+
+        if sub_do
+          obj.method = @blocks.first.method
+          obj.params = @blocks.first.params
+        elsif params[:method]
+          obj.method = params[:method]
+        end
         super(obj)
       end
 
@@ -111,7 +118,7 @@ module Zafu
         end
 
         src = @params.delete(key)
-        if src && src[0..6] != 'http://'
+        if src && src[0..7] != 'http://'
           new_value = helper.send(:template_url_for_asset, :src => src, :base_path => @options[:base_path], :type => type)
           @markup.params[key] = new_value.blank? ? src : new_value
         end

data/lib/zafu/process/ruby_less_processing.rb

@@ -33,7 +33,7 @@ module Zafu
 
         rubyless_render(@method, params)
       rescue RubyLess::NoMethodError => err
-        parser_continue("#{err.error_message} <span class='type'>#{err.method_with_arguments}</span> for #{err.receiver_with_class}")
+        parser_continue("#{err.error_message} <span class='type'>#{err.method_with_arguments}</span> (#{node.klass} context)")
       rescue RubyLess::Error => err
         parser_continue(err.message)
       end
@@ -133,7 +133,7 @@ module Zafu
       end
 
       private
-        # Extract arguments from params
+        # Extract arguments from params (evaluates params as RubyLess strings).
         def extract_from_params(*keys)
           res = []
 
@@ -272,7 +272,6 @@ 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/mock/params.rb

@@ -9,5 +9,10 @@ module Mock
         out_post str
       end
     end
+
+
+    def r_inspect
+      out "#{@params.inspect}"
+    end
   end
 end

data/test/zafu/basic.yml

@@ -13,3 +13,19 @@ empty_do:
 do_with_escaped_quote:
   src: "<li do='raw(\'blah\')'>blah</li>"
   tem: "<li><%= raw(\"blah\") %></li>"
+
+quotes_in_quotes:
+  src: "<r:inspect line_numbers='true' text=\"<code lang='lua'&gt;function foo(a); print(a); end</code&gt;\"/>"
+  tem: "/:text=>\"<code lang='lua'>function foo\(a\); print\(a\); end</code>\"/"
+
+comment:
+  src: "<r:raw>hello</r:raw> //! This is a comment that will be removed"
+  tem: "<%= raw(\"hello\") %>"
+
+line_comment:
+  src: "<r:raw>hello</r:raw>\n//! This is a comment that will be removed\nabc"
+  tem: "<%= raw(\"hello\") %>\nabc"
+
+do_not_touch_js_comment:
+  src: "<r:raw>hello</r:raw> // This is a comment that will not be removed"
+  tem: "<%= raw(\"hello\") %> // This is a comment that will not be removed"

data/zafu.gemspec

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