zafu 0.8.3 → 0.8.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.4 2011-11-09
+
+* Enhancements
+  * Fixed saved_dom_id propagation.
+
 == 0.8.3 2011-07-12
 
 * Enhancements

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end
 

data/lib/zafu/node_context.rb

@@ -52,6 +52,7 @@ module Zafu
     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)
+      res.propagate_dom_scope! if @dom_scope
       res.dom_prefix = self.dom_prefix
       res
     end
@@ -176,7 +177,7 @@ module Zafu
     protected
       # List of scopes defined in ancestry (used to generate dom_id).
       def dom_scopes
-        return [@saved_dom_id] if @saved_dom_id
+        return [@saved_dom_id] if @dom_scope && @saved_dom_id
         if @up
           scopes = @up.dom_scopes
           if @dom_scope

data/lib/zafu/parser.rb

@@ -222,6 +222,7 @@ module Zafu
     def replace_with(obj)
       # keep @method (obj's method is always 'with')
       @blocks = obj.blocks.empty? ? @blocks : obj.blocks
+      obj.params.delete(:part)
       @params.merge!(obj.params)
     end
 

data/lib/zafu/process/ajax.rb

@@ -36,12 +36,6 @@ 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

data/test/node_context_test.rb

@@ -317,6 +317,17 @@ class NodeContextTest < Test::Unit::TestCase
           end
         end
       end
+      
+      context 'with a saved dom_id' do
+        setup do
+          @c.saved_dom_id = '#{ndom_id(@foo)}'
+        end
+        
+        should 'not use saved id in scope' do
+          # We did not ask for dom_scope to propagate.
+          assert_equal '<%= %Q{b_#{var3.zip}} %>', subject.dom_id
+        end
+      end
 
       context 'with ancestors and self as dom_scopes' do
         setup do

data/zafu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-07-12}
+  s.date = %q{2011-07-17}
   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: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +02:00
+date: 2011-07-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Provides a powerful templating language based on xhtml for rails