zena 0.15.2 → 0.16.0

data/test/unit/template_test.rb

@@ -52,7 +52,7 @@ class TemplateTest < Zena::Unit::TestCase
   def test_create_with_file
     login(:tiger)
     doc = secure!(Document) { Document.create(:parent_id=>nodes_id(:default), :name=>'skiny',
-      :c_file=>uploaded_file('some.txt', content_type="text/zafu", 'smoke'))}
+      :c_file=>uploaded_fixture('some.txt', content_type="text/zafu", 'smoke'))}
     assert_kind_of Template, doc
     assert !doc.new_record?, "Not a new record"
     assert_equal 'skiny.zafu', doc.version.content.filename
@@ -299,7 +299,7 @@ class TemplateTest < Zena::Unit::TestCase
   def test_update_same_text
     login(:tiger)
     tmpt = secure(Template) { Template.create(:parent_id=>nodes_id(:default), 'c_format' => 'vcard', 'c_klass' => 'Node', 'name' => '', 'v_status' => Zena::Status[:pub], 'c_file' =>
-      uploaded_file('some.txt', 'text/zafu')) }
+      uploaded_fixture('some.txt', 'text/zafu')) }
     assert_kind_of Template, tmpt
     Zena::Db.set_attribute(tmpt, :updated_at, Time.gm(2006,04,11))
     assert_equal Zena::Status[:pub], tmpt.version.status
@@ -335,7 +335,24 @@ class TemplateTest < Zena::Unit::TestCase
 
       should 'be able to destroy version' do
         assert_difference('Version.count', -1) do
-          assert @node.destroy_version
+          assert_difference('Node.count', 0) do
+            assert @node.destroy_version
+          end
+        end
+      end
+    end
+
+    context 'on a template with just one removed version' do
+      setup do
+        @node = secure(Node) { nodes(:Project_zafu) }
+        @node.remove
+      end
+
+      should 'be able to destroy template' do
+        assert_difference('Version.count', -1) do
+          assert_difference('Node.count', -1) do
+            assert @node.destroy_version
+          end
         end
       end
     end
@@ -352,6 +369,31 @@ class TemplateTest < Zena::Unit::TestCase
       end
     end
 
+    should 'be able to create a template with no format, mode or klass' do
+      assert_difference('Node.count', 1) do
+        @node = secure(Document) { Document.create(:parent_id => nodes_id(:default), :name=>'foo.zafu') }
+      end
+      content = @node.version.content
+      assert_nil content.format
+      assert_nil content.mode
+      assert_nil content.klass
+      assert_equal 'foo', @node.name
+      assert_equal 'foo', @node.version.title
+    end
+
+    should 'be able to update a template with blank format, mode or klass' do
+      @node = secure(Node) { nodes(:notes_zafu) }
+      assert @node.update_attributes('v_text' => 'hello', 'c_klass' => '', 'c_format' => '', 'c_mode' => '')
+      @node = secure(Node) { nodes(:notes_zafu) } # reload
+      content = @node.version.content
+
+      assert_nil content.format
+      assert_nil content.mode
+      assert_nil content.klass
+
+      assert_equal 'hello', @node.version.text
+    end
+
   end
 
 end

data/test/unit/text_document_test.rb

@@ -54,7 +54,7 @@ class TextDocumentTest < Zena::Unit::TestCase
     assert bird.update_attributes(:parent_id => node[:parent_id])
     Zena::Db.set_attribute(bird, :updated_at, b_at)
     start =<<-END_CSS
-    body { font-size:10px; }
+    body { font-size:10px; behavior:url("/stylesheets/csshover2.htc"); }
     #header { background:url('bird.jpg') }
     #pv     { background:url('bird_pv.jpg') }
     #footer { background:url('/projects/wiki/flower.jpg') }
@@ -66,9 +66,10 @@ class TextDocumentTest < Zena::Unit::TestCase
     helper = ApplicationController.new
     helper.instance_variable_set(:@visitor, visitor)
     text = node.parse_assets(start, helper, 'v_text')
+    err node
     assert node.errors.empty?
     res =<<-END_CSS
-    body { font-size:10px; }
+    body { font-size:10px; behavior:url("/stylesheets/csshover2.htc?#{File.mtime(File.join(RAILS_ROOT, 'public/stylesheets/csshover2.htc')).to_i}"); }
     #header { background:url('/en/image30.jpg?1144713600') }
     #pv     { background:url('/en/image30_pv.jpg?967816914293') }
     #footer { background:url('/en/image31.jpg?1144713600') }
@@ -80,7 +81,7 @@ class TextDocumentTest < Zena::Unit::TestCase
     assert_equal res, text
     text = node.unparse_assets(text, helper, 'v_text')
     unparsed =<<-END_CSS
-    body { font-size:10px; }
+    body { font-size:10px; behavior:url("/stylesheets/csshover2.htc"); }
     #header { background:url('bird.jpg') }
     #pv     { background:url('bird_pv.jpg') }
     #footer { background:url('/projects/wiki/flower.jpg') }

data/test/unit/user_test.rb

@@ -2,6 +2,15 @@ require 'test_helper'
 
 class UserTest < Zena::Unit::TestCase
 
+  def test_find_allowed_user_by_login
+    assert_equal users_id(:su), User.find_allowed_user_by_login('su').id
+  end
+
+  def test_deleted_user_should_not_be_allowed
+    User.connection.execute "UPDATE users SET status = #{User::Status[:deleted]} WHERE id = #{users_id(:tiger)} AND site_id = #{sites_id(:zena)}"
+    assert_nil User.find_allowed_user_by_login('tiger')
+  end
+
   def test_visited_node_ids
     login(:tiger)
     secure!(Node) { nodes(:status) }
@@ -55,8 +64,8 @@ class UserTest < Zena::Unit::TestCase
     user = secure!(User) { User.find(user[:id]) } # reload
     assert_equal sites_id(:ocean), user.site_id
     assert_equal 2, user.groups.size
-    assert user.groups.include?(groups(:public)), "Is in the public group"
-    assert user.groups.include?(groups(:aqua)), "Is in the 'site' group"
+    assert user.groups.map{|g| g.name}.include?('public'), "Is in the public group"
+    assert user.groups.map{|g| g.name}.include?('aqua'), "Is in the 'site' group"
     assert_equal User::Status[:moderated], user.status
     assert_equal 'ru', user.lang
     assert_equal 'US/Hawaii', user[:time_zone]
@@ -91,7 +100,7 @@ class UserTest < Zena::Unit::TestCase
 
   def test_create_admin_with_groups
     login(:lion)
-    user = secure!(User) { User.new("login"=>"john", "password"=>"isjjna78a9h", "group_ids"=>[groups_id(:admin)]) }
+    user = secure!(User) { User.new("login"=>"john", "password"=>"isjjna78a9h", "group_ids"=>[1329663069]) }
     assert user.save
     user = secure!(User) { User.find(user[:id])}
     assert_equal 3, user.groups.size
@@ -154,35 +163,6 @@ class UserTest < Zena::Unit::TestCase
     assert !user.is_admin?
   end
 
-  def test_login
-    assert user = User.login('ant', 'ant', 'test.host'), "Login  ok."
-    assert_equal user[:id], users_id(:ant)
-    assert_nil User.login('ant', 'bad', 'test.host')
-    assert_nil User.login('ant', 'ant', 'ocean.host')
-  end
-
-  def test_cannot_login_if_deleted
-    assert User.login('ant', 'ant', 'test.host')
-    User.connection.execute("UPDATE users SET status=#{User::Status[:deleted]} WHERE id=#{users_id(:ant)}")
-    assert !User.login('ant', 'ant', 'test.host')
-  end
-
-  def test_anon_cannot_login
-    assert_nil User.login('anon', '', 'test.host')
-  end
-
-  def test_unique_login
-    login(:lion)
-    bob = secure!(User) { User.create(:login=>'tiger', :password=>'anypassword') }
-    assert bob.new_record?
-    assert bob.errors[:login] #.any?
-
-    login(:whale)
-    bob = secure!(User) { User.create(:login=>'tiger', :password=>'anypassword') }
-    assert !bob.new_record?
-    assert_nil bob.errors[:login] #.empty?
-  end
-
   def test_empty_password
     login(:lion)
     bob = secure!(User) { User.new }
@@ -252,7 +232,7 @@ class UserTest < Zena::Unit::TestCase
     login(:lion)
     user = secure!(User) { User.create("login"=>"john", "password"=>"isjjna78a9h", 'time_zone' => 'Zurich') }
     assert user.new_record?
-    assert_equal 'is invalid', user.errors['time_zone']
+    assert_not_nil user.errors['time_zone']
 
     user = secure!(User) { User.create("login"=>"john", "password"=>"isjjna78a9h", 'time_zone' => 'Mexico/General') }
     assert !user.new_record?

data/test/unit/zena/db_test.rb

@@ -36,6 +36,14 @@ class DbTest < Zena::Unit::TestCase
     assert_nil Zena::Db.fetch_row("SELECT name FROM nodes WHERE 0")
   end
 
+  def test_fetch_attributes
+    assert_equal [{"name"=>"secret", "zip"=>"19"},
+     {"name"=>"status", "zip"=>"22"},
+     {"name"=>"strange", "zip"=>"36"},
+     {"name"=>"skins", "zip"=>"51"},
+     {"name"=>"style", "zip"=>"53"}], Zena::Db.fetch_attributes(['zip','name'], 'nodes', "name like 's%' and site_id = #{sites_id(:zena)} ORDER BY zip")
+  end
+
   context 'A node that needs attribute changes without validations or side effects' do
     setup do
       login(:anon)

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

@@ -157,13 +157,13 @@ link_no_title:
   src: '"":23'
   res: '<p>[make_link id:|23| title:||]</p>'
 
-link_sharp:
+link_anchor:
   src: '"hello":23#world of fame'
-  res: "<p>[make_link id:|23| sharp:|world| title:|hello|] of fame</p>"
+  res: "<p>[make_link anchor:|world| id:|23| title:|hello|] of fame</p>"
 
-link_sharp_same_as_title:
+link_anchor_same_as_title:
   src: '"hello":23# I love you'
-  res: "<p>[make_link id:|23| sharp:|true| title:|hello|] I love you</p>"
+  res: "<p>[make_link anchor:|true| id:|23| title:|hello|] I love you</p>"
 
 link_with_ending_punct:
   src: "I love \"\":20."

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

@@ -41,9 +41,10 @@ class DatesViewMethodsTest < Zena::View::TestCase
   end
 
   def test_full_date
+    I18n.locale = 'en'
     atime = visitor.tz.utc_to_local(Time.gm(2006,11,10))
     assert_equal "Friday, November 10 2006", full_date(atime)
-    I18n.locale = 'fr'
+    ::I18n.locale = 'fr'
     assert_equal "vendredi, 10 novembre 2006", full_date(atime)
   end
 

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

@@ -106,6 +106,14 @@ class HtmlTagsTest < Zena::View::TestCase
     assert_match %r{input type='text'.*name.*node\[icon_id\]}m, select_id('node', :icon_id)
   end
 
+  def test_select_id_with_empty_value
+    login(:lion)
+    vclass = VirtualClass.create(:superclass => 'Post', :name => 'Foo', :create_group_id =>  groups_id(:public))
+    @node = secure!(Node) { nodes(:status) }
+    select = select_id('node', :parent_id, :class=>'Foo')
+    assert_match %r{<select[^>]*></select>}, select
+  end
+
   def test_uses_datebox_with_lang
     res = uses_datebox
     assert_match %r{/calendar/lang/calendar-en-utf8.js}, res
@@ -191,16 +199,16 @@ class HtmlTagsTest < Zena::View::TestCase
   end
 
   def test_login_link
-    assert_equal "<a href=\"http://test.host/oo/projects/cleanWater\">login</a>", login_link
+    assert_equal "<a href=\"http://test.host/login\">login</a>", login_link
     login(:ant)
-    assert_equal "<a href='/logout'>logout</a>", login_link
+    assert_equal "<a href=\"http://test.host/logout\">logout</a>", login_link
   end
 
   def test_login_link_without_prefix
     overwrite_params(:prefix => nil, :controller => 'comments', :action => 'index')
-    assert_equal "<a href='/login'>login</a>", login_link
+    assert_equal "<a href=\"http://test.host/login\">login</a>", login_link
     login(:ant)
-    assert_equal "<a href='/logout'>logout</a>", login_link
+    assert_equal "<a href=\"http://test.host/logout\">logout</a>", login_link
   end
 
   def test_show_path_root

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

@@ -1,7 +1,8 @@
 require 'test_helper'
 
 class RefactorTest < Zena::View::TestCase
-  include Zena::Use::Refactor::ViewMethods # fquote
+  tests Zena::Use::Refactor::ViewMethods # fquote
+
   def _(k)
     k
   end
@@ -11,7 +12,7 @@ class RefactorTest < Zena::View::TestCase
   end
 
   def test_render_to_string
-    assert_match 'stupid test 25', render_to_string(:inline=>'stupid <%= "test" %> <%= 5*5 %>')
+    assert_match 'stupid test 25',  render_to_string(:inline=>'stupid <%= "test" %> <%= 5*5 %>')
   end
 
   def test_fsize
@@ -33,7 +34,7 @@ class RefactorTest < Zena::View::TestCase
   end
 
   def test_traductions
-    session[:lang] = 'en'
+    visitor.lang = 'en'
     # we must initialize an url for url_rewriting in 'traductions'
     @controller.instance_eval { @url = ActionController::UrlRewriter.new( @request, {:controller=>'nodes', :action=>'index'} ) }
     @node = secure!(Node) { Node.find(nodes_id(:status)) } # en,fr

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

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class RenderingTest < Zena::View::TestCase
+  def self.layout(*args); ''; end # Called by Rendering::ControllerMethods
   include Zena::Use::Rendering::ControllerMethods
   include Zena::Use::Zafu::ControllerMethods # template_url
   include Zena::Acts::Secure # secure

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

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+class UploadTest < Zena::View::TestCase
+  include Zena::Use::Upload::ControllerMethods
+  attr_reader :params
+
+  # only run these tests if network is available
+  if Zena::Use::Upload.has_network?
+    context 'Uploading with an attachment url' do
+      setup do
+        @params = {'attachment_url' => 'http://zenadmin.org/fr/blog/image5.jpg'}
+      end
+
+      should 'provide a file with the downloaded content' do
+        file, error = get_attachment
+        assert file, "error: #{error}"
+        content = file.read
+        assert_equal 73633, content.size
+      end
+
+      context 'to a file too large' do
+        setup do
+          @params = {'attachment_url' => "http://cdimage.debian.org/debian-cd/5.0.3/i386/iso-cd/debian-503-i386-CD-1.iso"}
+        end
+
+        should 'return an error about file being too big, without a download' do
+          file, error = get_attachment
+          assert_nil file
+          assert_equal 'size (645.5 MB) too big to fetch url', error
+        end
+      end
+
+      context 'to a file without size' do
+        setup do
+          @params = {'attachment_url' => "http://download.berlios.de/zena/zena_playground.zip"}
+        end
+
+        should 'return an error about missing content length' do
+          file, error = get_attachment
+          assert_nil file
+          assert_equal 'unknown size: cannot fetch url', error
+        end
+      end
+
+
+      context 'that is not valid' do
+        setup do
+          @invalid_urls = ['lkja a93z/3', 'bad .uri', '.']
+        end
+
+        should 'return an error' do
+          @invalid_urls.each do |url|
+            @params = {'attachment_url' => url}
+            file, error = get_attachment
+            assert_nil file
+            assert_equal 'invalid url', error
+          end
+        end
+      end
+
+      context 'that does not exist' do
+        setup do
+          @params = {'attachment_url' => "http://example.org/xyz.zip"}
+        end
+
+        should 'return an error about missing content length' do
+          file, error = get_attachment
+          assert_nil file
+          assert_equal 'not found', error
+        end
+      end
+    end
+  else
+    puts "upload by url disabled (no network)"
+  end # if has_network?
+end

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

@@ -65,6 +65,10 @@ class UrlsTest < Zena::View::TestCase
     assert_equal "/en/image30_pv.jpg?#{node.updated_at.to_i + Iformat['pv'][:hash_id]}", zen_path(node, :format => 'jpg', :mode => 'pv')
   end
 
+  def test_zen_path_with_anchor
+    assert_equal '/en/section12.html#comments', zen_path(nodes(:people), :anchor => 'comments')
+  end
+
   def test_zen_path_asset
     login(:ant)
     node = secure!(Node) { nodes(:zena) }

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

@@ -30,4 +30,12 @@ class ZafuTest < Zena::View::TestCase
     compiled_template = template_url
     assert_match %r{<%= render_js %></body>}, File.read(File.join(SITES_ROOT, compiled_template))
   end
+  
+  def test_template_path_from_template_url
+    assert_equal "/test.host/zafu/default/Node-test/en/pagir", template_path_from_template_url('/default/Node-test/pagir')
+  end
+  
+  def test_fullpath_from_template_url
+    assert_equal "#{SITES_ROOT}/test.host/zafu/default/Node-test/en/pagir", fullpath_from_template_url('/default/Node-test/pagir')
+  end
 end

data/test/unit/zena/workflow/status_version_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+class StatusVersionTest < Zena::Unit::TestCase
+
+
+end

data/test/unit/zena/zena_tags/ajax.yml

@@ -156,20 +156,20 @@ draggable_do_syntax:
 unlink:
   context:
     node: 'art'
-  src: "<r:tagged do='each' do='unlink'/>"
+  src: "<r:context select='tagged' do='each' do='unlink'/>"
   res: "/<div id='list1_21'><a .*onclick=.*Ajax.Request.*_ID(cleanWater_in_art)\?dom_id=list1_21.*class=.unlink.*bullet_delete.png.*<\/div><div id='list1_27'/"
 
 unlink_ignored_in_form:
   context:
     node: 'art'
-  src: "<r:tagged><r:each do='unlink'/><r:add/></r:tagged>"
+  src: "<r:context select='tagged'><r:each do='unlink'/><r:add/></r:context>"
   res: "!/<form.*bullet_delete.png/"
 
 edit_link:
   context:
     node: 'art'
     lang: 'fr'
-  src: "<r:tagged><r:each><r:show attr='name'/>: <r:show attr='l_status'/> <r:edit/></r:each></r:tagged>"
+  src: "<r:context select='tagged'><r:each><r:show attr='name'/>: <r:show attr='l_status'/> <r:edit/></r:each></r:context>"
   res: "/link_id.*éditer/"
   'edit/link/fr/list1_form.erb': "/<input type='hidden' name='link_id' value=.<%= @node.link_id %>./>/"
   'edit/link/fr/list1.erb': "/\#\{@node.link_id\}/"
@@ -183,7 +183,7 @@ each_in_each_dom_id:
     <ul class='tags' do='tags in site'>
       <li do='each'><b do='link'/>
         <div do='drop' set='set_tag'>
-          <ul class='tagged' do='tagged'>
+          <ul class='tagged' do='context' select='tagged'>
             <li do='each' draggable='true' do='link'/>
           </ul>
         </div>

data/test/unit/zena/zena_tags/basic.yml

@@ -260,20 +260,20 @@ link_root:
   tem: "<a href='<%= zen_path((secure(Node) { Node.find(_ID(zena))})) %>'><%= @node.version.title %></a>"
   res: "<a href='/oo'>status title</a>"
 
-link_sharp:
-  src: "<r:link sharp='true'/>"
+link_anchor:
+  src: "<r:link anchor='true'/>"
   res: "<a href='#node22'>status title</a>"
 
-link_sharp_name:
-  src: "<r:link sharp='[name]'/>"
+link_anchor_name:
+  src: "<r:link anchor='[name]'/>"
   res: "<a href='#status'>status title</a>"
 
-link_sharp_in:
-  src: "<r:link sharp='true' in='project' mode='tree'/>"
+link_anchor_in:
+  src: "<r:link anchor='true' in='project' mode='tree'/>"
   res: "<a href='/oo/projects/cleanWater_tree#node22'>status title</a>"
 
-link_sharp_name_in:
-  src: "<r:link sharp='[name]' in='parent'/>"
+link_anchor_name_in:
+  src: "<r:link anchor='[name]' in='parent'/>"
   res: "<a href='/oo/projects/cleanWater#status'>status title</a>"
 
 link_stored:
@@ -300,7 +300,7 @@ anchor:
   res: "<a name='node22'></a><a name='status'></a> <p>22</p>"
 
 anchor_in_link:
-  src: "<r:link anchor='true'/>"
+  src: "<r:anchor do='link'/>"
   res: "<a name='node22' href='/oo/projects/cleanWater/page22.html'>status title</a>"
 
 show_title_anchor:
@@ -320,7 +320,7 @@ link_version:
 version_anchor:
   context:
     node: 'opening'
-  src: "<r:traductions><r:each join=', '><r:link tattr='lang' anchor='true'/></r:each></r:traductions>"
+  src: "<r:traductions><r:each join=', '><r:anchor do='link' tattr='lang'/></r:each></r:traductions>"
   res: "<a name='version27.2' href='/oo/projects/cleanWater/post27.html?lang=en'>english</a>, <a name='version27.1' href='/oo/projects/cleanWater/post27.html?lang=fr'>french</a>"
 
 title:
@@ -642,6 +642,10 @@ if_in_tag:
   src: "<r:form><p do='if' in='form' do='[name]'/></r:form><i do='if' in='form' do='[name]'/>done."
   res: "/<p>status</p></form></div>done./"
 
+if_in_tag_else:
+  src: "<r:if in='form'>in form<r:else>not in form</r:else></r:if>"
+  res: "not in form"
+
 if_or:
   src: "<r:if can='write' or_test='d_foo'>hello</r:if>"
   tem: "/<% if @node.can_write? || !@node.version.dyn[\"foo\"].blank? -%>hello<% end -%>|<% if !@node.version.dyn[\"foo\"].blank? || @node.can_write? -%>hello<% end -%>/"
@@ -1085,6 +1089,7 @@ translate_id_to_zip:
 
 date:
   context:
+    visitor: ant
     node: 'letter'
     lang: 'fr'
   src: "<r:date select='[log_at]'>nouvelles de <r:trans do='[current_date]' format='%B'/> <r:show date='current_date' format='%Y'/>: <r:notes in='site' log='month' do='each' join=', ' do='[name]'/></r:date>"
@@ -1169,6 +1174,7 @@ captcha:
 
 date_fr:
   context:
+    visitor: ant
     lang: 'fr'
   src: "<r:show date='created_at' format='%a'/>"
   res: "ven"
@@ -1225,6 +1231,11 @@ link_page_list:
   tem: "/set_pak_page != set_pak.*zen_path\(@node,:pak.*elsif true.*set_pak_page/"
   res: "/<a href='.*page22.html\?pak=1'>1</a>, 2, .*pak=3'>3</a>.*pak=4'>4</a>.*pak=5'>5</a>/"
 
+# TODO:
+#link_page_list_single_page:
+#  src: "<r:images in='site' limit='10' order='zip' paginate='p' do='link' page='list' join=', '/>"
+#  res: "" # should not show single page
+
 link_page_list_page_count:
   context:
     pak: 3