zena 1.2.1 → 1.2.2

data/app/views/nodes/destroy.rjs

@@ -0,0 +1,2 @@
+@node = @parent
+update_page_content(page, @node)

data/app/views/sites/jobs.erb

@@ -2,9 +2,8 @@
 
 <table id='tasks_list' class='admin jobs' cellspacing="0">
   <tr>
-    <th do='t'>execution</th>
-    <th do='t'>info</th>
-    <th do='t'></th>
+    <th><%= _('execution') %></th>
+    <th><%= _('info') %></th>
   </tr>
   <%= render :partial=>'sites/job',  :collection=>@jobs %>
 </table>

data/app/views/templates/document_create_tabs/_file.rhtml

@@ -1,6 +1,6 @@
 <%= upload_form_tag(:action => 'upload') %>
 <%= hidden_field 'node', 'parent_id', :value=>@node.parent_zip  %>
-<% [:redir, :js].each do |p|; next unless params[p] %>
+<% [:redir, :js, :reload].each do |p|; next unless params[p] %>
 <input type='hidden' name='<%= p %>' value='<%= h params[p] %>'/>
 <% end %>
 <p class="btn_validate"><input type="submit" value='<%= _('validate') %>'/></p>

data/app/views/templates/document_create_tabs/_import.rhtml

@@ -1,5 +1,8 @@
 <%= upload_form_tag( :controller => 'nodes', :action => 'import', :id => @node.parent_zip ) %>
 <p class="btn_validate"><input type="submit" value='<%= _('validate') %>'/></p>
+<% [:redir, :js, :reload].each do |p|; next unless params[p] %>
+<input type='hidden' name='<%= p %>' value='<%= h params[p] %>'/>
+<% end %>
 
 <%= upload_field %>
 
@@ -7,7 +10,7 @@
 <label for='node_klass'><%= _('class of first element') %></label>
 <%= select('node', 'klass', Node.classes_for_form, :selected => 'Page' ) %><br/>
 
-<% if @node.can_publish? && !visitor.site.auto_publish? %>
+<% if @node.can_publish? && !@node.auto_publish? %>
 <label for='node_v_status'><%= _('publish nodes') %></label>
 <small><input type='checkbox' name='node[v_status]' value='50'/> <%= _('pub') %></small><br/>
 <% end -%>

data/app/views/templates/document_create_tabs/_template.rhtml

@@ -1,6 +1,9 @@
 <%= form_tag( documents_path ) %>
 <%= hidden_field 'node', 'parent_id', :value => @node.parent_zip  %>
 <p class="btn_validate"><input type="submit" onclick="$('loader').style.visibility = 'visible';" value='<%= _('validate') %>'/></p>
+<% [:redir, :js, :reload].each do |p|; next unless params[p] %>
+<input type='hidden' name='<%= p %>' value='<%= h params[p] %>'/>
+<% end %>
 
 <input type='hidden' name='node[klass]' value='Template'/>
 

data/app/views/templates/document_create_tabs/_text_document.rhtml

@@ -1,6 +1,9 @@
 <%= form_tag( documents_path ) %>
 <%= hidden_field 'node', 'parent_id', :value=>@node.parent_zip  %>
 <p class="btn_validate"><input type="submit" onclick="$('loader').style.visibility = 'visible';" value='<%= _('validate') %>'/></p>
+<% [:redir, :js, :reload].each do |p|; next unless params[p] %>
+<input type='hidden' name='<%= p %>' value='<%= h params[p] %>'/>
+<% end %>
 
 <label for='node_content_type'><%= _('content type') %></label>
 <input  id='node_content_type' type='text' name='node[content_type]'/><br/>

data/app/views/versions/custom_tab.rhtml

@@ -3,7 +3,7 @@
   <label for='<%= col.name %>'><%= _(col.name) %></label>
   <% case col.ptype
      when :datetime %>
-    <%= date_box(@node, col.name, :size=>15, :value => @node.prop[col.name]) %>
+    <%= date_box(@node, "node[#{col.name}]", :size=>15, :value => @node.prop[col.name]) %>
   <% else %>
     <%= text_area 'node', col.name, :cols => nil, :rows => 1, :value => @node.prop[col.name], :class => 'full_width' %>
   <% end %>

data/app/views/versions/edit.rhtml

@@ -29,7 +29,7 @@
 }) %>
     </div>
     <div><%= node_action_link('add_doc', @node.zip) %></div>
-    <% if @node.full_drive? && !visitor.site.auto_publish? %><div><small><input type='checkbox' name='node[v_backup]' value='true'/> <%= _('bak') %></small> <small><input type='checkbox' name='node[v_status]' value='50'<%= params[:pub] ? " checked='checked'" : '' %>/> <%= _('pub') %></small></div><% end -%>
+    <% if @node.full_drive? && !@node.auto_publish? %><div><small><input type='checkbox' name='node[v_backup]' value='true'/> <%= _('bak') %></small> <small><input type='checkbox' name='node[v_status]' value='50'<%= params[:pub] ? " checked='checked'" : '' %>/> <%= _('pub') %></small></div><% end -%>
   </div>
 <% partial.each_index do |i| %><div id='<%= partial[i] %>_tab' <%= i == 0 ? "" : "style='display:none;'" %> class='tab_content'>
   <%= render :partial=>"templates/edit_tabs/#{partial[i]}" %>

data/bricks/acls/lib/bricks/acls.rb

@@ -6,10 +6,10 @@ module Bricks
       end
       # If we have an exec skin, we check that t_url points in this skin's
       # directory to avoid letting the user render with any zafu template.
-      def template_path_from_template_url_with_acls(template_url=params[:t_url])
+      def template_path_from_template_url_with_acls(suffix='', template_url=params[:t_url], build=true)
         if visitor.exec_acl && skin = visitor.exec_acl.exec_skin
           # Make sure t_url is using templates in the allowed Skin
-          skin_name = skin.title.to_filename
+          skin_name = skin.skin_name
           unless template_url[0..skin_name.size] == skin_name + '/'
             # Wrong Skin !
             Node.logger.warn "Bad t_url used in ACL context (#{template_url}). Visitor = #{visitor.id} // #{visitor.login}"
@@ -17,7 +17,7 @@ module Bricks
             raise ActiveRecord::RecordNotFound
           end
         end
-        template_path_from_template_url_without_acls(template_url)
+        template_path_from_template_url_without_acls(suffix, template_url, build)
       end
     end
 

data/bricks/acls/zena/test/unit/acl_test.rb

@@ -65,6 +65,21 @@ class AclTest < Zena::Unit::TestCase
       end
     end # saving an acl with asset_host in query
 
+    context 'saving an acl with an error in rubyless syntax' do
+      subject do
+        acls(:rap)
+      end
+
+      should 'return an error' do
+        erebus_id = groups_id(:erebus)
+        visitor.instance_eval do
+          @group_ids = self.group_ids + [erebus_id]
+        end
+        assert !subject.update_attributes(:query => "nodes in site")
+        assert_equal 'parse error on value ["in", 1] (kIN)', subject.errors[:query]
+      end
+    end # saving an acl with asset_host in query
+
 
     context 'a visitor' do
       context 'with normal access' do

data/bricks/fs_skin/lib/bricks/fs_skin.rb

@@ -0,0 +1,190 @@
+module Bricks
+  module Fs_skin
+    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, :fs_skin
+        base.alias_method_chain :template_url_for_asset, :fs_skin
+        base.alias_method_chain :get_best_template, :fs_skin
+      end
+
+      def get_template_text_with_fs_skin(path, section_id = nil, opts = {})
+        if path =~ ZAFU_URL_REGEXP
+          brick_name, skin_name, path = $1, $2, $3
+          Skin.text_from_fs_skin(brick_name, skin_name, path, opts)
+        elsif !(path =~ %r{^(/|\$)}) && section_id.nil? && @fs_skin_brick_name && @fs_skin_skin_name
+          Skin.text_from_fs_skin(@fs_skin_brick_name, @fs_skin_skin_name, path, opts)
+        else
+          return *get_template_text_without_fs_skin(path, section_id, opts)
+        end
+      end
+
+      def template_url_for_asset_with_fs_skin(opts)
+        # TODO
+        template_url_for_asset_without_fs_skin(opts)
+      end
+
+      def get_best_template_with_fs_skin(kpaths, format, mode, skin)
+        return get_best_template_without_fs_skin(kpaths, format, mode, skin) unless fs_skin = skin.z_fs_skin
+        if idx_template = IdxTemplate.first(
+           :conditions => ["tkpath IN (?) AND format = ? AND mode #{mode ? '=' : 'IS'} ? AND (skin_id = ? OR fs_skin = ?) AND site_id = ?",
+              kpaths, format, mode, skin.id, fs_skin, 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_fs_skin(kpaths, format, mode, skin, template)
+          elsif fs_skin =~ STATIC_SKIN_REGEXP
+            @fs_skin_brick_name, @fs_skin_skin_name = $1, $2
+            if idx_template.path =~ SECURE_PATH_REGEXP
+              zafu_url = "$#{@fs_skin_brick_name}-#{@fs_skin_skin_name}/#{idx_template.path}"
+              template = Template.new
+              template.tkpath = idx_template.tkpath
+              [zafu_url, template]
+            end
+          end
+        end
+      end
+
+      # TODO
+      # Asset resolution: route = /fs_skin/fs_skin-blog/img/style.css
+      # ===> fs_skin 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/fs_skin
+    end # ControllerMethods
+
+    module SkinMethods
+      def self.included(base)
+        
+        base.class_eval do
+          property do |p|
+            p.string 'z_fs_skin'
+          end
+
+          safe_property 'z_fs_skin'
+          validate :validate_z_fs_skin
+          alias_method_chain :skin_name, :fs_skin
+        end
+        
+        # We move this method here so that we do not need to reference
+        # Bricks::Fs_skin in I18n when fs_skin brick is disabled.
+        def base.text_from_fs_skin(brick_name, skin_name, path, opts)
+          if path =~ SECURE_PATH_REGEXP
+            fullpath = "$#{brick_name}-#{skin_name}/#{path}"
+            section_id = nil
+            template = nil
+            
+            abs_path = File.join(RAILS_ROOT, 'bricks', brick_name, 'zena', 'skins', skin_name, path)
+            if opts[:ext]
+              abs_path_l = abs_path + ".#{visitor.lang}.#{opts[:ext]}"
+              abs_path = abs_path + ".#{opts[:ext]}"
+            else
+              abs_path_l ||= abs_path + ".zafu"
+            end
+            if abs_path_l
+              if text = File.exist?(abs_path_l) ? File.read(abs_path_l) : nil
+                return text, fullpath, section_id, template
+              end
+            end
+            if text = File.exist?(abs_path) ? File.read(abs_path) : nil
+              return text, fullpath, section_id, template
+            end
+          end
+        end
+      end
+      
+      def skin_name_with_fs_skin
+        z_fs_skin ? ('$' + z_fs_skin) : skin_name_without_fs_skin
+      end
+
+      private
+        def validate_z_fs_skin
+          if !(z_fs_skin.nil? || z_fs_skin =~ STATIC_SKIN_REGEXP)
+            errors.add(:z_fs_skin, _('invalid'))
+          end
+          true
+        end
+    end # SkinMethods
+
+    module SiteMethods
+      def self.included(base)
+        base.alias_method_chain :rebuild_index, :fs_skin
+      end
+
+      def rebuild_index_with_fs_skin(nodes = nil, page = nil, page_count = nil)
+        if !page
+          Zena::SiteWorker.perform(self, :rebuild_fs_skin_index, nil)
+        end
+        rebuild_index_without_fs_skin(nodes, page, page_count)
+      end
+
+      def rebuild_fs_skin_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_fs_skin_index(brick_name, skin_name, "#{p}/#{skin_name}")
+              end
+            end
+          end
+        end
+      end
+
+      private
+        def add_fs_skin_symlink(brick_name, skin_name, skin_path)
+          source_path = File.join(skin_path, 'static')
+          target_dir  = File.join(RAILS_ROOT, 'public', 'static')
+          target_path = File.join(target_dir, "#{brick_name}-#{skin_name}") 
+          if File.exist?(source_path) && !File.exist?(target_path)
+            if !File.exist?(target_dir)
+              Dir.mkdir(target_dir)
+            end
+            FileUtils.symlink_or_copy(source_path, target_path)
+          end
+        end
+        
+        def build_fs_skin_index(brick_name, skin_name, path)
+          add_fs_skin_symlink(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_fs_skin_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,
+                  :fs_skin => "#{brick_name}-#{skin_name}",
+                  :path    => idx_path
+                )
+              end
+            end
+          end
+        end
+    end # SiteMethods
+  end # Fs_skin
+end # Bricks

data/bricks/fs_skin/zena/init.rb

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

data/bricks/fs_skin/zena/migrate/20110702010330_add_fs_skin_to_idx_templates.rb

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

data/bricks/{static → fs_skin}/zena/skins/blog/Node.zafu

@@ -59,7 +59,7 @@
     <div style="clear: both;"> </div>
 
     <div id="footer">
-      &copy; Copyright <a href="#">Static blog</a> | <r:zena type='made'/> | <r:login_link/>
+      &copy; Copyright <a href="#">Fs_skin blog</a> | <r:zena type='made'/> | <r:login_link/>
     </div>
   </div>
 </body>

data/bricks/fs_skin/zena/tasks.rb

@@ -0,0 +1,26 @@
+
+namespace :fs_skin do
+  desc 'rebuild fs_skin index'
+  task :index => :environment do
+    # Make sure all bricks are loaded before executing the index rebuild
+    Zena::Use.upgrade_class('Site')
+  
+    include Zena::Acts::Secure
+    if ENV['HOST']
+      sites = [Site.find_by_host(ENV['HOST'])]
+    else
+      sites = Site.all
+    end
+    
+    sites.each do |site|
+      Thread.current[:visitor] = site.any_admin
+      if ENV['WORKER'] == 'false' || RAILS_ENV == 'test'
+        # We avoid SiteWorker.
+        site.rebuild_fs_skin_index
+      else
+        # We try to use the site worker.
+        Zena::SiteWorker.perform(site, :rebuild_fs_skin_index, nil)
+      end
+    end
+  end
+end

data/bricks/{static/zena/test/integration/static_integration_test.rb → fs_skin/zena/test/integration/fs_skin_integration_test.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 
-class StaticIntegrationTest < Zena::Integration::TestCase
+class Fs_skinIntegrationTest < Zena::Integration::TestCase
 
-  context 'A page using a static Skin' do
+  context 'A page using a fs_skin Skin' do
     subject do
       secure(Node) { nodes(:wiki) }
     end
@@ -10,7 +10,7 @@ class StaticIntegrationTest < Zena::Integration::TestCase
     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)}
+      skin = secure(Skin) { Skin.create(:title => 'foo', :z_fs_skin => 'fs_skin-blog', :parent_id => nodes_id(:skins), :v_status => Zena::Status::Pub)}
       subject.skin_id = skin.id
       assert subject.save
     end
@@ -20,11 +20,11 @@ class StaticIntegrationTest < Zena::Integration::TestCase
         FileUtils.rmtree("#{SITES_ROOT}/test.host/zafu")
       end
 
-      should 'use static template' do
+      should 'use fs_skin 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
+        assert_match %r{Copyright <a href="#">Fs_skin blog</a>}, response.body
       end
     end # with normal access
-  end # A page using a static Skin
+  end # A page using a fs_skin Skin
 end

data/bricks/fs_skin/zena/test/unit/fs_skin_test.rb

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