zena 0.16.3 → 0.16.4

data/public/calendar/lang/calendar-de-utf8.js

@@ -0,0 +1,128 @@
+// ** I18N
+
+// Calendar DE language
+// Author: Jack (tR), <jack@jtr.de>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sonntag",
+ "Montag",
+ "Dienstag",
+ "Mittwoch",
+ "Donnerstag",
+ "Freitag",
+ "Samstag",
+ "Sonntag");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = "1";
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("So",
+ "Mo",
+ "Di",
+ "Mi",
+ "Do",
+ "Fr",
+ "Sa",
+ "So");
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "M\u00e4rz",
+ "April",
+ "Mai",
+ "Juni",
+ "Juli",
+ "August",
+ "September",
+ "Oktober",
+ "November",
+ "Dezember");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "M\u00e4r",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dez");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "\u00DCber dieses Kalendarmodul";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Datum ausw\u00e4hlen:\n" +
+"- Benutzen Sie die \xab, \xbb Buttons um das Jahr zu w\u00e4hlen\n" +
+"- Benutzen Sie die " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " Buttons um den Monat zu w\u00e4hlen\n" +
+"- F\u00fcr eine Schnellauswahl halten Sie die Maustaste \u00fcber diesen Buttons fest.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Zeit ausw\u00e4hlen:\n" +
+"- Klicken Sie auf die Teile der Uhrzeit, um diese zu erh\u00F6hen\n" +
+"- oder klicken Sie mit festgehaltener Shift-Taste um diese zu verringern\n" +
+"- oder klicken und festhalten f\u00fcr Schnellauswahl.";
+
+Calendar._TT["TOGGLE"] = "Ersten Tag der Woche w\u00e4hlen";
+Calendar._TT["PREV_YEAR"] = "Voriges Jahr (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["PREV_MONTH"] = "Voriger Monat (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["GO_TODAY"] = "Heute ausw\u00e4hlen";
+Calendar._TT["NEXT_MONTH"] = "N\u00e4chst. Monat (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["NEXT_YEAR"] = "N\u00e4chst. Jahr (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["SEL_DATE"] = "Datum ausw\u00e4hlen";
+Calendar._TT["DRAG_TO_MOVE"] = "Zum Bewegen festhalten";
+Calendar._TT["PART_TODAY"] = " (Heute)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Woche beginnt mit %s ";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Schlie\u00dfen";
+Calendar._TT["TODAY"] = "Heute";
+Calendar._TT["TIME_PART"] = "(Shift-)Klick oder Festhalten und Ziehen um den Wert zu \u00e4ndern";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "KW";
+Calendar._TT["TIME"] = "Zeit:";

data/public/stylesheets/admin.css

@@ -17,6 +17,8 @@
 
 table.admin, table.admin table { border-collapse:separate; border-width:0; margin:auto; border-color:#666; border-style:solid; }
 table.admin { width:500px; }
+.admin_group { display:table; margin:1em auto; width:500px; border:1px solid grey; padding:5px; background:#eee;}
+.admin_group .btn_validate { float:right;}
 table.admin table { width:90%; }
 table.admin table td { text-align:left; }
 table.admin td:first-child { border-left: 1px solid #666; }
@@ -38,7 +40,6 @@ table.admin td:first-child { border-left: 1px solid #666; }
 .admin .adm_add table { border: 0; margin:10px;}
 .admin .adm_add table td { border: 0; font-size:inherit; padding: 2px; }
 .admin .btn_validate { float:right; margin-right:30px; }
-.btn_validate input { background:#C8D8C7; border:1px outset black;}
 .admin .label {width:150px; line-height:1.9em;}
 .admin th { color:#450009; }
 .admin .source, .admin .source_role { background:#DBBFBF;}

data/test/custom_queries/complex.host.yml

@@ -52,7 +52,7 @@
 # roger 5  tinformation[~12] / 2002-05-05
 # roger 1  radio[~24]
 
-NodeQuery:
+'Zena::Use::QueryNode':
   # find all courses that an employee must follow
   emp_form_date:
     # find courses assigned_to pages in job assigned_to CURRENT_NODE (employee)

data/test/fixtures/files/vclasses.yml

@@ -0,0 +1,12 @@
+Foo:
+  superclass: Bar
+
+Bar:
+  superclass: Note
+
+Baz:
+  superclass: Node
+
+# this one will fail
+Post:
+  superclass: Page

data/test/functional/virtual_classes_controller_test.rb

@@ -59,4 +59,13 @@ class VirtualClassesControllerTest < Zena::Controller::TestCase
     end
     assert_redirected_to virtual_classes_path
   end
+
+  context 'importing virtual class definitions' do
+    should 'create virtual_classes' do
+      assert_difference('VirtualClass.count', 3) do
+        post :import, :attachment => uploaded_fixture('vclasses.yml', 'text/yaml')
+      end
+      list = assigns(:virtual_classes)
+    end
+  end
 end

data/test/helpers/{node_query_test.rb → query_node_test.rb}

@@ -1,9 +1,8 @@
 require 'test_helper'
 require 'yamltest'
 
-class NodeQueryTest < Zena::Unit::TestCase
+class QueryNodeTest < Zena::Unit::TestCase
   yamltest
-
   def yt_do_test(file, test)
     context = Hash[*(yt_get('context', file, test).map{|k,v| [k.to_sym, v]}.flatten)]
 

data/test/integration/navigation_test.rb

@@ -189,6 +189,8 @@ class NavigationTest < ActionController::IntegrationTest
     assert_redirected_to 'http://test.host/en/1'
     follow_redirect!
     assert_response :missing
+    assert Thread.current[:visitor]
+    assert_match %r{Node-\+notFound}, @response.rendered[:template].to_s
   end
 
   def test_change_session_lang_on_login

data/test/test_helper.rb

@@ -23,7 +23,7 @@ end
 class SubPagerDummy < PagerDummy
 end
 
-NodeQuery.load_custom_queries File.join(Zena::ROOT, 'test', 'custom_queries')
+Zena::Use::QueryNode.load_custom_queries File.join(Zena::ROOT, 'test', 'custom_queries')
 
 class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method

data/test/test_zena.rb

@@ -135,4 +135,4 @@ class ZenaTestController < ActionController::TestCase
   #include Zena::Test::TestController
 end
 
-NodeQuery.insert_zero_link(Link)
+Zena::Use::QueryNode.insert_zero_link(Link)

data/test/unit/core_ext_test.rb

@@ -2,9 +2,9 @@ require 'rubygems'
 require 'tzinfo'
 require 'test/unit'
 require 'fileutils'
-require File.join(File.dirname(__FILE__), '../../lib/core_ext/string')
-require File.join(File.dirname(__FILE__), '../../lib/core_ext/fixnum')
-require File.join(File.dirname(__FILE__), '../../lib/core_ext/dir')
+require File.join(File.dirname(__FILE__), '../../lib/zena/core_ext/string')
+require File.join(File.dirname(__FILE__), '../../lib/zena/core_ext/fixnum')
+require File.join(File.dirname(__FILE__), '../../lib/zena/core_ext/dir')
 
 class StringExtTest < Test::Unit::TestCase
   def test_abs_rel_path

data/test/unit/iformat_test.rb

@@ -15,7 +15,7 @@ class IformatTest < Zena::Unit::TestCase
   def test_redefined_format
     login(:lion)
     fmt = Iformat['med']
-    assert_not_equal ImageBuilder::DEFAULT_FORMATS['med'], fmt
+    assert_not_equal Zena::Use::ImageBuilder::DEFAULT_FORMATS['med'], 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
 
@@ -35,7 +35,7 @@ class IformatTest < Zena::Unit::TestCase
 
   def test_other_site
     login(:whale)
-    assert_equal ImageBuilder::DEFAULT_FORMATS['med'], Iformat['med']
+    assert_equal Zena::Use::ImageBuilder::DEFAULT_FORMATS['med'], Iformat['med']
   end
 
   def test_defined_format
@@ -182,7 +182,7 @@ class IformatTest < Zena::Unit::TestCase
   def test_new_from_default
     login(:lion)
     imf = Iformat.new_from_default('pv')
-    assert_equal ImageBuilder::DEFAULT_FORMATS['pv'], imf.as_hash
+    assert_equal Zena::Use::ImageBuilder::DEFAULT_FORMATS['pv'], imf.as_hash
     assert_equal 70, imf[:height]
     assert_equal 70, imf[:width]
     assert_equal 2, imf[:size]

data/test/unit/image_builder_test.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 
-class ImageBuilderTest < Zena::Unit::TestCase
+class Zena::Use::ImageBuilderTest < Zena::Unit::TestCase
 
   # Dummy tests
-  if ImageBuilder.dummy?
+  if Zena::Use::ImageBuilder.dummy?
     def test_dummy
       img = nil
-      assert_nothing_raised { img = ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30) }
+      assert_nothing_raised { img = Zena::Use::ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30) }
       assert img.dummy?, 'Image is a dummy'
       assert_nil img.read
       assert_equal 100, img.width
@@ -14,20 +14,20 @@ class ImageBuilderTest < Zena::Unit::TestCase
     end
 
     def test_render_img
-      img = ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30)
+      img = Zena::Use::ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30)
       assert_raise(IOError) { img.render_img }
     end
 
     def test_rows_0
-      img = ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path)
+      img = Zena::Use::ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path)
       assert_nil img.width
       assert_nil img.height
     end
   else
     def test_dummy
       img = nil
-      assert_nothing_raised { img = ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30) }
-      assert ! ImageBuilder.dummy?, 'Image is not a dummy'
+      assert_nothing_raised { img = Zena::Use::ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30) }
+      assert ! Zena::Use::ImageBuilder.dummy?, 'Image is not a dummy'
       assert_nothing_raised { img.render_img }
       assert img.read
       assert_equal 100, img.width
@@ -35,20 +35,20 @@ class ImageBuilderTest < Zena::Unit::TestCase
     end
 
     def test_render_without_img
-      img = ImageBuilder.new(:width=>100, :height=>30)
-      assert ! ImageBuilder.dummy?, 'Class is not a dummy'
+      img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
+      assert ! Zena::Use::ImageBuilder.dummy?, 'Class is not a dummy'
       assert img.dummy?, 'Image is a dummy'
       assert_raise(IOError) { img.render_img }
       assert_nil img.read
     end
 
     def test_render_img
-      img = ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30)
+      img = Zena::Use::ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path, :width=>100, :height=>30)
       assert_nothing_raised { img.render_img }
     end
 
     def test_write_sepia
-      img = ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path)
+      img = Zena::Use::ImageBuilder.new(:path=>uploaded_jpg('bird.jpg').path)
       img.transform!(:size=>:limit, :width=>280, :ratio=>2/3.0, :post=>Proc.new {|img| img.sepiatone(Magick::MaxRGB * 0.8)})
       assert !File.exist?("#{SITES_ROOT}/test.host/sepia.jpg"), "File does not exist"
       assert_nothing_raised { img.write("#{SITES_ROOT}/test.host/sepia.jpg")}
@@ -58,14 +58,14 @@ class ImageBuilderTest < Zena::Unit::TestCase
 
     def test_png
       path = "#{Zena::ROOT}/public/images/ext/pdf.png"
-      img = ImageBuilder.new(:path=>path, :width=>30, :height=>30)
+      img = Zena::Use::ImageBuilder.new(:path=>path, :width=>30, :height=>30)
       img.transform!(:size=>:force, :width=>70,  :height=>79)
       assert_nothing_raised { data = img.read }
     end
 
     def test_format
       path = "#{Zena::ROOT}/public/images/ext/pdf.png"
-      img = ImageBuilder.new(:path=>path, :width=>30, :height=>30)
+      img = Zena::Use::ImageBuilder.new(:path=>path, :width=>30, :height=>30)
       img.format = 'jpg'
       new_img = img.render_img
       assert_kind_of Magick::ImageList, new_img
@@ -74,7 +74,7 @@ class ImageBuilderTest < Zena::Unit::TestCase
 
     def test_limit_size
       path = "#{Zena::ROOT}/test/fixtures/files/bird.jpg"
-      img = ImageBuilder.new(:path=>path, :width=>30, :height=>30)
+      img = Zena::Use::ImageBuilder.new(:path=>path, :width=>30, :height=>30)
       assert_equal 56243, File.stat(path).size
       img.max_filesize = 40000
       new_img = img.render_img
@@ -86,90 +86,90 @@ class ImageBuilderTest < Zena::Unit::TestCase
   end
 
   def test_image_content_type
-    assert ImageBuilder.image_content_type?('image/jpeg'), "jpeg is an image"
-    assert ImageBuilder.image_content_type?('image/png'), "png is an image"
-    assert !ImageBuilder.image_content_type?('application/pdf'), "pdf is not an image"
+    assert Zena::Use::ImageBuilder.image_content_type?('image/jpeg'), "jpeg is an image"
+    assert Zena::Use::ImageBuilder.image_content_type?('image/png'), "png is an image"
+    assert ! Zena::Use::ImageBuilder.image_content_type?('application/pdf'), "pdf is not an image"
   end
 
   def test_resize
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.resize!(0.5)
     assert_equal 50, img.width
     assert_equal 15, img.height
   end
 
   def test_crop_min
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.crop_min!(80, 70)
     assert_equal 80, img.width
     assert_equal 30, img.height
   end
 
   def test_crop
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.crop!(5, 10, 80, 70)
     assert_equal 80, img.width
     assert_equal 20, img.height
   end
 
   def test_set_background
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.set_background!(Magick::MaxRGB,120,15)
     assert_equal 120, img.width
     assert_equal 30, img.height
   end
 
   def test_transform_limit
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.transform!(:size=>:limit, :width=>80, :height=>60)
     assert_equal 80, img.width
     assert_equal 24, img.height
   end
 
   def test_transform_force
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.transform!(:size=>:force, :width=>80, :height=>60)
     assert_equal 80, img.width
     assert_equal 60, img.height
   end
 
   def test_transform_force_no_crop
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.transform!(:size=>:force_no_crop, :width=>80, :height=>60)
     assert_equal 80, img.width
     assert_equal 60, img.height
   end
 
   def test_transform_ratio
-    img = ImageBuilder.new(:width=>100, :height=>30)
+    img = Zena::Use::ImageBuilder.new(:width=>100, :height=>30)
     img.transform!(:size=>:force, :height=>30, :ratio=>3.0/4)
     assert_equal 30, img.height
     assert_equal 40, img.width
   end
 
   def test_transform_ratio_width
-    img = ImageBuilder.new(:width=>30, :height=>100)
+    img = Zena::Use::ImageBuilder.new(:width=>30, :height=>100)
     img.transform!(:size=>:force, :width=>40, :ratio=>3.0/4.0)
     assert_equal 30, img.height
     assert_equal 40, img.width
   end
 
   def test_transform_scale
-    img = ImageBuilder.new(:width=>30, :height=>100)
+    img = Zena::Use::ImageBuilder.new(:width=>30, :height=>100)
     img.transform!(:size=>:force, :scale=>0.5)
     assert_equal 15, img.width
     assert_equal 50, img.height
   end
 
   def test_transform_scale_up
-    img = ImageBuilder.new(:width=>30, :height=>100)
+    img = Zena::Use::ImageBuilder.new(:width=>30, :height=>100)
     img.transform!(:size=>:force, :scale=>2.0)
     assert_equal 60, img.width
     assert_equal 200, img.height
   end
 
   def test_transform_scale_up_no_size
-    img = ImageBuilder.new(:width=>30, :height=>100)
+    img = Zena::Use::ImageBuilder.new(:width=>30, :height=>100)
     img.transform!(:scale=>2.0)
     assert_equal 60, img.width
     assert_equal 200, img.height
@@ -182,15 +182,15 @@ class ImageBuilderTest < Zena::Unit::TestCase
   end
 
   def test_transform_limit_with_ratio
-    img = ImageBuilder.new(:width=>30, :height=>100)
+    img = Zena::Use::ImageBuilder.new(:width=>30, :height=>100)
     img.transform!(:size=>:limit, :height=>50, :ratio=>2.0/1.0)
     assert_equal 15, img.width
     assert_equal 50, img.height
-    img = ImageBuilder.new(:width=>30, :height=>100)
+    img = Zena::Use::ImageBuilder.new(:width=>30, :height=>100)
     img.transform!(:size=>:limit, :height=>200, :ratio=>4.0/1.0)
     assert_equal 30, img.width
     assert_equal 100, img.height
-    img = ImageBuilder.new(:width=>30, :height=>100)
+    img = Zena::Use::ImageBuilder.new(:width=>30, :height=>100)
     img.transform!(:height=>50, :ratio=>1.0/3.0)
     assert_equal 15, img.width
     assert_equal 50, img.height
@@ -198,7 +198,7 @@ class ImageBuilderTest < Zena::Unit::TestCase
 
   def test_exif
     path = "#{Zena::ROOT}/test/fixtures/files/exif_sample.jpg"
-    img = ImageBuilder.new(:path=>path)
+    img = Zena::Use::ImageBuilder.new(:path=>path)
     exif = img.exif
 
     assert exif['DateTime']
@@ -207,7 +207,7 @@ class ImageBuilderTest < Zena::Unit::TestCase
 
   def test_parse_dates_in_exif
     path = "#{Zena::ROOT}/test/fixtures/files/exif_sample.jpg"
-    img = ImageBuilder.new(:path=>path)
+    img = Zena::Use::ImageBuilder.new(:path=>path)
     assert_equal "1998:01:01 00:00:00", img.exif['DateTime']
     assert_equal Time.parse("1998-01-01 00:00:00"), img.exif.date_time
   end