zena 1.0.0 → 1.1.0

data/bricks/acls/zena/migrate/20110627193757_add_allowed_mode_and_format_to_acl.rb

@@ -0,0 +1,11 @@
+class AddAllowedModeAndFormatToAcl < ActiveRecord::Migration
+  def self.up
+    add_column :acls, :mode,   :string, :limit => 20
+    add_column :acls, :format, :string, :limit => 20
+  end
+
+  def self.down
+    remove_column :acls, :mode
+    remove_column :acls, :format
+  end
+end

data/bricks/acls/zena/test/integration/acl_integration_test.rb

@@ -56,6 +56,48 @@ class AclIntegrationTest < Zena::Integration::TestCase
           assert_match %r{Persephone, Wedding organization}, response.body
         end
 
+        context 'with fixed mode' do
+          setup do
+            Zena::Db.execute "UPDATE acls SET mode = 'foo' WHERE id = #{acls_id(:rap)}"
+            login(:hades)
+            # Create special mode template
+            secure(Template) { Template.create(:parent_id => nodes_id(:sky), :title => 'Node-foo', :text => 'foo <r:title/>') }
+            post 'http://erebus.host/session', :login=>'demeter', :password=>'demeter'
+          end
+
+          should 'not allow another mode' do
+            get "http://erebus.host/oo/project#{nodes_zip(:queen)}.html"
+            assert_response :missing
+          end
+
+          should 'allow given mode' do
+            get "http://erebus.host/oo/project#{nodes_zip(:queen)}_foo.html"
+            assert_response :success
+            assert_equal 'foo My Queen', response.body
+          end
+        end # with fixed mode
+
+        context 'with fixed format' do
+          setup do
+            Zena::Db.execute "UPDATE acls SET format = 'csv' WHERE id = #{acls_id(:rap)}"
+            login(:hades)
+            # Create special mode template
+            secure(Template) { Template.create(:parent_id => nodes_id(:sky), :title => 'Node--csv', :text => 'foo;<r:title/>') }
+            post 'http://erebus.host/session', :login=>'demeter', :password=>'demeter'
+          end
+
+          should 'not allow another mode' do
+            get "http://erebus.host/oo/project#{nodes_zip(:queen)}.html"
+            assert_response :missing
+          end
+
+          should 'allow given mode' do
+            get "http://erebus.host/oo/project#{nodes_zip(:queen)}.csv"
+            assert_response :success
+            assert_equal 'foo;My Queen', response.body
+          end
+        end # with fixed format
+
         context 'using zafu ajax' do
           setup do
             @zafu_url = "http://erebus.host/nodes/#{nodes_zip(:queen)}/zafu?t_url=Sky%20view/Node/list1&dom_id=list1"

data/bricks/acls/zena/test/sites/erebus/acls.yml

@@ -12,6 +12,10 @@ rap:
   # and viewing it through the 'sky' Skin.
   exec_skin:       sky
   priority:        10
+  # allow any mode
+  mode:            '*'
+  # allow any format
+  format:          '*'
 
 # Read self (this never matches)
 self:
@@ -27,3 +31,7 @@ self:
   # and viewing it through the 'sky' Skin.
   exec_skin:       sky
   priority:        5
+  # allow any mode
+  mode:            '*'
+  # allow any format
+  format:          '*'

data/bricks/mongrel/zena/deploy.rb

@@ -8,7 +8,20 @@ Capistrano::Configuration.instance(:must_exist).load do
 ##############################################################################}
   else
     #========================== MONGREL ===============================#
+
+    self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
+
     namespace :app do
+      desc "create haproxy config"
+      task :haproxy_setup, :roles => :app do
+        unless debian_host
+          puts "skipping 'logrotate' (debian specific)"
+        else
+          # Create config/haproxy.cnf
+          haproxy_cnf = render("#{templates}/haproxy.cnf.rhtml", :config => self)
+          put(haproxy_cnf, "#{deploy_to}/current/config/haproxy.cnf")
+        end
+      end
 
       desc "configure mongrel"
       task :configure, :roles => :app do
@@ -28,6 +41,12 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
         run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
+
+        if self[:haproxy_port]
+          # Setup haproxy
+          haproxy_setup
+        end
+
       end
 
       desc "Stop the drb upload_progress server"

data/bricks/single/lib/bricks/single.rb

@@ -0,0 +1,15 @@
+module Bricks
+  module Single
+    module SiteMethods
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :public_path, :single
+        end
+      end
+
+      def public_path_with_single
+        "/../public"
+      end
+    end # SiteMethods
+  end # Single
+end # Bricks

data/bricks/single/zena/init.rb

@@ -0,0 +1 @@
+Zena.use Bricks::Single

data/bricks/sphinx/zena/tasks.rb

@@ -68,7 +68,7 @@ namespace :sphinx do
     config = YAML.load_file(File.join(RAILS_ROOT, 'config', 'sphinx.yml'))[RAILS_ENV]
     every  = config['run_indexer_at'] || '10,40'
     res = `crontab -l 2>&1`
-    if $? != 0 || res =~ /crontab/
+    if $? != 0 || res =~ /\Acrontab/
       puts "Sphinx indexer: could not access crontab (#{res.chomp})"
     else
       crontab = res.chomp.split("\n")

data/bricks/static/lib/bricks/static.rb

@@ -0,0 +1,151 @@
+module Bricks
+  module Static
+    ELEM = "([a-zA-Z_]+)"
+    ELEM_REGEXP = %r{^#{ELEM}$}
+    SECURE_PATH_REGEXP = %r{^[a-zA-Z_/]+$}
+    STATIC_SKIN_REGEXP = %r{^#{ELEM}-#{ELEM}$}
+    ZAFU_URL_REGEXP    = %r{^\$#{ELEM}-#{ELEM}/(.+)$}
+    BRICK_NAME_REGEXP = %r{^#{RAILS_ROOT}/bricks/#{ELEM}/zena/skins$}
+
+    module ControllerMethods
+      def self.included(base)
+        base.alias_method_chain :get_template_text, :static
+        base.alias_method_chain :template_url_for_asset, :static
+        base.alias_method_chain :get_best_template, :static
+      end
+
+      def get_template_text_with_static(path, section_id = nil)
+        if path =~ ZAFU_URL_REGEXP
+          brick_name, skin_name, path = $1, $2, $3
+          text_from_static(brick_name, skin_name, path)
+        elsif section_id.nil? && @static_brick_name && @static_skin_name
+          text_from_static(@static_brick_name, @static_skin_name, path)
+        else
+          get_template_text_without_static(path, section_id)
+        end
+      end
+
+      def template_url_for_asset_with_static(opts)
+        # TODO
+        template_url_for_asset_without_static(opts)
+      end
+
+      def get_best_template_with_static(kpaths, format, mode, skin)
+        return get_best_template_without_static(kpaths, format, mode, skin) unless static = skin.z_static
+        if idx_template = IdxTemplate.first(
+           :conditions => ["tkpath IN (?) AND format = ? AND mode #{mode ? '=' : 'IS'} ? AND (skin_id = ? OR static = ?) AND site_id = ?",
+              kpaths, format, mode, skin.id, static, skin.site_id],
+            :order     => "length(tkpath) DESC, skin_id DESC"
+          )
+          if idx_template.path.nil?
+            template = secure(Template) { Template.find(idx_template.node_id) }
+            get_best_template_without_static(kpaths, format, mode, skin, template)
+          elsif static =~ STATIC_SKIN_REGEXP
+            @static_brick_name, @static_skin_name = $1, $2
+            if idx_template.path =~ SECURE_PATH_REGEXP
+              zafu_url = "$#{@static_brick_name}-#{@static_skin_name}/#{idx_template.path}"
+              template = Template.new
+              template.tkpath = idx_template.tkpath
+              [zafu_url, template]
+            end
+          end
+        end
+      end
+
+      # TODO
+      # Asset resolution: route = /static/static-blog/img/style.css
+      # ===> static brick ==> brick path
+      # ===> blog/img/style.css ==> brick path/zena/skins/  blog/img/style.css
+      # Cache in public directory
+      # FIXME: clear_cache should erase /home/static
+
+      private
+        def text_from_static(brick_name, skin_name, path)
+          if path =~ SECURE_PATH_REGEXP
+            abs_path = File.join(
+              RAILS_ROOT, 'bricks', brick_name,
+              'zena', 'skins', skin_name, path + '.zafu')
+            File.exist?(abs_path) ? File.read(abs_path) : nil
+          end
+        end
+    end # ControllerMethods
+
+    module SkinMethods
+      def self.included(base)
+        base.property do |p|
+          p.string 'z_static'
+        end
+
+        base.validate :validate_z_static
+      end
+
+      private
+        def validate_z_static
+          if !(z_static.nil? || z_static =~ STATIC_SKIN_REGEXP)
+            errors.add(:z_static, _('invalid'))
+          end
+          true
+        end
+    end # SkinMethods
+
+    module SiteMethods
+      def self.included(base)
+        base.alias_method_chain :rebuild_index, :static
+      end
+
+      def rebuild_index_with_static(nodes = nil, page = nil, page_count = nil)    if !page
+          Zena::SiteWorker.perform(self, :rebuild_static_index, nil)
+        end
+        rebuild_index_without_static(nodes, page, page_count)
+      end
+
+      def rebuild_static_index
+        Zena::Db.execute "DELETE FROM idx_templates WHERE node_id IS NULL AND site_id = #{id}"
+        Bricks.paths_for('zena/skins').each do |p|
+          if p =~ BRICK_NAME_REGEXP
+            brick_name = $1
+            list = []
+            Dir.foreach(p) do |skin_name|
+              if skin_name =~ ELEM_REGEXP
+                build_static_index(brick_name, skin_name, "#{p}/#{skin_name}")
+              end
+            end
+          end
+        end
+      end
+
+      private
+        def build_static_index(brick_name, skin_name, path)
+          # path = absolute path
+          # 1. Find all templates
+          Dir.foreach(path) do |elem|
+            next if elem =~ /^\./
+            elem_path = File.join(path, elem)
+            if File.directory?(elem_path)
+              build_static_index(brick_name, skin_name, elem_path)
+            elsif elem =~ Template::MODE_FORMAT_FROM_TITLE
+              # 2. Get klass, mode, format
+              klass    = $1
+              mode     = $4.blank? ? nil : $4
+              format   = $6 || 'html'
+              idx_path = elem_path[%r{^#{RAILS_ROOT}/bricks/#{brick_name}/zena/skins/#{skin_name}/(.+)\.zafu$}, 1]
+              # 3. Get kpath
+              if idx_path && vclass = VirtualClass[klass]
+                tkpath = vclass.kpath
+
+                # 4. insert idx_template entry (kpath, site_id, mode, format, path relative to bricks/brick/zena/skins/skin_name)
+                IdxTemplate.create(
+                  :tkpath  => tkpath,
+                  :mode    => mode,
+                  :format  => format,
+                  :site_id => id,
+                  :static  => "#{brick_name}-#{skin_name}",
+                  :path    => idx_path
+                )
+              end
+            end
+          end
+        end
+    end # SiteMethods
+  end # Static
+end # Bricks

data/bricks/static/zena/init.rb

@@ -0,0 +1 @@
+Zena.use Bricks::Static

data/bricks/static/zena/migrate/20110702010330_add_static_to_idx_templates.rb

@@ -0,0 +1,12 @@
+class AddStaticToIdxTemplates < ActiveRecord::Migration
+  def self.up
+    add_column :idx_templates, :static, :string, :limit => 30
+    add_column :idx_templates, :path, :string, :limit => 300
+    add_index  :idx_templates, [:static], :name => "index_idx_templates_on_static"
+  end
+
+  def self.down
+    remove_index  :idx_templates, :name => "index_idx_templates_on_static"
+    remove_column :idx_templates, :static
+  end
+end

data/bricks/static/zena/skins/blog/Image-edit.zafu

@@ -0,0 +1,6 @@
+<r:include template='Image'>
+<r:with part='location' do='form'>
+  <r:input type='hidden' name='v_status' value='50'/>
+  <a href='http://maps.google.com' target='_blank'>google maps</a>: lat <r:input name='d_gps_latitude'/> lon <r:input name='d_gps_longitude'/><r:input type='submit' value='valider'/>
+</r:with>
+</r:include>

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

@@ -0,0 +1,19 @@
+<r:include template='Node'>
+<r:with part='title'>
+  <h1 do='title' actions='all'/>
+  <div id='location'>
+    <r:case>
+      <r:when test='gps_latitude'>
+        <!-- iframe width="200" height="200" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" style='float:left;' do='void' set_src="http://maps.google.com/maps?q=[d_gps_latitude],[d_gps_longitude]&amp;ie=UTF8&amp;t=h&amp;ll=[d_gps]&amp;z=7&amp;iwloc=A&amp;output=embed"></iframe -->
+        <p>
+          <a target='_blank' do='void' set_href="http://maps.google.com/maps?q=#{gps_latitude},#{gps_longitude}&amp;ie=UTF8&amp;t=h&amp;hq=&amp;ll=#{gps_latitude},#{gps_longitude}&amp;z=7&amp;iwloc=A&amp;source=embed"><r:img src='find(97)'/> voir sur la carte</a> <r:if test='can_write?'>(<r:link mode='edit' do='t'>modifier</r:link>)</r:if>
+        </p>
+        <p class='clear'>&nbsp;</p>
+      </r:when>
+      <r:when can='write'>
+        <r:link mode='edit' do='t'><r:img src='97'/> ajouter la position gps</r:link>
+      </r:when>
+    </r:case>
+  </div>
+</r:with>
+</r:include>

data/bricks/static/zena/skins/blog/Node-+index.zafu

@@ -0,0 +1 @@
+<r:include template='Project'/>

data/bricks/static/zena/skins/blog/Node-+notFound.zafu

@@ -0,0 +1,7 @@
+<r:include template='Project'>
+  <r:with part='main_content'>
+    <div id="not_found">
+      <p><b><r:trans>La page demandée n'a pas pu être trouvée...</r:trans></b></p>
+    </div>
+  </r:with>
+</r:include>

data/bricks/static/zena/skins/blog/Node-+search.zafu

@@ -0,0 +1,19 @@
+<r:include template='Node'>
+  <r:with part='main_content'>
+
+    <h2 do='t'>search results</h2>
+
+    <ul id='search_results' do='search_results'>
+      <li class='result_entry' do='each'>
+        <p class='result_image' do='if' kind_of='Document'> <r:link format='data' do='img' alt_src='icon' mode='pv'/><r:else do='img' alt_src='icon' mode='pv' link='self'/></p>
+        <p class='result_name'><r:link/></p>      
+        <p class='result_path'><r:show attr='rootpath'/></p>
+        <r:summary/>
+        <div class='clear'></div>
+      </li>
+      <r:else>
+        <p do='trans'>no result found</p>
+      </r:else>
+    </ul>
+  </r:with>
+</r:include>

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

@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" do='load' dictionary='dict'>
+<head>
+  <title do='root' do='title'>Website Title</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <link rel="stylesheet" type="text/css" href="style.css" media="screen" />
+  <r:void name='stylesheets' do='stylesheets'/>
+  <r:javascripts/>
+  <r:uses_datebox/>
+</head>
+<body>
+
+  <div id="content">
+    <r:root>
+      <div id="header">
+        <p id='logo' do='link' do='t'>&nbsp;</p>
+      </div>
+      <div id="navigation">
+        <ul>
+          <li do='link' do='t'>Home</li>
+          <li do='menus' do='each' do='link'/>
+          <li id='search' do='search_box'/>
+          <li class='visitor' do='if' test='can_write?'><r:visitor_link/> - <r:login_link/></li>
+        </ul>
+      </div>
+    </r:root>
+    <div id="right">
+      <div id='photos' do='images'>
+        <h2>photos</h2>
+        <ul>
+          <li do='each' do='if' test='can_write?'><r:link do='img' mode='pve'/><r:else do='img' mode='pv'/></li>
+          <li do='add_document'/>
+        </ul>
+      </div>
+      <r:void name='latest_comments'/>
+      <div id='pages' do='nodes'>
+        <h2>pages</h2>
+        <ul>
+          <li do='each' do='link'/>
+          <li do='add' klass='Page'/>
+        </ul>
+      </div>
+      <div id='documents' do='Skin?' do='documents'>
+        <h2>documents</h2>
+        <ul>
+          <li do='each' do='link'/>
+          <li do='add_document'/>
+        </ul>
+      </div>
+    </div>
+
+    <div id="main">
+      <div id='main_content'>
+      <r:void name='title'><h1 do='title' actions='all'/></r:void>
+      <r:Image? do='if' test='exif.gps_latitude'><a href='http://maps.google.com?ll=#{exif.gps_latitude},#{exif.gps_longitude}&amp;z=11' do='title'/></r:Image?>
+      <r:zazen attr='text' code='#{content_lang}' else='summary'/>
+      </div>
+    </div>
+    <div style="clear: both;"> </div>
+
+    <div id="footer">
+      &copy; Copyright <a href="#">Static blog</a> | <r:zena type='made'/> | <r:login_link/>
+    </div>
+  </div>
+</body>
+</html>

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

@@ -0,0 +1,12 @@
+<r:include template='Node'>
+<r:with part='main'>
+<ul id='main_content'>
+  <li do='include' template='Project' part='post'>
+    <r:with part='text'>
+      <r:zazen attr='text' live='true'/>
+      <r:include template='comments'/>
+    </r:with>
+  </r:include>
+</ul>
+</r:with>
+</r:include>