zena 1.1.1 → 1.1.2

data/bricks/math/lib/bricks/math.rb

@@ -1,6 +1,7 @@
 require 'digest/sha1'
 module Bricks
   module Math
+
     module ViewMethods
       def math_asset(opts)
         content    = opts[:content]
@@ -66,15 +67,17 @@ module Bricks
                   f.syswrite("\n\\end{document}\n")
                 end
 
-                system("cd #{File.dirname(tempf.path)}; latex -interaction=batchmode #{"#{base}.tex".inspect} &> '#{base}.err'")
-                if !File.exists?("#{base}.dvi")
-                  Node.logger.error(File.read("#{base}.err"))
-                  system("cp '#{Zena::ROOT}/public/world.png' #{filepath.inspect}")
-                else
-                  system("dvips #{tempf.path}.dvi -E -o #{base}.ps &> '#{base}.err'") #||  Node.logger.error(File.read("#{base}.err"))
-                  system("convert -units PixelsPerInch -density 150 -matte -fuzz '10%' -transparent '#ffffff' #{base}.ps #{filepath.inspect} &> '#{base}.err'") #|| Node.logger.error(File.read("#{base}.err"))
+                ok, msg, err = Bricks::run(File.dirname(tempf.path), 'latex', '-interaction=batchmode', "#{base}.tex")
+                if ok
+                  ok, msg, err = Bricks::run(nil, 'dvips', "#{tempf.path}.dvi", '-E', '-o', "#{base}.ps")
+                end
+                if ok
+                  ok, msg, err = Bricks::run(nil, 'convert', '-units', 'PixelsPerInch', '-density', '150', '-matte', '-fuzz', '10%', '-transparent', '#ffffff', "#{base}.ps", filepath)
+                end
+                if !ok
+                  Node.logger.error(err)
+                  Bricks::run(nil, 'cp', "#{Zena::ROOT}/public/world.png", filepath.inspect)
                 end
-
               ensure
                 system("rm -rf #{tempf.path.inspect} #{(tempf.path + '.*').inspect}")
               end

data/bricks/worker/zena/worker

@@ -39,6 +39,7 @@ Daemons.run_proc('worker', daemon_options) do
 
   require 'delayed/worker'
   begin
+    require 'thinking_sphinx'
     require 'thinking_sphinx/deltas/delayed_delta'
   rescue LoadError
     # Ignore

data/bricks/zena/zena/migrate/20111101103900_add_comment_to_columns.rb

@@ -0,0 +1,9 @@
+class AddCommentToColumns < ActiveRecord::Migration
+  def self.up
+    add_column :columns, :comment, :text
+  end
+
+  def self.down
+    remove_column :columns, :comment
+  end
+end

data/config/gems.yml

@@ -2,7 +2,7 @@ hpricot:
 gettext:        '= 2.1.0'
 ruby-recaptcha: '= 1.0.3'
 syntax:         '= 1.0.0'
-tzinfo:         '= 0.3.26'
+tzinfo:
 uuidtools:      '= 2.0.0'
 rails:          '= 2.3.11'
 json:           '= 1.5.1'
@@ -12,13 +12,16 @@ will_paginate:  '~> 2.3.12'
 differ:         '= 0.1.2'
 shoulda:        '= 2.10.3'
 httparty:       '= 0.7.8'
+open4:
+daemons:        # upload progress
+gem_plugin:     # upload progress
 
-querybuilder:   '= 1.0.1'
+querybuilder:   '= 1.1.0'
 yamltest:       '= 0.7.0'
-rubyless:       '= 0.8.5'
+rubyless:       '= 0.8.6'
 property:       '= 2.2.0'
 versions:       '= 0.3.1'
-zafu:           '= 0.8.3'
+zafu:           '= 0.8.4'
 
 jeweler:
 

data/lib/bricks.rb

@@ -1,9 +1,11 @@
 require 'bricks/requirements_validation'
 require 'bricks/loader'
+require 'bricks/helper'
 
 module Bricks
   extend Bricks::RequirementsValidation
   extend Bricks::Loader
+  extend Bricks::Helper
   CONFIG = self.config_for_active_bricks
 end
 

data/lib/bricks/helper.rb

@@ -0,0 +1,18 @@
+require 'open4'
+module Bricks
+  module Helper
+    def run(cd, *args)
+      status = 0
+      msg    = nil
+      err    = nil
+      cd ||= '.'
+      Dir.chdir(cd) do
+        status = Open4::popen4(*args) do |pid, stdin, stdout, stderr|
+          msg = stdout.read
+          err = stderr.read
+        end
+      end
+      return status == 0, msg, err
+    end
+  end
+end

data/lib/zena.rb

@@ -19,7 +19,7 @@ module Zena
     end
   end
 
-  ASSET_PORT     = Bricks.raw_config['asset_port']
+  ASSET_PORT     = Bricks.raw_config['asset_port'].to_i
 
   ENABLE_LATEX   = true  && has_executable('pdflatex') # enable LateX post-rendering
   ENABLE_FOP     = true  && has_executable('fop', 'xsltproc') # enable xsl-fo post-rendering

data/lib/zena/console.rb

@@ -70,6 +70,30 @@ module Zena
       end
     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)
+      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|
+          prop = v.prop
+          val  = prop[key]
+          new_val = yield(node, val)
+          unless new_val == val
+            if new_val
+              prop[key] = new_val
+            else
+              prop.delete(key)
+            end
+            Zena::Db.execute "UPDATE #{v.class.table_name} SET properties=#{Zena::Db.quote(v.class.encode_properties(prop))} WHERE id=#{v[:id]}"
+          end
+        end
+      end
+    end
+
     def login(name, host = nil)
       finder = {}
       finder[:conditions] = cond = [[]]

data/lib/zena/db_helper/abstract_db.rb

@@ -118,8 +118,9 @@ module Zena
       end
 
       # Return a string matching the SQLiss function.
-      def sql_function(function, arg)
-        return arg unless function
+      def sql_function(function, *args)
+        return args.first unless function
+        arg = args.first
         case function
         when 'count'
           "COUNT(#{arg})"
@@ -129,6 +130,8 @@ module Zena
           "MAX(#{arg})"
         when 'sum'
           "SUM(#{arg})"
+        when 'coalesce'
+          "COALESCE(#{args.join(',')})"
         else
           super
         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_unicode_ci'
+          'ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
         end
 
         def update_value(name, opts)
@@ -78,8 +78,9 @@ module Zena
         end
 
         # Return a string matching the SQLiss function.
-        def sql_function(function, arg)
-          return arg unless function
+        def sql_function(function, *args)
+          return args.first unless function
+          arg = args.first
           case function
           when 'year'
             "year(#{arg})"
@@ -91,6 +92,8 @@ module Zena
             "DATE(#{arg})"
           when 'random'
             'RAND()'
+          when 'coalesce'
+            "COALESCE(#{args.join(',')})"
           else
             super
           end

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.1.1'
+  VERSION        = '1.1.2'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/init.rb

@@ -0,0 +1,22 @@
+# This is a dummy file to make mongrel happy when
+# gem_plugin starts to do stupid things.
+# The other solution would be for the gem_plugin to get fixed.
+# See http://rubyforge.org/tracker/index.php?func=detail&aid=16145&group_id=1306&atid=5145
+# 
+=begin
+----[ diff -u /usr/lib/ruby/gems/1.8/gems/gem_plugin-0.2.3/lib/gem_plugin.rb{~,} ]----
+--- /usr/lib/ruby/gems/1.8/gems/gem_plugin-0.2.3/lib/gem_plugin.rb~     2007-12-06 17:34:58.000000000 +0100
++++ /usr/lib/ruby/gems/1.8/gems/gem_plugin-0.2.3/lib/gem_plugin.rb      2007-12-06 17:35:09.000000000 +0100
+@@ -130,8 +130,9 @@
+           # Previously was set wrong, we already have the correct gem path!
+           #gem_dir = File.join(Gem.dir, "gems", "#{gem.name}-#{gem.version}")
+           gem_dir = File.join(Gem.dir, "gems", path)
+-
+-          require File.join(gem_dir, "lib", gem.name, "init.rb")
++          init_rb = File.join(gem_dir, "lib", gem.name, "init.rb")
++
++          require init_rb if File.readable?(init_rb)
+           @gems[gem.name] = gem_dir
+         end
+       end
+=end

data/lib/zena/use/ajax.rb

@@ -223,7 +223,7 @@ module Zena
 
           markup.tag ||= 'div'
 
-          if @name.blank?
+          if node.instance_variable_get(:@dom_prefix).blank?
             # make sure we have a scope
             node.dom_prefix = dom_name
           end

data/lib/zena/use/forms.rb

@@ -491,8 +491,12 @@ module Zena
             r_select
           when 'date_box', 'date'
             return parser_error("date_box without name") unless attribute
-            code = ::RubyLess.translate(self, "this.#{attribute}")
-            value = @context[:in_add] ? "''" : code
+            if value = @params[:value]
+              code = ::RubyLess.translate(self, value)
+            else
+              code = ::RubyLess.translate(self, "this.#{attribute}")
+            end
+            value = code # @context[:in_add] ? "''" : code
             html_params = [':size => 15']
             [:style, :class, :onclick, :size, :time].each do |key|
               html_params << ":#{key} => #{@params[key].inspect}" if @params[key]

data/lib/zena/use/i18n.rb

@@ -114,13 +114,17 @@ module Zena
 
         # Choose best language to display content.
         # 1. 'test.host/oo?lang=en' use 'lang', redirect without lang
+        # 2. 'test.host/nodes/12?node[v_lang]=es
         # 3. 'test.host/oo' use visitor[:lang]
-        # 4. 'test.host/'   use session[:lang]
-        # 5. 'test.host/oo' use visitor lang
-        # 6. 'test.host/'   use HTTP_ACCEPT_LANGUAGE
-        # 7. 'test.host/'   use default language
+        # 4. 'test.host/es' use prefix  ONLY ENABLED FOR html format (see below)
+        # 5. 'test.host/'   use session[:lang]
+        # 6. 'test.host/oo' use visitor lang
+        # 7. 'test.host/'   use HTTP_ACCEPT_LANGUAGE
+        # 8. 'test.host/'   use default language
         #
-        # 8. 'test.host/fr' the redirect for this rule is called once we are sure the request is not for document data (lang in this case can be different from what the visitor is visiting due to caching optimization)
+        # 4. 'test.host/es' the redirect for this rule is called once we are sure the request is
+        #     not for document data (lang in this case can be different from what the visitor is
+        #     visiting due to caching optimization).
         def set_lang
           if params[:prefix] =~ /^\d+$/
             # this has nothing to do with set_lang...
@@ -132,7 +136,11 @@ module Zena
           chosen_lang = nil
           [
             params[:lang],
+# FIXME: This is good to protect templates and other documents but is *NOT* nice when translating a website !!
+#        What should we do ?
             params[:node] ? params[:node][:v_lang] : nil,
+            # Avoid redirects for static assets (cached documents).
+            request.format == Mime::HTML ? params[:prefix] : nil,
             visitor.is_anon? ? session[:lang] : visitor.lang,
             (request.headers['HTTP_ACCEPT_LANGUAGE'] || '').split(',').sort {|a,b| (b.split(';q=')[1] || 1.0).to_f <=> (a.split(';q=')[1] || 1.0).to_f }.map {|l| l.split(';')[0].split('-')[0] },
             (visitor.is_anon? ? visitor.lang : nil), # anonymous user's lang comes last
@@ -142,7 +150,6 @@ module Zena
               break
             end
           end
-
           set_visitor_lang(chosen_lang || current_site[:default_lang])
           true
         end
@@ -374,66 +381,7 @@ module Zena
         end
 
         alias r_t r_trans
-        #def r_trans
-        #  static = true
-        #  if @params[:text]
-        #    text = @params[:text]
-        #  elsif @params[:attr]
-        #    text = "#{node_attribute(@params[:attr])}"
-        #    static = false
-        #  else
-        #    res  = []
-        #    text = ""
-        #    @blocks.each do |b|
-        #      if b.kind_of?(String)
-        #        res  << b.inspect
-        #        text << b
-        #      elsif ['show', 'current_date'].include?(b.method)
-        #        res << expand_block(b, :trans=>true)
-        #        static = false
-        #      else
-        #        # ignore
-        #      end
-        #    end
-        #    unless static
-        #      text = res.join(' + ')
-        #    end
-        #  end
-        #  if static
-        #    _(text)
-        #  else
-        #    "<%= _(#{text}) %>"
-        #  end
-        #end
-
 
-        # show language selector
-        #def r_lang_links
-        #  if wrap_tag = @params[:wrap]
-        #    wrap_tag = Zafu::Markup.new(wrap_tag)
-        #    tag_in  = "<#{opts[:wrap]}>"
-        #    tag_out = "</#{opts[:wrap]}>"
-        #  else
-        #    tag_in = tag_out = ''
-        #  end
-        #  res = []
-        #  visitor.site.lang_list.each do |l|
-        #    if l == visitor.lang
-        #      if opts[:wrap]
-        #        res << "<#{opts[:wrap]} class='on'>#{l}" + tag_out
-        #      else
-        #        res << "<em>#{l}</em>"
-        #      end
-        #    else
-        #      if visitor.is_anon? && params[:prefix]
-        #        res << tag_in + link_to(l, params.merge(:prefix => l)) + tag_out
-        #      else
-        #        res << tag_in + link_to(l, params.merge(:lang => l)) + tag_out
-        #      end
-        #    end
-        #  end
-        #  res.join(opts[:join] || '')
-        #end
         protected
 
           # Overwriten from Zafu to insert dictionary in partial if there is one

data/lib/zena/use/ml_index.rb

@@ -53,6 +53,21 @@ module Zena
             end
           end
       end # ModelMethods
+
+      module SiteMethods
+        def self.included(base)
+          base.before_save :rebuild_index_on_lang_list_change
+        end
+
+        protected
+          def rebuild_index_on_lang_list_change
+            if languages_changed? && !new_record?
+              # delete all ml entries for this site and rebuild
+              Zena::Db.execute "DELETE idx FROM idx_nodes_ml_strings idx INNER JOIN nodes ON idx.node_id = nodes.id WHERE nodes.site_id = #{self[:id]}"
+              rebuild_index
+            end
+          end
+      end # SiteMethods
     end # MLIndex
   end # Use
 end # Zena

data/lib/zena/use/query_node.rb

@@ -197,13 +197,15 @@ module Zena
           end
         end
 
+        def process_idx_field(scope_field)
+          scope_field
+        end
+
         # Overwrite this and take care to check for valid fields.
         def process_field(field_name)
           if fld = @query.attributes_alias[field_name]
             # use custom query alias value defined in select clause: 'custom_a AS validation'
             return processing_filter? ? "(#{fld})" : fld
-          elsif processing_filter? && scope_field = get_scope_index_field(field_name)
-            scope_field
           elsif processing_filter? && map_def = self.class.filter_fields[field_name]
             # Special filter fields such as 'role', 'tag' or 'class'
             if map_def.kind_of?(String)
@@ -291,7 +293,7 @@ module Zena
           "params[#{pagination_key.to_sym.inspect}]"
         end
 
-        # Handle special case for 'class = ' and 'role = '
+        # Handle special case for 'class = ' and 'role = ' and 'foo.date ='
         def process_equal(left, right)
           if (left == [:field, 'class'] || left == [:field, 'klass']) &&
              (right[0] == :field || right[0] == :string)
@@ -353,20 +355,21 @@ module Zena
           end
 
           scope_idx_field = "#{class_name}_#{field_name}"
-          if get_scope_index_field(scope_idx_field)
-            return [[:field, scope_idx_field], function]
+          if fld = get_scope_index_field(scope_idx_field)
+            return [[:idx_field, fld], function]
           else
             # not a scope index field
             return [arg1, arg2]
           end
         end
 
-        def process_function(arg, method)
+        def process_function(arg, method, *args)
           # Resolve scope index fields
           arg, method = resolve_scope_idx_fields(arg, method)
           if method
             arg, method = process(arg), process(method)
-            Zena::Db.sql_function(method, arg)
+            args = [arg] + args.map{|a| process(a)}
+            Zena::Db.sql_function(method, *args)
           else
             process(arg)
           end