From d6304e667eca827f4ca41dbda719306a562ae5b5 Mon Sep 17 00:00:00 2001
From: Gaspard Bucher <gaspard@teti.ch>
Date: Mon, 4 Nov 2013 15:01:37 +0100
Subject: [PATCH] Fixed bug in rubyless "split" method type: not returning an
 array of strings.

---
 config/bricks.yml                             |   5 +-
 config/gems.yml                               |   2 +-
 .../zafu_compiler/safe_definitions.yml        |   4 +
 zena.gemspec                                  | 104 +++++++++---------
 4 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/config/bricks.yml b/config/bricks.yml
index b94d7c48..661b0b44 100644
--- a/config/bricks.yml
+++ b/config/bricks.yml
@@ -13,7 +13,8 @@ test:
 
 
 development:
-#  asset_port: 7999  
+#  asset_port: 7999    
+  cache_path: '/public'
   activity:  ON
   mongrel:   OFF
   passenger: ON
@@ -62,7 +63,7 @@ production:
 # what Zena considers 'local'
 #  local_ips: 123.45.67.89, 127.0.0.1
   activity:  ON
-  cache_path: '/public/cache'
+  cache_path: '/public'
   mongrel:   OFF
   passenger: ON
   uv:
diff --git a/config/gems.yml b/config/gems.yml
index a7c3c8e2..0510990b 100644
--- a/config/gems.yml
+++ b/config/gems.yml
@@ -21,7 +21,7 @@ simple_xlsx_writer:    # spreadsheet
 querybuilder:   '= 1.2.2'
 yamltest:       '= 0.7.0'
 safe_yaml:      '= 0.8.0'
-rubyless:       '= 0.8.10'
+rubyless:       '= 0.8.11'
 property:       '= 2.3.4'
 versions:       '= 0.3.1'
 
diff --git a/test/integration/zafu_compiler/safe_definitions.yml b/test/integration/zafu_compiler/safe_definitions.yml
index 78d2d6cb..0f087490 100644
--- a/test/integration/zafu_compiler/safe_definitions.yml
+++ b/test/integration/zafu_compiler/safe_definitions.yml
@@ -45,6 +45,10 @@ string_strip:
   tem: "<%= \" #{@node.zip}\".strip %>"
   res: "22"
 
+string_split:
+  src: "<r:void do=\"'one,two'.split(',')\"><span do='each' join=' ' do='this'/></r:void>"
+  res: '<span>one</span> <span>two</span>'
+
 string_to_i:
   eval: "%Q{ #{id}}.to_i"
   tem: "<%= \" #{@node.zip}\".to_i %>"
diff --git a/zena.gemspec b/zena.gemspec
index 083ab129..0147a138 100644
--- a/zena.gemspec
+++ b/zena.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-10-17}
+  s.date = %q{2013-10-30}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -2228,84 +2228,84 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.4"])
-      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
       s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
       s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
-      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.4"])
+      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
       s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
+      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.11"])
+      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
     else
-      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
       s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<property>, ["= 2.3.4"])
-      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
       s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
       s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.9"])
-      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
+      s.add_dependency(%q<property>, ["= 2.3.4"])
+      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<gettext>, ["= 2.1.0"])
       s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.9"])
+      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_dependency(%q<rubyless>, ["= 0.8.11"])
+      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     end
   else
-    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-    s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<differ>, ["= 0.1.2"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
     s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<property>, ["= 2.3.4"])
-    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-    s.add_dependency(%q<rails>, ["= 2.3.18"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
     s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
     s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.9"])
-    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
+    s.add_dependency(%q<property>, ["= 2.3.4"])
+    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<gettext>, ["= 2.1.0"])
     s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.9"])
+    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+    s.add_dependency(%q<rubyless>, ["= 0.8.11"])
+    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
   end
 end