zafu 0.5.0 → 0.6.0

data/test/ruby_less_test.rb

@@ -1,34 +1,44 @@
 require 'test_helper'
 
 class ZafuRubyLessTest < Test::Unit::TestCase
-  include RubyLess::SafeClass
-  include Zafu::Process::RubyLess
+  include RubyLess
+  def self.process_unknown(callback); end;
+  include Zafu::Process::RubyLessProcessing
   def helper; self.class; end
   safe_method :one => {:class => String, :method => "main_one"}
 
-  context 'Parsing an attribute without dynamic strings' do
-    should 'not alter string' do
-      assert_equal '"this is a string"', rubyless_attr('this is a string')
+
+  context 'With a Markup' do
+    setup do
+      @markup = Zafu::Markup.new('p')
     end
-  end
 
-  context 'Parsing an attribute with dynamic content' do
-    should 'use RubyLess to translate content' do
-      assert_equal '"this #{main_one}"', rubyless_attr('this #{one}')
+    context 'parsing an attribute without dynamic strings' do
+      should 'not alter string' do
+        set_markup_attr(@markup, :name, 'this is a string')
+        assert_equal '<p name=\'this is a string\'>foo</p>', @markup.wrap('foo')
+      end
     end
 
-    context 'with ruby errors' do
-      should 'raise a RubyLess::Error' do
-        assert_raises(::RubyLess::Error) do
-          rubyless_attr('this #{one}}')
-        end
+    context 'parsing an attribute with dynamic content' do
+      should 'use RubyLess to translate content' do
+        set_markup_attr(@markup, :name, 'this #{one}')
+        assert_equal '<p name=\'<%= "this #{main_one}" %>\'>foo</p>', @markup.wrap('foo')
       end
 
-      should 'produce an error message with the original attribute' do
-        begin
-          rubyless_attr('this #{one}}')
-        rescue ::RubyLess::Error => err
-          assert_equal 'Error parsing string "this #{one}}": parse error on value "}" (tRCURLY)', err.message
+      context 'with ruby errors' do
+        should 'raise a RubyLess::SyntaxError' do
+          assert_raises(RubyLess::SyntaxError) do
+            set_markup_attr(@markup, :name, 'this #{one}}')
+          end
+        end
+
+        should 'produce an error message with the original attribute' do
+          begin
+            set_markup_attr(@markup, :name, 'this #{one}}')
+          rescue RubyLess::Error => err
+            assert_match %r{parse error on value "\}" \(tRCURLY\)}, err.message
+          end
         end
       end
     end

data/test/test_helper.rb

@@ -2,8 +2,9 @@ require 'rubygems'
 require 'stringio'
 require 'test/unit'
 require 'shoulda'
+require 'yamltest'
 require 'zafu'
 require 'zafu/test_helper'
-require 'mock/params'
-
-TestCompiler = Zafu.parser_with_rules(Zafu::All, Mock::Params)
+require 'zafu/ordered_hash'
+require 'mock/test_compiler'
+require 'mock/core_ext'

data/test/zafu/ajax.yml

@@ -0,0 +1,7 @@
+store_block:
+  src: "TODO"
+  tem: "TODO"
+
+use_root_in_template_url:
+  src: "TODO"
+  tem: "TODO"

data/test/zafu/asset.yml

@@ -0,0 +1,3 @@
+should_parse_script_tags_and_keep_params:
+  src: "<script type='text/javascript'>alert('hello');</script>"
+  tem: "<script type='text/javascript'>alert('hello');</script>"

data/test/zafu/basic.yml

@@ -0,0 +1,3 @@
+out_post:
+  src: "<r:link post_string='Monday'/>"
+  tem: "<%= make_link(@node) %>Monday"

data/test/zafu/markup.yml

@@ -0,0 +1,4 @@
+
+double_do_should_not_propagate_markup:
+  src: "<div id='top' do='root' do='link'/>"
+  tem: "<% if var1 = @node.root -%><div id='top'><%= make_link(var1) %></div><% end -%>"

data/test/zafu/meta.yml

@@ -0,0 +1,8 @@
+some_template:
+  src: "<div id='a'>a</div><div id='b'>b</div>"
+  tem: "<div id='a'>a</div><div id='b'>b</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>"

data/test/zafu/security.yml

@@ -0,0 +1,19 @@
+nasty_erb:
+  src: "this <% puts \"could be\" %> nasty"
+  tem: "this &lt;% puts \"could be\" %&gt; nasty"
+
+never_end_erb:
+  src: "never ending erb  <%= puts "
+  tem: "never ending erb  &lt;%= puts "
+
+nasty_evil_erb:
+  src: "this <% puts <% puts 'could be' %> %> nasty"
+  tem: "this &lt;% puts &lt;% puts 'could be' %&gt; %&gt; nasty"
+
+trick_erb:
+  src: "this <<r:void/>% puts 'is bad' %>"
+  tem: "this <<r:void/>% puts 'is bad' %&gt;"
+
+include_erb:
+  src: "include: <r:include template='/nasty_erb'/>"
+  tem: "include: this &lt;% puts \"could be\" %&gt; nasty"

data/test/zafu_test.rb

@@ -7,12 +7,12 @@ class String
 end
 
 class ZafuTest < Test::Unit::TestCase
-  include RubyLess::SafeClass
+  include RubyLess
   include Zafu::TestHelper
   safe_method :one => {:class => String, :method => "main_one"}
-  
+
   class Dummy
-    include RubyLess::SafeClass
+    include RubyLess
     safe_method :hello => String
     safe_method :one => {:class => String, :method => "dummy_one"}
   end
@@ -42,16 +42,33 @@ class ZafuTest < Test::Unit::TestCase
       end
     end
   end
-  
-  context 'a custom compiler' do
-    setup do
-      @compiler = TestCompiler
-    end
-    
-    should 'execute before_process callbacks' do
-      res = zafu_erb("<p class='simple' do='one' class='foo\#{dum.one}'/>", self, @compiler)
-      assert_match %r{class='simple <%= "foo\#\{dum.dummy_one\}"}, res
+
+  # ========== YAML TESTS
+
+  yamltest
+
+  def get_template_text(path, base_path)
+    folder = base_path.blank? ? [] : base_path.split('/')
+    url    = (folder + path[1..-1].split('/'))
+
+
+    file      = url.shift
+    test_name = url.join('_')
+
+    if test = @@test_strings[file][test_name]
+      # text, absolute_url, base_path
+      [test['src'], (file + test_name), file]
+    else
+      nil
     end
   end
 
+  def yt_do_test(file, test)
+    url  = "/#{file}/#{test}"
+    tem  = @@test_strings[file][test]['tem']
+    ast  = TestCompiler.new_with_url(url, :helper => self)
+    yt_assert tem, ast.to_erb(:node => Zafu::NodeContext.new('@node', Page), :helper => self)
+  end
+
+  yt_make
 end

data/zafu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-03-21}
+  s.date = %q{2010-05-27}
   s.description = %q{Provides a powerful templating language based on xhtml for rails}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [
@@ -29,24 +29,38 @@ Gem::Specification.new do |s|
      "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.rb",
+     "lib/zafu/process/ruby_less_processing.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"
   ]
@@ -57,8 +71,13 @@ Gem::Specification.new do |s|
   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"
@@ -70,14 +89,17 @@ 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_runtime_dependency(%q<rubyless>, [">= 0.4.0"])
+      s.add_development_dependency(%q<yamltest>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<rubyless>, [">= 0.5.0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rubyless>, [">= 0.4.0"])
+      s.add_dependency(%q<yamltest>, [">= 0.5.0"])
+      s.add_dependency(%q<rubyless>, [">= 0.5.0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rubyless>, [">= 0.4.0"])
+    s.add_dependency(%q<yamltest>, [">= 0.5.0"])
+    s.add_dependency(%q<rubyless>, [">= 0.5.0"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 +01:00
+date: 2010-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyless
+  name: yamltest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -38,11 +38,25 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
-  type: :runtime
+        version: 0.5.0
+  type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rubyless
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id003
 description: Provides a powerful templating language based on xhtml for rails
 email: gaspard@teti.ch
 executables: []
@@ -65,24 +79,38 @@ files:
 - 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.rb
+- lib/zafu/process/ruby_less_processing.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
 has_rdoc: true
@@ -117,8 +145,13 @@ specification_version: 3
 summary: Provides a powerful templating language based on xhtml for rails
 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

data/lib/zafu/process/ruby_less.rb

@@ -1,145 +0,0 @@
-require 'rubyless'
-
-module Zafu
-  module Process
-    module RubyLess
-      include ::RubyLess::SafeClass
-      # 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)
-        get_method_type(signature, false)
-      end
-
-      # Resolve unknown methods by using RubyLess in the current compilation context (the
-      # translate method in RubyLess will call 'safe_method_type' in this module).
-      def r_unknown
-        rubyless_render(@method, @params)
-      rescue ::RubyLess::NoMethodError => err
-        parser_error("#{err.error_message} <span class='type'>#{err.method_with_arguments}</span>", err.receiver_with_class)
-      rescue ::RubyLess::Error => err
-        parser_error(err.message)
-      end
-
-      # Print documentation on the current node type.
-      def r_m
-        if @params[:helper] == 'true'
-          klass = helper.class
-        else
-          klass = node.klass
-        end
-
-        out "<div class='rubyless-m'><h3>Documentation for <b>#{klass}</b></h3>"
-        out "<ul>"
-        ::RubyLess::SafeClass.safe_methods_for(klass).each do |signature, opts|
-          opts = opts.dup
-          opts.delete(:method)
-          if opts.keys == [:class]
-            opts = opts[:class]
-          end
-          out "<li>#{signature.inspect} => #{opts.inspect}</li>"
-        end
-        out "</ul></div>"
-      end
-
-      # TEMPORARY METHOD DURING HACKING...
-      def r_erb
-        "<pre><%= @erb.gsub('<','&lt;').gsub('>','&gt;') %></pre>"
-      end
-
-      def rubyless_render(method, params)
-        rubyless_expand(::RubyLess.translate(method_with_arguments(method, params), self))
-      end
-
-      def rubyless_attr(val)
-        ::RubyLess.translate_string(val, self)
-      end
-
-      private
-        def get_method_type(signature, added_options = false)
-          if type = node_context_from_signature(signature)
-            # Resolve @page, @node
-            type
-          elsif type = safe_method_from(helper, signature)
-            # Resolve template helper methods
-            type
-          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)
-            # Resolve node context methods (xxx.foo, xxx.bar)
-            type.merge(:method => "#{node.name}.#{type[:method]}")
-          elsif node && !added_options
-            # Try prepending current node before arguments: link("foo") becomse link(var1, "foo")
-            signature_with_node = signature.dup
-            signature_with_node.insert(1, node.klass)
-            if type = get_method_type(signature_with_node, added_options = true)
-              type = type.merge(:prepend_args => ::RubyLess::TypedString.new(node.name, :class => node.klass))
-              type
-            else
-              nil
-            end
-          else
-            nil
-          end
-        end
-
-        def method_with_arguments(method, params)
-          hash_arguments = {}
-          arguments = []
-          keys = params.keys.map {|k| k.to_s}
-          keys.sort.each do |k|
-            if k.to_s =~ /\A_/
-              arguments << params[k.to_sym]
-            else
-              hash_arguments[k.to_s] = params[k.to_sym]
-            end
-          end
-
-          arguments += [hash_arguments] if hash_arguments != {}
-          if arguments != [] && method[-1..-1] =~ /\w/
-            "#{method}(#{arguments.inspect[1..-2]})"
-          else
-            method
-          end
-        end
-
-        def rubyless_expand(res)
-          if res.klass == String && @blocks.map {|b| b.kind_of?(String) ? nil : b.method}.compact.empty?
-            out "<%= #{res} %>"
-          elsif res.could_be_nil?
-            out "<% if #{var} = #{res} -%>"
-            out @markup.wrap(expand_with_node(var, res.klass))
-            out "<% end -%>"
-          else
-            out "<% #{var} = #{res} -%>"
-            out @markup.wrap(expand_with_node(var, res.klass))
-          end
-        end
-
-        # This is used to resolve '@node' as NodeContext with class Node, '@page' as first NodeContext
-        # of type Page, etc.
-        def node_context_from_signature(signature)
-          return nil unless signature.size == 1
-          ivar = signature.first
-          return nil unless ivar[0..0] == '@'
-          begin
-            klass = Module.const_get(ivar[1..-1].capitalize)
-            context = node(klass)
-          rescue NameError
-            return nil
-          end
-          {:class => context.klass, :method => context.name}
-        end
-
-        def safe_method_from(context, signature)
-          if context.respond_to?(:safe_method_type)
-            context.safe_method_type(signature)
-          else
-            ::RubyLess::SafeClass.safe_method_type_for(context, signature)
-          end
-        end
-
-    end # RubyLess
-  end # Process
-end # Zafu