zafu 0.6.3 → 0.7.0

data/History.txt

@@ -1,3 +1,11 @@
+== 0.7.0 2010-09-14
+
+* Major enhancements
+  * Using latest API from RubyLess and better NodeContext parameter transparency.
+  * Added get_type_from_query_select to resolve RubyLess with QueryBuilder select.
+  * Added 'opts' attribute to pass information in the compiler.
+  * Removed bad '#{foo}' resolution to r_show (this is syntactically wrong Ruby). Using a fallback on r_show instead.
+
 == 0.6.3 2010-08-25
 
 * Minor enhancement

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.authors = ["Gaspard Bucher"]
     gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "yamltest", ">= 0.5.0"
-    gem.add_dependency "rubyless", ">= 0.5.0"
+    gem.add_dependency "rubyless", ">= 0.7.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.6.3'
+  VERSION = '0.7.0'
 end
 

data/lib/zafu/markup.rb

@@ -100,9 +100,9 @@ module Zafu
         if value =~ /^(.*)\#\{(.*)\}(.*)$/
           @params.delete(key)
           if $1 == '' && $3 == ''
-            append_dyn_param(key, "<%= #{RubyLess.translate($2, helper)} %>")
+            append_dyn_param(key, "<%= #{RubyLess.translate(helper, $2)} %>")
           else
-            append_dyn_param(key, "<%= #{RubyLess.translate_string(value, helper)} %>")
+            append_dyn_param(key, "<%= #{RubyLess.translate_string(helper, value)} %>")
           end
         end
       end

data/lib/zafu/node_context.rb

@@ -13,12 +13,16 @@ module Zafu
     # it has a name or dom id defined ('main', 'related', 'list', etc).
     attr_writer :dom_prefix
 
-    def initialize(name, klass, up = nil)
-      @name, @klass, @up = name, klass, up
+    # Any kind of information that the compiler might need to use (QueryBuilder query used
+    # to fetch the node for example).
+    attr_reader :opts
+
+    def initialize(name, klass, up = nil, opts = {})
+      @name, @klass, @up, @opts = name, klass, up, opts
     end
 
-    def move_to(name, klass)
-      NodeContext.new(name, klass, self)
+    def move_to(name, klass, opts={})
+      NodeContext.new(name, klass, self, opts)
     end
 
     # Since the idiom to write the node context name is the main purpose of this class, it

data/lib/zafu/process/context.rb

@@ -11,7 +11,7 @@ module Zafu
             out "<% #{node}.each_with_index do |#{var},#{var}_index| -%>"
 
             if join = @params[:join]
-              join = RubyLess.translate_string(join, self)
+              join = RubyLess.translate_string(self, join)
               #if join_clause = @params[:join_if]
               #  set_stored(Node, 'prev', "#{var}_prev")
               #  cond = get_test_condition(var, :test=>join_clause)
@@ -22,7 +22,7 @@ module Zafu
             end
 
             if alt_class = @params[:alt_class]
-              alt_class = RubyLess.translate_string(alt_class, self)
+              alt_class = RubyLess.translate_string(self, alt_class)
               alt_test = @params[:alt_reverse] == 'true' ? "(#{var}_max_index - #{var}_index) % 2 != 0" : "#{var}_index % 2 != 0"
               @markup.append_dyn_param(:class, "<%= #{alt_test} ? #{alt_class} : '' %>")
               @markup.tag ||= 'div'
@@ -32,7 +32,9 @@ module Zafu
           end
 
 
-          with_context(:node => node.move_to(var, node.klass.first)) do
+          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
+
             # The id set here should be used as prefix for sub-nodes to ensure uniqueness of generated DOM ids
             if node.list_context?
               # we are still in a list (example: previous context was [[Node]], current is [Node])
@@ -100,12 +102,12 @@ module Zafu
       def expand_with_finder(finder)
         if finder[:nil]
           open_node_context(finder, :form => nil) do # do not propagate :form
-            expand_if("#{var} = #{finder[:method]}", node.move_to(var, finder[:class]))
+            expand_if("#{var} = #{finder[:method]}", node.move_to(var, finder[:class], finder.merge(:nil => false)))
           end
         else
           res = ''
           res << "<% #{var} = #{finder[:method]} -%>"
-          open_node_context(finder, :node => node.move_to(var, finder[:class]), :form => nil) do
+          open_node_context(finder, :node => node.move_to(var, finder[:class], finder), :form => nil) do
             res << wrap(expand_with)
           end
           res

data/lib/zafu/process/ruby_less_processing.rb

@@ -20,7 +20,7 @@ module Zafu
       # Actual method resolution. The lookup first starts in the current helper. If nothing is found there, it
       # searches inside a 'helpers' module and finally looks into the current node_context.
       # If nothing is found at this stage, we prepend the method with the current node and start over again.
-      def safe_method_type(signature)
+      def safe_method_type(signature, receiver = nil)
         #puts [node.name, node.klass, signature].inspect
         super || get_method_type(signature, false)
       end
@@ -32,12 +32,7 @@ module Zafu
           return rubyless_class_scope(@method)
         end
 
-        if code = @method[/^\#\{(.+)\}$/, 1]
-          params[:eval] = $1
-          r_show
-        else
-          rubyless_render(@method, params)
-        end
+        rubyless_render(@method, params)
       rescue RubyLess::NoMethodError => err
         parser_continue("#{err.error_message} <span class='type'>#{err.method_with_arguments}</span> for #{err.receiver_with_class}")
       rescue RubyLess::Error => err
@@ -73,15 +68,25 @@ module Zafu
       def rubyless_render(method, params)
         # We need to set this here because we cannot pass options to RubyLess or get them back
         # when we evaluate the method to see if we can use blocks as arguments.
-        @rendering_block_owner = true
-        code = method_with_arguments(method, params)
-        rubyless_expand RubyLess.translate(code, self)
-      ensure
-        @rendering_block_owner = false
+        begin
+          @rendering_block_owner = true
+          code = method_with_arguments(method, params)
+          rubyless_expand RubyLess.translate(self, code)
+        rescue RubyLess::Error => err
+          if !@params.empty?
+            # try to use r_show without using params as arguments
+            params[:eval] = @method
+            r_show
+          else
+            raise err
+          end
+        ensure
+          @rendering_block_owner = false
+        end
       end
 
       def set_markup_attr(markup, key, value)
-        value = value.kind_of?(RubyLess::TypedString) ? value : RubyLess.translate_string(value, self)
+        value = value.kind_of?(RubyLess::TypedString) ? value : RubyLess.translate_string(self, value)
         if value.literal
           markup.set_param(key, value.literal)
         else
@@ -90,7 +95,7 @@ module Zafu
       end
 
       def append_markup_attr(markup, key, value)
-        value = RubyLess.translate_string(value, self)
+        value = RubyLess.translate_string(self, value)
         if value.literal
           markup.append_param(key, value.literal)
         else
@@ -110,7 +115,7 @@ module Zafu
           return parser_continue("Missing attribute/eval parameter")
         end
 
-        RubyLess.translate(code, self)
+        RubyLess.translate(self, code)
       rescue RubyLess::Error => err
         return parser_continue(err.message, code)
       end
@@ -122,14 +127,21 @@ module Zafu
 
           keys.each do |key|
             next unless value = @params[key.to_sym]
-            res << ":#{key} => #{RubyLess.translate_string(value, self)}"
+            res << ":#{key} => #{RubyLess.translate_string(self, value)}"
           end
 
           res.empty? ? nil : res
         end
 
-        # block_owner should be set to true when we are resolving <r:xxx>...</r:xxx> or <div do='xxx'>...</div>
+        # Method resolution. The first matching method is returned. Order of evaluation is
+        # 1. find node_context (@page, @image, self)
+        # 2. set var (set_xxx = '...')
+        # 3. template helper methods
+        # 4. contextual node methods (var1.xxx)
+        # 5. contextual first node of list method ([...].first.xxx)
+        # 6. append block as argument (restart 1-5 with xxx(block_string))
         def get_method_type(signature, added_options = false)
+          node = self.node
           raise "#{node.klass.class}" unless node.klass.kind_of?(Array) || node.klass.kind_of?(Class)
 
           if type = node_context_from_signature(signature)
@@ -144,10 +156,11 @@ module Zafu
           elsif helper.respond_to?(:helpers) && type = safe_method_from(helper.helpers, signature)
             # Resolve by looking at the included helpers
             type
-          elsif node && node.klass.kind_of?(Class) && type = safe_method_from(node.klass, signature)
+          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
             type.merge(:method => "#{node.name}.#{type[:method]}")
-          elsif node && node.klass.kind_of?(Array) && type = safe_method_from(node.klass.first, signature)
+          elsif node && node.list_context? && type = safe_method_from(node.klass.first, signature, node)
             type.merge(:method => "#{node.name}.first.#{type[:method]}")
           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")
@@ -248,11 +261,11 @@ module Zafu
             if node.list_context?
               raise RubyLess::Error.new("Cannot use 'this' in list_context.")
             else
-              {:class => node.klass, :method => node.name}
+              node.opts.merge(:class => node.klass, :method => node.name)
             end
           elsif ivar[0..0] == '@' && klass = get_class(ivar[1..-1].capitalize)
             if node = self.node(klass)
-              {:class => node.klass, :method => node.name}
+              node.opts.merge(:class => node.klass, :method => node.name)
             else
               nil
             end
@@ -271,12 +284,12 @@ module Zafu
           end
         end
 
-        def safe_method_from(context, signature)
+        def safe_method_from(solver, signature, receiver = nil)
 
-          if context.respond_to?(:safe_method_type)
-            context.safe_method_type(signature)
+          if solver.respond_to?(:safe_method_type)
+            solver.safe_method_type(signature, receiver)
           else
-            RubyLess::SafeClass.safe_method_type_for(context, signature)
+            RubyLess::SafeClass.safe_method_type_for(solver, signature)
           end
         end
 

data/zafu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.6.3"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-08-25}
+  s.date = %q{2010-09-14}
   s.description = %q{Provides a powerful templating language based on xhtml for rails}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [
@@ -90,16 +90,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<yamltest>, [">= 0.5.0"])
-      s.add_runtime_dependency(%q<rubyless>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<rubyless>, [">= 0.7.0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<yamltest>, [">= 0.5.0"])
-      s.add_dependency(%q<rubyless>, [">= 0.5.0"])
+      s.add_dependency(%q<rubyless>, [">= 0.7.0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<yamltest>, [">= 0.5.0"])
-    s.add_dependency(%q<rubyless>, [">= 0.5.0"])
+    s.add_dependency(%q<rubyless>, [">= 0.7.0"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +02:00
+date: 2010-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
+        - 7
         - 0
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id003
 description: Provides a powerful templating language based on xhtml for rails