zena 1.2.1 → 1.2.2

data/test/unit/zafu_ordered_hash_test.rb

@@ -0,0 +1,69 @@
+require 'test_helper'
+
+class OrderedHashTest < Test::Unit::TestCase
+
+  context 'An OrderedHash' do
+    setup do
+      @hash = Zafu::OrderedHash.new
+      @hash[:a] = 1
+      @hash[:c] = 2
+      @hash[:b] = 3
+    end
+
+    should 'keep keys in insertion order' do
+      assert_equal [:a, :c, :b], @hash.keys
+    end
+
+    should 'list each in insertion order' do
+      res = []
+      @hash.each do |k, v|
+        res << v
+      end
+      assert_equal [1, 2, 3], res
+    end
+
+    should 'remove entry on delete' do
+      @hash.delete(:c)
+      assert_equal [:a, :b], @hash.keys
+    end
+    
+    context 'running through keys' do
+      should 'allow key alteration' do
+        @hash.keys.each do |k|
+          assert k != :d
+          @hash[:d] = 'x'
+        end
+      end
+    end
+    
+    context 'running each' do
+      should 'allow key alteration' do
+        @hash.each do |k, v|
+          assert k != :d
+          @hash[:d] = 'x'
+        end
+      end
+    end
+
+    context 'with a duplicate' do
+      setup do
+        @dup = @hash.dup
+      end
+
+      should 'not alter duplicate on set' do
+        @hash[:d] = 4
+        assert_equal [:a, :c, :b], @dup.keys
+      end
+
+      should 'not alter duplicate on change' do
+        @hash[:a] = 10
+        assert_equal 1, @dup[:a]
+      end
+
+      should 'not alter duplicate on delete' do
+        @hash.delete(:a)
+        assert_equal [:a, :c, :b], @dup.keys
+      end
+    end
+  end
+end

data/test/unit/zena/acts/enrollable_test.rb

@@ -139,7 +139,7 @@ class EnrollableTest < Zena::Unit::TestCase
         assert_kind_of Proc, type[:class]
         klass = type[:class].call[:class]
         assert_equal VirtualClass['Section'], klass
-        assert_equal %w{assigned cached_role_ids origin summary text title tz weight}, klass.columns.keys.sort
+        assert_equal %w{assigned cached_role_ids origin settings summary text title tz weight}, klass.columns.keys.sort
       end
     end # A safe method returning a sub-class of Node
 

data/test/unit/zena/parser/zafu_asset.yml

@@ -31,13 +31,3 @@ change_script_src:
     <script src='/test_script/functions.js' type='text/javascript'>
       var = 'hello world!'
     </script>
-
-change_style_url:
-  src: |
-    <style>
-    #super { background:url('images/logo.png');}
-    </style>
-  res: |
-    <style>
-    #super { background:url('/test_/images/logo.png');}
-    </style>

data/test/unit/zena/parser/zazen.yml

@@ -215,4 +215,4 @@ wiki_link_partial_url:
 
 make_asset:
   src: "my email: [email]bob@example.com[/email]."
-  res: "<p>my email: [make_asset asset_tag:|email| content:|bob@example.com| output:|html|].</p>"
+  res: "<p>my email: [make_asset asset_tag:|email| content:|bob@example.com| output:|html|].</p>"

data/test/unit/zena/parser_test.rb

@@ -79,11 +79,8 @@ class ParserTest < Test::Unit::TestCase
   class ParserTestHelper < Zena::Parser::DummyHelper
     include ParserTest::Mock
   end
-  yamltest :files => [:zafu, :zafu_asset, :zafu_insight, :zazen] #, :options => {:latex => {:module => :zazen, :output => 'latex'}}
+  yamltest :files => [:zazen] #, :options => {:latex => {:module => :zazen, :output => 'latex'}}
   MODULES = {
-    :zafu          => [Zena::Parser::ZafuRules,  Zena::Parser::ZafuTags, ZafuTestTags],
-    :zafu_asset    => [Zena::Parser::ZafuRules,  Zena::Parser::ZafuTags, ZafuTestTags],
-    :zafu_insight  => [Zena::Parser::ZafuRules,  Zena::Parser::ZafuTags, ZafuTestTags],
     :zazen         => [Zena::Parser::ZazenRules, Zena::Parser::ZazenTags],
   }
   @@test_parsers = {}
@@ -103,10 +100,6 @@ class ParserTest < Test::Unit::TestCase
     end
   end
 
-  def test_single
-    yt_do_test('zafu', 'only_hello')
-  end
-
   def test_zazen_image_no_image
     file = 'zazen'
     test = 'image_no_image'
@@ -116,69 +109,5 @@ class ParserTest < Test::Unit::TestCase
     assert_equal @@test_strings[file][test]['res'], res
   end
 
-  def test_all_descendants
-    block = @@test_parsers['zafu'].new(
-    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>",
-      :helper => ParserTestHelper.new(@@test_strings['basic'])
-    )
-    assert_equal ['add', 'add_link', 'each', 'pages', 'test', 'title'], block.all_descendants.keys.sort
-    assert_equal 2, block.all_descendants['title'].size
-    assert_equal ['add_link', 'title'], block.descendant('add').all_descendants.keys.sort
-  end
-
-  def test_descendants
-    block = @@test_parsers['zafu'].new(
-    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>",
-      :helper => ParserTestHelper.new(@@test_strings['basic'])
-    )
-    assert_equal 2, block.descendants('title').size
-    assert_equal ['test'], block.descendants('each')[0].descendants('test').map {|n| n.method}
-    assert_equal [], block.descendants('each')[0].descendants('foo')
-  end
-
-  def test_ancestor
-    block = @@test_parsers['zafu'].new(
-    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>",
-      :helper => ParserTestHelper.new(@@test_strings['basic'])
-    )
-    sub_block = block.descendant('add_link')
-    assert_equal ['void', 'pages', 'add'], sub_block.ancestors.map{|a| a.method}
-    assert_equal sub_block.ancestor('pages'), block.descendant('pages')
-  end
-
-  def test_public_descendants
-    block = @@test_parsers['zafu'].new(
-    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>",
-      :helper => ParserTestHelper.new(@@test_strings['basic'])
-    )
-    block.all_descendants.merge('self'=>[block]).each do |k,blocks|
-      blocks.each do |b|
-        b.send(:remove_instance_variable, :@all_descendants)
-        class << b
-          def public_descendants
-            if ['each'].include?(@method)
-              {}
-            else
-              super
-            end
-          end
-        end
-      end
-    end
-    assert_equal ['add', 'add_link', 'each', 'pages', 'title'], block.all_descendants.keys.sort
-    assert_equal ['test'], block.descendant('each').all_descendants.keys.sort
-  end
-
-  def test_root
-    block = @@test_parsers['zafu'].new(
-    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>",
-      :helper => ParserTestHelper.new(@@test_strings['basic'])
-    )
-    sub_block = block.descendant('add_link')
-    assert_equal 'add_link', sub_block.method
-    assert_equal 'add', sub_block.parent.method
-    assert_equal block, sub_block.root
-  end
-
   yt_make
 end

data/test/unit/zena/use/dates_test.rb

@@ -5,7 +5,7 @@ class DatesTest < Zena::View::TestCase
   def test_date_box
     login(:anon)
     visiting(:status)
-    assert_match %r{span class="date_box".*img src="\/calendar\/iconCalendar.gif".*input id='datef.*' name='node\[updated_at\]' type='text' value='2006-04-11 00:00'}m, date_box(@node, 'updated_at')
+    assert_match %r{span class="date_box".*img src="\/calendar\/iconCalendar.gif".*input id='datef.*' name='node\[updated_at\]' type='text' value='2006-04-11 00:00'}m, date_box(@node, 'node[updated_at]', :value => @node.updated_at)
   end
 
   # see dates.yml

data/test/unit/zena/use/rendering_test.rb

@@ -10,11 +10,21 @@ class RenderingTest < Zena::View::TestCase
     context 'resolving template_url' do
 
       should 'append host and insert lang on template_path_from_template_url' do
-        assert_equal '/test.host/zafu/SKIN/TEMPLATE/en/DOM_ID', template_path_from_template_url('SKIN/TEMPLATE/DOM_ID')
+        assert_equal '/test.host/zafu/SKIN/TEMPLATE/en/DOM_ID.erb', template_path_from_template_url('', 'SKIN/TEMPLATE/DOM_ID', false)
+      end
+      
+      should 'build template on template_path_from_template_url' do
+        fullpath = fullpath_from_template_url('wiki skin/Page-changes/_main', false)
+        if File.exist?(fullpath)
+          FileUtils.rm(fullpath)
+        end
+        assert_equal '/test.host/zafu/wiki skin/Page-changes/en/foo.erb', template_path_from_template_url('', 'wiki skin/Page-changes/foo', true)
+        assert File.exist?(fullpath)
+        FileUtils.rm(fullpath)
       end
 
       should 'return a fullpath on fullpath_from_template_url' do
-        assert_equal "#{SITES_ROOT}/test.host/zafu/SKIN/TEMPLATE/en/DOM_ID", fullpath_from_template_url('SKIN/TEMPLATE/DOM_ID')
+        assert_equal "#{SITES_ROOT}/test.host/zafu/SKIN/TEMPLATE/en/DOM_ID.erb", fullpath_from_template_url('SKIN/TEMPLATE/DOM_ID', false)
       end
 
       should 'return a relative path on admin_layout' do
@@ -149,7 +159,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
         login(:anon)
         # render page to build template
         get 'show', :path => ["section#{nodes_zip(:people)}_#{@mode}.html"], :prefix => 'en'
-        assert_equal "<div id='foo'>hello people</div>", @response.body
+        assert_equal "<div id='foo' data-z='12'>hello people</div>", @response.body
       end
 
       should 'execute Element update' do
@@ -158,7 +168,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
           :t_url  => 'Default skin/Node-ins/foo',
           :dom_id => 'foo',
         }
-        assert_equal %Q{Element.replace("foo", "\\u003Cdiv id='foo'\\u003Ehello people\\u003C/div\\u003E");\n}, @response.body
+        assert_equal %Q{Element.replace(\"foo\", \"\\u003Cdiv id='foo' data-z='12'\\u003Ehello people\\u003C/div\\u003E\");\n}, @response.body
       end
 
       context 'with insert' do
@@ -169,7 +179,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
             :dom_id => 'foo',
             :insert => 'bottom',
           }
-          assert_equal %Q{Zena.insert_inner("foo", "bottom", "\\u003Cdiv id='foo'\\u003Ehello people\\u003C/div\\u003E");\n}, @response.body
+          assert_equal %Q{Zena.insert_inner(\"foo\", \"bottom\", \"\\u003Cdiv id='foo' data-z='12'\\u003Ehello people\\u003C/div\\u003E\");\n}, @response.body
         end
       end # with insert
     end # to update
@@ -179,12 +189,12 @@ class RenderingInControllerTest < Zena::Controller::TestCase
     subject do
       login(:lion)
       # create template for 'special' mode
-      t = secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Node-bar.zafu', :text => @zafu, :v_status => Zena::Status::Pub) }
+      @template = secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Node-bar.zafu', :text => @zafu, :v_status => Zena::Status::Pub) }
       login(:anon)
       {:action => 'show', :controller => 'nodes', :path => ["section#{nodes_zip(:people)}_bar.html"], :prefix => 'en'}
     end
 
-    should 'type and disposition headers' do
+    should 'set type and disposition headers' do
       @zafu = %q{<r:headers X-Foobar='my thing' Content-Type='text/css' Content-Disposition='attachment; filename=special_#{title}.csv'/>}
       get_subject
       assert_response :success
@@ -196,6 +206,13 @@ class RenderingInControllerTest < Zena::Controller::TestCase
         assert_equal v, @response.headers[k]
       end
     end
+    
+    should 'find master template' do
+      @zafu = %q{MASTER_TEMPLATE[<r:master_template do='id'/>]}
+      get_subject
+      assert_response :success
+      assert_equal "MASTER_TEMPLATE[#{@template.zip}]", @response.body
+    end
   end # Custom rendering options
 
 end

data/test/unit/zena/use/scope_index_test.rb

@@ -99,6 +99,23 @@ class ScopeIndexTest < Zena::Unit::TestCase
       end
     end # deleting a sub node
 
+    context 'deleting a node' do
+      subject do
+        blog = nil
+        assert_difference('IdxProject.count', 1) do
+          blog = secure(Node) { Node.create_node(:parent_id => @project.zip, :v_status => Zena::Status::Pub, :klass => 'Blog', :title => 'Life threat') }
+        end
+        blog
+      end
+
+      should 'rebuild target indexes' do
+        node = subject
+        assert_difference('IdxProject.count', -1) do
+          node.destroy
+        end
+      end
+    end # deleting a sub node
+
     context 'moving a sub node' do
       subject do
         secure(Node) { VirtualClass['Contact'].create_instance(:first_name => 'Friedrich', :name => 'Hölderlin', :parent_id => nodes_id(:zena), :v_status => Zena::Status::Pub) }

data/test/unit/zena/use/zazen_test.rb

@@ -28,6 +28,7 @@ class ZazenTest < Zena::View::TestCase
   def test_make_link
     # * ["":34] creates a link to node 34 with node's title.
     assert_equal '<p><a href="/en/projects-list/Clean-Water-project">Clean Water project</a></p>', zazen('"":21')
+    assert_equal '<p><a href="/en/projects-list/Clean-Water-project" target="_blank">Clean Water project</a></p>', zazen('"":21', :target => "_blank")
     # * ["title":34] creates a link to node 34 with the given title.
     assert_equal '<p><a href="/en/projects-list/Clean-Water-project">hello</a></p>', zazen('"hello":21')
     # * ["":034] if the node id starts with '0', creates a popup link.
@@ -243,7 +244,7 @@ class ZazenTest < Zena::View::TestCase
 
   def test_table_asset
     login(:tiger)
-    assert_match %r{<table data-a='node\[shopping_list\]'.*class='grid'}m, zazen("This is a table test:\n\n|shopping_list|")
+    assert_match %r{<table id='grid[^']+' data-a='node\[shopping_list\]'.*class='grid'}m, zazen("This is a table test:\n\n|shopping_list|")
   end
 
   # only works if recaptcha plugin is installed

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2012-05-01}
+  s.date = %q{2012-08-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}
@@ -86,6 +86,7 @@ Gem::Specification.new do |s|
     "app/models/section.rb",
     "app/models/site.rb",
     "app/models/skin.rb",
+    "app/models/string_hash.rb",
     "app/models/template.rb",
     "app/models/template_content.rb",
     "app/models/template_version.rb",
@@ -188,7 +189,7 @@ Gem::Specification.new do |s|
     "app/views/nodes/_show_attr.rhtml",
     "app/views/nodes/clear_order.rjs",
     "app/views/nodes/create.rjs",
-    "app/views/nodes/destroy.erb",
+    "app/views/nodes/destroy.rjs",
     "app/views/nodes/drive.rjs",
     "app/views/nodes/drop.rjs",
     "app/views/nodes/edit.html.erb",
@@ -298,6 +299,29 @@ Gem::Specification.new do |s|
     "bricks/captcha/lib/bricks/captcha.rb",
     "bricks/captcha/zena/init.rb",
     "bricks/captcha/zena/test/zafu/captcha.yml",
+    "bricks/fs_skin/lib/bricks/fs_skin.rb",
+    "bricks/fs_skin/zena/init.rb",
+    "bricks/fs_skin/zena/migrate/20110702010330_add_fs_skin_to_idx_templates.rb",
+    "bricks/fs_skin/zena/skins/blog/Image-edit.zafu",
+    "bricks/fs_skin/zena/skins/blog/Image.zafu",
+    "bricks/fs_skin/zena/skins/blog/Node-+index.zafu",
+    "bricks/fs_skin/zena/skins/blog/Node-+notFound.zafu",
+    "bricks/fs_skin/zena/skins/blog/Node-+search.zafu",
+    "bricks/fs_skin/zena/skins/blog/Node.zafu",
+    "bricks/fs_skin/zena/skins/blog/Post.zafu",
+    "bricks/fs_skin/zena/skins/blog/Project--kml.zafu",
+    "bricks/fs_skin/zena/skins/blog/Project.zafu",
+    "bricks/fs_skin/zena/skins/blog/comments.zafu",
+    "bricks/fs_skin/zena/skins/blog/dict.yml",
+    "bricks/fs_skin/zena/skins/blog/img/dateBg.jpg",
+    "bricks/fs_skin/zena/skins/blog/img/header.png",
+    "bricks/fs_skin/zena/skins/blog/img/mapPin.png",
+    "bricks/fs_skin/zena/skins/blog/img/menu.gif",
+    "bricks/fs_skin/zena/skins/blog/img/menuover.gif",
+    "bricks/fs_skin/zena/skins/blog/img/style.css",
+    "bricks/fs_skin/zena/tasks.rb",
+    "bricks/fs_skin/zena/test/integration/fs_skin_integration_test.rb",
+    "bricks/fs_skin/zena/test/unit/fs_skin_test.rb",
     "bricks/grid/lib/bricks/grid.rb",
     "bricks/grid/zena/init.rb",
     "bricks/math/lib/bricks/math.rb",
@@ -345,28 +369,6 @@ Gem::Specification.new do |s|
     "bricks/spreadsheet/zena/test/unit/xlsx_test.rb",
     "bricks/spreadsheet/zena/test/zafu/README",
     "bricks/spreadsheet/zena/test/zafu/spreadsheet.yml",
-    "bricks/static/lib/bricks/static.rb",
-    "bricks/static/zena/init.rb",
-    "bricks/static/zena/migrate/20110702010330_add_static_to_idx_templates.rb",
-    "bricks/static/zena/skins/blog/Image-edit.zafu",
-    "bricks/static/zena/skins/blog/Image.zafu",
-    "bricks/static/zena/skins/blog/Node-+index.zafu",
-    "bricks/static/zena/skins/blog/Node-+notFound.zafu",
-    "bricks/static/zena/skins/blog/Node-+search.zafu",
-    "bricks/static/zena/skins/blog/Node.zafu",
-    "bricks/static/zena/skins/blog/Post.zafu",
-    "bricks/static/zena/skins/blog/Project--kml.zafu",
-    "bricks/static/zena/skins/blog/Project.zafu",
-    "bricks/static/zena/skins/blog/comments.zafu",
-    "bricks/static/zena/skins/blog/dict.yml",
-    "bricks/static/zena/skins/blog/img/dateBg.jpg",
-    "bricks/static/zena/skins/blog/img/header.png",
-    "bricks/static/zena/skins/blog/img/mapPin.png",
-    "bricks/static/zena/skins/blog/img/menu.gif",
-    "bricks/static/zena/skins/blog/img/menuover.gif",
-    "bricks/static/zena/skins/blog/img/style.css",
-    "bricks/static/zena/test/integration/static_integration_test.rb",
-    "bricks/static/zena/test/unit/static_test.rb",
     "bricks/tags/README",
     "bricks/tags/lib/bricks/tags.rb",
     "bricks/tags/zena/init.rb",
@@ -394,6 +396,8 @@ Gem::Specification.new do |s|
     "bricks/zena/zena/migrate/20110710113731_remove_icon_field.rb",
     "bricks/zena/zena/migrate/20111101103900_add_comment_to_columns.rb",
     "bricks/zena/zena/migrate/20111214112233_add_comment_to_relations.rb",
+    "bricks/zena/zena/migrate/20120605091558_add_ssl_login_to_site.rb",
+    "bricks/zena/zena/migrate/20120630123551_add_auto_publish_to_group.rb",
     "config/boot.rb",
     "config/bricks.yml",
     "config/database_example.yml",
@@ -563,6 +567,28 @@ Gem::Specification.new do |s|
     "lib/tasks/zena.rake",
     "lib/tasks/zena.rb",
     "lib/upload_progress_server.rb",
+    "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",
     "lib/zazen_parser.rb",
     "lib/zena.rb",
     "lib/zena/acts/enrollable.rb",
@@ -579,6 +605,7 @@ Gem::Specification.new do |s|
     "lib/zena/core_ext/dir.rb",
     "lib/zena/core_ext/file_utils.rb",
     "lib/zena/core_ext/fixnum.rb",
+    "lib/zena/core_ext/float.rb",
     "lib/zena/core_ext/string.rb",
     "lib/zena/crypto_provider/initial.rb",
     "lib/zena/db.rb",
@@ -608,11 +635,8 @@ Gem::Specification.new do |s|
     "lib/zena/loader/yaml_loader.rb",
     "lib/zena/migrator.rb",
     "lib/zena/parser.rb",
-    "lib/zena/parser/zafu_rules.rb",
-    "lib/zena/parser/zafu_tags.rb",
     "lib/zena/parser/zazen_rules.rb",
     "lib/zena/parser/zazen_tags.rb",
-    "lib/zena/parser/zena_rules.rb",
     "lib/zena/refactor/act_as_content.rb",
     "lib/zena/remote.rb",
     "lib/zena/remote/connection.rb",
@@ -682,6 +706,9 @@ Gem::Specification.new do |s|
     "locale/fr/LC_MESSAGES/zena.mo",
     "locale/fr/zena.mo",
     "locale/fr/zena.po",
+    "locale/it/LC_MESSAGES/zena.mo",
+    "locale/it/zena.mo",
+    "locale/it/zena.po",
     "locale/log.txt",
     "locale/zena.pot",
     "misc/zena",
@@ -764,6 +791,7 @@ Gem::Specification.new do |s|
     "public/images/application_view_tile.png",
     "public/images/application_xp.png",
     "public/images/application_xp_terminal.png",
+    "public/images/arrow_back.png",
     "public/images/arrow_branch.png",
     "public/images/arrow_divide.png",
     "public/images/arrow_down.png",
@@ -1500,6 +1528,7 @@ Gem::Specification.new do |s|
     "public/images/project.png",
     "public/images/rails.png",
     "public/images/rainbow.png",
+    "public/images/remove_tag.png",
     "public/images/report.png",
     "public/images/report_add.png",
     "public/images/report_delete.png",
@@ -1976,6 +2005,8 @@ Gem::Specification.new do |s|
     "test/selenium/Add/add1.rsel",
     "test/selenium/Add/add2.rsel",
     "test/selenium/Add/add3.rsel",
+    "test/selenium/Destroy/0setup.rsel",
+    "test/selenium/Destroy/destroy1.rsel",
     "test/selenium/Drop/0setup.rsel",
     "test/selenium/Drop/drop1.rsel",
     "test/selenium/Drop/drop2.rsel",
@@ -1996,6 +2027,7 @@ Gem::Specification.new do |s|
     "test/selenium/Form/form1.rsel",
     "test/selenium/Form/form2.rsel",
     "test/selenium/Form/form3.rsel",
+    "test/selenium/Form/form4.rsel",
     "test/selenium/Grid/0setup.rsel",
     "test/selenium/Grid/grid1.rsel",
     "test/selenium/Paginate/0setup.rsel",
@@ -2005,6 +2037,7 @@ Gem::Specification.new do |s|
     "test/selenium/Swap/swap2.rsel",
     "test/selenium/Toggle/0setup.rsel",
     "test/selenium/Toggle/toggle1.rsel",
+    "test/selenium/Toggle/toggle2.rsel",
     "test/sites/README",
     "test/sites/complex/columns.yml",
     "test/sites/complex/complex.png",
@@ -2072,6 +2105,7 @@ Gem::Specification.new do |s|
     "test/unit/section_test.rb",
     "test/unit/site_test.rb",
     "test/unit/skin_test.rb",
+    "test/unit/string_hash_test.rb",
     "test/unit/template_test.rb",
     "test/unit/template_version_test.rb",
     "test/unit/text_document_content_test.rb",
@@ -2081,6 +2115,9 @@ Gem::Specification.new do |s|
     "test/unit/version_test.rb",
     "test/unit/virtual_class_test.rb",
     "test/unit/workflow_test.rb",
+    "test/unit/zafu_markup_test.rb",
+    "test/unit/zafu_node_context_test.rb",
+    "test/unit/zafu_ordered_hash_test.rb",
     "test/unit/zena/acts/enrollable_test.rb",
     "test/unit/zena/acts/secure_test.rb",
     "test/unit/zena/acts/serializable_test.rb",
@@ -2436,10 +2473,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, ["= 0.7.8"])
       s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
       s.add_runtime_dependency(%q<rubyless>, ["= 0.8.6"])
-      s.add_runtime_dependency(%q<property>, ["= 2.2.0"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_runtime_dependency(%q<zafu>, ["= 0.8.6"])
       s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
@@ -2455,7 +2491,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
       s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.1.0"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.1.3"])
     else
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
@@ -2463,10 +2499,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, ["= 0.7.8"])
       s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
       s.add_dependency(%q<rubyless>, ["= 0.8.6"])
-      s.add_dependency(%q<property>, ["= 2.2.0"])
+      s.add_dependency(%q<property>, ["= 2.3.2"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_dependency(%q<zafu>, ["= 0.8.6"])
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_dependency(%q<syntax>, ["= 1.0.0"])
@@ -2482,7 +2517,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<differ>, ["= 0.1.2"])
       s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<querybuilder>, ["= 1.1.0"])
+      s.add_dependency(%q<querybuilder>, ["= 1.1.3"])
     end
   else
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
@@ -2491,10 +2526,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, ["= 0.7.8"])
     s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
     s.add_dependency(%q<rubyless>, ["= 0.8.6"])
-    s.add_dependency(%q<property>, ["= 2.2.0"])
+    s.add_dependency(%q<property>, ["= 2.3.2"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-    s.add_dependency(%q<zafu>, ["= 0.8.6"])
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
     s.add_dependency(%q<syntax>, ["= 1.0.0"])
@@ -2510,7 +2544,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<differ>, ["= 0.1.2"])
     s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
     s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<querybuilder>, ["= 1.1.0"])
+    s.add_dependency(%q<querybuilder>, ["= 1.1.3"])
   end
 end