zena 0.16.9 → 1.0.0.beta1

data/lib/zena/info.rb

@@ -9,7 +9,6 @@ ZENA_CALENDAR_LANGS = ["en", "fr", "de"] # FIXME: build this dynamically from ex
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '0.16.9'
-  REVISION = 1336
+  VERSION = '1.0.0.beta1'
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/integration/test_case.rb

@@ -0,0 +1,70 @@
+module Zena
+  module Integration
+    class MockConnection < ActiveResource::Connection
+      def initialize(test, site = 'http://test.host')
+        @test = test
+        super site
+      end
+
+      def logger
+        Page.logger
+      end
+
+      # Mock request to remote service by doing a call to the integration test.
+      def request(method, path, *arguments)
+        case method
+        when :get, :delete, :head
+          headers = arguments.first
+          params  = {}
+        else
+          headers = arguments.last
+          # The params here contain an xml string representing the request body.
+          params  = arguments.first
+        end
+        logger.info "#{method.to_s.upcase} #{site.scheme}://#{site.host}#{path} (#{arguments.last.inspect})" if logger
+        result = nil
+        ms = Benchmark.ms do
+          @test.send(method, "#{site.scheme}://#{site.host}#{path}", params, headers)
+          result = @test.response
+        end
+        logger.info "--> %d %s (%d %.0fms)" % [result.code, result.message, result.body ? result.body.length : 0, ms] if logger
+        handle_response(result)
+      rescue Timeout::Error => e
+        raise TimeoutError.new(e.message)
+      end
+    end # MockConnection
+
+
+    class TestCase < ActionController::IntegrationTest
+      include Zena::Use::Fixtures
+
+      def open_session
+        sess = super
+
+        sess.extend Zena::Acts::Secure
+        sess.extend Zena::Use::TestHelper
+
+        yield sess if block_given?
+        sess
+      end
+
+      def init_test_connection!
+        $test_connection = MockConnection.new(self)
+      end
+    end # TestCase
+
+    module MockResource
+      def self.included(base)
+        base.class_eval do
+          def self.connection(*args)
+            $test_connection.tap do |conn|
+              conn.site     = self.site
+              conn.password = self.password
+              conn.user     = self.user
+            end
+          end
+        end
+      end
+    end # MockResource
+  end # Integration
+end # Zena

data/lib/zena/loader/yaml_loader.rb

@@ -0,0 +1,80 @@
+require 'active_record/fixtures'
+module Zena
+
+  # mass yaml loader for ActiveRecord (a single file can contain different classes)
+  module Loader
+    class YamlLoader < ActiveRecord::Base
+      class << self
+        def set_table(tbl)
+          set_table_name tbl
+          reset_column_information
+        end
+
+        def create_or_update(opts)
+          h = {}
+          opts.each_pair do |k,v|
+            if :type == k
+              h['_type_'] = v
+            else
+              h[k.to_s] = v
+            end
+          end
+
+          if h['id'] && obj = find_by_id(h['id'])
+            res = []
+            h.each do |k,v|
+              res << "`#{k}` = #{v ? v.inspect : 'NULL'}"
+            end
+            connection.execute "UPDATE #{table_name}  SET #{res.join(', ')} WHERE id = #{h['id']}"
+          else
+            keys   = []
+            values = []
+            h.each do |k,v|
+              keys   << "`#{k}`"
+              values << (v ? v.inspect : 'NULL')
+            end
+            connection.execute "INSERT INTO #{table_name} (#{keys.join(', ')}) VALUES (#{values.join(', ')})"
+          end
+        end
+      end
+
+      def site_id=(i)
+        self[:site_id] = i
+      end
+
+      def _type_=(t)
+        self.type = t
+      end
+    end
+
+    # Is this used ?
+    def self.load_file(filepath)
+      raise Exception.new("Invalid filepath for loader (#{filepath})") unless ((filepath =~ /.+\.yml$/) && File.exist?(filepath))
+      base_objects = {}
+      YAML::load_documents( File.open( filepath ) ) do |doc|
+        doc.each do |elem|
+          list = elem[1].map do |l|
+            hash = {}
+            l.each_pair do |k, v|
+              hash[k.to_sym] = v
+            end
+            hash
+          end
+          tbl = elem[0].to_sym
+          if base_objects[tbl]
+            base_objects[tbl] += list
+          else
+            base_objects[tbl] = list
+          end
+        end
+      end
+
+      base_objects.each_pair do |tbl, list|
+        YamlLoader.set_table(tbl.to_s)
+        list.each do |record|
+          YamlLoader.create_or_update(record)
+        end
+      end
+    end
+  end
+end

data/lib/zena/migrator.rb

@@ -51,11 +51,11 @@ module Zena
         si_table = ActiveRecord::Base.table_name_prefix + 'schema_info' + ActiveRecord::Base.table_name_suffix
         if !connection.tables.include?(sm_table) && connection.tables.include?(old_bricks_info_table_name)
           v_brick, v_schema = 0, 0
-          connection.select_all("SELECT `version` FROM #{old_bricks_info_table_name} WHERE brick = 'zena'", "Bricks_info fix").each do |record|
+          connection.select_all("SELECT version FROM #{old_bricks_info_table_name} WHERE brick = 'zena'", "Bricks_info fix").each do |record|
             v_brick = record['version'].to_i
           end
           if v_brick > 0
-            connection.select_all("SELECT `version` FROM #{si_table}", "Bricks_info fix").each do |record|
+            connection.select_all("SELECT version FROM #{si_table}", "Bricks_info fix").each do |record|
               v_schema = record['version'].to_i
             end
             if v_schema < v_brick

data/lib/zena/parser.rb

@@ -14,11 +14,10 @@ module Zena
         @strings = strings
       end
 
-      def get_template_text(opts)
-        src    = opts[:src]
-        folder = (opts[:current_folder] && opts[:current_folder] != '') ? opts[:current_folder][1..-1].split('/') : []
+      def get_template_text(src, current_dir)
+        current_dir = (current_dir && current_dir != '') ? current_dir[1..-1].split('/') : []
         src = src[1..-1] if src[0..0] == '/' # just ignore the 'relative' or 'absolute' tricks.
-        url = (folder + src.split('/')).join('_')
+        url = (current_dir + src.split('/')).join('_')
         if test = @strings[url]
           return [test['src'], url.split('_').join('/')]
         else
@@ -49,26 +48,26 @@ module Zena
     end # DummyHelper
 
     class Processor
-      include RubyLess::SafeClass
+      include RubyLess
       attr_accessor :text, :method, :pass, :options, :blocks, :params, :ids, :defined_ids, :parent
 
       class << self
         def new_with_url(url, opts={})
           helper = opts[:helper] || ParserModule::DummyHelper.new
-          text, absolute_url = self.get_template_text(url,helper)
-          current_folder     = absolute_url ? absolute_url.split('/')[1..-2].join('/') : nil
-          self.new(text, :helper=>helper, :current_folder=>current_folder, :included_history=>[absolute_url], :root => url)
+          text, absolute_url = self.get_template_text(url, helper)
+          current_dir     = absolute_url ? absolute_url.split('/')[1..-2].join('/') : nil
+          self.new(text, :helper=>helper, :current_dir=>current_dir, :included_history=>[absolute_url], :root => url)
         end
 
         # Retrieve the template text in the current folder or as an absolute path.
         # This method is used when 'including' text
-        def get_template_text(url, helper, current_folder=nil)
+        def get_template_text(url, helper, current_dir=nil)
 
-          if (url[0..0] != '/') && current_folder
-            url = "#{current_folder}/#{url}"
+          if (url[0..0] != '/') && current_dir
+            url = "#{current_dir}/#{url}"
           end
 
-          res = helper.send(:get_template_text, :src=>url, :current_folder=>'')
+          res = helper.send(:get_template_text, url, nil)
           return ["<span class='parser_error'>[include] template '#{url}' not found</span>", nil, nil] unless res
           text, url, node = *res
           url = "/#{url}" unless url[0..0] == '/' # has to be an absolute path
@@ -143,7 +142,7 @@ module Zena
         else
           @context = context
         end
-        @result  = ""
+        @result  = ''
         return @result unless before_render
         @pass    = {} # used to pass information to the parent
         res = nil
@@ -238,19 +237,22 @@ module Zena
         # fetch text
         @options[:included_history] ||= []
 
-        included_text, absolute_url = self.class.get_template_text(@params[:template], @options[:helper], @options[:current_folder])
+        included_text, absolute_url = self.class.get_template_text(@params[:template], @options[:helper], @options[:current_dir])
 
-        if absolute_url
+        if included_text
           absolute_url += "::#{@params[:part].gsub('/','_')}" if @params[:part]
           absolute_url += "??#{@options[:part].gsub('/','_')}" if @options[:part]
           if @options[:included_history].include?(absolute_url)
             included_text = "<span class='parser_error'>[include] infinity loop: #{(@options[:included_history] + [absolute_url]).join(' --&gt; ')}</span>"
           else
             included_history  = @options[:included_history] + [absolute_url]
-            current_folder    = absolute_url.split('/')[1..-2].join('/')
+            current_dir    = absolute_url.split('/')[1..-2].join('/')
           end
+        else
+          return "<span class='parser_error'>[include] template '#{url}' not found</span>"
         end
-        res = self.class.new(included_text, :helper=>@options[:helper], :current_folder=>current_folder, :included_history=>included_history, :part => @params[:part], :root=>@options[:root]) # we set :part to avoid loop failure when doing self inclusion
+
+        res = self.class.new(included_text, :helper=>@options[:helper], :current_dir=>current_dir, :included_history=>included_history, :part => @params[:part], :root=>@options[:root]) # we set :part to avoid loop failure when doing self inclusion
 
         if @params[:part]
           if iblock = res.ids[@params[:part]]

data/lib/zena/parser/zafu_rules.rb

@@ -59,6 +59,13 @@ module Zena
         end
       end
 
+      # Dummy method. We only insert the error here so that 'r_include' can be overwriten
+      # to enable recursion.
+      def r_include
+        parser_error("missing 'template' attribute", 'include')
+      end
+
+
       def before_parse(text)
         text.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
       end

data/lib/zena/parser/zafu_tags.rb

@@ -125,7 +125,7 @@ module Zena
               $&
             else
               quote   = $1
-              new_src = @options[:helper].send(:template_url_for_asset, :current_folder=>@options[:current_folder], :src => $2)
+              new_src = @options[:helper].send(:template_url_for_asset, :current_dir=>@options[:current_dir], :src => $2)
               "url(#{quote}#{new_src}#{quote})"
             end
           end
@@ -136,7 +136,7 @@ module Zena
 
         src = @params[key]
         if src && src[0..0] != '/' && src[0..6] != 'http://'
-          @params[key] = @options[:helper].send(:template_url_for_asset, :src => src, :current_folder => @options[:current_folder], :type => type)
+          @params[key] = @options[:helper].send(:template_url_for_asset, :src => src, :current_dir => @options[:current_dir], :type => type)
         end
 
         res   = "<#{@html_tag}#{params_to_html(@params)}"

data/lib/zena/parser/zazen_rules.rb

@@ -204,7 +204,7 @@ module Zena
             else
               id = "#{node.zip}#{mode_format}"
               if format == '.data'
-                title = "#{node.fullpath}#{mode}.#{node.c_ext}#{dash}"
+                title = "#{node.fullpath}#{mode}.#{node.ext}#{dash}"
               else
                 title = "#{node.fullpath}#{mode_format}"
               end
@@ -344,10 +344,10 @@ module Zena
               lang = ''
             end
             #divparams << "class='code'" unless params =~ /class\s*=/
-            divparams.unshift('') if divparams != []
-            @escaped_code << [lang, text]
+            divparams = nil if divparams.empty?
+            @escaped_code << [lang, text, divparams]
             block_counter += 1
-            "<pre#{divparams.join(' ')}>\\ZAZENBLOCKCODE#{block_counter}ZAZENBLOCKCODE\\</pre>"
+            "\\ZAZENBLOCKCODE#{block_counter}ZAZENBLOCKCODE\\"
           end
         end
 
@@ -365,19 +365,8 @@ module Zena
           if @translate_ids
             @escaped_code[$1.to_i]
           else
-            lang, code = *(@escaped_code[$1.to_i])
-            if lang != ''
-              code_tag = "<code class='#{lang}'>"
-            else
-              code_tag = '<code>'
-            end
-            if Syntax::SYNTAX[lang] != Syntax::Default && @context[:pretty_code]
-              convertor = Syntax::Convertors::HTML.for_syntax(lang)
-              "#{code_tag}#{convertor.convert( code, false )}</code>"
-            else
-              RedCloth.new("#{code_tag}#{code}</code>").to_html
-            end
-            #code_tag + code.gsub(/\n( *)/m) { "<br/>\n" + ('&nbsp;' * $1.length) } + '</code>'
+            code_lang, code, pre_params = @escaped_code[$1.to_i]
+            Zena::CodeSyntax.new(code, @context[:pretty_code] ? code_lang : nil).to_html(:pre_params => pre_params)
           end
         end
 
@@ -386,19 +375,10 @@ module Zena
           if @translate_ids
             '@'+code+'@'
           else
-            if code =~ /^(\w+)\|/ && Syntax::SYNTAX[$1]
-              lang = $1
-              if @context[:pretty_code]
-                convertor = Syntax::Convertors::HTML.for_syntax(lang)
-                res = convertor.convert( code[(lang.length+1)..-1], false )
-              else
-                res = code[(lang.length+1)..-1]
-              end
-              res = "<code class='#{lang}'>#{res}</code>"
-            else
-              res = RedCloth.new("<code>#{code}</code>").to_html
+            if code =~ /^(\w+)\|(.*)$/
+              code_lang, code = $1, $2
             end
-            res
+            Zena::CodeSyntax.new(code, @context[:pretty_code] ? code_lang : nil).to_html(:inline => true)
           end
         end
       end

data/lib/zena/parser/zena_rules.rb

@@ -9,11 +9,11 @@ module Zena
           @method = 'show'
           @params[:attr_or_date] = $1
         elsif @method =~ /^\{(.*)\}$/
-          # do='{v_text}'
+          # do='{text}'
           @method = 'zazen'
           @params[:attr] = $1
         elsif @method =~ /\A(\w+)\s+(\w+)\s+(.+)$/
-          # 'pages where name ...'
+          # 'pages where node_name ...'
           @params[:select] = @method
           @method = 'context'
         end

data/lib/zena/refactor/act_as_content.rb

@@ -0,0 +1,6 @@
+module Zena
+  module Refactor
+    module ActAsContent
+    end
+  end
+end

data/lib/zena/routes.rb

@@ -4,16 +4,19 @@ module Zena
       home       ':prefix',  :controller => 'nodes',    :action => 'index',  :prefix => /[a-zA-Z]{0,2}/
       not_found  ':prefix/404.html',  :controller => 'nodes',    :action => 'not_found', :prefix => /\w\w/
       login      'login',  :controller => 'user_sessions',  :action => 'new',    :requirements => { :method => :get  }
-      logout     'logout',  :controller => 'user_sessions',  :action => 'destroy'
+      logout     'logout', :controller => 'user_sessions',  :action => 'destroy'
+      rescue_    'rescue',   :controller => 'users', :action => 'rescue'
+      dev_skin   'dev_skin', :controller => 'users', :action => 'dev_skin'
 
       upload_progress 'upload_progress', :controller => 'documents', :action => 'upload_progress'
 
       resource  :session, :controller => "user_sessions"   # singleton resource
       resources :pings
-      resources :users, :member => { :preferences => :get, :swap_dev => :get }
+      resources :users, :member => { :preferences => :get }
       resources :groups
       resources :iformats
 
+
       connect ':prefix/*path?:cachestamp',  :controller => 'nodes', :action => 'show', :prefix => /\w\w/, :cachestamp => /\d+/
       connect ':prefix/*path',  :controller => 'nodes', :action => 'show', :prefix => /\w\w/
       connect 'dav/*path_info', :controller => 'nodes', :action => 'webdav'
@@ -53,8 +56,11 @@ module Zena
 
       resources :relations
       resources :virtual_classes, :collection => {:import => :post}
+      resources :columns,         :collection => {:import => :post}
+
       resources :sites,
-        :member     => { :clear_cache => :post }
+                    :member     => { :clear_cache => :post }
+
       resources :comments,
                     :collection => { :empty_bin => :delete },
                     :member => { :remove  => :put,

data/lib/zena/site_worker.rb

@@ -0,0 +1,48 @@
+module Zena
+  class SiteWorker < Struct.new(:site_id, :action, :page)
+    include Zena::Acts::Secure
+
+    # Execute operations on 50 nodes at a time
+    CHUNK_SIZE = 50
+
+    def self.perform(site, action, page = 1)
+      action = new(site.id, action, page)
+
+      if Bricks::CONFIG['worker']
+        Delayed::Job.enqueue action
+      else
+        # No worker: do it now
+        action.perform(site)
+      end
+    end
+
+    def perform(site = nil)
+      if site.nil?
+        site ||= Site.find(site_id)
+        Thread.current[:visitor] = site.anon
+      end
+
+      if nodes = get_nodes
+        # Register next one (if we are lucky and have many workers, we can parallelize work)
+        Zena::SiteWorker.perform(site, action, page + 1)
+
+        # do action on nodes
+        site.send(action, nodes, page, page_count)
+      end
+    end
+
+    def get_nodes
+      nodes = Node.find(:all,
+        :conditions => ['site_id = ?', site_id],
+        :limit  => CHUNK_SIZE,
+        :offset => (page - 1) * CHUNK_SIZE,
+        :order => 'id ASC'
+      )
+      secure_result(nodes)
+    end
+
+    def page_count
+      (Node.count(:conditions => ['site_id = ?', site_id]) / CHUNK_SIZE) + 1
+    end
+  end
+end # Zena