zafu 0.8.2 → 0.8.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.3 2011-07-12
+
+* Enhancements
+  * Better handling of DOM scoped ids in saved templates
+
 == 0.8.2 2011-07-11
 
 * Enhancements

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 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)
       res.dom_prefix = self.dom_prefix
       res
     end
@@ -94,11 +94,14 @@ module Zafu
           str || "<%= #{code} %>"
         end
       else
-        @saved_dom_id || (
-          [dom_prefix] +
-          dom_scopes   +
-          (options[:list] ? [make_scope_id] : [])
-        ).compact.uniq.join('_')
+        @saved_dom_id || if options[:list]
+          scopes = dom_scopes
+          scopes = [dom_prefix] if scopes.empty?
+          scopes + [make_scope_id]
+        else
+          scopes = dom_scopes
+          scopes + ((@up || scopes.empty?) ? [dom_prefix] : [])
+        end.compact.uniq.join('_')
       end
     end
 
@@ -173,7 +176,17 @@ module Zafu
     protected
       # List of scopes defined in ancestry (used to generate dom_id).
       def dom_scopes
-        (@up ? @up.dom_scopes : []) + (@dom_scope ? [make_scope_id] : [])
+        return [@saved_dom_id] if @saved_dom_id
+        if @up
+          scopes = @up.dom_scopes
+          if @dom_scope
+            (scopes.empty? ? [dom_prefix] : scopes) + [make_scope_id]
+          else
+            scopes
+          end
+        else
+          @dom_scope ? [dom_prefix, make_scope_id] : []
+        end
       end
 
     private

data/lib/zafu/process/ajax.rb

@@ -36,20 +36,25 @@ module Zafu
         end
 
         if need_ajax?(each_block)
+          #node.dom_prefix = dom_name
           # We need to build the templates for ajax rendering.
+          # HACK to avoid changing dom_prefix in drag&drop
+
+          # The bug with wrong prefix between drop inline and ajax result comes from
+          # here (see selenium test drop1 and drop2).
+          node.dom_prefix = dom_name
 
           # 1. Render inline
           #                                                                                                                 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.
           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...
+            tmplt_node = self.node.move_to(var, finder[:class])
+            tmplt_node.dom_prefix = node.dom_prefix
 
             # INLINE ==========
             out wrap(
@@ -72,11 +77,11 @@ module Zafu
             )
 
             # 2. Save 'each' template
-            store_block(each_block, :node => self.node.move_to(var, finder[:class])) #, :klass => klass) # do we need klass here ?
+            store_block(each_block, :node => tmplt_node)
 
             # 3. Save 'form' template
             cont = {
-              :saved_template     => form_url(node.dom_prefix),
+              :saved_template     => form_url(tmplt_node.dom_prefix),
               :klass              => klass,
               :make_form          => each_block == form_block,
               # Used to get parameters like 'publish', 'done', 'after'
@@ -238,8 +243,7 @@ module Zafu
           klass = @context[:klass] || node.single_class
 
           # New object to render form.
-          new_node = node.move_to("#{var}_new", klass,
-            :new_keys   => {})
+          new_node = node.move_to("#{var}_new", klass, :new_keys => {})
 
 
           if new_node.will_be?(Node)
@@ -313,6 +317,7 @@ module Zafu
         if @context[:saved_template]
           # render to start a saved template
           node.saved_dom_id = "\#{ndom_id(#{node})}"
+          node.dom_prefix ||= dom_name
           node.propagate_dom_scope!
           @markup.set_id(node.dom_id)
 
@@ -346,7 +351,7 @@ module Zafu
 
       # Return true if we need to insert the dom id for this element.
       def need_dom_id?
-        @context[:form] || descendant('unlink') || descendant('drop')
+        @context[:form] || child['unlink'] || (single_child_method && single_child_method == child['drop'])
       end
 
       # Unique template_url, ending with dom_id
@@ -362,7 +367,7 @@ module Zafu
       # 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)
+        @dom_name ||= unique_name(context)
       end
 
       # Return a different name on each call

data/lib/zafu/process/context.rb

@@ -40,6 +40,7 @@ module Zafu
             if node.list_context?
               # we are still in a list (example: previous context was [[Node]], current is [Node])
             else
+              node.dom_prefix ||= dom_name
               node.propagate_dom_scope!
 
               if need_dom_id?

data/lib/zafu/process/forms.rb

@@ -41,7 +41,7 @@ module Zafu
             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
+            elsif v.kind_of?(Array)
               # We use ['ffff'] to indicate that the content is already escaped and ready for ERB.
               out v.first
             end

data/test/node_context_test.rb

@@ -261,22 +261,30 @@ class NodeContextTest < Test::Unit::TestCase
   context 'Generating a dom id' do
     context 'in a blank context' do
       subject do
-        NodeContext.new('@foo', Page)
+        n = NodeContext.new('@foo', Page)
+        n.dom_prefix = 'list1'
+        n
       end
 
       should 'return the node name in DOM id' do
-        assert_equal '<%= @foo.zip %>', subject.dom_id
+        assert_equal '<%= %Q{list1_#{@foo.zip}} %>', subject.dom_id
+      end
+
+      should 'not use zip on list false' do
+        assert_equal 'list1', subject.dom_id(:list => false)
       end
 
       should 'scope without erb on erb false' do
-        assert_equal '#{@foo.zip}', subject.dom_id(:erb => false)
+        assert_equal 'list1_#{@foo.zip}', subject.dom_id(:erb => false)
       end
     end
 
     context 'in a hierarchy of contexts' do
       setup do
         @a       = NodeContext.new('@node', Page)
+        @a.dom_prefix = 'a'
         @b       = NodeContext.new('var1', [Page], @a)
+        @b.dom_prefix = 'b'
         @c       = NodeContext.new('var2', Page, @b)
       end
 
@@ -291,7 +299,22 @@ class NodeContextTest < Test::Unit::TestCase
         end
 
         should 'use dom_scopes' do
-          assert_equal '<%= %Q{#{var1.zip}_#{var2.zip}_#{var3.zip}} %>', subject.dom_id
+          assert_equal '<%= %Q{b_#{var1.zip}_#{var2.zip}_#{var3.zip}} %>', subject.dom_id
+        end
+
+        should 'use dom_scopes and dom_prefix not in list' do
+          subject.dom_prefix = 'd'
+          assert_equal '<%= %Q{b_#{var1.zip}_#{var2.zip}_d} %>', subject.dom_id(:list => false)
+        end
+        
+        context 'with a saved dom_id' do
+          setup do
+            @c.saved_dom_id = '#{ndom_id(@foo)}'
+          end
+          
+          should 'use saved id in scope' do
+            assert_equal '<%= %Q{#{ndom_id(@foo)}_#{var3.zip}} %>', subject.dom_id
+          end
         end
       end
 
@@ -302,7 +325,7 @@ class NodeContextTest < Test::Unit::TestCase
         end
 
         should 'not use self twice' do
-          assert_equal '<%= %Q{#{@node.zip}_#{var3.zip}} %>', subject.dom_id
+          assert_equal '<%= %Q{a_#{@node.zip}_#{var3.zip}} %>', subject.dom_id
         end
       end
 
@@ -312,6 +335,7 @@ class NodeContextTest < Test::Unit::TestCase
         end
 
         should 'use dom_prefix' do
+          subject.dom_prefix = nil
           assert_equal '<%= %Q{cart_#{var3.zip}} %>', subject.dom_id
         end
       end

data/zafu.gemspec

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