zena 1.0.0.rc2 → 1.0.0.rc3

data/lib/zena/code_syntax.rb

@@ -2,7 +2,9 @@ require 'rubygems'
 require 'syntax/convertors/html'
 require 'syntax/lang/xml'
 require 'syntax/lang/ruby'
+require 'syntax/lang/yaml'
 require 'syntax'
+require 'redcloth'
 
 module Zena
   class CodeSyntax
@@ -128,172 +130,173 @@ module Syntax
       end
     end
   end # Convertors
-end # CodeSyntax
 
-class ZafuTokenizer < Syntax::Tokenizer
-  def step
-    if ztag = scan(/\A<\/?r:[^>]+>/)
-      ztag =~ /<(\/?)r:([\w_]+)([^>]*?)(\/?)>/
-      start_group :tag, "<#{$1}r:"
-      start_group :ztag, $2
-      trailing = $4
-      params = parse_params($3)
-      params.each do |k,v|
-        append " "
-        if v =~ /[^\\]'/
-          v = "\"#{v}\""
-        else
-          v = "'#{v}'"
+  class ZafuTokenizer < Tokenizer
+    METHOD = "[\\w]+\\??"
+    def step
+      if ztag = scan(/\A<\/?r:[^>]+>/)
+        ztag =~ /<(\/?)r:(#{METHOD})([^>]*?)(\/?)>/
+        start_group :tag, "<#{$1}r:"
+        start_group :ztag, $2
+        trailing = $4
+        params = parse_params($3)
+        params.each do |k,v|
+          append " "
+          if v =~ /[^\\]'/
+            v = "\"#{v}\""
+          else
+            v = "'#{v}'"
+          end
+          start_group :param, k.to_s
+          append '='
+          start_group :value, v
         end
-        start_group :param, k.to_s
-        append '='
-        start_group :value, v
-      end
-      start_group :tag, "#{trailing}>"
-    elsif dotag = scan(/<(\w+)([^>]*?)do\s*=('|")([^\3]*?[^\\])\3([^>]*?)(\/?)>/)
-        if dotag =~ /\A<(\w+)([^>]*?)do\s*=('|")([^\3]*?[^\\])\3([^>]*?)(\/?)>/
-          start_group :tag, "<#{$1}#{$2}"
-          start_group :tag, "do="
-          start_group :ztag, "'#{$4}'"
-          trailing = $6
-          params = parse_params($5)
-          params.each do |k,v|
-            append " "
-            if v =~ /[^\\]'/
-              v = "\"#{v}\""
-            else
-              v = "'#{v}'"
-            end
-            if k == :do
-              start_group :tag, k.to_s
-              append '='
-              start_group :ztag, v
-            else
-              start_group :param, k.to_s
-              append '='
-              start_group :value, v
+        start_group :tag, "#{trailing}>"
+      elsif dotag = scan(/<(\w+)([^>]*?)do\s*=('|")([^\3]*?[^\\])\3([^>]*?)(\/?)>/)
+          if dotag =~ /\A<(\w+)([^>]*?)do\s*=('|")([^\3]*?[^\\])\3([^>]*?)(\/?)>/
+            start_group :tag, "<#{$1}#{$2}"
+            start_group :tag, "do="
+            start_group :ztag, "'#{$4}'"
+            trailing = $6
+            params = parse_params($5)
+            params.each do |k,v|
+              append " "
+              if v =~ /[^\\]'/
+                v = "\"#{v}\""
+              else
+                v = "'#{v}'"
+              end
+              if k == :do
+                start_group :tag, k.to_s
+                append '='
+                start_group :ztag, v
+              else
+                start_group :param, k.to_s
+                append '='
+                start_group :value, v
+              end
             end
+            start_group :tag, "#{trailing}>"
+          else
+            start_group :normal, dotag
           end
-          start_group :tag, "#{trailing}>"
-        else
-          start_group :normal, dotag
-        end
-    elsif html = scan(/\A<\/?[^>]+>/)
-      html =~/<\/?([^>]+)>/
-      start_group :tag, html
-    else
-      start_group :normal, scan(/./m)
+      elsif html = scan(/\A<\/?[^>]+>/)
+        html =~/<\/?([^>]+)>/
+        start_group :tag, html
+      else
+        start_group :normal, scan(/./m)
+      end
     end
-  end
-end # ZafuTokenizer
-Syntax::SYNTAX['zafu'] = ZafuTokenizer
+  end # ZafuTokenizer
+  SYNTAX['zafu'] = ZafuTokenizer
 
-class ErbTokenizer < Syntax::Tokenizer
-  def step
-    if methods = scan(/<%[^>]+%>/m)
-      methods =~ /<%(=?)([^>]+?)(-?)%>/m
-      start_group :punct, "<%#{$1}"
-      trailing = $3
-      sub_lang :expr, "<code class='ruby'>#{Syntax::Convertors::HTML.for_syntax('ruby').convert($2, false)}</code>"
-      start_group :punct, "#{trailing}%>"
-    elsif html = scan(/<\/?[^>]+>/)
-      html =~/<\/?([^>]+)>/
-      start_group :tag, html
-    else
-      start_group :normal, scan(/./m)
+  class ErbTokenizer < Tokenizer
+    def step
+      if methods = scan(/<%[^>]+%>/m)
+        methods =~ /<%(=?)([^>]+?)(-?)%>/m
+        start_group :punct, "<%#{$1}"
+        trailing = $3
+        sub_lang :expr, "<code class='ruby'>#{Convertors::HTML.for_syntax('ruby').convert($2, false)}</code>"
+        start_group :punct, "#{trailing}%>"
+      elsif html = scan(/<\/?[^>]+>/)
+        html =~/<\/?([^>]+)>/
+        start_group :tag, html
+      else
+        start_group :normal, scan(/./m)
+      end
     end
-  end
-end # ErbTokenizer
-Syntax::SYNTAX['erb'] = ErbTokenizer
+  end # ErbTokenizer
+  SYNTAX['erb'] = ErbTokenizer
 
-class CssTokenizer < Syntax::Tokenizer
-  def step
-    if comments = scan(/\s*\/\*.*?\*\/\s*/m)
-      start_group :comment, comments
-    elsif variables = scan(/[^\{]*?\{[^\}]*?\}/m)
-      variables =~ /(\s*)([^\{]*?)\{([^\}]*?)\}/m
-      start_group :normal, $1
-      vars = $3
-      selectors = $2.split(',').map { |s| s.strip }
-      selectors.each_index do |i|
-        selectors[i].gsub('.','|.').gsub('#','|#').split('|').each do |g|
-          g = g.split(' ')
-          g.each do |s|
-            if s[0..0] == '#'
-              start_group :id, s
-            elsif s[0..0] == '.'
-              start_group :class, s
-            else
-              start_group :tag, s
+  class CssTokenizer < Tokenizer
+    def step
+      if comments = scan(/\s*\/\*.*?\*\/\s*/m)
+        start_group :comment, comments
+      elsif variables = scan(/[^\{]*?\{[^\}]*?\}/m)
+        variables =~ /(\s*)([^\{]*?)\{([^\}]*?)\}/m
+        start_group :normal, $1
+        vars = $3
+        selectors = $2.split(',').map { |s| s.strip }
+        selectors.each_index do |i|
+          selectors[i].gsub('.','|.').gsub('#','|#').split('|').each do |g|
+            g = g.split(' ')
+            g.each do |s|
+              if s[0..0] == '#'
+                start_group :id, s
+              elsif s[0..0] == '.'
+                start_group :class, s
+              else
+                start_group :tag, s
+              end
+              start_group :normal, ' '
             end
-            start_group :normal, ' '
+          end
+          unless i == selectors.size - 1
+            start_group :punct, ', '
           end
         end
-        unless i == selectors.size - 1
-          start_group :punct, ', '
-        end
-      end
-      start_group :punct, '{ '
+        start_group :punct, '{ '
 
-      rest = vars
-      while rest != '' && rest =~ /([\w-]+)\s*:\s*(.*?)\s*;(.*)/m
-        start_group :variable, $1
-        start_group :punct, ':'
-        start_group :normal, $2
-        start_group :punct, '; '
-        rest = $3
+        rest = vars
+        while rest != '' && rest =~ /([\w-]+)\s*:\s*(.*?)\s*;(.*)/m
+          start_group :variable, $1
+          start_group :punct, ':'
+          start_group :normal, $2
+          start_group :punct, '; '
+          rest = $3
+        end
+        start_group :punct, "#{rest}}"
+      else
+        start_group :normal, scan(/./m)
       end
-      start_group :punct, "#{rest}}"
-    else
-      start_group :normal, scan(/./m)
     end
-  end
-end # CssTokenizer
-Syntax::SYNTAX['css'] = CssTokenizer
+  end # CssTokenizer
+  SYNTAX['css'] = CssTokenizer
 
-class ShTokenizer < Syntax::Tokenizer
-  def step
-    if variables = scan(/\$\w+/)
-      start_group :variable, variables
-    elsif start = scan(/# \S+/)
-      start_group :punct, '# '
-      start_group :method, start[2..-1]
-    elsif start = scan(/\$ \S+/)
-      start_group :root, '$ '
-      start_group :method, start[2..-1]
-    else
-      start_group :normal, scan(/./m)
+  class ShTokenizer < Tokenizer
+    def step
+      if variables = scan(/\$\w+/)
+        start_group :variable, variables
+      elsif start = scan(/# \S+/)
+        start_group :punct, '# '
+        start_group :method, start[2..-1]
+      elsif start = scan(/\$ \S+/)
+        start_group :root, '$ '
+        start_group :method, start[2..-1]
+      else
+        start_group :normal, scan(/./m)
+      end
     end
-  end
-end # ShTokenizer
-Syntax::SYNTAX['sh'] = ShTokenizer
+  end # ShTokenizer
+  SYNTAX['sh'] = ShTokenizer
 
-class PseudoSqlTokenizer < Syntax::Tokenizer
-  def step
-    if @state.nil? and method = scan(/\w+/)
-      start_group :method, method
-      @state = :method
-    elsif @state == :in and context = scan(/\w+/)
-      start_group :context, context
-      @state = :context
-    elsif keyword = scan(/\bin\b/)
-      start_group :context, keyword
-      @state = :in
-    elsif keyword = scan(/\bfrom\b/)
-      start_group :sub, keyword
-      @state = nil
-    elsif keyword = scan(/\bwhere|group|order|limit|offset|paginate\b/)
-      start_group :keyword, keyword
-    elsif punct  = scan(/\b>=|<=|<>|<|=|>|not\s+like|like|lt|le|eq|ne|ge|gt\b/)
-      start_group :punct, punct
-    elsif string = scan(/("|')[^'"]*\1/)
-      string =~ /("|')([^'"]*)\1/
-      start_group :punct, $1
-      start_group :string, $2
-      start_group :punct, $1
-    else
-      start_group :normal, scan(/./m)
+  class PseudoSqlTokenizer < Tokenizer
+    def step
+      if @state.nil? and method = scan(/\w+/)
+        start_group :method, method
+        @state = :method
+      elsif @state == :in and context = scan(/\w+/)
+        start_group :context, context
+        @state = :context
+      elsif keyword = scan(/\bin\b/)
+        start_group :context, keyword
+        @state = :in
+      elsif keyword = scan(/\bfrom\b/)
+        start_group :sub, keyword
+        @state = nil
+      elsif keyword = scan(/\bwhere|select|group\s+by|having|order|limit|offset|paginate\b/)
+        start_group :keyword, keyword
+      elsif punct  = scan(/\b>=|<=|<>|<|=|>|not\s+like|like|lt|le|eq|ne|ge|gt\b/)
+        start_group :punct, punct
+      elsif string = scan(/("|')[^'"]*\1/)
+        string =~ /("|')([^'"]*)\1/
+        start_group :punct, $1
+        start_group :string, $2
+        start_group :punct, $1
+      else
+        start_group :normal, scan(/./m)
+      end
     end
-  end
-end # PseudoSqlTokenizer
-Syntax::SYNTAX['pseudo_sql'] = PseudoSqlTokenizer
+  end # PseudoSqlTokenizer
+  SYNTAX['sqliss'] = PseudoSqlTokenizer
+end # Syntax

data/lib/zena/console.rb

@@ -0,0 +1,141 @@
+module Zena
+  module Console
+    include Zena::Acts::Secure
+
+    def self.included(base)
+      if base == Object
+        raise %q{You should not include Zena::Console directly in Object. Use this instead: class << self; include Zena::Console; end
+}
+      end
+    end
+
+    def err(obj)
+      obj.errors.each_error do |er,msg|
+        puts "[#{er}] #{msg}"
+      end
+    end
+
+    def rename_prop(list, old_key, new_key)
+      if list.first.kind_of?(Node)
+        list = list.map(&:visible_versions).flatten
+      end
+      list.each do |rec|
+        prop  = rec.prop
+        if value = prop.delete(old_key)
+          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
+
+    def field_to_prop(list, native_key, prop_key)
+      list.each do |rec|
+        next unless value = rec[native_key]
+        if rec.kind_of?(Node)
+          elems = rec.visible_versions
+        else
+          elems = [rec]
+        end
+        elems.each do |rec|
+          prop  = rec.prop
+          prop[prop_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
+
+    def login(name, host = nil)
+      finder = {}
+      finder[:conditions] = cond = [[]]
+      if host
+        finder[:joins] = 'INNER JOIN sites ON sites.id = users.site_id'
+        cond.first << 'sites.host = ?'
+        cond << host.to_s
+      end
+
+      cond.first << 'users.login = ?'
+      cond << name.to_s
+      cond[0] = cond.first.join(' AND ')
+      if visitor = User.find(:first, finder)
+        Thread.current[:visitor] = visitor
+        puts "Logged #{visitor.login} in #{visitor.site.host}"
+      else
+        raise ActiveRecord::RecordNotFound
+      end
+    rescue ActiveRecord::RecordNotFound
+      puts "Could not login with user name: #{name}"
+    end
+
+    def nodes(zip_or_name)
+      if zip_or_name.kind_of?(Fixnum)
+        secure(Node) { Node.find_by_zip(zip_or_name) }
+      else
+        secure(Node) { Node.find_by_title(zip_or_name) }
+      end
+    end
+
+    def find(query)
+      default_scope = 'site'
+      query = {:qb => query} unless query.kind_of?(Hash)
+      nodes = secure(Node) { Node.search_records(query, :node => current_site.root_node, :default => {:scope => default_scope}) }
+    end
+
+    def count(pseudo_sql, opts = {})
+      node  = opts.delete(:node) || current_site.root_node
+      options = {:errors => true, :rubyless_helper => self, :default => {:scope => 'site'}}
+
+      count = node.find(:count, pseudo_sql, options)
+
+      if count.kind_of?(::QueryBuilder::Error)
+        puts "Error parsing query #{pseudo_sql.inspect} (#{count.message})"
+        return nil
+      else
+        return count
+      end
+    end
+
+    def foreach(pseudo_sql, opts = {})
+      limit = 100
+
+      return nil unless block_given?
+      node    = opts.delete(:node) || current_site.root_node
+      options = {:errors => true, :rubyless_helper => self, :default => {:scope => 'site'}}
+
+      count = node.find(:count, pseudo_sql, options)
+
+      if count.kind_of?(::QueryBuilder::Error)
+        puts "Error parsing query #{pseudo_sql.inspect} (#{count.message})"
+        return nil
+      end
+
+      begin
+        query = Node.build_query(:all, pseudo_sql,
+          :node_name       => 'self',
+          :main_class      => VirtualClass['Node'],
+          :rubyless_helper => self,
+          :default         => options[:default]
+        )
+      rescue ::QueryBuilder::Error => err
+        puts "Error parsing query #{pseudo_sql.inspect} (#{err.message})"
+        return nil
+      end
+
+
+      query.limit  = " LIMIT #{limit}"
+
+      page_count = (count.to_f / limit).ceil
+      puts "#{count} nodes, #{page_count} chunk(s) (100 items)"
+      curr_page  = 1
+      for curr_page in (1..page_count)
+        query.offset = " OFFSET #{limit * (curr_page - 1)}"
+        if list = Node.do_find(:all, eval(query.to_s(:find)))
+          puts "Page #{curr_page}/#{page_count}"
+          list.each do |record|
+            yield(record)
+          end
+        end
+      end
+      nil
+    end
+  end # Console
+end # Zena

data/lib/zena/controller/test_case.rb

@@ -24,7 +24,7 @@ module Zena
       %w{get post put delete}.each do |method|
         class_eval <<-END_TXT
           def #{method}_subject
-            without_files('/test.host/zafu') do
+            without_files('test.host/zafu') do
               #{method} subject.delete(:action), subject
               if block_given?
                 yield

data/lib/zena/db_helper/abstract_db.rb

@@ -11,7 +11,7 @@ module Zena
 
       # Set a single attribute directly in the database.
       def set_attribute(obj, key, value)
-        obj.send("#{key}=", value)
+        obj.write_attribute(key, value)
         execute "UPDATE #{obj.class.table_name} SET #{key}=#{quote(value)} WHERE id=#{obj[:id]}"
         obj.send(:changed_attributes).delete(key.to_s)
       end
@@ -35,7 +35,7 @@ module Zena
       end
 
       def adapter
-        self.class.to_s.downcase
+        @adapter ||= self.to_s.downcase.split('::').last
       end
 
       def execute(*args)
@@ -117,8 +117,20 @@ module Zena
       end
 
       # Return a string matching the SQLiss function.
-      def sql_function(function, key)
-        raise Exception.new("Database Adapter #{adapter.inspect} does not support function #{function.inspect}.")
+      def sql_function(function, arg)
+        return arg unless function
+        case function
+        when 'count'
+          "COUNT(#{arg})"
+        when 'min'
+          "MIN(#{arg})"
+        when 'max'
+          "MAX(#{arg})"
+        when 'sum'
+          "SUM(#{arg})"
+        else
+          super
+        end
       end
 
       # This is used by zafu and it's a mess.
@@ -171,7 +183,7 @@ module Zena
       end
 
       # Fixes #98
-      def prepare_connection_for_timezone
+      def prepare_connection
         # do nothing by default ?
       end
 

data/lib/zena/db_helper/mysql.rb

@@ -37,7 +37,7 @@ module Zena
         end
 
         def table_options
-          'type=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci'
+          'type=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
         end
 
         def update_value(name, opts)
@@ -78,17 +78,17 @@ module Zena
         end
 
         # Return a string matching the SQLiss function.
-        def sql_function(function, key)
-          return key unless function
+        def sql_function(function, arg)
+          return arg unless function
           case function
           when 'year'
-            "year(#{key})"
+            "year(#{arg})"
           when 'month'
-            "date_format(#{key},'%Y-%m')"
+            "date_format(#{arg},'%Y-%m')"
           when 'week'
-            "date_format(#{key},'%Y-%v')"
+            "date_format(#{arg},'%Y-%v')"
           when 'day'
-            "DATE(#{key})"
+            "DATE(#{arg})"
           when 'random'
             'RAND()'
           else
@@ -99,6 +99,7 @@ module Zena
         # This is used by zafu and it's a mess.
         # ref_date can be a string ('2005-05-03') or ruby ('Time.now'). It should not come uncleaned from evil web.
         def date_condition(date_cond, field, ref_date)
+          # raise "DEPRECATED"
           case date_cond
           when 'today', 'current', 'same'
             "DATE(#{field}) = DATE(#{ref_date})"
@@ -131,17 +132,18 @@ module Zena
           end
         end # date_condition
 
-        def prepare_connection_for_timezone
+        def prepare_connection
           # Fixes timezone to "+0:0"
-          raise "prepare_connection_for_timezone executed too late, connection already active." if Class.new(ActiveRecord::Base).connected?
+          raise "prepare_connection executed too late, connection already active." if Class.new(ActiveRecord::Base).connected?
 
           ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
-            def configure_connection_with_timezone
-              configure_connection_without_timezone
+            def configure_connection_with_zena
+              configure_connection_without_zena
               tz = ActiveRecord::Base.default_timezone == :utc ? "+0:0" : "SYSTEM"
               execute("SET time_zone = '#{tz}'")
+              execute("SET collation_connection = 'utf8_unicode_ci'")
             end
-            alias_method_chain :configure_connection, :timezone
+            alias_method_chain :configure_connection, :zena
           end
         end
       end # class << self

data/lib/zena/db_helper/postgresql.rb

@@ -54,8 +54,7 @@ module Zena
         end
 
         # Return a string matching the SQLiss function.
-        def sql_function(function, key)
-          return key unless function
+        def sql_function(function, arg)
           # TODO
           super
         end

data/lib/zena/db_helper/sqlite3.rb

@@ -73,19 +73,19 @@ module Zena
         end
 
         # Return a string matching the SQLiss function.
-        def sql_function(function, key)
-          return key unless function
+        def sql_function(function, arg)
+          return arg unless function
           case function
           when 'year'
             # we multiply by '1' to force a cast to INTEGER so that comparaison against
             # numbers works.
-            "strftime('%Y', #{key})*1"
+            "strftime('%Y', #{arg})*1"
           when 'month'
-            "strftime('%Y-%m', #{key})"
+            "strftime('%Y-%m', #{arg})"
           when 'week'
-            "strftime('%Y-%W', #{key})"
+            "strftime('%Y-%W', #{arg})"
           when 'day'
-            "DATE(#{key})"
+            "DATE(#{arg})"
           when 'random'
             'random()'
           else

data/lib/zena/deploy/awstats.conf.rhtml

@@ -777,7 +777,7 @@ DecodeUA=0
 # - Realplayer G2 plugin
 # - QuickTime plugin
 # - Mediaplayer plugin
-# - Acrobat PDF plugin
+# - Acrobat Pdf plugin
 # To enable all this features, you must copy the awstats_misc_tracker.js file
 # into a /js/ directory stored in your web document root and add the following
 # HTML code at the end of your index page (but before </BODY>) :

data/lib/zena/deploy/httpd.rhtml

@@ -23,4 +23,9 @@ PassengerDefaultUser www-data
   ExpiresByType image/png "access plus 1 year"
   ExpiresByType text/css "access plus 1 year"
   ExpiresByType application/javascript "access plus 1 year"
-</IfModule>
+</IfModule>
+
+<% if config[:ssl] %>
+SSLProtocol all
+SSLCipherSuite HIGH:MEDIUM
+<% end %>