zena 0.15.0 → 0.15.1

data/test/unit/iformat_test.rb

@@ -16,7 +16,7 @@ class IformatTest < Zena::Unit::TestCase
     login(:lion)
     fmt = Iformat['med']
     assert_not_equal ImageBuilder::DEFAULT_FORMATS['med'], fmt
-    assert_equal ({:name => 'med', :width=>300, :height=>200, :gravity=>Magick::CenterGravity, :size=>:limit, :hash_id => 389519063846}), fmt
+    assert_equal ({:name => 'med', :width=>300, :height=>200, :gravity=>Magick::CenterGravity, :size=>:limit, :hash_id => 389519063846, :popup => {:show=> %w{navigation v_title v_summary}, :name=>'std', :options=>{'v_title'=>'link'}}}), fmt
   end
 
   def test_format_hash_id
@@ -187,4 +187,56 @@ class IformatTest < Zena::Unit::TestCase
     assert_equal 70, imf[:width]
     assert_equal 2, imf[:size]
   end
+
+  context 'An image format with popup' do
+    setup do
+      login(:lion)
+    end
+
+    context 'defined with name' do
+      setup do
+        Iformat.create(:name => 'header', :height=>'34', :width => '500', :size => 'force', :popup => "pop")
+        @imf = Iformat['header']
+      end
+
+      should 'use default fields and navigation' do
+        assert_equal({:show=>%w{navigation v_title v_summary}, :name=>"pop", :options=>{'v_title' => 'link'}}, @imf[:popup])
+      end
+    end
+
+    context 'defined with name and json' do
+      setup do
+        Iformat.create(:name  => 'header', :height=>'34', :width => '500', :size => 'force',
+                       :popup => 'pop {"v_title":"link", "a":true}')
+        @imf = Iformat['header']
+      end
+
+      should 'respect key order' do
+        assert_equal({:show=>%w{v_title a}, :name=>"pop", :options=>{'v_title' => 'link'}}, @imf[:popup])
+      end
+    end
+
+    context 'defined with name and list' do
+      setup do
+        Iformat.create(:name => 'header', :height=>'34', :width => '500', :size => 'force', :popup => "pop (link,navigation,created_at)")
+        @imf = Iformat['header']
+      end
+
+      should 'respect key order' do
+        assert_equal({:show=>%w{v_title navigation created_at}, :name=>"pop", :options=>{'v_title' => 'link'}}, @imf[:popup])
+      end
+    end
+
+    context 'defined with name and empty list' do
+      setup do
+        Iformat.create(:name => 'header', :height=>'34', :width => '500', :size => 'force', :popup => "pop ()")
+        @imf = Iformat['header']
+      end
+
+      should 'show image alone' do
+        assert_equal({:show=>[], :name=>"pop", :options=>{}}, @imf[:popup])
+      end
+    end
+
+  end
 end

data/test/unit/text_document_test.rb

@@ -58,6 +58,7 @@ class TextDocumentTest < Zena::Unit::TestCase
     #header { background:url('bird.jpg') }
     #pv     { background:url('bird_pv.jpg') }
     #footer { background:url('/projects/wiki/flower.jpg') }
+    #back   { background:url('../../projects/wiki/flower.jpg') }
     #no_stamp { background:url('/en/image30_pv.jpg') }
     END_CSS
     node.version.text = start.dup
@@ -71,6 +72,7 @@ class TextDocumentTest < Zena::Unit::TestCase
     #header { background:url('/en/image30.jpg?1144713600') }
     #pv     { background:url('/en/image30_pv.jpg?967816914293') }
     #footer { background:url('/en/image31.jpg?1144713600') }
+    #back   { background:url('/en/image31.jpg?1144713600') }
     #no_stamp { background:url('/en/image30_pv.jpg?967816914293') }
     END_CSS
     assert_equal res, text
@@ -82,6 +84,7 @@ class TextDocumentTest < Zena::Unit::TestCase
     #header { background:url('bird.jpg') }
     #pv     { background:url('bird_pv.jpg') }
     #footer { background:url('/projects/wiki/flower.jpg') }
+    #back   { background:url('/projects/wiki/flower.jpg') }
     #no_stamp { background:url('bird_pv.jpg') }
     END_CSS
     assert_equal unparsed, text

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

@@ -32,6 +32,15 @@ class HtmlTagsTest < Zena::View::TestCase
     @controller.send(:flash)
   end
 
+  # ============ stubs ============
+  def js_data
+    @js_data ||= []
+  end
+  def zazen(txt)
+    txt
+  end
+  # ===============================
+
   def test_img_tag
     login(:ant)
     img = secure!(Node) { nodes(:bird_jpg) }
@@ -67,8 +76,8 @@ class HtmlTagsTest < Zena::View::TestCase
                   img_tag(img, :mode=>nil, :id=>'yo')
     assert_equal "<img src='/en/image30_pv.jpg?967816914293' width='70' height='70' alt='bird' id='yo' class='super'/>",
                   img_tag(img, :mode=>'pv', :id=>'yo', :class=>'super')
-    assert_equal "<img src='/en/image30_med.jpg?390663777446' width='220' height='200' alt='super man' class='med'/>",
-                  img_tag(img, :mode=>'med', :alt=>'super man')
+    assert_equal "<img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='super man' class='side'/>",
+                  img_tag(img, :mode=>'side', :alt=>'super man')
   end
 
   def test_img_tag_other
@@ -241,4 +250,17 @@ class HtmlTagsTest < Zena::View::TestCase
     node = secure!(Node) { nodes(:status) }
     assert_match %r{opener.Zena.version_preview\('/nodes/#{node.zip}/versions/#{node.version.number}'\)}, version_actions(node.version, :actions => :view)
   end
+
+  def test_popup_images
+    login(:anon)
+    img = secure!(Node) { nodes(:bird_jpg) }
+    @js_data = nil
+    img_tag(img)
+    assert_nil @js_data
+    img_tag(img, :mode => 'med', :id => 'flop') # med has a popup setting
+    popup_data = JSON.load(@js_data[0][%r{\A.*?(\{.*\}).*\Z},1])
+    assert_equal '/en/image30_std.jpg?929831698949', popup_data['src']
+    assert_equal 400, popup_data['height']
+    assert_equal 440, popup_data['width']
+  end
 end

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

@@ -26,10 +26,6 @@ class RefactorTest < Zena::View::TestCase
     assert ((Time.now.to_i-1 <= rnd) && (rnd <= Time.now.to_i+2))
   end
 
-  def test_javascript
-    assert_nothing_raised { javascript('test') }
-  end
-
   def test_change_lang
     assert_equal ({:overwrite_params=>{:prefix=>'io'}}), change_lang('io')
     login(:ant)

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

@@ -4,6 +4,12 @@ class ZafuTest < Zena::View::TestCase
   include Zena::Use::Zafu::ViewMethods
   include Zena::Use::Zafu::ControllerMethods
 
+  # mocks
+  def session; {} end
+  def lang; 'en' end
+  def zafu_helper; self end
+  def method_missing(m, *args); [m,args].inspect end
+
   def test_page_numbers
     s = ""
     page_numbers(2, 3, ',') {|p,j| s << "#{j}#{p}"}
@@ -18,4 +24,10 @@ class ZafuTest < Zena::View::TestCase
     page_numbers(28, 30, ' | ') {|p,j| s << "#{j}#{p}"}
     assert_equal "21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30", s
   end
+
+  def test_render_body_ends_with_js_render
+    @node = secure!(Node) { nodes(:status) }
+    compiled_template = template_url
+    assert_match %r{<%= render_js %></body>}, File.read(File.join(SITES_ROOT, compiled_template))
+  end
 end

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

@@ -11,6 +11,9 @@ class ZazenTest < Zena::View::TestCase
   def _(str)
     ApplicationController.send(:_, str)
   end
+  def js_data
+    @js_data ||= []
+  end
   # ===============================
 
   def assert_zazen_match(css, code)
@@ -179,12 +182,12 @@ class ZazenTest < Zena::View::TestCase
 
     @node = secure!(Node) { nodes(:people) }
     assert_equal '<p>Read <a href="/oo/projects/cleanWater/page22.html">projects/cleanWater/status</a></p>', zazen('Read "":(/projects/cleanWater/status)')
-    assert_equal "<p>See <img src='/en/image30_med.jpg?390663777446' width='220' height='200' alt='bird' class='med'/></p>", zazen('See !:(/projects/wiki/bird)_med!')
-    assert_equal "<p>See <a href=\"/oo/contact15.html\"><img src='/en/image30_med.jpg?390663777446' width='220' height='200' alt='bird' class='med'/></a></p>", zazen('See !:(/projects/wiki/bird)_med!:(status)')
+    assert_equal "<p>See <img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='bird' class='side'/></p>", zazen('See !:(/projects/wiki/bird)_side!')
+    assert_equal "<p>See <a href=\"/oo/contact15.html\"><img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='bird' class='side'/></a></p>", zazen('See !:(/projects/wiki/bird)_side!:(status)')
     assert_equal '<p>Read <a href="/oo/contact15.html">people/status</a></p>', zazen('Read "":(status)')
 
     @node = secure!(Node) { nodes(:wiki) }
-    assert_equal "<p>See <a href=\"/oo/projects/cleanWater\"><img src='/en/image30_med.jpg?390663777446' width='220' height='200' alt='bird' class='med'/></a></p>", zazen('See !:(bird)_med!:(/projects/cleanWater)')
+    assert_equal "<p>See <a href=\"/oo/projects/cleanWater\"><img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='bird' class='side'/></a></p>", zazen('See !:(bird)_side!:(/projects/cleanWater)')
   end
 
   def test_bad_pseudo_path

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

@@ -421,7 +421,7 @@ show_path_options:
 
 uses_datebox:
   src: "<r:uses_datebox/>"
-  tem: "/<script.*calendar.js.*calendar-setup.js.*calendar-en-utf8.js.*calendar-brown.css.*CDATA.*DEF_DATE_FORMAT.*%Y-%m-%d %H:%M.*FIRST_DAY.*0/"
+  tem: "/<script.*calendar.js.*calendar-setup.js.*calendar-en-utf8.js.*calendar-brown.css.*DEF_DATE_FORMAT.*%Y-%m-%d %H:%M.*FIRST_DAY.*0/"
 
 calendar:
   context:
@@ -776,14 +776,14 @@ img_image:
   context:
     node: 'bird_jpg'
   src: "<r:img/><r:img mode='med'/>"
-  res: "<img src='/en/image30_std.jpg?929831698949' width='440' height='400' alt='bird' class='std'/><img src='/en/image30_med.jpg?390663777446' width='220' height='200' alt='bird' class='med'/>"
+  res: "/<img src='/en/image30_std.jpg\?929831698949' width='440' height='400' alt='bird' class='std'/><img src='/en/image30_med.jpg\?390663777446' width='220' height='200' alt='bird' id='.*' class='med' onclick='Zena.popup\(this\)'/>/"
 
 img_image_not_public:
   context:
     visitor: 'ant'
     node: 'tree_jpg'
   src: "<r:img/><r:img mode='med'/>"
-  res: "<img src='/oo/image40_std.jpg?929831698949' width='600' height='399' alt='Autumn Tree' class='std'/><img src='/oo/image40_med.jpg?390663777446' width='300' height='200' alt='Autumn Tree' class='med'/>"
+  res: "/<img src='/oo/image40_std.jpg\?929831698949' width='600' height='399' alt='Autumn Tree' class='std'/><img src='/oo/image40_med.jpg\?390663777446' width='300' height='200' alt='Autumn Tree' id='.*' class='med' onclick='Zena.popup\(this\)'/>/"
 
 img_href:
   context:

data/vendor/apache2_upload_progress/MIT-LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2008 Piotr Sarnacki
+ 
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/vendor/apache2_upload_progress/README

@@ -0,0 +1,53 @@
+Apache upload progress module. Works with mod_passenger (aka mod_rails). It's MIT license.
+
+More info here: http://drogomir.com/blog/2008/6/18/upload-progress-bar-with-mod_passenger-and-apache
+
+Tutorials showing how to use apache upload progress module:
+http://www.drogomir.com/blog/2008/7/3/tweaking-rails-app-with-jquery-part-i (using jQuery)
+http://www.railsillustrated.com/screencast-file-uploads-progress-in-rails-passenger.html (tutorial with screencast using prototype)
+
+To install and activate module:
+apxs2 -c -i -a mod_upload_progress.c
+
+-c -> compile
+-i -> install (copy upload_progress_module.so to apache lib folder)
+-a -> activate (add LoadModule line to httpd.conf)
+
+To compile it on mac you may need to:
+sudo apxs -c -i -Wc,-arch -Wc,ppc7400 -Wl,-arch -Wl,ppc7400 -Wc,-arch -Wc,ppc64 -Wl,-arch -Wl,ppc64 -Wc,-arch -Wc,x86_64 -Wl,-arch -Wl,x86_64 -Wc,-arch -Wc,i386 -Wl,-arch -Wl,i386 mod_upload_progress.c
+
+on an Intel mac: sudo apxs -c -i -a -Wc,-arch -Wc,x86_64 -Wl,-arch -Wl,x86_64 -Wc,-arch -Wc,i386 -Wl,-arch -Wl,i386 mod_upload_progress.c
+
+Global config:
+  you can define maximum size for shared memory (default is 50kB):
+  UploadProgressSharedMemorySize 1024000 # sets memory size to 1MB
+
+Note:
+If you get "(12)Cannot allocate memory: Upload Progress cache: could not create shared memory segment Configuration Failed"
+error you should try to set memory size to smaller value.
+
+Config for vhost:
+<Location />
+    # enable tracking uploads in /
+    TrackUploads On
+</Location>
+
+<Location /progress>
+    # enable upload progress reports in /progress
+    ReportUploads On
+</Location>
+
+- JSON-P Support
+You can also request progress updates by using JSON-P, if you are uploading the file from a different domain or subdomain than the web server that is handling your original request. Adding a "callback=yourCallbackFunction" parameter to your request to the progress server will activate this functionality.
+
+For example, a request like:
+  http://uploads.yourdomain.com/progress?callback=jsonp123&X-Progress-ID=1234
+
+Would return the JSON-P function:
+  jsonp123(new Object({ 'state' : 'uploading', 'received' : 35587, 'size' : 716595, 'speed' : 35587 }));
+
+The normal JSON request:
+  http://www.yourdomain.com/progress?X-Progress-ID=1234
+
+Would return the JSON data:
+  new Object({ 'state' : 'uploading', 'received' : 35587, 'size' : 716595, 'speed' : 35587 })