zena 0.16.9 → 1.0.0.beta1

data/lib/zena/use/recursion.rb

@@ -0,0 +1,71 @@
+module Zena
+  module Use
+    module Recursion
+      module ZafuMethods
+        def self.included(base)
+          base.before_process :recursion_prepare
+          base.after_process  :recursion_call
+        end
+
+        # recursion
+        def r_include
+          return '' if @context[:saved_template]
+          return super if @params[:template] || !@params[:part]
+          recursion = get_context_var('recursion', @params[:part])
+          return parser_error("no parent named '#{part}'") unless recursion
+          klass = recursion[:klass]
+          if klass.kind_of?(Array)
+            return parser_error("node context '#{node.klass}' incompatible with '[#{klass}]'")   unless node.list_context?
+            return parser_error("node context '[#{node.klass}]' incompatible with '[#{klass}]'") unless node.klass.first <= klass.first
+          else
+            return parser_error("node context '[#{node.klass}]' incompatible with '#{klass}'") if node.list_context?
+            return parser_error("node context '#{node.klass}' incompatible with '#{klass}'") unless node.klass <= klass
+          end
+          depth = get_context_var('recursion', 'depth')
+          "<% #{recursion[:proc_name]}.call(#{depth}+1,#{node}) %>"
+        end
+
+        private
+          def recursion_prepare
+            inc = descendant('include')
+            if inc && inc.params[:part] == @name
+              # We are called by a descendant, create method
+              proc_name = unique_name.gsub(/[^\w]/,'_')
+
+              if node.klass.kind_of?(Array)
+                if node.klass.first.name.blank?
+                  # Skip current anonymous class
+                  klass = [node.klass.first.superclass]
+                else
+                  klass = node.klass
+                end
+              else
+                if node.klass.name.blank?
+                  # Skip current anonymous class
+                  klass = node.klass.superclass
+                else
+                  klass = node.klass
+                end
+              end
+
+              set_context_var('recursion', @name, {:proc_name => proc_name, :klass => klass})
+              depth = get_var_name('recursion', 'depth')
+              out "<% #{proc_name} = Proc.new do |#{depth}, #{var}| %>"
+              out "<% next if #{depth} > #{inc.params[:depth] ? [inc.params[:depth].to_i,30].min : 5} -%>"
+              @recursion_call =  "<% end -%><% #{proc_name}.call(0,#{node}) %>"
+              @context[:node] = node.move_to(var, node.klass)
+              @var = nil # avoid reuse of our 'var' as new var name
+            end
+          end
+
+          def recursion_call(res)
+            if @recursion_call
+              res = res + @recursion_call
+              @recursion_call = nil
+            end
+            res
+          end
+      end # ZafuMethods
+    end # Recursion
+  end # Use
+end # Zena

data/lib/zena/use/refactor.rb

@@ -24,10 +24,6 @@ module Zena
 
         include Common
 
-        # Quote for html values (input tag, alt attribute, etc)
-        def fquote(text)
-          text.to_s.gsub("'",''')
-        end
 
         # TODO: see if this is still needed. Creates a pseudo random string to avoid browser side ajax caching
         def rnd
@@ -78,7 +74,7 @@ module Zena
 
         # TODO: is this still used ?
         def show(obj, sym, opt={})
-          return show_title(obj, opt) if sym == :v_title
+          return show_title(obj, opt) if sym == :title
           if opt[:as]
             key = "#{opt[:as]}#{obj.zip}.#{obj.version.number}"
             preview_for = opt[:as]
@@ -91,15 +87,15 @@ module Zena
             opt.delete(:text)
           else
             text = obj.send(sym)
-            if text.blank? && sym == :v_summary
-              text = obj.version.text
+            if text.blank? && sym == :summary
+              text = obj.text
               opt[:images] = false
             else
               opt.delete(:limit)
             end
           end
-          if [:v_text, :v_summary].include?(sym)
-            if obj.kind_of?(TextDocument) && sym == :v_text
+          if [:text, :summary].include?(sym)
+            if obj.kind_of?(TextDocument) && sym == :text
               lang = obj.content_lang
               lang = lang ? " lang='#{lang}'" : ""
               text = "<code#{lang} class='full'>#{text}</code>"
@@ -166,39 +162,30 @@ ENDTXT
           trad_list
         end
 
-        def change_lang(new_lang)
-          if visitor.is_anon?
-            {:overwrite_params => { :prefix => new_lang }}
-          else
-            {:overwrite_params => { :lang => new_lang }}
-          end
-        end
-
         # This lets helpers render partials
         # TODO: make sure this is the best way to handle this problem.
-
-        def render_to_string(*args)
-          controller ||= begin
-             # ==> this means render_to_string uses a view with everything ApplicationController has...
-            ApplicationController.new.instance_eval do
-              class << self
-                public :render, :render_to_string
-                attr_accessor :request, :response, :params
-              end
-
-              @request = ::ActionController::TestRequest.new
-              @response = ::ActionController::TestResponse.new
-
-              @params = {}
-              send(:initialize_current_url)
-              @template = @response.template = ::ActionView::Base.new(self.class.view_paths, {}, self)
-              @template.helpers.send :include, self.class.master_helper_module
-              self
-            end
-          end
-
-          controller.render(*args)
-        end
+        # def render_to_string(*args)
+        #   controller = self.controller || begin
+        #      # ==> this means render_to_string uses a view with everything ApplicationController has...
+        #     ApplicationController.new.instance_eval do
+        #       class << self
+        #         public :render, :render_to_string
+        #         attr_accessor :request, :response, :params
+        #       end
+        #
+        #       @request = ::ActionController::TestRequest.new
+        #       @response = ::ActionController::TestResponse.new
+        #
+        #       @params = {}
+        #       send(:initialize_current_url)
+        #       @template = @response.template = ::ActionView::Base.new(self.class.view_paths, {}, self)
+        #       @template.helpers.send :include, self.class.master_helper_module
+        #       self
+        #     end
+        #   end
+        #
+        #   controller.render(*args)
+        # end
 
       end # ViewMethods
     end # Refactor

data/lib/zena/use/relations.rb

@@ -5,15 +5,21 @@ module Zena
       # The ProxyLoader is used so that nested_attributes_alias resolution through node.send('link').send('friend')
       # makes it to the 'friend' relation proxy.
       class ProxyLoader
-        include RubyLess::SafeClass
+        include RubyLess
         safe_method [:[], String] => {:class => 'RelationProxy', :nil => true}
 
+        DUMMY = Class.new do
+          def other_id;   nil; end
+          def other_ids;  [];  end
+          def other_zids; [];  end
+        end.new.freeze
+
         def initialize(node)
           @node = node
         end
 
         def [](role)
-          @node.relation_proxy(role.to_s)
+          @node.relation_proxy(role.to_s) || DUMMY
         end
 
         def send(role)
@@ -21,7 +27,6 @@ module Zena
         end
 
         def method_missing(sym, *args)
-          deb sym, args
           nil
         end
       end
@@ -61,6 +66,7 @@ module Zena
           base.safe_method :l_status  => {:class => Number, :nil => true}
           base.safe_method :l_comment => {:class => String, :nil => true}
           base.safe_method :l_date    => {:class => Time,   :nil => true}
+          base.safe_method :link_id   => {:class => Number, :nil => true}
 
           base.nested_attributes_alias LINK_REGEXP => Proc.new {|obj, m| obj.relation_alias(m) }
           base.class_eval <<-END

data/lib/zena/use/rendering.rb

@@ -4,9 +4,15 @@ module Zena
   module Use
     module Rendering
       module ViewMethods
-        def render_js
-          return '' unless self.js_data
-          javascript_tag(self.js_data.join("\n"))
+        # Append javascript to the end of the page.
+        def render_js(in_html = true)
+          return '' unless js_data
+          js = js_data.join("\n")
+          if in_html
+            javascript_tag(js)
+          else
+            js
+          end
         end
       end
 
@@ -40,16 +46,18 @@ module Zena
           end
         end
 
-
         # TODO: test
         def render_404(exception)
           if Thread.current[:visitor]
             # page not found
             @node = current_site.root_node
+            zafu_node('@node', Project)
+
             respond_to do |format|
               format.html do
-                if File.exists?("#{SITES_ROOT}/#{current_site.host}/public/#{prefix}/404.html")
-                  render :file => "#{SITES_ROOT}/#{current_site.host}/public/#{prefix}/404.html", :status => '404 Not Found'
+                not_found = "#{SITES_ROOT}/#{current_site.host}/public/#{prefix}/404.html"
+                if File.exists?(not_found)
+                  render :text => File.read(not_found), :status => '404 Not Found'
                 else
                   render_and_cache :mode => '+notFound', :format => 'html', :cache_url => "/#{prefix}/404.html", :status => '404 Not Found'
                 end
@@ -59,7 +67,7 @@ module Zena
           else
             # site not found
             respond_to do |format|
-              format.html { render :file    => "#{Zena::ROOT}/app/views/sites/404.html", :status => '404 Not Found' }
+              format.html { render :text    => File.read("#{Zena::ROOT}/app/views/sites/404.html"), :status => '404 Not Found' }
               format.all  { render :nothing => true, :status => "404 Not Found" }
             end
           end
@@ -81,7 +89,7 @@ module Zena
         # END_MSG
 
           respond_to do |format|
-            format.html { render :file    => "#{Zena::ROOT}/app/views/nodes/500.html", :status => '500 Error' }
+            format.html { render :text    => File.read("#{Zena::ROOT}/app/views/nodes/500.html"), :status => '500 Error' }
             format.all  { render :nothing => true, :status => "500 Error" }
           end
         end
@@ -90,127 +98,38 @@ module Zena
           opts = {:skin=>@node[:skin], :cache=>true}.merge(options)
           opts[:mode  ] ||= params[:mode]
           opts[:format] ||= params[:format].blank? ? 'html' : params[:format]
-
           # cleanup before rendering
           params.delete(:mode)
-
           if opts[:format] != 'html'
+            # Document data or special renderings.
             content_type  = (Zena::EXT_TO_TYPE[opts[:format]] || ['application/octet-stream'])[0]
             template_path = template_url(opts)
             data = render_to_string(:file => template_path, :layout=>false)
             # TODO: use plugins...
-            if opts[:format] == 'pdf' && ((Zena::ENABLE_LATEX && data =~ /\A% (latex)\n/) || (Zena::ENABLE_FOP && data =~ /\A<\?(xml)/))
-              rendering_egine = $1 == 'xml' ? 'fop' : $1
-              # 1. find cached PDF. If found, send data.
-              if @node[:user_id] == visitor[:id]
-                # owner
-                filename = "u#{@node[:user_id]}.pdf"
-              else
-                # group
-                filename = "g#{@node[:rgroup_id]}.pdf"
-              end
-              filepath = @node.asset_path(filename)
-              if File.exist?(filepath)
-                # ok send data
-                data = File.read(filepath)
-                send_data( data , :filename=>@node.version.title, :type => content_type, :disposition=>'inline')
-              else
-                # generate pdf
-                FileUtils::mkpath(File.dirname(filepath)) unless File.exist?(File.dirname(filepath))
-
-                tempf = Tempfile.new("#{@node[:id]}_#{@node.version.lang}")
-                pdf_path = "#{tempf.path}.pdf"
-                failure  = nil
-                case rendering_egine
-                when 'latex'
-                  # Parse data to produce LateX
-                  data = data.gsub(/\\input/,'input not supported')
-                  data = data.gsub(/\\includegraphics(\*|)(\[[^\{]*\]|)\{([^\}]*?)(\.(\w+)|)\}/) do
-                    cmd_name = "includegraphics#{$1}"
-                    img_opts = $2
-                    img_id   = $3
-                    img_mode = $5
-                    if id = Node.translate_pseudo_id(img_id)
-                      img = secure(Image) { Image.find_by_id(id) }
-                      if img
-                        if img_mode
-                          format = Iformat[img_mode]
-                          img_path = img.version.content.filepath(format)
-                          if !File.exists?(img_path)
-                            img_file = img.c_file(format) # force rendering of image
-                            img_file.close
-                          end
-                        else
-                          img_path = img.version.content.filepath(nil)
-                        end
-                      end
-                      "\\includegraphics#{img_opts}{#{img_path}}"
-                    else
-                      "(image '#{img_id}' not found)"
-                    end
-                  end
-
-                  tempf = Tempfile.new("#{@node[:id]}_#{@node.version.lang}")
-                  tex_path = "#{tempf.path}.tex"
-                  pdf_path = "#{tempf.path}.pdf"
-                  File.open(tex_path, 'wb') { |f| f.syswrite(data) }
-                  if !system("pdflatex -halt-on-error -output-directory '#{File.dirname(tex_path)}' '#{tex_path}' &> '#{tempf.path}'")
-                    failure = tempf.read
-                  end
-                when 'fop'
-                  # FOP rendering
-                  xml_path  = "#{tempf.path}.xml"
-                  fo_path   = "#{tempf.path}.fo"
+            #if opts[:format] == 'pdf' && ((Zena::ENABLE_LATEX && data =~ /\A% (latex)\n/) || (Zena::ENABLE_FOP && data =~ /\A<\?(xml)/))
+             # render_pdf($1 == 'xml' ? 'fop' : $1)
 
-                  # write xml to file
-                  File.open(xml_path, 'wb') { |f| f.syswrite(data) }
-
-                  # find stylesheet path is in the zafu folder
-                  xsl_path = template_path.sub(/\.erb\Z/,'.xsl')
-                  raise Excpetion.new("xsl content not found #{xsl_path.inspect} while rendering #{template_path.inspect} (node #{@node[:id]})") unless File.exist?(xsl_path)
-
-                  # run xsl with 'xml' content and stylesheet ==> 'xsl-fo' file
-                  if !system("xsltproc -o '#{fo_path}' '#{xsl_path}' '#{xml_path}' &> '#{tempf.path}'")
-                    failure = tempf.read
-                  else
-                    # run fop ==> PDF
-                    if !system("fop '#{fo_path}' '#{pdf_path}' &> '#{tempf.path}'")
-                      failure = tempf.read
-                    end
-                  end
-                end
-
-                if !failure
-                  if data =~ /<!-- xsl_id:(\d+)/
-                    # make sure changes in xsl stylesheet expires cached PDF
-                    expire_with_ids = visitor.visited_node_ids + [$1.to_i]
-                  else
-                    expire_with_ids = visitor.visited_node_ids
-                  end
-
-                  data = File.read(pdf_path)
-                  # cache pdf data
-                  filepath = filepath[(SITES_ROOT.size)..-1]
-                  secure!(CachedPage) { CachedPage.create(:expire_after => nil, :path => filepath, :content_data => data, :node_id => @node[:id], :expire_with_ids => expire_with_ids) }
-                  send_data( data , :filename=>@node.version.title, :type => content_type, :disposition=>'inline')
-                else
-                  # failure: send log
-                  send_data( failure , :filename=>"#{@node.version.title} - error", :type => 'text/plain', :disposition=>'inline')
-                end
-                #system("rm -rf #{tempf.path.inspect} #{(tempf.path + '.*').inspect}")
+            if opts[:format] == 'pdf'
+              Data2pdf.engine =  'Xhtml2pdf'
+              disposition = params['disposition']   || 'inline'
+              if params.keys.include?("debug")
+                render :text => data
+              else
+                pdf = Data2pdf.render(data)
+                send_data(pdf,  :type=> 'application/pdf', :disposition=>disposition)
               end
             else
-              # no post-rendering
+              # send data inline
               filepath = nil
-              send_data( data , :filename=>@node.version.title, :type => content_type, :disposition=>'inline')
+              send_data( data , :filename=>@node.title, :type => content_type, :disposition=>'inline')
             end
-            cache_page(:content_data => (failure || data), :content_path => filepath) if opts[:cache]
+
+            cache_page(:content_data => data, :content_path => filepath) if opts[:cache]
           else
             # html
             render :file => template_url(opts), :layout=>false, :status => opts[:status]
             cache_page(:url => opts[:cache_url]) if opts[:cache]
           end
-
         end
 
         # Cache page content into a static file in the current sites directory : SITES_ROOT/test.host/public
@@ -241,9 +160,10 @@ module Zena
           path = ((path.empty? || path == "/") ? "/index" : URI.unescape(path))
           ext = params[:format].blank? ? 'html' : params[:format]
           path << ".#{ext}" unless path =~ /\.#{ext}(\?\d+|)$/
-          if cachestamp_format?(params['format'])
-            path << "?" << make_cachestamp(@node, params['mode'])
-          end
+          # Do not cache filename with query or apache will not see it !
+          # if cachestamp_format?(params['format'])
+          #   path << "?" << make_cachestamp(@node, params['mode'])
+          # end
           path
         end
 
@@ -251,7 +171,7 @@ module Zena
         # and then into default. This action is also responsible for setting a default @title_for_layout.
         def admin_layout
           @title_for_layout ||= "#{params[:controller]}/#{params[:action]}"
-          template_url(:mode=>'+adminLayout')
+          template_url(:mode => '+adminLayout')
         end
 
         # TODO: test
@@ -260,6 +180,113 @@ module Zena
           template_url(:mode=>'+popupLayout')
         end
 
+        # Use the current visitor as master node.
+        def visitor_node
+          @node = visitor.contact
+          zafu_node('@node', BaseContact)
+        end
+
+        def render_pdf(rendering_egine)
+          # 1. find cached PDF. If found, send data.
+          if @node[:user_id] == visitor[:id]
+            # owner
+            filename = "u#{@node[:user_id]}.pdf"
+          else
+            # group
+            filename = "g#{@node[:rgroup_id]}.pdf"
+          end
+          filepath = @node.asset_path(filename)
+          if File.exist?(filepath)
+            # ok send data
+            data = File.read(filepath)
+            send_data( data , :filename=>@node.title, :type => content_type, :disposition=>'inline')
+          else
+            # generate pdf
+            FileUtils::mkpath(File.dirname(filepath)) unless File.exist?(File.dirname(filepath))
+
+            tempf = Tempfile.new("#{@node[:id]}_#{@node.version.lang}")
+            pdf_path = "#{tempf.path}.pdf"
+            failure  = nil
+            case rendering_egine
+            when 'latex'
+              # Parse data to produce LateX
+              data = data.gsub(/\\input/,'input not supported')
+              data = data.gsub(/\\includegraphics(\*|)(\[[^\{]*\]|)\{([^\}]*?)(\.(\w+)|)\}/) do
+                cmd_name = "includegraphics#{$1}"
+                img_opts = $2
+                img_id   = $3
+                img_mode = $5
+                if id = Node.translate_pseudo_id(img_id)
+                  img = secure(Image) { Image.find_by_id(id) }
+                  if img
+                    if img_mode
+                      format = Iformat[img_mode]
+                      img_path = img.filepath(format)
+                      if !File.exists?(img_path)
+                        img_file = img.file(format) # force rendering of image
+                        img_file.close
+                      end
+                    else
+                      img_path = img.filepath(nil)
+                    end
+                  end
+                  "\\includegraphics#{img_opts}{#{img_path}}"
+                else
+                  "(image '#{img_id}' not found)"
+                end
+              end
+
+              tempf = Tempfile.new("#{@node[:id]}_#{@node.version.lang}")
+              tex_path = "#{tempf.path}.tex"
+              pdf_path = "#{tempf.path}.pdf"
+              File.open(tex_path, 'wb') { |f| f.syswrite(data) }
+              if !system("pdflatex -halt-on-error -output-directory '#{File.dirname(tex_path)}' '#{tex_path}' &> '#{tempf.path}'")
+                failure = tempf.read
+              end
+            when 'fop'
+              # FOP rendering
+              xml_path  = "#{tempf.path}.xml"
+              fo_path   = "#{tempf.path}.fo"
+
+              # write xml to file
+              File.open(xml_path, 'wb') { |f| f.syswrite(data) }
+
+              # find stylesheet path is in the zafu folder
+              xsl_path = template_path.sub(/\.erb\Z/,'.xsl')
+              raise Excpetion.new("xsl content not found #{xsl_path.inspect} while rendering #{template_path.inspect} (node #{@node[:id]})") unless File.exist?(xsl_path)
+
+              # run xsl with 'xml' content and stylesheet ==> 'xsl-fo' file
+              if !system("xsltproc -o '#{fo_path}' '#{xsl_path}' '#{xml_path}' &> '#{tempf.path}'")
+                failure = tempf.read
+              else
+                # run fop ==> PDF
+                if !system("fop '#{fo_path}' '#{pdf_path}' &> '#{tempf.path}'")
+                  failure = tempf.read
+                end
+              end
+            end
+
+            if !failure
+              if data =~ /<!-- xsl_id:(\d+)/
+                # make sure changes in xsl stylesheet expires cached PDF
+                expire_with_ids = visitor.visited_node_ids + [$1.to_i]
+              else
+                expire_with_ids = visitor.visited_node_ids
+              end
+
+              data = File.read(pdf_path)
+              # cache pdf data
+              filepath = filepath[(SITES_ROOT.size)..-1]
+              secure!(CachedPage) { CachedPage.create(:expire_after => nil, :path => filepath, :content_data => data, :node_id => @node[:id], :expire_with_ids => expire_with_ids) }
+              send_data( data , :filename=>@node.title, :type => content_type, :disposition=>'inline')
+            else
+              # failure: send log
+              send_data( failure , :filename=>"#{@node.title} - error", :type => 'text/plain', :disposition=>'inline')
+            end
+            #system("rm -rf #{tempf.path.inspect} #{(tempf.path + '.*').inspect}")
+          end
+        end
+
       end # ControllerMethods
     end # Rendering
   end # Use