zena 1.2.2 → 1.2.3

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

@@ -22,14 +22,14 @@ form .date_box { float:none;}
 #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 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 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;}

data/bricks/grid/lib/bricks/grid.rb

@@ -51,10 +51,11 @@ module Bricks
 
         res = prefix + error.to_s
         uuid = UUIDTools::UUID.random_create.to_s.gsub('-','')[0..6]
+        dom_id = opts[:id] || "grid#{uuid}"
         msg = opts[:msg] || _('type to edit')
-        res << "<table id='grid#{uuid}' data-a='node[#{attribute}]' data-msg='#{msg}' class='grid'>"
+        res << "<table id='#{dom_id}' data-a='node[#{attribute}]' data-msg='#{msg}' class='grid'>"
         if node.can_write? && !opts[:no_edit]
-          js_data << "Grid.make('grid#{uuid}');"
+          js_data << "Grid.make('#{dom_id}');"
         end
 
 
@@ -105,7 +106,12 @@ module Bricks
         code = RubyLess.translate(node(Node).klass, attribute)
         msg = RubyLess.translate(self, "t('type to edit')")
         editable = @params[:edit] == 'true' ? '' : ', :no_edit => true'
-        out "<%= make_table(:attribute => #{attribute.inspect}, :node => #{node(Node)}, :msg => #{msg}#{editable}) %>"
+        if dom_id = @params[:id]
+          id_opt = ":id => #{dom_id.inspect}, "
+        else
+          id_opt = ''
+        end
+        out "<%= make_table(#{id_opt}:attribute => #{attribute.inspect}, :node => #{node(Node)}, :msg => #{msg}#{editable}) %>"
       end
     end
   end # Grid

data/bricks/passenger/zena/deploy.rb

@@ -16,7 +16,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         c_file = File.read("#{Zena::ROOT}/vendor/apache2_upload_progress/mod_upload_progress.c")
         run "test -e #{tmp_dir}  || mkdir #{tmp_dir}"
         put c_file, "#{tmp_dir}/mod_upload_progress.c"
-        run "cd #{tmp_dir} && apxs2 -c -i mod_upload_progress.c && rm -rf #{tmp_dir}"
+        run "cd #{tmp_dir} && apxs2 -c -i -a mod_upload_progress.c && rm -rf #{tmp_dir}"
+        run apache2_reload_cmd
       end
     end
 

data/bricks/pdf/lib/bricks/pdf.rb

@@ -107,7 +107,7 @@ module Bricks
             :type        => 'text/html',
             # Compile html to pdf
             :disposition => 'inline',
-            :data        => "Could not render pdf file... <a href='#{debug_url}'>debug</a>"
+            :error       => "Could not render pdf file... <a href='#{debug_url}'>debug</a>"
           }
         end
       end

data/bricks/tags/zena/test/zafu/tags.yml

@@ -42,4 +42,8 @@ tag_names:
 
 checkbox_tagged:
   src: "<r:input type='checkbox' name='tagged[blue]'/>"
-  res: "<input type='hidden' name='node[tagged][blue]' value=''/><input type='checkbox' name='node[tagged][blue]' value='blue' checked='checked'/>"
+  res: "<input type='hidden' name='node[tagged][blue]' value=''/><input type='checkbox' name='node[tagged][blue]' value='blue' checked='checked'/>"
+
+tag_cloud:
+  src: "<r:void do='tag_cloud from nodes in site' do='each' join=', '><r:name/> (<r:link_count/>)</r:void>"
+  res: "blue (2), sky (1)"

data/bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb

@@ -0,0 +1,13 @@
+class ChangeLinkStatusToFloat < ActiveRecord::Migration
+  def self.up
+    remove_index :links, :name => "index_links_on_status"
+    change_column :links, :status, :float, :default => nil
+    add_index :links, ["status"], :name => "index_links_on_status"
+  end
+
+  def self.down
+    remove_index :links, :name => "index_links_on_status"
+    change_column :links, :status, :integer, :default => nil
+    add_index :links, ["status"], :name => "index_links_on_status"
+  end
+end

data/config/bricks.yml

@@ -1,6 +1,5 @@
 test:
-  # Integration testing does not use 'port' settings so we must use 80...
-  asset_port:  80
+#  asset_port:  80
   tags:        ON
   captcha:     ON
   acls:        ON
@@ -13,9 +12,9 @@ test:
 
 
 development:
-  asset_port: 7999
-  mongrel:   ON
-  passenger: OFF
+#  asset_port: 7999
+  mongrel:   OFF
+  passenger: ON
   uv:
     switch:  ON
     activate_if:
@@ -51,11 +50,12 @@ development:
       gem: 'delayed_job'
 
 production:
-  # Port used only to provide assets during custom rendering (pdf).
-  # We need this to avoid deadlocks.
-  asset_port: 7999
-  mongrel:   ON
-  passenger: OFF
+# Port used only to provide assets during custom rendering (pdf).
+# We need this to avoid deadlocks with round-robin based serving.
+#  asset_port: 7999
+  cache_path: '/public/cache'
+  mongrel:   OFF
+  passenger: ON
   uv:
     switch:  ON
     activate_if:

data/config/deploy.rb

@@ -1,11 +1,7 @@
 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 :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
+set :app_type,              :passenger
 
 # You need to give the public key from the server to the git repository if the application is not public
 set :scm,                   'git'

data/config/gems.yml

@@ -18,9 +18,9 @@ gem_plugin:     # upload progress
 simple_xlsx_writer:    # spreadsheet
   lib:          'simple_xlsx'
 
-querybuilder:   '= 1.1.3'
+querybuilder:   '= 1.2.1'
 yamltest:       '= 0.7.0'
-rubyless:       '= 0.8.6'
+rubyless:       '= 0.8.8'
 property:       '= 2.3.2'
 versions:       '= 0.3.1'
 

data/db/init/base/skins/default/Node.zafu

@@ -58,9 +58,12 @@
             <li do='add_document'></li>
           </ol>
         </r:documents>
-        <r:pages name='pages'><h3 do='trans'>pages</h3>
+
+        <div id='pages' do='block' do='pages'>
+      <h3 do='t'>pages</h3>
           <ol>
-            <li do='each' class='li_s#{v.status}' do='link'/>
+      <li do='reset_sort'/>
+            <li do='each' sortable='true' class='li_s#{v.status}' do='link'/>
             <li do='add' before='self'/>
             <li class='inline_form' do='form'>
               <p class='node_klass'>  <r:select name='klass' root_class='Page'/></p>
@@ -68,7 +71,8 @@
               <p class='btn_validate'><r:input type="submit" value='#{trans("validate")}'/></p>
             </li>
           </ol>
-        </r:pages>
+        </div>
+
         <r:nodes where='kpath not like "ND%" and kpath not like "NP%"'><h3 do='trans'>references</h3>
           <ol>
             <li do='each' class='li_s#{v.status}' do='link'/>

data/db/init/base/skins/default/notes.zafu

@@ -1,4 +1,5 @@
-<div id='notes' do='posts' in='project' limit='10' order='date desc'>
+<r:cache allow_query='p=\d'/>
+<div id='notes' do='posts in project order by date desc limit 10 paginate p'>
   <ul class='note_list'>
     <li do='add' after='self' klass='Post' done='focus' focus='title'/>
     <li class='inline_form' do='form'>
@@ -16,5 +17,6 @@
       <r:zazen attr='text' live='true'/>
       <div class='clear'></div>
     </li>
+    <li><r:link page='next' do='t' text='older posts'/></li>
   </ul>
 </div>

data/lib/zafu/all.rb

@@ -1,12 +1,3 @@
-require 'zafu/parsing_rules'
-require 'zafu/process/ajax'
-require 'zafu/process/html'
-require 'zafu/process/ruby_less_processing'
-require 'zafu/process/context'
-require 'zafu/process/conditional'
-require 'zafu/process/forms'
-require 'zafu/security'
-
 module Zafu
   All = [
     Zafu::ParsingRules,

data/lib/zafu/compiler.rb

@@ -1,7 +1,3 @@
-require 'zafu/parser'
-require 'zafu/node_context'
-require 'zafu/all'
-
 module Zafu
   Compiler = Zafu.parser_with_rules(Zafu::All)
 end

data/lib/zafu/controller_methods.rb

@@ -1,5 +1,3 @@
-require 'zafu/node_context'
-
 module Zafu
   module ControllerMethods
     def self.included(base)

data/lib/zafu/handler.rb

@@ -1,8 +1,3 @@
-require 'zafu/parser'
-require 'zafu/markup'
-require 'zafu/node_context'
-require 'zafu/template'
-
 module Zafu
   class Handler < ActionView::TemplateHandler
     include ActionView::TemplateHandlers::Compilable

data/lib/zafu/markup.rb

@@ -1,5 +1,3 @@
-require 'zafu/ordered_hash'
-
 module Zafu
   # A Markup object is used to hold information on the tag used (<li>), it's parameters (.. class='xxx') and
   # indentation.
@@ -32,9 +30,9 @@ module Zafu
       # Parse parameters into a hash. This parsing supports multiple values for one key by creating additional keys:
       # <tag do='hello' or='goodbye' or='gotohell'> creates the hash {:do=>'hello', :or=>'goodbye', :or1=>'gotohell'}
       def parse_params(text)
-        return OrderedHash.new unless text
+        return Zafu::OrderedHash.new unless text
         return text if text.kind_of?(Hash)
-        params = OrderedHash.new
+        params = Zafu::OrderedHash.new
         rest = text.strip
         while (rest != '')
           if rest =~ /(.+?)=/
@@ -72,9 +70,9 @@ module Zafu
       if params
         self.params = params
       else
-        @params = OrderedHash.new
+        @params = Zafu::OrderedHash.new
       end
-      @dyn_params = OrderedHash.new
+      @dyn_params = Zafu::OrderedHash.new
     end
 
     # Set params either using a string (like "alt='time passes' class='zen'")

data/lib/zafu/ordered_hash.rb

@@ -2,7 +2,7 @@ module Zafu
 
   if RUBY_VERSION.split('.')[0..1].join('.').to_f > 1.8
     OrderedHash = Hash
-  else
+  elsif !defined?(OrderedHash)
     class OrderedHash < Hash
 
       def []=(k, v)
@@ -22,8 +22,9 @@ module Zafu
         res.merge!(hash)
         res
       end
-
+      
       alias o_keys keys
+      
       def get_keys
         @keys ||= o_keys
       end

data/lib/zafu/parsing_rules.rb

@@ -1,5 +1,3 @@
-require 'zafu/markup'
-
 module Zafu
   PARAM_KEY_REGEXP = %r{^\s+([\w_\-\[\]:]+)=}m
   PARAM_VALUE_REGEXP = %r{('|")(|[^\1]*?[^\\])\1}m
@@ -26,7 +24,7 @@ module Zafu
     # This callback is run just after the block is initialized (Parser#initialize).
     def start(mode)
       # tag_context
-      @markup = Markup.new(@options.delete(:html_tag))
+      @markup = Zafu::Markup.new(@options.delete(:html_tag))
 
       # html_tag
       if html_params = @options.delete(:html_tag_params)

data/lib/zafu/process/ajax.rb

@@ -140,7 +140,9 @@ module Zafu
           #node.dom_prefix = dom_name
           @markup.set_id(node.dom_id(:list => false))
           @markup.set_dyn_param(:"data-z", "<%= #{node}.zip %>")
-          expand_with
+          # Elements inside the block should render as normal (not transforming forms into remote
+          # forms or things like this).
+          expand_with(:template_url => nil)
         elsif @context[:saved_template]
           # already in a parent's store operation. Reset scope and simply render inline elements
           # reset scope
@@ -368,7 +370,7 @@ module Zafu
 
       # Return true if we need to insert the dom id for this element.
       def need_dom_id?
-        @context[:form] || child['unlink'] || (single_child_method && single_child_method == child['drop'])
+        @context[:form] || @params[:sortable] || child['unlink'] || (single_child_method && single_child_method == child['drop'])
       end
 
       # Unique template_url, ending with dom_id

data/lib/zafu/process/context.rb

@@ -6,7 +6,8 @@ module Zafu
     module Context
       def r_each
         if node.list_context?
-          if @params[:alt_class] || @params[:join]
+          
+          if @params[:alt_class] || @params[:join] || @params[:sortable]
             out "<% #{var}_max_index = #{node}.size - 1 %>" if @params[:alt_reverse]
             out "<% #{node}.each_with_index do |#{var},#{var}_index| %>"
 
@@ -34,11 +35,30 @@ module Zafu
           end
 
           raw_dom_prefix = node.raw_dom_prefix
+          query = node.opts[:query]
 
           with_context(:node => node.move_to(var, node.klass.first, :query => node.opts[:query])) do
             # We pass the :query option for RubyLess resolution by using the QueryBuilder finder
+            
+            before_wrap = ''
 
             steal_and_eval_html_params_for(@markup, @params)
+            if s = @params[:sortable]
+              unless sort_attr = @params.delete(:sort_attr)
+                if query
+                  sort_attr = query.select_keys.include?('l_status') ? 'l_status' : 'position'
+                else
+                  sort_attr = 'position'
+                end
+              end
+              @markup.set_param(:'data-a', sort_attr)
+              @markup.set_dyn_param(:'data-p', "<%= #{node}.#{RubyLess.translate(node.klass, sort_attr)} %>")
+              s = 'drag_handle' if s == 'true'
+              unless s == 'all' || @blocks.detect{|b| b.kind_of?(String) ? b =~ /class=.#{s}/ : (b.params[:class] == s || (b.markup && b.markup.params[:class] == s))}
+                before_wrap << "<span class='#{s}'>&nbsp;</span>"
+              end
+            end
+            
             # The id set here should be used as prefix for sub-nodes to ensure uniqueness of generated DOM ids
             if node.list_context?
               # we are still in a list (example: previous context was [[Node]], current is [Node])
@@ -47,12 +67,22 @@ module Zafu
               node.dom_prefix = dom_name unless raw_dom_prefix
               node.propagate_dom_scope!
 
-              if need_dom_id?
+              if need_dom_id? || @params[:sortable]
                 @markup.set_id(node.dom_id)
               end
             end
-
-            out wrap(expand_with)
+            
+            if s = @params[:sortable]
+              if s == 'all'
+                # drag full element
+                before_wrap << %Q{<% if #{var}_index == 0; js_data << "Zena.sortable('#{node.dom_id(:erb => false)}')" end %>}
+              else
+                # drag element with given class
+                s = 'drag_handle' if s == 'true'
+                before_wrap << %Q{<% if #{var}_index == 0; js_data << "Zena.sortable('#{node.dom_id(:erb => false)}', {handle:'#{s}'})" end %>}
+              end
+            end
+            out wrap(before_wrap + expand_with)
           end
           out "<% end %>"
         else

data/lib/zafu/process/forms.rb

@@ -73,7 +73,7 @@ module Zafu
         # Return id, style, form and cancel parts of the form.
         def form_options
           opts = {}
-
+          
           # Do we need this ?
           # opts[:klass] = node.master_class(ActiveRecord::Base).to_s
 
@@ -85,7 +85,7 @@ module Zafu
             opts[:id]    = "#{node.dom_prefix}_tbl"
             form_id      = node.dom_prefix
           end
-
+          
           form_id ||= "#{node.dom_prefix}_form_t"
           if @context[:template_url]
             opts[:form_tag]    = "<% remote_form_for(:#{node.form_name}, #{node}, :html => {:id => #{form_id.inspect}}) do |f| %>"

data/lib/zafu/process/ruby_less_processing.rb

@@ -3,6 +3,7 @@ require 'rubyless'
 module Zafu
   module Process
     module RubyLessProcessing
+      EXCLUDE_KEYS_IN_ARGS = [:h]
       include RubyLess
 
       def self.included(base)
@@ -211,6 +212,7 @@ module Zafu
           hash_arguments = []
           arguments = []
           params.keys.sort {|a,b| a.to_s <=> b.to_s}.each do |k|
+            next if EXCLUDE_KEYS_IN_ARGS.include?(k)
             if k =~ /\A_/
               arguments << "%Q{#{params[k]}}"
             else
@@ -238,19 +240,12 @@ module Zafu
         end
 
         def rubyless_expand(res)
-          if res.klass == String && !@blocks.detect {|b| !b.kind_of?(String)}
-            if lit = res.literal
-              out erb_escape(lit)
-            # TODO: Enable this when we have time to ensure tests/functionality work correctly.
-            #elsif res.opts[:h]
-            #  show_string(res)
-            else
-              out "<%= #{res} %>"
-            end
+          if res.klass == String && !(@blocks.detect {|b| !b.kind_of?(String)})
+            r_show(res)
           elsif res.klass == Boolean
             expand_if(res)
           elsif @blocks.empty?
-            out "<%= #{res} %>"
+            r_show(res)
           else
             expand_with_finder(:method => res, :class => res.klass, :query => res.opts[:query], :nil => res.could_be_nil?)
           end

data/lib/zafu/template.rb

@@ -1,5 +1,3 @@
-require 'zafu/compiler'
-
 module Zafu
   class Template
     def initialize(template, src_helper = nil, compiler = Zafu::Compiler)

data/lib/zafu/test_helper.rb

@@ -1,5 +1,3 @@
-require 'zafu/template'
-
 module Zafu
   module TestHelper
     include RubyLess::SafeClass

data/lib/zafu/view_methods.rb

@@ -1,4 +1,3 @@
-require 'zafu/controller_methods'
 module Zafu
   module ViewMethods
     include Zafu::ControllerMethods::Common

data/lib/zafu.rb

@@ -1,4 +1,4 @@
-require 'zafu/all'
+require 'zafu/parser'
 
 if defined?(ActionView)
   require 'zafu/handler'

data/lib/zena/acts/secure_node.rb

@@ -44,7 +44,8 @@ module Zena
 
         # Return true if the node can be viewed by all (public)
         def public?
-          can_read?(visitor.site.anon,visitor.site.anon.group_ids) # visible by anonymous
+          anon = visitor.site.anon
+          can_read?(anon, anon.group_ids) # visible by anonymous
         end
 
         # Return true if the node is properly secured (was loaded with secure)
@@ -77,12 +78,12 @@ module Zena
         # Returns true if the current visitor can see redactions (unpublished versions)
         # of the node.
         def can_see_redactions?(ugps = visitor.group_ids)
-          visitor.group_ids.include?(wgroup_id)
+          ugps.include?(wgroup_id)
         end
 
         # The node has just been created so the creator can still delete it
         # or move it around.
-        def draft?(vis=visitor)
+        def draft?
           !publish_from && visitor.id == user_id &&
           visitor.user? && visitor.id == version.user_id &&
           versions.count == 1
@@ -90,7 +91,7 @@ module Zena
 
         # The node has just been created so the creator can still delete it
         # or move it around.
-        def draft_was_true?(vis=visitor)
+        def draft_was_true?
           !publish_from_was && visitor.id == user_id_was &&
           visitor.user? && visitor.id == version.user_id_was &&
           versions.count == 1

data/lib/zena/console.rb

@@ -20,23 +20,6 @@ module Zena
       secure(Node) { Node.create_node(Node.transform_attributes(attrs)) }
     end
 
-    def rename_prop(list, old_key, new_key)
-      list = find(list) if list.kind_of?(String)
-      if list.first.kind_of?(Node)
-        list = list.map(&:visible_versions).flatten
-      end
-
-      list.each do |rec|
-        prop  = rec.prop
-        value = prop.delete(old_key)
-        if !value.blank?
-          prop[new_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
-      end
-      "Renamed '#{old_key}' to '#{new_key}' in #{list.size} #{list.first.class.to_s.downcase.pluralize}"
-    end
-
     def field_to_prop(list, native_key, prop_key)
       list = find(list) if list.kind_of?(String)
       list.each do |rec|
@@ -70,15 +53,33 @@ module Zena
       end
     end
 
+    def rename_prop(pseudo_sql, old_key, new_key)
+      count = 0
+      foreach(pseudo_sql) do |node|
+        node.versions.each do |rec|
+          count += 1
+          prop  = rec.prop
+          value = prop.delete(old_key)
+          if !value.blank?
+            prop[new_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
+        end
+      end
+      "Renamed '#{old_key}' to '#{new_key}' in #{count} versions"
+    end
+
     # Transform every value of a given property by using a block with |node, old_value| and
     # returning the new value.
     def change_prop(pseudo_sql, key)
+      count = 0
       unless block_given?
         puts "You need to provide a block |node, old_value| and return the new value"
         return
       end
       foreach(pseudo_sql) do |node|
         node.versions.each do |v|
+          count += 1
           prop = v.prop
           val  = prop[key]
           new_val = yield(node, val)
@@ -92,6 +93,7 @@ module Zena
           end
         end
       end
+      "Changed '#{key}' prop in #{count} versions"
     end
 
     def login(name, host = nil)

data/lib/zena/core_ext/string.rb

@@ -100,9 +100,10 @@ class String
   # of the readmore argument.
   def limit(size, readmore = '…')
     if self.size > size
-      self[0..(size-1)] + readmore
+      # readmore can contain a link: <a...> but this is defined in the zafu template.
+      ::ERB::Util.html_escape(self[0..(size-1)]) + readmore
     else
-      self
+      ::ERB::Util.html_escape(self)
     end
   end
 

data/lib/zena/deploy/app_init.rhtml

@@ -16,9 +16,9 @@ def run(cmd)
 end
 
 operations = [
-  'ruby lib/upload_progress_server.rb ',
   'rake worker:',
 <% if config[:app_type] == :mongrel %>
+  'ruby lib/upload_progress_server.rb ',
   'mongrel_rails cluster::',
 <% end %>  
   # 'rake sphinx:',
@@ -53,6 +53,11 @@ if %w{start restart}.include?(cmd)
   operations.each do |op|
     run "cd #{APP_ROOT} && #{op}start"
   end
+  
+  <% if config[:app_type] == :passenger %>
+  # Restart Passenger
+  run "cd #{APP_ROOT} && touch tmp/restart.txt"
+  <% end %>
 end
 
 unless %w{start stop restart}.include?(cmd)