zafu 0.7.6 → 0.7.7

data/History.txt

@@ -1,4 +1,10 @@
-== 0.7.6
+== 0.7.7
+
+* Enhancements
+  * Added to_s for Markup.
+  * Fixed a bug where markup wrapping would occur too often on ajax block.
+
+== 0.7.6 2011-02-11
 
 * Enhancements
   * Enabled empty do (ignore method)

data/lib/zafu/info.rb

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

data/lib/zafu/markup.rb

@@ -4,7 +4,7 @@ module Zafu
   # A Markup object is used to hold information on the tag used (<li>), it's parameters (.. class='xxx') and
   # indentation.
   class Markup
-    EMPTY_TAGS   = %w{meta input link}
+    EMPTY_TAGS   = %w{meta input link img}
     STEAL_PARAMS = {
       'link'   => [:href, :charset, :rel, :type, :media, :rev, :target],
       'script' => [:type, :charset, :defer],
@@ -63,10 +63,14 @@ module Zafu
       end
     end
 
-    def initialize(tag)
+    def initialize(tag, params = nil)
       @done       = false
       @tag        = tag
-      @params     = OrderedHash.new
+      if params
+        self.params = params
+      else
+        @params     = OrderedHash.new
+      end
       @dyn_params = OrderedHash.new
     end
 
@@ -241,6 +245,10 @@ module Zafu
       (@space_before || '') + res + (@space_after || '')
     end
 
+    def to_s
+      wrap(nil)
+    end
+
     def steal_keys
       (STEAL_PARAMS[@tag] || []) + STEAL_PARAMS[:other]
     end

data/lib/zafu/process/ajax.rb

@@ -33,7 +33,7 @@ module Zafu
 
           # 1. Render inline
           #                                                                                                                 assign [] to var
-          out "<% if (#{var} = #{finder[:method]}) || (#{node}.#{node.will_be?(Comment) ? "can_comment?" : "can_write?"} && #{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.
           set_dom_prefix
 
@@ -55,12 +55,10 @@ module Zafu
             )
 
             # Render 'else' clauses
-            @markup.done = false
-            out wrap(
-              expand_with(
+            else_clauses = expand_with(
                 :in_if => true,
-                :only  => ['elsif', 'else']
-              )
+                :only  => ['elsif', 'else'],
+                :markup => @markup
             )
 
             # 2. Save 'each' template
@@ -270,7 +268,8 @@ module Zafu
         if ['context', 'each', 'block'].include?(method)
           # do not propagate 'form',etc up
           all.reject do |k,v|
-            ['form','unlink'].include?(k)
+            # FIXME: Zena leakage
+            ['form','unlink', 'count'].include?(k)
           end
         elsif ['if', 'case'].include?(method) || (method =~ /^[A-Z]/)
           # conditional
@@ -338,6 +337,9 @@ module Zafu
           ['block', 'drop'].include?(each_block.single_child_method)
         end
 
+        def context_for_partial(cont)
+          context_without_vars.merge(cont)
+        end
       private
 
         # Find a block to update on the page
@@ -354,7 +356,7 @@ module Zafu
         end
 
         def store_block(block, cont = {})
-          cont = context_without_vars.merge(cont)
+          cont, prefix = context_for_partial(cont)
 
           # Create new node context
           node = cont[:node].as_main(ActiveRecord::Base)
@@ -369,7 +371,7 @@ module Zafu
 
           # We overwrite all context: no merge.
           with_context(cont, false) do
-            template = expand_block(block)
+            template = prefix.to_s + expand_block(block)
           end
 
           out helper.save_erb_to_url(template, cont[:saved_template])

data/lib/zafu/process/conditional.rb

@@ -29,6 +29,7 @@ module Zafu
 
         # We use 'elsif' just in case there are more then one 'else' clause
         if markup = @context[:markup]
+          # Copy markup tag
           @markup.tag ||= markup.tag
           @markup.steal_html_params_from(@params)
           markup.params.each do |k, v|

data/lib/zafu/process/ruby_less_processing.rb

@@ -94,7 +94,9 @@ module Zafu
       end
 
       def get_attribute_or_eval(use_string_block = true)
-        if attribute = @params[:attr] || @params[:date]
+        if attribute = @params[:date]
+          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]
@@ -110,19 +112,32 @@ module Zafu
         return parser_continue(err.message, code)
       end
 
+      # Pass default values as parameters in @context as :param_XXXX
+      def r_default
+        cont = {}
+        @params.each do |k, v|
+          cont[:"params_#{k}"] = v
+        end
+        expand_with cont
+      end
+
       private
         # Extract arguments from params
         def extract_from_params(*keys)
           res = []
 
           keys.each do |key|
-            next unless value = @params[key.to_sym]
+            next unless value = param(key.to_sym)
             res << ":#{key} => #{RubyLess.translate_string(self, value)}"
           end
 
           res.empty? ? nil : res
         end
 
+        def param(key, default = nil)
+          @params[key] || @context[:"params_#{key}"] || default
+        end
+
         # Method resolution. The first matching method is returned. Order of evaluation is
         # 1. find node_context (@page, @image, self)
         # 2. set var (set_xxx = '...')
@@ -217,6 +232,8 @@ module Zafu
             else
               out "<%= #{res} %>"
             end
+          elsif res.klass == Boolean
+            expand_if(res)
           elsif @blocks.empty?
             out "<%= #{res} %>"
           elsif res.could_be_nil?

data/test/markup_test.rb

@@ -296,6 +296,16 @@ class MarkupTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context 'To string' do
+    subject do
+      Markup.new('img', :src => '/foo/bar.png')
+    end
+    
+    should 'render' do
+      assert_equal "<img src='/foo/bar.png'/>", subject.to_s
+    end
+  end
 
   context 'Wrapping some text' do
     setup do

data/test/zafu/meta.yml

@@ -1,12 +1,17 @@
 some_template:
-  src: "<div id='a'>a</div><div id='b'>b</div>"
-  tem: "<div id='a'>a</div><div id='b'>b</div>"
+  src: "<div id='a'>a</div><div id='b' do='link'>b</div>"
+  tem: "<div id='a'>a</div><div id='b'><%= make_link(@node) %></div>"
 
 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>"
   tem: "<div id='b'>new b:<div id='a'>a</div></div>"
 
+include_with_part_change_class:
+  # part 'a' is moved around
+  src: "<r:include template='/some/template'><div class='foobar' do='with' part='b'>new b</div></r:include>"
+  tem: "<div id='a'>a</div><div id='b' class='foobar'><%= make_link(@node) %></div>"
+
 include_missing_part:
   # part 'a' is moved around
   src: "<r:include template='/some/template' part='bad'/>"
@@ -14,4 +19,8 @@ include_missing_part:
 
 missing_template:
   src: "<r:include template='Foo'/>"
-  tem: "/template 'Foo' not found/"
+  tem: "/template 'Foo' not found/"
+
+include_part:
+  src: "xxx <r:include template='/some/template' part='b'/>"
+  tem: "xxx <div id='b'><%= make_link(@node) %></div>"

data/zafu.gemspec

@@ -1,91 +1,88 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.7.6"
+  s.version = "0.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-04-15}
   s.description = %q{Provides a powerful templating language based on xhtml for rails}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "README.rdoc",
-     "Rakefile",
-     "lib/zafu.rb",
-     "lib/zafu/all.rb",
-     "lib/zafu/compiler.rb",
-     "lib/zafu/controller_methods.rb",
-     "lib/zafu/handler.rb",
-     "lib/zafu/info.rb",
-     "lib/zafu/markup.rb",
-     "lib/zafu/mock_helper.rb",
-     "lib/zafu/node_context.rb",
-     "lib/zafu/ordered_hash.rb",
-     "lib/zafu/parser.rb",
-     "lib/zafu/parsing_rules.rb",
-     "lib/zafu/process/ajax.rb",
-     "lib/zafu/process/conditional.rb",
-     "lib/zafu/process/context.rb",
-     "lib/zafu/process/forms.rb",
-     "lib/zafu/process/html.rb",
-     "lib/zafu/process/ruby_less_processing.rb",
-     "lib/zafu/security.rb",
-     "lib/zafu/template.rb",
-     "lib/zafu/test_helper.rb",
-     "lib/zafu/view_methods.rb",
-     "rails/init.rb",
-     "script/console",
-     "script/destroy",
-     "script/generate",
-     "test/markup_test.rb",
-     "test/mock/classes.rb",
-     "test/mock/core_ext.rb",
-     "test/mock/params.rb",
-     "test/mock/process.rb",
-     "test/mock/test_compiler.rb",
-     "test/node_context_test.rb",
-     "test/ordered_hash_test.rb",
-     "test/ruby_less_test.rb",
-     "test/test_helper.rb",
-     "test/zafu/ajax.yml",
-     "test/zafu/asset.yml",
-     "test/zafu/basic.yml",
-     "test/zafu/markup.yml",
-     "test/zafu/meta.yml",
-     "test/zafu/security.yml",
-     "test/zafu_test.rb",
-     "zafu.gemspec"
+    "History.txt",
+    "README.rdoc",
+    "Rakefile",
+    "lib/zafu.rb",
+    "lib/zafu/all.rb",
+    "lib/zafu/compiler.rb",
+    "lib/zafu/controller_methods.rb",
+    "lib/zafu/handler.rb",
+    "lib/zafu/info.rb",
+    "lib/zafu/markup.rb",
+    "lib/zafu/mock_helper.rb",
+    "lib/zafu/node_context.rb",
+    "lib/zafu/ordered_hash.rb",
+    "lib/zafu/parser.rb",
+    "lib/zafu/parsing_rules.rb",
+    "lib/zafu/process/ajax.rb",
+    "lib/zafu/process/conditional.rb",
+    "lib/zafu/process/context.rb",
+    "lib/zafu/process/forms.rb",
+    "lib/zafu/process/html.rb",
+    "lib/zafu/process/ruby_less_processing.rb",
+    "lib/zafu/security.rb",
+    "lib/zafu/template.rb",
+    "lib/zafu/test_helper.rb",
+    "lib/zafu/view_methods.rb",
+    "rails/init.rb",
+    "script/console",
+    "script/destroy",
+    "script/generate",
+    "test/markup_test.rb",
+    "test/mock/classes.rb",
+    "test/mock/core_ext.rb",
+    "test/mock/params.rb",
+    "test/mock/process.rb",
+    "test/mock/test_compiler.rb",
+    "test/node_context_test.rb",
+    "test/ordered_hash_test.rb",
+    "test/ruby_less_test.rb",
+    "test/test_helper.rb",
+    "test/zafu/ajax.yml",
+    "test/zafu/asset.yml",
+    "test/zafu/basic.yml",
+    "test/zafu/markup.yml",
+    "test/zafu/meta.yml",
+    "test/zafu/security.yml",
+    "test/zafu_test.rb",
+    "zafu.gemspec"
   ]
   s.homepage = %q{http://zenadmin.org/zafu}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Provides a powerful templating language based on xhtml for rails}
   s.test_files = [
     "test/markup_test.rb",
-     "test/mock/classes.rb",
-     "test/mock/core_ext.rb",
-     "test/mock/params.rb",
-     "test/mock/process.rb",
-     "test/mock/test_compiler.rb",
-     "test/node_context_test.rb",
-     "test/ordered_hash_test.rb",
-     "test/ruby_less_test.rb",
-     "test/test_helper.rb",
-     "test/zafu_test.rb"
+    "test/mock/classes.rb",
+    "test/mock/core_ext.rb",
+    "test/mock/params.rb",
+    "test/mock/process.rb",
+    "test/mock/test_compiler.rb",
+    "test/node_context_test.rb",
+    "test/ordered_hash_test.rb",
+    "test/ruby_less_test.rb",
+    "test/test_helper.rb",
+    "test/zafu_test.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zafu
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +01:00
+date: 2011-04-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -126,8 +125,8 @@ homepage: http://zenadmin.org/zafu
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -151,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Provides a powerful templating language based on xhtml for rails

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-.DS_Store