zafu 0.8.5 → 0.8.6

data/History.txt

@@ -1,8 +1,9 @@
-== 0.8.5
+== 0.8.5 2012-05-01
 
 * Enhancements
   * Fixed add/edit problem in lists.
   * Added support for RubyLess access to alt_class.
+  * Fixed a bug where [block] would alter the current template url.
 
 == 0.8.4 2011-11-09
 

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end
 

data/lib/zafu/node_context.rb

@@ -112,6 +112,11 @@ module Zafu
       @dom_prefix || (@up ? @up.dom_prefix : nil)
     end
 
+    # Return dom_prefix without looking up.
+    def raw_dom_prefix
+      @dom_prefix
+    end
+
     # Mark the current context as being a looping element (each) whose DOM id needs to be propagated to sub-nodes
     # in order to ensure uniqueness of the dom_id (loops in loops problem).
     def propagate_dom_scope!

data/lib/zafu/process/ajax.rb

@@ -36,8 +36,6 @@ module Zafu
         end
 
         if need_ajax?(each_block)
-          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}=[]) %>"
@@ -48,7 +46,9 @@ module Zafu
             # Pagination count and other contextual variables exist here.
 
             tmplt_node = self.node.move_to(var, finder[:class])
-            tmplt_node.dom_prefix = node.dom_prefix
+            # Own scope
+            node.dom_prefix = dom_name
+            tmplt_node.dom_prefix = dom_name
 
             # INLINE ==========
             out wrap(
@@ -133,42 +133,60 @@ module Zafu
           return expand_with
         end
 
-        # Since we are using ajax, we will need this object to have an ID set.
-        node.dom_prefix = dom_name
-
         @markup.done = false
 
         if @context[:block] == self
-          # Storing template (called from within store_block)
-          # Set id with the template's node context (<%= @node.zip %>).
+          # Storing our block template
+          #node.dom_prefix = dom_name
           @markup.set_id(node.dom_id(:list => false))
           expand_with
+        elsif @context[:saved_template]
+          # already in a parent's store operation. Reset scope and simply render inline elements
+          # reset scope
+          with_context(:node => node.dup, :saved_template => nil) do
+            node.saved_dom_id = nil
+            node.dom_prefix = dom_name
+            @markup.set_id(node.dom_id(:list => false))
+            expand_with
+          end
         else
-          # 1. store template
-          # will wrap with @markup
-          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',
-            }
+          # Since we are using ajax, we will need this object to have an ID set and
+          # have its own template_url and such.
+          with_context(:node => node.dup, :saved_template => nil) do
+            # reset scope. We only keep current id when we are called from
+            # r_drop.
+            @markup = @markup.dup
+            @markup.set_id(nil)
+            node.saved_dom_id = nil
+            # our own domain
+            node.dom_prefix = dom_name
+
+            # 1. inline
+            # Set id with the current node context (<%= var1.zip %>).
+            @markup.set_id(node.dom_id(:list => false))
+
+            out expand_with
+            # 2. store template
+            # will wrap with @markup
+            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])
+
+              # 3. store form
+              cont = {
+                :saved_template     => form_url(node.dom_prefix),
+                :make_form          => self == form_block,
+                :publish_after_save => publish_after_save,
+                :ajax_action        => 'edit',
+              }
 
-            store_block(form_block, cont)
+              store_block(form_block, cont)
+            end
           end
-
-          # 3. render
-          # Set id with the current node context (<%= var1.zip %>).
-          @markup.set_id(node.dom_id(:list => false))
-          out expand_with
         end
       end
 
@@ -304,14 +322,14 @@ module Zafu
       def r_add_btn
         default = node.will_be?(Comment) ? _("btn_add_comment") : _("btn_add")
 
-        out "<a href='#' onclick='#{@context[:onclick]}'>#{text_for_link(default)}</a>"
+        out "<a href='javascript:void(0)' onclick='#{@context[:onclick]}'>#{text_for_link(default)}</a>"
       end
 
       def r_each
         if @context[:saved_template]
           # render to start a saved template
           node.saved_dom_id = "\#{ndom_id(#{node})}"
-          node.dom_prefix ||= dom_name
+          node.dom_prefix = dom_name unless node.raw_dom_prefix
           node.propagate_dom_scope!
           @markup.set_id(node.dom_id)
 

data/lib/zafu/process/context.rb

@@ -39,6 +39,7 @@ module Zafu
             out "<% #{node}.each do |#{var}| %>"
           end
 
+          raw_dom_prefix = node.raw_dom_prefix
 
           with_context(:node => node.move_to(var, node.klass.first, :query => node.opts[:query])) do
             # We pass the :query option for RubyLess resolution by using the QueryBuilder finder
@@ -48,7 +49,8 @@ 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
+              # Change dom_prefix if it isn't our own (inherited).
+              node.dom_prefix = dom_name unless raw_dom_prefix
               node.propagate_dom_scope!
 
               if need_dom_id?
@@ -165,9 +167,9 @@ module Zafu
       # Change context for a given scope.
       def with_context(cont, merge = true)
         raise "Block missing" unless block_given?
-        cont_bak = @context.dup
+        cont_bak = @context
           if merge
-            @context.merge!(cont)
+            @context = @context.merge(cont)
           else
             @context = cont
           end

data/lib/zafu/process/forms.rb

@@ -19,7 +19,7 @@ module Zafu
 
         if descendant('form_tag')
           # We have a specific place to insert our form
-          out expand_with(:form_options => options, :form => self)
+          out expand_with(:form_options => options, :form => self, :form_prefix => dom_name)
         else
           r_form_tag(options)
         end
@@ -31,7 +31,7 @@ module Zafu
           form_error_messages(opts[:form_helper])
 
           # Render form elements
-          out expand_with(opts)
+          out expand_with(opts.merge(:form_prefix => dom_name))
 
           # Render hidden fields (these must go after normal elements so that focusFirstElement works)
           hidden_fields = form_hidden_fields(options)

data/lib/zafu/process/ruby_less_processing.rb

@@ -174,15 +174,16 @@ module Zafu
           elsif node && !node.list_context? && type = safe_method_from(node.klass, signature, node)
             # not a list_contex
             # Resolve node context methods: xxx.foo, xxx.bar
+            # All direct methods from nodes should be html escaped:
             type = type[:class].call(self, node.klass, signature) if type[:class].kind_of?(Proc)
-            type.merge(:receiver => RubyLess::TypedString.new(node.name, :class => node.klass))
+            type.merge(:receiver => RubyLess::TypedString.new(node.name, :class => node.klass, :h => true))
           elsif node && node.list_context? && type = safe_method_from(Array, signature, node)
             # FIXME: why do we need this here ? Remove with related code in zafu_safe_definitions ?
             type = type[:class].call(self, node.klass, signature) if type[:class].kind_of?(Proc)
             type.merge(:receiver => RubyLess::TypedString.new(node.name, :class => Array, :elem => node.klass.first))
           elsif node && node.list_context? && type = safe_method_from(node.klass.first, signature, node)
             type = type[:class].call(self, node.klass, signature) if type[:class].kind_of?(Proc)
-            type.merge(:receiver => RubyLess::TypedString.new("#{node.name}.first", :class => node.klass.first))
+            type.merge(:receiver => RubyLess::TypedString.new("#{node.name}.first", :class => node.klass.first, :h => true))
           elsif @rendering_block_owner && @blocks.first.kind_of?(String) && !added_options
             # Insert the block content into the method: <r:trans>blah</r:trans> becomes trans("blah")
             signature_with_block = signature.dup
@@ -240,6 +241,9 @@ module Zafu
           if res.klass == String && !@blocks.detect {|b| !b.kind_of?(String)}
             if lit = res.literal
               out erb_escape(lit)
+            # TODO: Enable this when we have time to ensure tests/functionality work correctly.
+            #elsif res.opts[:h]
+            #  show_string(res)
             else
               out "<%= #{res} %>"
             end

data/zafu.gemspec

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