zena 0.15.2 → 0.16.0

data/lib/zena/foxy_parser.rb

@@ -150,7 +150,7 @@ module Zena
       def get_content(site, table)
         fixtures_paths  = {'zena' => File.join("#{Zena::ROOT}/test/sites",site,"#{table}.yml")}
         fixtures_bricks = ['zena']
-        Bricks::Patcher.foreach_brick do |brick_path|
+        Bricks.foreach_brick do |brick_path|
           brick_name = brick_path.split('/').last
           fixtures_paths[brick_name] = File.join(brick_path,'test','sites',site,"#{table}.yml")
           fixtures_bricks << brick_name

data/lib/zena/info.rb

@@ -1,13 +1,15 @@
+
 if defined?(RAILS_ROOT)
   SITES_ROOT = "#{RAILS_ROOT}/sites"
 end
+
 AUTHENTICATED_PREFIX = "oo"
 PASSWORD_SALT = "jf93jfnvnas09093nas0923" # type anything here (but change this line !)
 ZENA_CALENDAR_LANGS = ["en", "fr"] # FIXME: build this dynamically from existing files
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '0.15.2'
+  VERSION = '0.16.0'
   REVISION = 1336
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/migrator.rb

@@ -85,7 +85,7 @@ module Zena
       raise StandardError.new("This database does not yet support migrations") unless ActiveRecord::Base.connection.supports_migrations?
       self.class.init_bricks_migration_table
       @direction, @migrations_path, @brick_name, @target_version = direction, migrations_path, brick_name, target_version
-      @brick_name = nil if @brick_name = 'zena' # use NULL so that rails migrations work the same
+      @brick_name = nil if @brick_name == 'zena' # use NULL so that rails migrations work the same
     end
 
     def migrated

data/lib/zena/parser.rb

@@ -147,10 +147,11 @@ module Zena
         return @result unless before_render
         @pass    = {} # used to pass information to the parent
         res = nil
-        if self.respond_to?("r_#{@method}".to_sym)
-          res = self.do_method("r_#{@method}".to_sym)
+
+        if respond_to?("r_#{@method}".to_sym)
+          res = do_method("r_#{@method}".to_sym)
         else
-          res = self.do_method(:r_unknown)
+          res = do_method(:r_unknown)
         end
 
         after_render(res + @text)
@@ -286,7 +287,7 @@ module Zena
         @blocks = included_blocks + not_found
       end
 
-      # Return a has of all descendants. Find a specific descendant with descendant['form'] for example.
+      # Return a hash of all descendants. Find a specific descendant with descendant['form'] for example.
       def all_descendants
         @all_descendants ||= begin
           d = {}
@@ -304,6 +305,13 @@ module Zena
         end
       end
 
+      # Find a direct child with +child[method]+.
+      def child
+        Hash[*@blocks.map do |b|
+          b.kind_of?(String) ? nil : [b.method, b]
+        end.compact.flatten]
+      end
+
       def descendants(key)
         all_descendants[key] || []
       end

data/lib/zena/parser/zazen_rules.rb

@@ -187,10 +187,10 @@ module Zena
             # link inside the cms "":34
             title, id = $1, $2
             if id =~ /(.*?)#(.*)/
-              id, sharp = $1, $2
-              sharp = 'true' if sharp == ''
+              id, anchor = $1, $2
+              anchor = 'true' if anchor == ''
             end
-            store @helper.make_link(:title=>title,:id=>id,:sharp=>sharp)
+            store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor)
           end
         elsif @text =~ /\A"([^"]*)":(#{PSEUDO_ID_REGEXP})((_[a-z]+|)(\.[a-z]+|)(#[a-z_\/\[\]]*|))/m
           #puts "SHORTCUT_LINK:[#{$&}]"
@@ -209,10 +209,10 @@ module Zena
                 title = "#{node.fullpath}#{mode_format}"
               end
               if id =~ /(.*?)#(.*)/
-                id, sharp = $1, $2
-                sharp = 'true' if sharp == ''
+                id, anchor = $1, $2
+                anchor = 'true' if anchor == ''
               end
-              store @helper.make_link(:title=>title,:id=>id,:sharp=>sharp,:node=>node)
+              store @helper.make_link(:title=>title,:id=>id,:anchor=>anchor,:node=>node)
             end
           elsif @translate_ids
             store $&

data/lib/zena/parser/zena_rules.rb

@@ -1,6 +1,7 @@
 module Zena
   module Parser
     module ZenaRules
+      # FIXME: remove all this when rubyless is in place !
       def start(mode)
         super
         if @method =~ /^\[(.*)\]$/
@@ -16,13 +17,6 @@ module Zena
           @params[:select] = @method
           @method = 'context'
         end
-
-        if @method == 'with' || self.respond_to?("r_#{@method}")
-          # ok
-        else
-          @params[:select] = @method
-          @method = 'context'
-        end
       end
     end # ZenaRules
   end # Parser

data/lib/zena/routes.rb

@@ -3,12 +3,13 @@ module Zena
     def zen_routes
       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 => 'sessions',  :action => 'new',    :requirements => { :method => :get  }
-      logout     'logout',  :controller => 'sessions',  :action => 'destroy'
+      login      'login',  :controller => 'user_sessions',  :action => 'new',    :requirements => { :method => :get  }
+      logout     'logout',  :controller => 'user_sessions',  :action => 'destroy'
 
       upload_progress 'upload_progress', :controller => 'documents', :action => 'upload_progress'
 
-      resource  :session   # singleton resource
+      resource  :session, :controller => "user_sessions"   # singleton resource
+      resources :pings
       resources :users, :member => { :preferences => :get, :swap_dev => :get }
       resources :groups
       resources :iformats
@@ -47,13 +48,12 @@ module Zena
       end
 
       # FIXME: merge 'documents' controller into 'nodes' (keep module for clarity)
-      resources :documents, :collection => { :upload    => :post, :file_form => :get },
+      resources :documents, :collection => { :upload    => :post, :get_uf => :get },
                                 :member     => { :crop_form => :get }
 
       resources :relations
       resources :virtual_classes
       resources :sites,
-        :collection => { :zena_up => :get },
         :member     => { :clear_cache => :post }
       resources :comments,
                     :collection => { :empty_bin => :delete },

data/lib/zena/test_controller.rb

@@ -2,8 +2,11 @@ ActionController::Routing::Routes.add_route '----/test/:action', :controller =>
 
 module Zena
   class TestController < ApplicationController
+    include Zena::Use::Fixtures
+    include Zena::Use::TestHelper
     helper_method :get_template_text, :template_url_for_asset, :save_erb_to_url
-    before_filter :set_context
+    skip_before_filter :set_visitor
+    prepend_before_filter :set_context
 
     class << self
       def templates=(templates)
@@ -40,14 +43,16 @@ module Zena
     def set_lang
     end
 
+    # We skip authlogic
     def set_context
-      @visitor = User.make_visitor(:id => params[:user_id], :host => request.host)
+      login(params[:user])
       set_visitor_lang(params[:prefix])
       @node = secure!(Node) { Node.find(params[:node_id])}
       @text = params[:text]
       @test_url  = params[:url]
       @date = Date.parse(params[:date]) if params[:date]
       params.delete(:user_id)
+      params.delete(:user)
       params.delete(:prefix)
       params.delete(:node_id)
       params.delete(:text)

data/lib/zena/unit/test_case.rb

@@ -4,19 +4,17 @@ module Zena
       include Zena::Use::Fixtures
       include Zena::Use::TestHelper
       include Zena::Acts::Secure
+      include ::Authlogic::TestCase
 
-      def self.helper_attr(*args)
-        # Ignore since we include helpers in the TestCase itself
-      end
+      setup :activate_authlogic
 
       def setup
-        login(:anon, 'zena')
+        #log anonymously by default
+        login(:anon)
       end
 
-      def err(obj)
-        obj.errors.each_error do |er,msg|
-          puts "[#{er}] #{msg}"
-        end
+      def self.helper_attr(*args)
+        # Ignore since we include helpers in the TestCase itself
       end
 
     end

data/lib/zena/use/ajax.rb

@@ -32,14 +32,14 @@ module Zena
 
           if obj.new_record?
             # A. could not create object: show form with errors
-            page.replace "#{params[:dom_id]}_form", :file => fullpath_from_template_url + "_form.erb"
+            page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
           elsif @errors || !obj.errors.empty?
             # B. could not update/delete: show errors
             case params[:action]
             when 'destroy', 'drop'
               page.insert_html :top, params[:dom_id], :inline => render_errors
             else
-              page.replace "#{params[:dom_id]}_form", :file => fullpath_from_template_url + "_form.erb"
+              page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
             end
           elsif params[:udom_id]
             if params[:udom_id] == '_page'
@@ -56,10 +56,10 @@ module Zena
                   end
                 end
               end
-              page.replace params[:udom_id], :file => fullpath_from_template_url(params[:u_url]) + ".erb"
+              page.replace params[:udom_id], :file => template_path_from_template_url(params[:u_url]) + ".erb"
               if params[:upd_both]
                 @dom_id = params[:dom_id]
-                page.replace params[:dom_id], :file => fullpath_from_template_url + ".erb"
+                page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
               end
               if params[:done] && params[:action] == 'create'
                 page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
@@ -76,25 +76,25 @@ module Zena
             #
             case params[:action]
             when 'edit'
-              page.replace params[:dom_id], :file => fullpath_from_template_url + "_form.erb"
+              page.replace params[:dom_id], :file => template_path_from_template_url + "_form.erb"
       #        page << "$('#{params[:dom_id]}_form_t').focusFirstElement();"
             when 'create'
               pos = params[:position]  || :before
               ref = params[:reference] || "#{params[:dom_id]}_add"
-              page.insert_html pos.to_sym, ref, :file => fullpath_from_template_url + ".erb"
+              page.insert_html pos.to_sym, ref, :file => template_path_from_template_url + ".erb"
               if obj.kind_of?(Node)
                 @node = @node.parent.new_child(:class => @node.class)
               else
                 instance_variable_set("@#{base_class.to_s.underscore}", obj.clone)
               end
-              page.replace "#{params[:dom_id]}_form", :file => fullpath_from_template_url + "_form.erb"
+              page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
               if params[:done]
                 page << params[:done]
               else
                 page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
               end
             when 'update'
-              page.replace params[:dom_id], :file => fullpath_from_template_url + ".erb"
+              page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
               page << params[:done] if params[:done]
             when 'destroy'
               page.visual_effect :highlight, params[:dom_id], :duration => 0.3
@@ -105,9 +105,9 @@ module Zena
                 page.visual_effect :highlight, params[:drop], :duration => 0.3
                 page.visual_effect :fade, params[:drop], :duration => 0.3
               end
-              page.replace params[:dom_id], :file => fullpath_from_template_url + ".erb"
+              page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
             else
-              page.replace params[:dom_id], :file => fullpath_from_template_url + ".erb"
+              page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
             end
           end
         end

data/lib/zena/use/authlogic.rb

@@ -0,0 +1,93 @@
+module Zena
+  module Use
+    module Authlogic
+      module Common
+
+        def visitor
+           Thread.current[:visitor]
+         end
+
+      end # Common
+
+      module ControllerMethods
+
+        def self.included(base)
+          base.before_filter :set_after_login, :set_visitor, :force_authentication?
+        end
+
+        include Common
+
+        private
+
+          def set_after_login
+            Thread.current[:after_login_url] = request.parameters
+          end
+
+          def set_visitor
+            unless site = Site.find_by_host(request.host)
+              raise ActiveRecord::RecordNotFound.new("host not found #{request.host}")
+            end
+
+            # We temporarily set the locale so that any error message raised during authentification can be properly shown
+            ::I18n.locale = site.default_lang
+
+            User.send(:with_scope, :find => {:conditions => ['site_id = ?', site.id]}) do
+              Thread.current[:visitor] = registered_visitor || http_visitor(site) || token_visitor || anonymous_visitor(site)
+            end
+          end
+
+          def registered_visitor
+            visitor_session && visitor_session.user
+          end
+
+          def visitor_session
+            UserSession.find
+          end
+
+          def anonymous_visitor(site)
+            site.anon.tap do |v|
+              v.ip = request.headers['REMOTE_ADDR']
+            end
+          end
+
+          def check_is_admin
+            render_404(ActiveRecord::RecordNotFound) unless visitor.is_admin?
+            @admin = true
+          end
+
+          def lang
+            visitor.lang
+          end
+
+          def token_visitor
+            if user_token = params[:user_token] && request.format == Mime::XML
+              User.find_by_single_access_token(user_token)
+            end
+          end
+
+          def http_visitor(site)
+            if site.http_auth && request.format == Mime::XML
+              authenticate_or_request_with_http_basic do |login, password|
+                user = User.find_allowed_user_by_login(login)
+                user if (user && user.valid_password?(password))
+              end
+            end
+          end
+
+          def force_authentication?
+            if current_site.authentication? && visitor.is_anon?
+              redirect_to login_url
+            end
+          end
+
+      end
+
+      module ViewMethods
+
+        include Common
+
+      end # ViewMethods
+
+    end # Authlogic
+  end # Use
+end # Zena

data/lib/zena/use/dyn_attributes.rb

@@ -186,6 +186,9 @@ module Zena
             nested_attributes_alias nested_alias
           end
 
+          # This is used by Sphinx brick or other 'rails association crawlers'.
+          self.has_many :dynamic_attributes, :foreign_key => 'owner_id', :table_name => options[:table_name], :class_name => 'DynAttribute'
+
           class_eval <<-END
             def self.dyn_attribute_options
               #{options.inspect}
@@ -200,6 +203,8 @@ module Zena
           # add all methods from the module "AddActsAsMethod" to the 'base' module
           base.extend  Zena::Use::DynAttributes::ClassMethods
 
+          # This is used by Sphinx brick or other 'rails association crawlers'.
+          base.has_many      :dynamic_attributes, :foreign_key => 'owner_id', :table_name => 'dyn_attributes', :class_name => 'DynAttribute'
           base.after_save    :save_dynamic_attributes
           base.after_destroy :destroy_attributes
           base.class_eval <<-END

data/lib/zena/use/html_tags.rb

@@ -1,5 +1,4 @@
 require 'will_paginate'
-require 'uuidtools'
 
 module Zena
   module Use
@@ -9,7 +8,7 @@ module Zena
         # This is used by _crop.rhtml
         def crop_formats(obj)
           buttons = ['jpg', 'png']
-          ext = TYPE_TO_EXT[obj.c_conten_type]
+          ext = Zena::TYPE_TO_EXT[obj.c_conten_type]
           ext = ext ? ext[0] : obj.c_ext
           buttons << ext unless buttons.include?(ext)
           buttons.map do |e|
@@ -198,8 +197,8 @@ module Zena
 
         # date_box seizure setup
         def uses_datebox(opt={})
-          if ZENA_CALENDAR_LANGS.include?(lang)
-            l = lang
+          if ZENA_CALENDAR_LANGS.include?(visitor.lang)
+            l = visitor.lang
           else
             l = visitor.site[:default_lang]
           end
@@ -227,23 +226,6 @@ module Zena
           @form_skins ||= secure!(Skin) { Skin.find(:all, :order=>'name ASC') }.map {|r| r[:name]}
         end
 
-
-        def upload_form_tag(url_opts, html_opts = {})
-          @uuid = UUIDTools::UUID.random_create.to_s.gsub('-','')
-          html_opts.reverse_merge!(:multipart => true, :id => "UploadForm#{@uuid}")
-          if html_opts[:multipart]
-            html_opts[:onsubmit] = "submitUploadForm('#{html_opts[:id]}', '#{@uuid}');"
-            url_opts[UPLOAD_KEY] = @uuid
-          end
-          if block_given?
-            form_tag( url_opts, html_opts ) do |f|
-              yield(f)
-            end
-          else
-            form_tag( url_opts, html_opts )
-          end
-        end
-
         # Date selection tool
       	def date_box(obj, var, opts = {})
       	  rnd_id = rand(100000000000)
@@ -281,9 +263,10 @@ module Zena
           end
 
           count = secure_write(Node) { Node.count(:all, :conditions => ['kpath LIKE ?', "#{kpath}%"]) }
-          if count < 30
-            sql = "SELECT zip, name FROM nodes WHERE kpath LIKE '#{kpath}%' AND #{secure_write_scope} ORDER BY name ASC"
-            values = Node.connection.select_all(sql, "Node Load").map do |record|
+          if count == 0
+            return select(obj, sym, [], {:include_blank => opt[:include_blank]})
+          elsif count < 30
+            values = secure_write(Node) { Node.all(:order=>:name, :conditions=>["kpath LIKE ?", "#{kpath}%"]) }.map do |record|
               [record['name'], record['zip']]
             end
             return select(obj, sym, values, { :include_blank => opt[:include_blank] })
@@ -389,13 +372,15 @@ module Zena
         # Shows 'login' or 'logout' button.
         def login_link(opts={})
           if visitor.is_anon?
-            if params[:prefix]
-              link_to _('login'), :overwrite_params => { :prefix => AUTHENTICATED_PREFIX }
-            else
-              "<a href='/login'>#{_('login')}</a>"
-            end
+            # if params[:prefix]
+            #    link_to _('login'), :overwrite_params => { :prefix => AUTHENTICATED_PREFIX }
+            #  else
+            #    "<a href='/login'>#{_('login')}</a>"
+            #  end
+            link_to "login", login_url
           else
-            "<a href='/logout'>#{_('logout')}</a>"
+            # "<a href='/logout'>#{_('logout')}</a>"
+            link_to "logout", logout_url
           end
         end
 
@@ -441,9 +426,6 @@ module Zena
           when :sites
             return '' unless visitor.is_admin?
             link_to_with_state(_('manage sites'), sites_path)
-          when :zena_up
-            return '' unless ENABLE_ZENA_UP && visitor.is_admin?
-            link_to_with_state(_('update zena'), zena_up_sites_path)
           when :dev
             return '' unless visitor.is_admin?
             if @controller.session[:dev]
@@ -466,7 +448,7 @@ module Zena
           end
           res = []
           visitor.site.lang_list.each do |l|
-            if l == lang
+            if l == visitor.lang
               if opts[:wrap]
                 res << "<#{opts[:wrap]} class='on'>#{l}" + tag_out
               else