zafu 0.8.0 → 0.8.2

data/History.txt

@@ -1,3 +1,15 @@
+== 0.8.2 2011-07-11
+
+* Enhancements
+  * Fixed forms in ajax context (was not passing parent_id).
+  * Changed resolution of 'this' in list context (going up, not using first).
+  * Fixed forms in "table" (should wrap around table, not inside).
+
+== 0.8.1
+
+* Enhancements
+  * Added support to pass elements in sibling's context.
+
 == 0.8.0 2011-06-15
 
 * Enhancements

data/lib/zafu/info.rb

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

data/lib/zafu/node_context.rb

@@ -51,7 +51,7 @@ module Zafu
     # ivar name (see #master_class).
     def as_main(after_class = nil)
       klass = after_class ? master_class(after_class) : single_class
-      res = self.class.new("@#{klass.to_s.underscore}", single_class, nil, :new_record => @opts[:new_record])
+      res = self.class.new("@#{klass.to_s.underscore}", single_class, nil) #, :new_record => @opts[:new_record])
       res.dom_prefix = self.dom_prefix
       res
     end
@@ -114,17 +114,23 @@ module Zafu
       @dom_scope = true
     end
 
+    # Returns the first occurence of the klass up in the hierachy
+    # This does not resolve [Node] as [Node].first.
     def get(klass)
-      if single_class <= klass
-        return self unless list_context?
-
-        res_class = self.klass
-        method = self.name
-        while res_class.kind_of?(Array)
-          method = "#{method}.first"
-          res_class = res_class.first
-        end
-        move_to(method, res_class)
+      if list_context?
+        return @up ? @up.get(klass) : nil
+      end
+      if self.klass <= klass
+        self
+        # return self unless list_context?
+        #
+        # res_class = self.klass
+        # method = self.name
+        # while res_class.kind_of?(Array)
+        #   method = "#{method}.first"
+        #   res_class = res_class.first
+        # end
+        # move_to(method, res_class)
       elsif @up
         @up.get(klass)
       else

data/lib/zafu/parser.rb

@@ -210,6 +210,13 @@ module Zafu
       enter(mode)
     end
 
+    # Pass some contextual information to siblings
+    def pass(elems = nil)
+      return @pass unless elems
+      (@pass ||= {}).merge!(elems)
+      @pass
+    end
+
     # Hook called when replacing part of an included template with '<r:with part='main'>...</r:with>'
     # This replaces the current object 'self' which is in the original included template, with the custom version 'obj'.
     def replace_with(obj)
@@ -241,11 +248,10 @@ module Zafu
       # FIXME: replace with array and join (faster)
       @result   = ""
       @out_post = ""
+      @pass     = nil
 
       before_process
 
-      @pass = {} # used to pass information to the parent (is this used ?)
-
       res = wrap(expander || default_expander)
 
       res = after_process(res)
@@ -270,7 +276,7 @@ module Zafu
       if res.kind_of?(String)
         @result << res
       elsif @result.blank?
-        @result << (@errors.blank? ? @method : show_errors)
+        @result << (@errors.empty? ? '' : show_errors)
       end
       @result
     end
@@ -284,7 +290,6 @@ module Zafu
     def r_inspect
       expand_with(:preflight=>true)
       @blocks = []
-      @pass.merge!(@parts||{})
       self.inspect
     end
 
@@ -594,10 +599,6 @@ module Zafu
       blocks = acontext.delete(:blocks) || @blocks
       res = ""
 
-      # FIXME: I think we can delete @pass and @parts stuff now (test first).
-
-      @pass  = {} # current object sees some information from it's direct descendants
-      @parts = {}
       only   = acontext[:only]
       new_context = @context.merge(acontext)
 
@@ -619,11 +620,7 @@ module Zafu
         elsif (!only || (only.kind_of?(Array) && only.include?(b.method)) || only =~ b.method) && (!ignore || !ignore.include?(b.method))
           res << b.process(new_context.dup)
           if pass = b.pass
-            if pass[:part]
-              @parts.merge!(pass[:part])
-              pass.delete(:part)
-            end
-            @pass.merge!(pass)
+            new_context.merge!(pass)
           end
         end
       end
@@ -648,20 +645,6 @@ module Zafu
       end
       attributes << " {> #{context.sort.join(', ')}}" unless context == []
 
-      pass = []
-      (@pass || {}).each do |k,v|
-        unless v.nil?
-          if v.kind_of?(Array)
-            pass << "#{k.inspect.gsub('"', "'")}=>#{v.inspect.gsub('"', "'")}"
-          elsif v.kind_of?(Parser)
-            pass << "#{k.inspect.gsub('"', "'")}=>['#{v}']"
-          else
-            pass << "#{k.inspect.gsub('"', "'")}=>#{v.inspect.gsub('"', "'")}"
-          end
-        end
-      end
-      attributes << " {< #{pass.sort.join(', ')}}" unless pass == []
-
       res = []
       @blocks.each do |b|
         if b.kind_of?(String)

data/lib/zafu/process/ajax.rb

@@ -82,7 +82,7 @@ module Zafu
               # 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)
+              :new_keys           => {:parent_id => '@node.parent_zip'}
             }
 
             store_block(form_block, cont)
@@ -238,13 +238,40 @@ module Zafu
           klass = @context[:klass] || node.single_class
 
           # New object to render form.
-          new_node = node.move_to("#{var}_new", klass, :new_record => true)
+          new_node = node.move_to("#{var}_new", klass,
+            :new_keys   => {})
+
 
           if new_node.will_be?(Node)
             # FIXME: BUG if we set <r:form klass='Post'/> the user cannot select class with menu...
 
+            if @context[:saved_template]
+              parent_id = "#{node}.parent_zip"
+            else
+              parent_id = "#{node(Node)}.zip"
+            end
+
+            new_node.opts[:new_keys]['parent_id'] = parent_id
+
             # 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}', 'parent_id' => #{parent_id}) } %>"
+            # if node.will_be?(Node)
+            #   # Nested contexts:
+            #   # 1. @node
+            #   # 2. var1 = @node.children
+            #   # 3. var1_new = Node.new
+            #   if node.opts[:new_record] || @context[:saved_template]
+            #     if @context[:saved_template] || !@context[:in_add]
+            #       # TODO: we should not add parent_id on every saved_template. Why is this needed ?
+            #       parent_id = "#{node}.parent_zip"
+            #     else
+            #       # We are in var2_new
+            #       parent_id = "#{node.up(Node)}.zip"
+            #     end
+            #
+            #     hidden_fields['node[parent_id]'] = "<%= #{parent_id} %>"
+            #   end
+            # els
           else
             out "<% if #{new_node} = #{new_node.class_name}.new %>"
           end
@@ -395,6 +422,7 @@ module Zafu
 
           # Create new node context
           node = cont[:node].as_main(ActiveRecord::Base)
+          node.opts[:new_keys] = cont.delete(:new_keys)
 
           # The dom_id will be calculated from the Ajax params in the view.
           node.saved_dom_id = "\#{ndom_id(#{node})}"

data/lib/zafu/process/forms.rb

@@ -35,6 +35,7 @@ module Zafu
 
           # 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)
@@ -68,15 +69,20 @@ module Zafu
           # opts[:klass] = node.master_class(ActiveRecord::Base).to_s
 
           if @context[:in_add]
-            opts[:id]    = "#{node.dom_prefix}_form"
+            opts[:id]    = "#{node.dom_prefix}_add"
             opts[:style] = 'display:none;'
+          elsif @markup.tag == 'table'
+            # the normal id goes to the form wrapping the table
+            opts[:id]    = "#{node.dom_prefix}_tbl"
+            form_id      = node.dom_prefix
           end
 
+          form_id ||= "#{node.dom_prefix}_form_t"
           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_tag]    = "<% remote_form_for(:#{node.form_name}, #{node}, :html => {:id => #{form_id.inspect}}) 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_tag]    = "<% form_for(:#{node.form_name}, #{node}, :html => {:id => #{form_id.inspect}}) do |f| %>"
             opts[:form_helper] = 'f'
           end
 
@@ -106,7 +112,15 @@ module Zafu
           # form_for ... do |f|
           out opts.delete(:form_tag)
             # f.xxx
-            yield(opts.merge(:in_form => true))
+            if markup.tag == 'table'
+              # Avoid <table><form> (invalid HTML)
+              bak = @result
+              @result = ''
+              yield(opts.merge(:in_form => true))
+              @result = bak + markup.wrap(@result)
+            else
+              yield(opts.merge(:in_form => true))
+            end
           # close form
           out opts[:form_helper] ? "<% end %>" : '</form>'
         end

data/lib/zafu/process/ruby_less_processing.rb

@@ -284,8 +284,13 @@ module Zafu
           ivar = signature.first
           if ivar == 'this'
             if node.list_context?
-              # Return first element
-              node.opts.merge(:class => node.klass.first, :method => "#{node}.first")
+              # Find single element up
+              if single_node = node(node.klass.first)
+                single_node.opts.merge(:class => single_node.klass, :method => single_node.to_s)
+              else
+                out parser_error("In [#{node.klass.first}], could resolve 'this'.")
+                nil
+              end
             else
               node.opts.merge(:class => node.klass, :method => node.name)
             end

data/test/mock/params.rb

@@ -12,7 +12,18 @@ module Mock
 
 
     def r_inspect
-      out "#{@params.inspect}"
+      out "#{@params.inspect} xxxx"
+    end
+
+    # Test passing information to siblings
+    def r_pass
+      pass(@params)
+      true
+    end
+
+    def r_view_passed
+      key = @params[:key]
+      out @context[@params[:key].to_sym].to_s
     end
   end
 end

data/test/node_context_test.rb

@@ -210,10 +210,10 @@ class NodeContextTest < Test::Unit::TestCase
       @mother.move_to('list', [Page])
     end
 
-    should 'find the context and resolve with first' do
+    should 'find the context and resolve without using first' do
       assert context = subject.get(Page)
-      assert_equal 'list.first', context.name
-      assert_equal Page, context.klass
+      assert_equal '@page', context.name
+      assert_equal SubPage, context.klass
     end
 
     should 'return parent on up with class' do
@@ -239,10 +239,10 @@ class NodeContextTest < Test::Unit::TestCase
       @mother.move_to('list', [[[Page]]])
     end
 
-    should 'find the context and resolve with first' do
+    should 'find the context without using first' do
       assert context = subject.get(Page)
-      assert_equal 'list.first.first.first', context.name
-      assert_equal Page, context.klass
+      assert_equal '@page', context.name
+      assert_equal SubPage, context.klass
     end
 
     should 'return parent on up with class' do

data/test/zafu/basic.yml

@@ -28,4 +28,8 @@ line_comment:
 
 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"
+  tem: "<%= raw(\"hello\") %> // This is a comment that will not be removed"
+
+pass:
+  src: "<r:pass foo='hello'/><r:view_passed key='foo'/>"
+  tem: "hello"

data/zafu.gemspec

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