zafu 0.7.7 → 0.7.8

data/History.txt

@@ -1,4 +1,12 @@
-== 0.7.7
+== 0.7.8 2011-05-10
+
+* Enhancements
+  * Added 'to_s' method to ease debugging.
+  * Added support for an array of keys in "ancestor".
+  * Added 'on' option to form (ajax actions).
+  * Should steal 'title' attribute on 'a' Markup.
+
+== 0.7.7 2011-04-14
 
 * Enhancements
   * Added to_s for Markup.

data/lib/zafu/info.rb

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

data/lib/zafu/markup.rb

@@ -7,6 +7,7 @@ module Zafu
     EMPTY_TAGS   = %w{meta input link img}
     STEAL_PARAMS = {
       'link'   => [:href, :charset, :rel, :type, :media, :rev, :target],
+      'a'      => [:title, :onclick],
       'script' => [:type, :charset, :defer],
       :other   => [:class, :id, :style],
     }
@@ -23,6 +24,8 @@ module Zafu
     attr_accessor :space_before
     # Space to insert after tag
     attr_accessor :space_after
+    # Keys to remove from zafu and use for the tag itself
+    attr_writer   :steal_keys
 
     class << self
 
@@ -250,7 +253,7 @@ module Zafu
     end
 
     def steal_keys
-      (STEAL_PARAMS[@tag] || []) + STEAL_PARAMS[:other]
+      @steal_keys || (STEAL_PARAMS[@tag] || []) + STEAL_PARAMS[:other]
     end
 
     private

data/lib/zafu/parser.rb

@@ -427,16 +427,15 @@ module Zafu
 
     alias public_descendants all_descendants
 
-    # Return the last defined parent for the given key.
-    def ancestor(key)
-      res = nil
+    # Return the last defined parent for the given keys.
+    def ancestor(keys)
+      keys = Array(keys)
       ancestors.reverse_each do |a|
-        if key == a.method
-          res = a
-          break
+        if keys.include?(a.method)
+          return a
         end
       end
-      res
+      nil
     end
 
     # Return the last defined descendant for the given key.

data/lib/zafu/parsing_rules.rb

@@ -71,7 +71,7 @@ module Zafu
         @params = Markup.parse_params(@params)
       end
 
-      # set name used for include/replace from html_tag if not allready set by superclass
+      # set name used for include/replace from html_tag if not already set by superclass
       @name = extract_name
 
       if !@markup.tag && (@markup.tag = @params.delete(:tag))
@@ -88,6 +88,11 @@ module Zafu
       end
     end
 
+    # Used to debug parser.
+    def to_s
+      "[#{@method}#{@name.blank? ? '' : " '#{@name}'"}#{@params.empty? ? '' : " #{@params.map{|k,v| ":#{k}=>#{v.inspect}"}.join(', ')}"}]" + (@blocks||[]).join('') + "[/#{@method}]"
+    end
+
     def extract_name
       super ||
       (%w{input select textarea}.include?(@method) ? nil : @params[:name]) ||
@@ -291,5 +296,25 @@ module Zafu
         flush
       end
     end
+
+    # Helper during compilation to make a block
+    def add_block(text_or_opts, at_start = false)
+      # avoid wrapping objects in [void][/void]
+      bak = @blocks
+        @blocks = []
+        if text_or_opts.kind_of?(String)
+          new_blocks = make(:void, :method => 'void', :text => text_or_opts).blocks
+        else
+          new_blocks = [make(:void, text_or_opts)]
+        end
+        if at_start
+          bak = new_blocks + bak
+        else
+          bak += new_blocks
+        end
+      @blocks = bak
+      # Force descendants rebuild
+      @all_descendants = nil
+    end
   end # ParsingRules
 end # Zafu

data/lib/zafu/process/ajax.rb

@@ -41,6 +41,8 @@ module Zafu
           open_node_context(finder, :node => self.node.move_to(var, finder[:class])) do
             # Pagination count and other contextual variables exist here.
 
+            # TODO: DRY with r_block...
+
             # INLINE ==========
             out wrap(
               expand_with(
@@ -134,9 +136,26 @@ module Zafu
         else
           # 1. store template
           # will wrap with @markup
-          store_block(self)
+          store_block(self, :ajax_action => 'show')
+
+          if edit_block = descendant('edit')
+            form_block = descendant('form') || self
+
+            publish_after_save = form_block.params[:publish] ||
+                                 (edit_block && edit_block.params[:publish])
+
+            # 2. store form
+            cont = {
+              :saved_template     => form_url(node.dom_prefix),
+              :make_form          => self == form_block,
+              :publish_after_save => publish_after_save,
+              :ajax_action        => 'edit',
+            }
 
-          # 2. render
+            store_block(form_block, cont)
+          end
+
+          # 3. render
           # Set id with the current node context (<%= var1.zip %>).
           @markup.set_id(node.dom_id(:list => false))
           out expand_with
@@ -146,29 +165,28 @@ module Zafu
 
       def r_edit
         # ajax
-        if @context[:form_cancel]
+        if cancel = @context[:form_cancel]
           # cancel button
-          @context[:form_cancel]
+          out cancel
         else
           # edit button
 
           # TODO: show 'reply' instead of 'edit' in comments if visitor != author
-          each_block = ancestor('each')
+          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')
 
-          link = wrap(make_link(:default_text => _('edit'), :update => each_block, :action => 'edit'))
+          link = wrap(make_link(:default_text => _('edit'), :update => block, :action => 'edit'))
 
           out "<% if #{node}.can_write? %>#{link}<% end %>"
         end
-
-        #if @context[:template_url]
-        #else
-        #  # FIXME: we could link to some html page to edit the item.
-        #  ""
-        #end
       end
 
       def r_cancel
-        (@context[:form_options] || {})[:form_cancel]
+        r_edit
       end
 
       def r_add
@@ -188,7 +206,7 @@ module Zafu
           @blocks = []
           add_btn = make(:void, :method => 'add_btn', :params => @params.dup, :text => '')
           add_btn.blocks = blocks
-          remove_instance_variable(:@all_descendants)
+          @all_descendants = nil
         end
 
         if @context[:form]
@@ -205,10 +223,14 @@ module Zafu
           # Expand 'add' block
           out wrap("#{expand_with(:onclick=>"[\"#{node.dom_prefix}_add\", \"#{node.dom_prefix}_form\"].each(Element.toggle);#{focus}return false;")}")
 
-          # New object to render form.
+          if klass = @context[:klass]
+            return parser_error("Invalid class '#{klass}'") unless klass = get_class(klass)
+          else
+            klass = Array(node.klass).first
+          end
 
-          # FIXME: use 'klass' param in r_add or r_form instead of current list content.
-          new_node = node.move_to("#{var}_new", [node.klass].flatten.first, :new_record => true)
+          # New object to render form.
+          new_node = node.move_to("#{var}_new", klass, :new_record => true)
 
           if new_node.will_be?(Node)
             # FIXME: BUG if we set <r:form klass='Post'/> the user cannot select class with menu...

data/lib/zafu/process/conditional.rb

@@ -59,7 +59,6 @@ module Zafu
       def expand_if(condition, new_node_context = self.node, alt_markup = @markup)
         res = ""
         res << "<% if #{condition} %>"
-
         with_context(:node => new_node_context) do
           res << wrap(expand_with)
         end

data/lib/zafu/process/forms.rb

@@ -6,6 +6,10 @@ module Zafu
       end
 
       def r_form
+        unless @params[:on].nil? || @params[:on].split(',').include?(@context[:ajax_action])
+          return ''
+        end
+
         options = form_options
 
         @markup.set_id(options[:id]) if options[:id]
@@ -59,7 +63,7 @@ module Zafu
         def make_form
           return nil unless @context[:make_form]
 
-          if method == 'each'
+          if method == 'each' || method == 'block'
             r_form
           else
             nil
@@ -101,9 +105,8 @@ module Zafu
         # Render the 'form' tag and set expansion context.
         def form_tag(options)
           opts = options.dup
-          form = @context[:form]
 
-          if form && (form.descendant('cancel') || form.descendant('edit'))
+          if descendant('cancel') || descendant('edit')
             # Pass 'form_cancel' content to expand_with (already in options).
           else
             # Insert cancel before form

data/lib/zafu/process/html.rb

@@ -84,7 +84,9 @@ module Zafu
         case @markup.tag
         when 'link'
           key = :href
-          if @params[:rel].downcase == 'stylesheet'
+          return parser_error("Missing 'rel' parameter.") unless rel = @params[:rel]
+          return parser_error("Missing 'href' parameter.") unless @params[:href]
+          if rel.downcase == 'stylesheet'
             type = :stylesheet
           else
             type = :link

data/lib/zafu/process/ruby_less_processing.rb

@@ -21,7 +21,6 @@ module Zafu
       # searches inside a 'helpers' module and finally looks into the current node_context.
       # If nothing is found at this stage, we prepend the method with the current node and start over again.
       def safe_method_type(signature, receiver = nil)
-        #puts [node.name, node.klass, signature].inspect
         super || get_method_type(signature, false)
       end
 
@@ -94,13 +93,15 @@ module Zafu
       end
 
       def get_attribute_or_eval(use_string_block = true)
-        if attribute = @params[:date]
+        if @params[:date] && method != 'link'
           return parser_continue("'date' parameter is deprecated. Please use 'attr' or 'eval'.")
         elsif attribute = @params[:attr]
           code = "this.#{attribute}"
         elsif code = @params[:eval] || @params[:test]
         elsif text = @params[:text]
           code = "%Q{#{text}}"
+        elsif text = @params[:t]
+          code = "t(%Q{#{text}})"
         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
@@ -273,7 +274,8 @@ module Zafu
           ivar = signature.first
           if ivar == 'this'
             if node.list_context?
-              raise RubyLess::Error.new("Cannot use 'this' in list_context.")
+              # Return first element
+              node.opts.merge(:class => node.klass.first, :method => "#{node}.first")
             else
               node.opts.merge(:class => node.klass, :method => node.name)
             end

data/test/zafu/meta.yml

@@ -4,7 +4,8 @@ some_template:
 
 include_with_part:
   # part 'a' is moved around
-  src: "<r:include template='/some/template'><r:with part='a'/><r:with part='b'>new b:<r:include template='/some/template' part='a'/></r:with></r:include>"
+  # and we overwrite 'link' method with 'void'
+  src: "<r:include template='/some/template'><r:with part='a'/><r:with part='b' do='void'>new b:<r:include template='/some/template' part='a'/></r:with></r:include>"
   tem: "<div id='b'>new b:<div id='a'>a</div></div>"
 
 include_with_part_change_class:

data/zafu.gemspec

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