zena 0.15.2 → 0.16.0

data/doc/template/cache/URL

@@ -0,0 +1 @@
+http://blog.evanweaver.com/articles/2006/06/02/allison

data/doc/zafu_changes.yml

@@ -0,0 +1,29 @@
+CHANGESET1:
+  from: '0.14.0'
+  to:   '0.14.1'
+
+  CHANGES:
+    if_or:
+      old: "<r:if can='write' or_test='[d_foo]'>hello</r:if>"
+      new: "<r:if can='write' or_test='d_foo'>hello</r:if>"
+
+SHOULD_CHANGE:
+  basic:
+    link_anchor_name:
+      old: "<r:link anchor='[name]'/>"
+      new: "<r:link anchor='#{name}'/>"
+
+CHANGESET2:
+  from: '0.15.1'
+  to:   '0.15.2'
+
+  CHANGES:
+    basic:
+      link_sharp:
+        old: "<r:link sharp='true'/>"
+        new: "<r:link anchor='true'/>"
+      anchor_with_link:
+        old: "<r:link anchor='true'/>"
+        new: "<r:anchor do='link'/>"
+
+

data/lib/base_additions.rb

@@ -4,4 +4,4 @@ module Zena
   end
 end
 
-Bricks::Patcher.apply_patches
+Bricks.apply_patches

data/lib/bricks.rb

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), '/bricks/requirements_validation')
+require File.join(File.dirname(__FILE__), '/bricks/loader')
+
+module Bricks
+  extend Bricks::RequirementsValidation
+  extend Bricks::Loader
+  CONFIG = self.config_for_active_bricks
+end
+

data/lib/bricks/loader.rb

@@ -0,0 +1,86 @@
+module Bricks
+  module Loader
+    def bricks
+      @@bricks ||= bricks_folders.map do |bricks_folder|
+        if File.exist?(bricks_folder)
+          Dir.entries(bricks_folder).sort.map do |brick|
+            if Bricks::CONFIG[brick]
+              File.join(bricks_folder, brick)
+            else
+              nil
+            end
+          end
+        else
+          nil
+        end
+      end.flatten.compact.uniq
+    end
+
+    def bricks_folders
+      @@bricks_folders ||= [File.join(Zena::ROOT, 'bricks'), File.join(RAILS_ROOT, 'bricks')].uniq.reject do |f|
+        !File.exist?(f)
+      end
+    end
+
+    def models_paths
+      bricks.map {|f| Dir["#{f}/models"] }.flatten
+    end
+
+    def libs_paths
+      bricks.map {|f| Dir["#{f}/lib"] }.flatten
+    end
+
+    def foreach_brick(&block)
+      bricks.each do |path|
+        block.call(path)
+      end
+    end
+
+    def apply_patches(file_name = nil)
+      file_name ||= caller[0].split('/').last.split(':').first
+      foreach_brick do |brick_path|
+        patch_file = File.join(brick_path, 'patch', file_name)
+        if File.exist?(patch_file)
+          load patch_file
+        end
+      end
+    end
+
+    def load_bricks
+      # load all libraries in bricks
+      libs_paths.each do |lib_path|
+        Dir.foreach(lib_path) do |f|
+          next unless f =~ /\A.+\.rb\Z/
+          require File.join(lib_path, f)
+        end
+      end
+
+      # FIXME: do we really need to load these now, load_path isn't enough ?
+      models_paths.each do |models_path|
+        Dir.foreach(models_path) do |f|
+          next unless f =~ /\A.+\.rb\Z/
+          require File.join(models_path, f)
+        end
+      end
+    end
+
+    def load_misc(filename)
+      bricks.map {|f| Dir["#{f}/misc/#{filename}.rb"] }.flatten.each do |file|
+        require file
+      end
+    end
+
+    def load_zafu(mod)
+      foreach_brick do |brick_path|
+        brick_name = File.basename(brick_path)
+        zafu_path  = File.join(brick_path, 'zafu')
+        next unless File.exist?(zafu_path)
+        Dir.foreach(zafu_path) do |rules_name|
+          next if rules_name =~ /\A\./
+          load File.join(zafu_path, rules_name)
+        end
+        mod.send(:include, eval("Bricks::#{brick_name.capitalize}::Zafu"))
+      end
+    end
+  end
+end

data/lib/bricks/requirements_validation.rb

@@ -0,0 +1,71 @@
+require 'yaml'
+
+module Bricks
+  module RequirementsValidation
+    def requirement_errors(brick, requirements)
+      errors = []
+      requirements.each do |k,v|
+        case k
+        when 'gem'
+          v.split(',').each do |name|
+            begin
+              require name.strip
+            rescue LoadError => err
+              errors << "'#{name}' missing"
+            end
+          end
+        when 'file'
+          v.split(',').each do |name|
+            unless File.exist?("#{RAILS_ROOT}/#{name}")
+              errors << "'#{name}' missing"
+            end
+          end
+        when 'adapter'
+          config = YAML.load_file(File.join(RAILS_ROOT, 'config', 'database.yml'))
+          adapter = config[RAILS_ENV]['adapter']
+          unless v.split(',').map(&:strip).include?(adapter)
+            errors << "'#{adapter}' not supported"
+          end
+        end
+      end
+      errors.empty? ? nil : errors
+    end
+
+    def config_for_active_bricks
+      if File.exist?("#{RAILS_ROOT}/config/bricks.yml")
+        raw_config = YAML.load_file("#{RAILS_ROOT}/config/bricks.yml")[RAILS_ENV] || {}
+      else
+        raw_config = YAML.load_file("#{Zena::ROOT}/config/bricks.yml")[RAILS_ENV] || {}
+      end
+      config = {}
+
+      raw_config.each do |brick, opts|
+        if opts.kind_of?(Hash)
+          next unless opts['switch'] == true
+          if activation = opts.delete('activate_if')
+            if errors = requirement_errors(brick, activation)
+              if defined?(ActiveRecord::Base) && logger = ActiveRecord::Base.logger
+                ActiveRecord::Base.logger.warn "'#{brick}' not activated: #{errors.join(', ')}"
+              end
+              puts "'#{brick}' not activated: #{errors.join(', ')}" if RAILS_ENV == 'development'
+            end
+          end
+          config[brick] = opts unless errors
+        else
+          if opts == true
+            config[brick] = {}
+          end
+        end
+      end
+      config
+    end
+
+    def runtime_requirement_errors(brick_name)
+      return ["'#{brick_name}' was not activated."] unless opts = Bricks::CONFIG[brick_name]
+      if run_requirements = opts.delete('run_if')
+        return requirement_errors(brick_name, run_requirements)
+      end
+      nil
+    end
+  end
+end

data/lib/tasks/zena.rake

@@ -1,7 +1,14 @@
 require 'yaml'
 require 'fileutils'
 
+# We need to make sure the RAILS_ENV is set before brick activation or the wrong bricks will
+# be loaded.
+RAILS_ENV = 'test' if ARGV.join(' ') =~ /zena:test/
+
 require File.join(File.dirname(__FILE__), '..', 'zena', 'info') # to have Zena::ROOT
+require File.join(File.dirname(__FILE__), '..', 'bricks') # to have Bricks
+
+Bricks.load_misc('tasks')
 
 def symlink_assets(from, to)
   from = File.expand_path(from)
@@ -39,7 +46,7 @@ def copy_assets(from, to)
   from = File.expand_path(from)
   to = File.expand_path(to)
   return if from == to
-  ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb', 'config/deploy.rb', 'db/migrate/*.rb', 'public/**/*'].each do |base_path|
+  ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb', 'config/deploy.rb', 'config/bricks.yml', 'db/migrate/*.rb', 'public/**/*'].each do |base_path|
     if base_path =~ /\*/
       Dir["#{from}/#{base_path}"].each do |path|
         path = path[(from.length + 1)..-1]
@@ -125,8 +132,8 @@ namespace :zena do
     end
   end
 
-  desc "Rename a host"
-  task :rename_host => :environment do
+  desc "Rename a site"
+  task :rename_site => :environment do
     # 0. set host name
     unless host = ENV['HOST']
       puts "Please set HOST to the hostname for the new site name. Aborting."
@@ -231,7 +238,7 @@ namespace :zena do
       paths  = {'zena' => "#{RAILS_ROOT}/db/migrate"}
       bricks = ['zena']
 
-      Bricks::Patcher.foreach_brick do |brick_path|
+      Bricks.foreach_brick do |brick_path|
         brick_name = brick_path.split('/').last
         migration_path = File.join(brick_path, 'migrate')
         next unless File.exist?(migration_path) && File.directory?(migration_path)
@@ -373,4 +380,35 @@ namespace :zena do
       end
     end
   end
+
+  namespace :sessions do
+    desc "Count database sessions"
+    task :count => :environment do
+      count = ActiveRecord::SessionStore::Session.count
+      puts "Sessions stored: #{count}"
+    end
+
+    desc "Clear database-stored sessions older than two weeks"
+    task :prune => :environment do
+      ActiveRecord::SessionStore::Session.delete_all [ "updated_at < ?", 2.weeks.ago
+      ]
+    end
+  end
+
+  desc "Create the database, migrate, create 'localhost' site and start application"
+  task :init do
+    # FIXME: how to run sub-task
+    [
+      "rake zena:migrate RAILS_ENV=production",
+      "rake zena:mksite HOST='localhost' PASSWORD='admin' LANG='en' RAILS_ENV=production",
+      "#{Gem.win_platform? ? 'start' : 'open'} #{File.join(Zena::ROOT, 'lib/zena/deploy/start.html')}"
+    ].each do |cmd|
+      puts cmd
+      system(cmd)
+    end
+    cmd = "script/server -e production -p 3211"
+    puts cmd
+    exec cmd
+  end
+
 end

data/lib/zafu/action.rb

@@ -0,0 +1,285 @@
+module Zafu
+  module Action
+    # swap an attribute
+    # TODO: test
+    def r_swap
+      if upd = @params[:update]
+        if upd == '_page'
+          block = nil
+        elsif block = find_target(upd)
+          # ok
+          if ancestor('block') || ancestor('each')
+            upd_both = '&upd_both=true'
+          else
+            upd_both = ''
+          end
+        else
+          return
+        end
+      elsif ancestor('block') || ancestor('each')
+        # ancestor: ok
+        block = self
+      elsif parent && block = parent.descendant('block')
+        # sibling: ok
+        upd_both = ''
+      else
+        return parser_error("missing 'block' in same parent")
+      end
+
+      states = ((@params[:states] || 'todo, done') + ' ').split(',').map(&:strip)
+
+      query_params = "node[#{@params[:attr]}]=\#{#{states.inspect}[ ((#{states.inspect}.index(#{node_attribute(@params[:attr])}.to_s) || 0)+1) % #{states.size}]}#{upd_both}"
+      out link_to_update(block, :query_params => query_params, :method => :put, :html_params => get_html_params(@params, :link))
+    end
+
+    def r_edit
+      if @context[:dom_prefix]
+        # ajax
+        if @context[:in_form]
+          # cancel button
+          @context[:form_cancel] || ''
+        else
+          # edit button
+
+          # TODO: show 'reply' instead of 'edit' in comments if visitor != author
+          out link_to_update(self, :default_text => _('edit'), :url => "\#{edit_#{base_class.to_s.underscore}_path(#{node_id})}", :html_params => get_html_params(@params, :link), :method => :get, :cond => "#{node}.can_write?", :else => :void)
+        end
+      else
+        # FIXME: we could link to some html page to edit the item.
+        ""
+      end
+    end
+
+    alias r_cancel r_edit
+
+    # TODO: test
+    def r_add
+      return parser_error("should not be called from within 'each'") if parent.method == 'each'
+      return '' if @context[:make_form]
+
+      # why is node = @node (which we need) but we are supposed to have Comments ?
+      # FIXME: during rewrite, replace 'node' by 'node(klass = node_class)' so the ugly lines below would be
+      # if node_kind_of?(Comment)
+      #   out "<% if #{node(Node)}.can_comment? -%>"
+      # Refs #198.
+      if node_kind_of?(Comment)
+        out "<% if #{node}.can_comment? -%>"
+      else
+        out "<% if #{node}.can_write? -%>"
+      end
+
+      unless descendant('add_btn')
+        # add a descendant between self and blocks.
+        blocks = @blocks.dup
+        @blocks = []
+        add_btn = make(:void, :method=>'add_btn', :params=>@params.dup, :text=>'')
+        add_btn.blocks = blocks
+        remove_instance_variable(:@all_descendants)
+      end
+
+      if @context[:form] && @context[:dom_prefix]
+        # ajax add
+
+        @html_tag_params.merge!(:id => "#{erb_dom_id}_add")
+        @html_tag_params[:class] ||= 'btn_add'
+        if @params[:focus]
+          focus = "$(\"#{erb_dom_id}_#{@params[:focus]}\").focus();"
+        else
+          focus = "$(\"#{erb_dom_id}_form_t\").focusFirstElement();"
+        end
+
+        out render_html_tag("#{expand_with(:onclick=>"[\"#{erb_dom_id}_add\", \"#{erb_dom_id}_form\"].each(Element.toggle);#{focus}return false;")}")
+
+        if node_kind_of?(Node)
+          # FIXME: BUG if we set <r:form klass='Post'/> the user cannot select class with menu...
+          klass = @context[:klass] || 'Node'
+          # FIXME: inspect '@context[:form]' to see if it contains v_klass ?
+          out "<% if #{var}_new = secure(Node) { Node.new_from_class(#{klass.inspect}) } -%>"
+        else
+          out "<% if #{var}_new = #{node_class}.new -%>"
+        end
+
+        if @context[:form].method == 'form'
+          out expand_block(@context[:form], :in_add => true, :no_ignore => ['form'], :add=>self, :node => "#{var}_new", :parent_node => node, :klass => klass, :publish_after_save => auto_publish_param)
+        else
+          # build form from 'each'
+          out expand_block(@context[:form], :in_add => true, :no_ignore => ['form'], :add=>self, :make_form => true, :node => "#{var}_new", :parent_node => node, :klass => klass, :publish_after_save => auto_publish_param)
+        end
+        out "<% end -%>"
+      else
+        # no ajax
+        @html_tag_params[:class] ||= 'btn_add' if @html_tag
+        out render_html_tag(expand_with)
+      end
+      out "<% end -%>"
+      @html_tag_done = true
+    end
+
+    def r_add_btn
+      if @params[:text]
+        text = @params[:text]
+        text = "<div>#{text}</div>" unless @html_tag
+      elsif @params[:trans]
+        text = _(@params[:trans])
+        text = "<div>#{text}</div>" unless @html_tag
+      elsif @blocks != []
+        text = expand_with
+      else
+        text = node_class == Comment ? _("btn_add_comment") : _("btn_add")
+      end
+
+      out "<a href='#' onclick='#{@context[:onclick]}'>#{text}</a>"
+    end
+
+    # Show html to add open a popup window to add a document.
+    # TODO: inline ajax for upload ?
+    def r_add_document
+      return parser_error("only works with nodes (not with #{node_class})") unless node_kind_of?(Node)
+      @html_tag_params[:class] ||= 'btn_add'
+      res = "<a href='/documents/new?parent_id=#{erb_node_id}' onclick='uploader=window.open(\"/documents/new?parent_id=#{erb_node_id}\", \"upload\", \"width=400,height=300\");return false;'>#{_('btn_add_doc')}</a>"
+      "<% if #{node}.can_write? -%>#{render_html_tag(res)}<% end -%>"
+    end
+
+    #if RAILS_ENV == 'test'
+    #  def r_test
+    #    inspect
+    #  end
+    #end
+
+    def r_drop
+      if parent.method == 'each' && @method == parent.single_child_method
+        parent.add_html_class('drop')
+      else
+        @html_tag_params[:class] ||= 'drop'
+      end
+      r_block
+    end
+
+    def drop_javascript
+      hover  = @params[:hover]
+      change = @params[:change]
+
+      if role = @params[:set] || @params[:add]
+        query_params = ["node[#{role}_id]=[id]"]
+      else
+        query_params = []
+        # set='icon_for=[id], v_status='50', v_title='[v_title]'
+        @params.each do |k, v|
+          next if [:hover, :change, :done].include?(k)
+          value, static = parse_attributes_in_value(v, :erb => false, :skip_node_attributes => true)
+          key = change == 'params' ? "params[#{k}]" : "node[#{k}]"
+          query_params << "#{key}=#{CGI.escape(value)}"
+        end
+        return parser_error("missing parameters to set values") if query_params == []
+      end
+
+      query_params << "change=#{change}" if change == 'receiver'
+      query_params << "t_url=#{CGI.escape(template_url)}"
+      query_params << "dom_id=#{erb_dom_id}"
+      query_params << start_node_s_param(:erb)
+      query_params << "done=#{CGI.escape(@params[:done])}" if @params[:done]
+
+      "<script type='text/javascript'>
+      //<![CDATA[
+      Droppables.add('#{erb_dom_id}', {hoverclass:'#{hover || 'drop_hover'}', onDrop:function(element){new Ajax.Request('/nodes/#{erb_node_id}/drop?#{query_params.join('&')}', {asynchronous:true, evalScripts:true, method:'put', parameters:'drop=' + encodeURIComponent(element.id)})}})
+      //]]>
+      </script>"
+    end
+
+    def r_draggable
+      new_dom_scope
+      @html_tag ||= 'div'
+      case @params[:revert]
+      when 'move'
+        revert_effect = 'Element.move'
+      when 'remove'
+        revert_effect = 'Element.remove'
+      else
+        revert_effect = 'Element.move'
+      end
+
+      res, drag_handle = set_drag_handle_and_id(expand_with, @params, :id => erb_dom_id)
+
+      out render_html_tag(res)
+
+      if drag_handle
+        out "<script type='text/javascript'>\n//<![CDATA[\n
+          new Draggable('#{erb_dom_id}', {ghosting:true, revert:true, revertEffect:#{revert_effect}, handle:$('#{erb_dom_id}').select('.#{drag_handle}')[0]});\n//]]>\n</script>"
+      else
+        out "<script type='text/javascript'>\n//<![CDATA[\nZena.draggable('#{erb_dom_id}',0,true,true,#{revert_effect})\n//]]>\n</script>"
+      end
+    end
+
+    def r_unlink
+      return "" if @context[:make_form]
+      opts = {}
+
+      if upd = @params[:update]
+        if upd == '_page'
+          target = nil
+        elsif target = find_target(upd)
+          # ok
+        else
+          return
+        end
+      elsif target = ancestor('block')
+        # ok
+      else
+        target = self
+      end
+
+      if node_kind_of?(Node)
+        opts[:cond] = "#{node}.can_write? && #{node}.link_id"
+        opts[:url] = "/nodes/\#{#{node_id}}/links/\#{#{node}.link_id}"
+      elsif node_kind_of?(Link)
+        opts[:url] = "/nodes/\#{#{node}.this_zip}/links/\#{#{node}.zip}"
+      end
+
+      opts[:method]       = :delete
+      opts[:default_text] = _('btn_tiny_del')
+      opts[:html_params]  = get_html_params({:class => 'unlink'}.merge(@params), :link)
+
+      out link_to_update(target, opts)
+
+     #tag_to_remote
+     #"<%= tag_to_remote({:url => node_path(#{node_id}) + \"#{opts[:method] != :put ? '/zafu' : ''}?#{action.join('&')}\", :method => #{opts[:method].inspect}}) %>"
+     #  out "<a class='#{@params[:class] || 'unlink'}' href='/nodes/#{erb_node_id}/links/<%= #{node}.link_id %>?#{action}' onclick=\"new Ajax.Request('/nodes/#{erb_node_id}/links/<%= #{node}.link_id %>?#{action}', {asynchronous:true, evalScripts:true, method:'delete'}); return false;\">"
+     #  if !@blocks.empty?
+     #    inner = expand_with
+     #  else
+     #    inner = _('btn_tiny_del')
+     #  end
+     #  out "#{inner}</a><% else -%>#{inner}<% end -%>"
+     #elsif node_kind_of?(DataEntry)
+     #  text = get_text_for_erb
+     #  if text.blank?
+     #    text = _('btn_tiny_del')
+     #  end
+     #  out "<%= link_to_remote(#{text.inspect}, {:url => \"/data_entries/\#{#{node}[:id]}?dom_id=#{dom_id}#{upd_url}\", :method => :delete}, :class=>#{(@params[:class] || 'unlink').inspect}) %>"
+     #end
+    end
+
+    protected
+      def auto_publish_param(in_string = false)
+        if in_string
+          ['true','force'].include?(@params[:publish]) ? "&publish=#{@params[:publish]}" : ''
+        else
+          @params[:publish]
+        end
+      end
+
+      # Returns true if a form/edit needs to keep track of link_id (l_status or l_comment used).
+      def need_link_id
+        if (input_fields = (descendants('input') + descendants('select'))) != []
+          input_fields.each do |f|
+            return true if f.params[:name] =~ /\Al_/
+          end
+        elsif (show_fields = descendants('show')) != []
+          show_fields.each do |f|
+            return true if f.params[:attr] =~ /\Al_/
+          end
+        end
+        return false
+      end
+  end # Action
+end # Zafu