zena 1.0.0 → 1.1.0

data/bricks/static/zena/skins/blog/Project--kml.zafu

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://earth.google.com/kml/2.2">
+  <Document do='default' host='#{site.host}' do='images' in='project' order='created_at asc'>
+<r:each do='if' test='gps_latitude'>
+  <Placemark>
+    <name do='title'>Le désert</name>
+    <description>
+    <![CDATA[
+<r:img mode='med'/><br/>
+<h3 do='parent' do='link'/>
+]]>
+    </description>
+    <Point>
+      <coordinates><r:show attr='gps_longitude'/>,<r:show attr='gps_latitude'/></coordinates>
+    </Point>
+  </Placemark>
+</r:each>
+  <Placemark>
+    <name>Route</name>
+    <LineString>
+      <extrude>1</extrude>
+      <tessellate>1</tessellate>
+      <coordinates>
+<r:each><r:if test='gps_latitude'><r:show attr='gps_longitude'/>,<r:show attr='gps_latitude'/>
+</r:if></r:each>
+      </coordinates>
+    </LineString>
+  </Placemark>
+  </Document>
+</kml>

data/bricks/static/zena/skins/blog/Project.zafu

@@ -0,0 +1,45 @@
+<r:include template='Node'>
+  <r:with part='main'>
+    <ul id='main_content' do='posts in site' order='date desc'>
+      <li do='add' after='self' klass='Post'/>
+      <li do='form'><b>titre</b> <r:input name='title'/> <b>date</b> <r:input name='date' type='date'/> <r:input type='submit'/></li>
+      <li class='post' do='each' do='void' name='post'>
+        <p class='post_date' do='show' attr='date' format='%b %d'/>
+        <p class='icon' do='link' do='image' do='img' mode='post'/>
+        <h1 do='title' actions='all'>Donec mauris metus, venenatis vitae</h1>
+        <r:void name='text'>
+          <r:zazen eval='summary || text' limit='1'/>
+          <p class='comments'><r:link do='t'>Lire la suite... </r:link> <r:tags> - mots clés: <r:each join=', ' do='link' href='main' tagged='#{name}'/></r:tags> - <r:link href='this' anchor='comments'>commentaires (<r:show attr='comments_count'/>)</r:link></p>
+        </r:void>
+      </li>
+    </ul>
+  </r:with>
+
+  <div id='lcomments' do='with' part='latest_comments'>
+    <h2>commentaires</h2>
+    <ul do='comments where status = 50 from nodes in site order by created_at desc limit 9' do='group' by='discussion_id'>
+      <li do='each_group'>
+        <r:node do='link' class='post' anchor='comments'/>
+        <ul>
+          <li do='each' class='comment'><span class='date' do='show' attr='created_at' format='%d %b %Hh'/> <r:show attr='author_name'/></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+
+  <r:with part='pages' do='if' test='can_write?' do='pages'>
+    <h2>pages</h2>
+    <ul>
+      <li do='each' do='link'/>
+      <li do='add' klass='Page'/>
+    </ul>
+  </r:with>
+
+  <r:with part='photos' do='images in section order by created_at desc limit 15'>
+    <h2>photos</h2>
+    <p class='map'><a target='_blank' href='http://maps.google.com?q=http://#{site.host}/#{visitor.lang}/project#{main.id}.kml&amp;t=p'>le parcours !</a></p>
+    <ul>
+      <li do='each' do='img' mode='pv'/>
+    </ul>
+  </r:with>
+</r:include>

data/bricks/static/zena/skins/blog/comments.zafu

@@ -0,0 +1,30 @@
+<div id='comments' do='discussion' do='comments'>
+  <h3 do='t'>comments</h3>
+  <ol>
+    <li class='comment' alt_class='alt' do='each' name='com'>
+      <div class='header'>
+        <p class='prop' do='if' test='status < 50'><r:t>Your message has been received and is waiting approval for publication.</r:t></p>
+        <span class='date' do='created_at' tformat='comment_date'/>
+        <span class='sign' do='show' attr='author_name' sanitize='true'/>
+      </div>
+      <div class='body'>
+        <div class='zazen'>
+          <r:if test='text' do='zazen' attr='text' filter='css,html'/>
+        </div>
+      </div>
+    </li>
+    <li class='form' do='form'>
+      <ol>
+        <li do='cancel'/>
+        <li class='author' do='if' test='visitor.is_anon?'><b do='t'>author</b> <r:input name='author_name'/></li>
+        <li class='text'>
+          <b do='t'>message</b>
+          <r:textarea name='text'/>
+        </li>
+        <li class='captcha' do='captcha' theme='white'/>
+        <li class='validate'><r:input type='submit'/></li>
+      </ol>
+    </li>
+    <li do='add'><img src='/img/add.png'/> <r:t>leave a comment</r:t></li>
+  </ol>
+</div>

data/bricks/static/zena/skins/blog/dict.yml

@@ -0,0 +1,11 @@
+translations:
+  'new project': nouveau projet
+  'upcoming dates': prochaines dates
+  'project dates': dates du projet
+  project: projet
+  title: titre
+  comments: commentaires
+  'leave a comment': ajouter un commentaire
+  'Your message has been received and is waiting approval for publication.': Votre message nous est bien parvenu et est en attente de validation.
+  post_date: %A, %d %B %Y
+  comment_date: %A, %d %B %Y %Hh%M

data/bricks/static/zena/skins/blog/img/style.css

@@ -0,0 +1,110 @@
+* {padding:0; margin:0; }
+
+body {margin:0; padding:0; background:#111; color:#666; font:12px Verdana, Arial, Tahoma, sans-serif; line-height:20px; }
+
+img {border:none; }
+a{ color:#0F61B4;  text-decoration:none;  }
+a:hover {  color:#000;  }
+form .date_box { float:none;}
+
+#content {width:760px; margin:20px auto; background:#ccad7f; }
+
+#header {background:#000 url('/fr/image22.png') no-repeat; height:80px; padding-top:10px;}
+#header a { display:block; height:50px; margin:0px; width:300px;}
+
+#navigation {background:#111 url('/fr/image23.gif') repeat-x; height:30px; line-height:30px; margin:0; }
+#navigation ul {list-style-type:none;}
+#navigation li {float:left; border-right:1px solid #444; }
+#navigation li a {display:block; padding:0 20px; text-decoration:none; color:#fff; letter-spacing:1px; }
+#navigation li a:hover {background:#333 url('/fr/image24.gif') repeat-x; color:#fff; text-decoration:none; }
+#navigation .visitor { float:right; border:0;}
+#navigation .visitor a { color:#999; display:inline; padding:5px; font-size:10px;}
+#navigation #search { float:right;}
+
+#main {float:left; width:530px; padding:10px; margin-left:50px; line-height:14px; }
+#right h2 {margin-top:10px; font:bold 12px Verdana, 'Trebuchet MS', Sans-serif; padding:5px 0 5px 5px;  	border-bottom:1px dotted #999; }
+#right ul  {color:#999; text-align:left; margin:3px 0 8px 0;  padding-left:20px; text-decoration:none; 	list-style-type:square; 	}
+#right ul li {padding:2px 0 2px 0px; margin:0 2px; 	}
+#right ul a {font-weight:600; color:#173D7F; }
+#right ul a:hover { color :#333;  }
+
+#right { clear:right; float:right; width:130px; padding:5px; margin-right:20px; }
+#right h2 {padding:2px 0 5px 0px;  font:bold 14px Verdana, 'Trebuchet MS', Sans-serif; color:#444; 	border-bottom:1px dotted #999; margin-bottom:5px; margin-top:10px; }
+#right div { clear:both;}
+
+#lcomments li,#lcomments ul { list-style-type:none; margin:0;padding:0; color:#444;}
+#lcomments .post { font-size:11px; font-weight:normal; display:block;}
+#lcomments .date { color:#666;}
+
+#footer { background:#222; color:#aaa; margin-top:20px; height:30px; line-height:30px; text-align:center; font-size:11px;}
+#footer a { color:inherit; text-decoration:none;  }
+#footer  a:hover { color:orange;  }
+
+#main_content { background:white; padding:15px; padding-right:20px; border:1px solid #aaa;}
+ul#main_content { list-style-type:none; }
+#main_content li { position:relative; padding-bottom:3em;}
+#main_content li.btn_add { padding-bottom:0;}
+img.post { border:4px solid #ddd; }
+.post_date { position:absolute; left:-56px; top:0; height:30px; width:30px; background:url('img/dateBg.jpg') no-repeat ;
+font-family:Georgia,"Times New Roman",Times,serif; text-transform:uppercase; font-size:16px;
+padding:5px;}
+.comments { border-bottom:1px solid #ccc; background:#FFE; padding:2px; text-align:right;
+font-size:90%;}
+#main_content h1 { margin:1em 0 1em 10px; font-family:Georgia,"Times New Roman",Times,serif; font-variant:small-caps;}
+#main_content h1 a { color:inherit;}
+#main_content .zazen { margin-left:10px;}
+.zazen { line-height:18px; font-size:12px; margin-bottom:1em; }
+.zazen .img_title { font-size:80%; margin-bottom:2em; font-style:italic;}
+.zazen p, .zazen h3 { margin-bottom:1em;}
+.zazen img { border:1px solid #333;}
+#main_content .zazen ul {list-style-type:disc;}
+#main_content .zazen li {padding-bottom:0; margin-left:2em;}
+
+#photos ul {list-style-type:none;}
+#photos li { float:left; padding:0; margin:2px; line-height:10px;}
+#photos { list-style-type:none; padding:0;}
+#photos img { border:1px solid #777;}
+#photos .btn_add img { border:0;}
+
+#pages li.btn_add { list-style-type:none;}
+
+#comments ol { margin-top:8px; list-style-type:none;}
+#comments_add, #comments .form { margin-top:18px;}
+#comments .form .btn_x { margin:0;}
+#comments .form ol, #comments .btn_add a { visibility:visible; background:#eee; display:table; padding:9px 9px 8px; margin-top:18px; border:1px solid grey;}
+#comments .btn_add img { float:left; margin-right:4px;}
+#comments .form b { display:block; float:left; width:65px;}
+#comments .form li { clear:both; margin-top:5px;}
+#comments .form .title input, #comments .form .author input { width:360px;}
+#comments .form textarea { width:360px; height:8em;}
+
+#main_content li.comment { padding:8px; border-bottom:1px solid #ccc;}
+.alt { background:#eee;}
+.comment .sign { color:#a88; font-size:16px; font-family:Georgia,serif;}
+.comment .date { float:right; color:#a88; font-size:10px;}
+.comment .prop { border:1px solid #055; padding:5px; background:#cee; color:black; font-weight:bold;}
+.comment .body { padding:8px 0; }
+
+.captcha { padding: 5px 0 0 63px; height:135px;}
+
+#search_results { margin-top:2em;}
+#search_box { width:100%; font-size:0.8em;}
+#search_box input { border:1px inset #444; width:146px; padding:1px; margin:0; font-size:10px;}
+#search_results { width:100%; }
+#search_results p { margin:0;}
+.results, #search_loader { border:1px solid #444; margin:3px 0 0; padding:2px; text-align:left; background:#97A97F; }
+.result_entry { list-style:none; padding:5px 0; border-top:1px solid #647D35;}
+.result_entry:first-child { border-top-width:0;}
+.result_entry img { float:left; margin-right:3px; }
+.result_entry img.mini { border:1px solid grey; float:left; margin:0 2px 0 0;}
+
+.result_entry { position:relative;}
+.result_id {color:#5C2200; font-weight:bold; float:left; padding-right:3px; }
+.result_name { font-weight:bold; }
+.result_name em { color:#333; font-size:90%; font-weight:normal;}
+.result_path { color:#bbb;}
+
+#location { margin-left:15px; margin-bottom:1em;}
+
+/* old browsers hack */
+#main .s50 .actions, .li_s50 .actions, #main .btn_add a { visibility:visible; }

data/bricks/static/zena/test/integration/static_integration_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class StaticIntegrationTest < Zena::Integration::TestCase
+
+  context 'A page using a static Skin' do
+    subject do
+      secure(Node) { nodes(:wiki) }
+    end
+
+    setup do
+      $_test_site = 'zena'
+      login(:lion)
+      skin = secure(Skin) { Skin.create(:title => 'foo', :z_static => 'static-blog', :parent_id => nodes_id(:skins), :v_status => Zena::Status::Pub)}
+      subject.skin_id = skin.id
+      assert subject.save
+    end
+
+    context 'on zafu rebuild' do
+      setup do
+        FileUtils.rmtree("#{SITES_ROOT}/test.host/zafu")
+      end
+
+      should 'use static template' do
+        get "http://test.host/en/blog#{subject.zip}.html"
+        assert_response :success
+        assert_match %r{Copyright <a href="#">Static blog</a>}, response.body
+      end
+    end # with normal access
+  end # A page using a static Skin
+end

data/bricks/static/zena/test/unit/static_test.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class StaticTest < Zena::Unit::TestCase
+
+  context 'A Skin' do
+    setup do
+      login(:lion)
+    end
+
+    subject do
+      secure(Node) { nodes(:wikiSkin) }
+    end
+
+    should 'have z_static prop' do
+      subject.z_static = 'foo'
+      assert_equal 'foo', subject.prop['z_static']
+    end
+
+    should 'allow brick-skin values' do
+      assert subject.update_attributes(:z_static => 'static-blog')
+    end
+
+    should 'allow nil values' do
+      assert subject.update_attributes(:z_static => 'static-blog')
+      assert subject.update_attributes(:z_static => nil)
+    end
+
+    should 'not allow any value' do
+      assert !subject.update_attributes(:z_static => '../foo-/bar/..')
+      assert_equal 'invalid', subject.errors[:z_static]
+    end
+  end # A Skin
+end

data/bricks/zena/zena/migrate/01_base.rb

@@ -16,7 +16,7 @@ class Base < ActiveRecord::Migration
     end
 
     create_table "cached_pages", :options => table_options, :force => true do |t|
-      t.text     "path"
+      t.string   "path"
       t.datetime "expire_after"
       t.datetime "created_at"
       t.integer  "node_id"
@@ -320,7 +320,6 @@ class Base < ActiveRecord::Migration
       t.string   "name"
       t.string   "kpath",                  :limit => 16
       t.string   "real_class",             :limit => 16
-      t.string   "icon",                   :limit => 200
       t.integer  "create_group_id"
       t.integer  "site_id",                               :null => false
       t.boolean  "auto_create_discussion"

data/bricks/zena/zena/migrate/20110623072048_fix_cached_path_index.rb

@@ -0,0 +1,10 @@
+class FixCachedPathIndex < ActiveRecord::Migration
+  def self.up
+    remove_index "cached_pages", :name => "index_cached_pages_on_path_and_site_id" rescue nil
+    change_column :cached_pages, :path, :string
+    add_index "cached_pages", ["path", "site_id"], :name => "index_cached_pages_on_path_and_site_id"
+  end
+
+  def self.down
+  end
+end

data/bricks/zena/zena/migrate/20110710113731_remove_icon_field.rb

@@ -0,0 +1,18 @@
+class RemoveIconField < ActiveRecord::Migration
+  def self.up
+    if Role.column_names.include?('icon')
+      native_key = :icon
+      prop_key   = 'icon'
+      Role.all.each do |rec|
+        next unless value = rec[native_key]
+        prop  = rec.prop
+        prop[prop_key] = value
+        Zena::Db.execute "UPDATE #{rec.class.table_name} SET properties=#{Zena::Db.quote(rec.class.encode_properties(prop))} WHERE id=#{rec[:id]}"
+      end
+      remove_column :roles, :icon
+    end
+  end
+
+  def self.down
+  end
+end

data/config/bricks.yml

@@ -4,6 +4,7 @@ test:
   tags:        ON
   captcha:     ON
   acls:        ON
+  static:      OFF
   sphinx:      OFF
   worker:      OFF
   uv:          OFF
@@ -27,6 +28,7 @@ development:
   tags:     ON
   captcha:  ON
   acls:     ON
+  static:   OFF
   sphinx:
     switch: OFF
     activate_if:
@@ -58,6 +60,8 @@ production:
   tags:     ON
   captcha:  ON
   acls:     ON
+  static:   OFF
+  single:   OFF
   sphinx:
     switch: OFF
     activate_if:

data/config/deploy.rb

@@ -1,13 +1,20 @@
 set :db_name,               "zena"     # If you change this: no dots in this name !
-set :server_ip,             nil        # FIXME: set this to your remote server IP in the form: "215.0.0.1"
-set :app_type,              :passenger
+set :server_ip,             'nil'        # FIXME: set this to your remote server IP in the form: "215.0.0.1"
 set :db_password,           nil        # FIXME: set password (can be anything).
+set :app_type,              :mongrel
+set :mongrel_port,          8000
+set :mongrel_count,         3
+set :haproxy_port,          9000
+set :haproxy_password,      nil        # If you set this, you can view stats on /_haproxy
 
 # You need to give the public key from the server to the git repository if the application is not public
 set :scm,                   'git'
 set :repository,            'git@github.com:YOUR_PROJECT/APPLICATION.git'
 set :branch,                'master'
 
+# Uncomment if you are using rvm on the remote server
+# set :rvm_ruby_string,       '1.8.7'
+
 if self[:server_ip]
   #================= ADVANCED SETTINGS =============#
 
@@ -27,6 +34,14 @@ if self[:server_ip]
   role :app,         "#{ssh_user}@#{server_ip}"
   role :db,          "#{ssh_user}@#{server_ip}", :primary => true
 
+  # Set to 'true' if you use rvm on the remote server
+  if self[:rvm_ruby_string]
+    $:.unshift(File.expand_path('./lib', ENV['rvm_path'])) # Add RVM's lib directory to the load path.
+    require "rvm/capistrano"                  # Load RVM's capistrano plugin.
+    # Uncomment if you are not using a System wide install of rvm
+    # set :rvm_type, :user
+  end
+
   #================= END ADVANCED SETTINGS ==========#
   # We need to set RAILS_ROOT and RAILS_ENV to know which bricks we need to load, activate
   if !defined?(::RAILS_ROOT)

data/config/gems.yml

@@ -13,12 +13,12 @@ differ:         '= 0.1.2'
 shoulda:        '= 2.10.3'
 httparty:       '= 0.7.8'
 
-querybuilder:   '= 1.0.0'
+querybuilder:   '= 1.0.1'
 yamltest:       '= 0.7.0'
-rubyless:       '= 0.8.4'
+rubyless:       '= 0.8.5'
 property:       '= 2.2.0'
 versions:       '= 0.3.1'
-zafu:           '= 0.8.0'
+zafu:           '= 0.8.2'
 
 jeweler:
 
@@ -26,10 +26,12 @@ RedCloth:
   lib:          'redcloth'
   version:      '= 3.0.4'
 
-rmagick:
-  optional:     yes
-  lib:          'RMagick'
-  version:      '= 2.13.1'
+# Cannot do "gem 'rmagick', '= 1.3.14'" on some hosts. Leave this alone and
+# let 'require' pick whatever it can.
+# rmagick:
+#   optional:     yes
+#   lib:          'RMagick'
+#   version:      '= 2.13.1'
 
 thinking-sphinx:
   optional:     yes