spiderfw 0.5.19 → 0.6.0

data/apps/core/components/widgets/month_calendar/month_calendar.shtml

@@ -1,21 +1,24 @@
-<table class="{ @widget[:css_class] }">
+<div>
     <tpl:asset type="css" src="css/month_calendar.css" />
-    <thead>
-        <tr>
-            <th colspan="7">
-                <a href="{ @request[:path] }?_w{ @widget[:param] }[d]={ @prev_link }"><span>&lt;&lt;</span></a>
-                { @current_month_name } { @year }
-                <a href="{ @request[:path] }?_w{ @widget[:param] }[d]={ @next_link }"><span>&gt;&gt;</span></a>
-            </th>
-        <tr>
-            <th sp:each="@week_days |i|">{ @days_short_names[i] }</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr sp:each="@rows |row|">
-            <td sp:each="row |col|" class="{ col[:classes] }">
-                { col[:day] }
-            </td>
-        </tr>
-    </tbody>
-</table>
+    <table class="{ @widget[:css_class] }">
+        <thead>
+            <tr>
+                <th colspan="7">
+                    <a href="{ @request[:path] }?_w{ @widget[:param] }%5Bd%5D={ @prev_link }"><span>&lt;&lt;</span></a>
+                    { @current_month_name } { @year }
+                    <a href="{ @request[:path] }?_w{ @widget[:param] }%5Bd%5D={ @next_link }"><span>&gt;&gt;</span></a>
+                </th>
+            </tr>
+            <tr>
+                <th sp:each="@week_days |i|">{ @days_short_names[i] }</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr sp:each="@rows |row|">
+                <td sp:each="row |col|" class="{ col[:classes] }">
+                    { col[:day] }
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</div>

data/apps/core/components/widgets/switcher/switcher.rb

@@ -7,13 +7,20 @@ module Spider; module Components
         is_attribute :default
         attr_reader :current, :current_label
         
+        default_template 'default'
+        
+        
         def init
-            @items = []
             @sections = {}
             @labels = {}
             @links = {}
-            @content_by_action = {}
+            @first_link = nil
+            @content_by_label = {}
+            @labels_by_action = {}
             @link_mode = :path
+            @current_action = nil
+            @inline_widgets = {}
+            @inline_w_order = []
         end
         
         def route_widget
@@ -23,23 +30,39 @@ module Spider; module Components
 
 
         def prepare(action='')
-            if (@_action_local)
-                act = @_action_local
-            elsif @default
-                act = @default
-            else
-                redirect(widget_request_path+'/'+@links[@items[0]]) unless @items.empty?
+            act = @_action_local || @default
+            @current_action = act
+            @scene.current_action = @current_action
+            if @labels_by_action[act] && content = @content_by_label[@labels_by_action[act]]
+                # must add the widget here so that it gets processed in super
+                add_widget(content) if content.is_a?(Spider::Widget)
             end
-            content = @content_by_action[act]
+            
+            init_widgets
+            
+            
+            # The widget object gets instantiated in super, so it is available now
+            @inline_w_order.each do |id|
+                iw = @inline_widgets[id]
+                add(iw[:label], @widgets[id], iw[:section])
+            end
+            
+            redirect(widget_request_path+'/'+@first_link) if !act && @first_link
+            
+            label = @labels_by_action[act]
+            content = @content_by_label[label]
             raise NotFound.new(request_path) unless content
-            add_widget(content) if content.is_a?(Spider::Widget)
-            @current = content
-            @current_label = @labels[content]
+
+            # content must not be set in inline, so it is not rendered by sp:run
+            @current = @inline_widgets[content.id.to_sym] ? nil : content
+            @current_label = label
+            
             super
-            @sections.each do |section, items|
-                items.each do |item|
-                    menu_link = @link_mode == :path ? widget_request_path+'/'+@links[item] : "#{widget_request_path}?_wa[#{full_id}]=#{@links[item]}"
-                    @widgets[:menu].add(@labels[item], menu_link, section)
+            
+            @sections.each do |section, labels|
+                labels.each do |label|
+                    menu_link = @link_mode == :path ? widget_request_path+'/'+@links[label] : "#{widget_request_path}?_wa[#{full_id}]=#{@links[label]}"
+                    @widgets[:menu].add(label, menu_link, section)
                 end
             end
             @widgets[:menu].current = @current_label
@@ -47,13 +70,14 @@ module Spider; module Components
         end
         
         def add(label, content, section=nil)
-            @items << content
             @sections[section] ||= []
-            @sections[section] << content
+            @sections[section] << label
             @labels[content] = label
-            w_action = self.class.label_to_link(label)
-            @content_by_action[w_action] = content
-            @links[content] = w_action
+            @content_by_label[label] = content
+            w_act = self.class.label_to_link(label)
+            @first_link ||= w_act
+            @links[label] = w_act
+            @labels_by_action[w_act] = label
         end
         
         def widget_assets
@@ -66,6 +90,38 @@ module Spider; module Components
             label.downcase.gsub(/\s+/, '_').gsub(/[^a-zA-Z_]/, '')
         end
         
+        def self.parse_content(doc)
+            ov = ""
+            @inline_widgets = []
+            doc.root.search('> [@id]').each do |w|
+                w_id = w.get_attribute('id')
+                w_label = w.get_attribute('switcher:label') || w_id
+                w_section = w.get_attribute('switcher:section')
+                w.remove_attribute('switcher:label')
+                w.remove_attribute('switcher:section')
+                ov += %Q{<tpl:pass sp:if="@current_action == '#{w_id}'">#{w.to_s}</tpl:pass>}
+                inline_attrs = %Q{id="#{w_id}" label="#{w_label}"}
+                inline_attrs += %Q{ section="#{w_section}"} if w_section
+                w.swap(%Q{<switcher:inline-widget #{inline_attrs}/>})
+            end
+            override = Hpricot(%Q{<tpl:append search="#content">#{ov}</tpl:append>}).root
+            parse_override(override)
+            runtime, soverrides = super(doc)
+            return [runtime, [override] + soverrides]
+        end
+        
+        def parse_runtime_content(doc, src_path)
+            doc = super
+            @inline_widgets = {}
+            doc.search('switcher:inline-widget').each do |w|
+                w_id = w.get_attribute('id').to_sym
+                @inline_widgets[w_id] = {:label => w.get_attribute('label')}
+                @inline_w_order << w_id
+            end
+            doc.search('switcher:inline-widget').remove
+            doc
+        end
+        
         
     end
     

data/apps/core/components/widgets/switcher/templates/default.shtml

@@ -0,0 +1,8 @@
+<div>
+    <tpl:asset type="css" src="css/switcher.css" />
+    <core:menu id="menu"/>
+    <div id="content" class="content">
+        <sp:render sp:if="@current.is_a?(Spider::Template)" obj="@current" />
+        <sp:run sp:if="@current.is_a?(Spider::Widget)" obj="@current" />
+    </div>
+</div>

data/apps/core/components/widgets/switcher/templates/table.shtml

@@ -0,0 +1,15 @@
+<tpl:extend src="default.shtml">
+    <tpl:override-content>
+        <div id="switcher_top"></div>
+        <table width="100%">
+            <tr>
+                <td valign="top" width="18%">
+                    <tpl:overridden search="#menu" />
+                </td>
+                <td valign="top">
+                    <tpl:overridden search="#content" />
+                </td>
+            </tr>
+        </table>
+    </tpl:override-content>
+</tpl:extend>

data/apps/core/components/widgets/table/table.rb

@@ -112,6 +112,7 @@ module Spider; module Components
             @scene.has_more = @rows.has_more?
             @scene.pages = (@rows.total_rows.to_f / @attributes[:row_limit]).ceil
             @scene.paginate_last = [@scene.paginate_first + 9, @scene.pages].min
+            @scene.columns = @elements.size
             super
         end
         
@@ -145,7 +146,9 @@ module Spider; module Components
                             res_row[el] = list
                         end
                     else
-                        if (!row[el])
+                        if element.type <= Spider::Bool
+                            res_row[el] = row[el] ? _('Yes') : _('No')
+                        elsif (!row[el])
                             res_row[el] = '' 
                         elsif (element.type <= Date || element.type <= Time)
                             res_row[el] = Spider::I18n.localize_date_time(@request.locale, row[el], :short)

data/apps/core/components/widgets/table/table.shtml

@@ -12,17 +12,19 @@
             </tr>
         </thead>
         <tbody>
-            <tr sp:each_index="@rows |row_i|" class="row { (row_i%2==0) ? 'odd' : 'even' }">
-                <td sp:each="@elements |element|">
-                    <a sp:tag-if="@link_el && element == @link_el" href="{ @link }{ Spider::HTTP.urlencode(@rows[row_i][@link_id]) }">
-                        { @rows[row_i][element] }
-                    </a>
-                </td>
-            </tr>
+            <tpl:pass sp:each_index="@rows |row_i|">
+                <tr class="row { (row_i%2==0) ? 'odd' : 'even' }">
+                    <td sp:each="@elements |element|">
+                        <a sp:tag-if="@link_el && element == @link_el" href="{ @link }{ Spider::HTTP.urlencode(@rows[row_i][@link_id]) }">
+                            { @rows[row_i][element] }
+                        </a>
+                    </td>
+                </tr>
+            </tpl:pass>
         </tbody>
         <tfoot>
             <tr class="paginator" sp:if="@paginate && @pages > 1">
-                <td colspan="{ @elements.size }" >
+                <td colspan="{ @columns }" >
                     <a sp:if="@page > 1" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }">Indietro</a>
                     <sp:pass sp:if="@paginate_first > 1">
                         <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1" class="page">1</a> ... 

data/apps/core/forms/public/css/form.css

@@ -87,6 +87,14 @@
     background-color: #F2F2F2;
 }
 
-.asmSelectTitle{
+.bsmSelectTitle{
     color: #999999;
 }
+
+.spider.forms.form .bsmContainer{
+    float: left;
+}
+
+.spider.forms.form .bsmListItem{
+    padding-right: 2em;
+}

data/apps/core/forms/public/date_time.js

@@ -3,13 +3,25 @@ Spider.defineWidget('Spider.Forms.DateTime', {
 	autoInit: true,
 	
 	ready: function(){
-		if (this.el.is('.date')) this.el.datepicker();
+	    var conf = {};
+	    if (this.el.is('.change-month')) conf.changeMonth = true;
+	    if (this.el.is('.change-year')) conf.changeYear = true;
+        var classes = this.el.attr('class').split(' ');
+        for (var i=0; i<classes.length; i++){
+            var cl = classes[i];
+            if (cl.substr(0, 10) == 'year-range'){
+                var range = cl.substr(11).split('-');
+                conf.yearRange = range[0].replace("m", "-")+":"+range[1].replace('p', '+');
+                a = 3;
+            }
+        }
+		if (this.el.is('.date')) this.el.datepicker(conf);
 		else if (this.el.is('.date_time')){
 			var el = this.el;
 			el.hide();
 			var val = el.val().split(' ');
 			if (!val[1]) val[1] = '';
-			var d = $('<input type="text" class="date" size="10" />').val(val[0]).insertAfter(el).datepicker();
+			var d = $('<input type="text" class="date" size="10" />').val(val[0]).insertAfter(el).datepicker(conf);
 			var span = $('<span> </span>').insertAfter(d);
 			var t = $('<input type="text" class="time" size="8" />').val(val[1]).insertAfter(span);
 			var updateDt = function(){

data/apps/core/forms/public/input.js

@@ -22,7 +22,7 @@ Spider.defineWidget('Spider.Forms.Input', {
 	},
 	
 	val: function(){
-		this.el.val();
+		return this.el.val();
 	}
 	
 	

data/apps/core/forms/public/select.js

@@ -5,12 +5,13 @@ Spider.defineWidget('Spider.Forms.Select', 'Spider.Forms.Input', {
 	ready: function(){
 		if (this.el.is('select[multiple]')){
             this.el.attr('title', 'Aggiungi...');
-		    this.el.asmSelect({
+		    this.el.bsmSelect({
     			removeLabel: 'togli',
     			highlightAddedLabel: 'Aggiunto: ',
-    			highlightRemovedLabel: 'Tolto: '
+    			highlightRemovedLabel: 'Tolto: ',
+    			addItemTarget: 'top'
     		});
-            $('.asmSelect option:first', this.el.parent()).addClass('asmSelectTitle')
+            $('.bsmSelect option:first', this.el.parent()).addClass('bsmSelectTitle')
                 .attr("selected", false)
 				.attr("disabled", true);
 		} 

data/apps/core/forms/tags/element_row.erb

@@ -1,9 +1,18 @@
 <%
+    tag_attrs = ['required', 'element', 'error_condition']
     error_condition = @attributes['error_condition'] ? @attributes['error_condition'] : "@inputs[#{@attributes['element']}].error?"
     required =  @attributes['required'] ? @attributes['required'] : "@inputs[#{@attributes['element']}].required?"
 %>
 <forms:row error_condition="<%=error_condition%>" required="<%=required%>">
     <forms:element_label element="<%=@attributes['element']%>" required="<%=required%>"/>
-    <sp:run obj="@inputs[<%=@attributes['element']%>]" />
-    <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="required" value="<%=(@attributes['required']=='true')? 'true' : ''%>" />
+    <sp:run obj="@inputs[<%=@attributes['element']%>]" widget="<%=@attributes['element']%>">
+      <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="required" value="<%=(@attributes['required']=='true')? 'true' : ''%>" />
+      <%
+        (@attributes.keys - tag_attrs).each do |k|
+      %>
+      <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="<%=k%>" value="<%=@attributes[k]%>" />
+      <%
+        end
+      %>
+    </sp:run>
 </forms:row>

data/apps/core/forms/widgets/inputs/date_time/date_time.rb

@@ -6,6 +6,9 @@ module Spider; module Forms
         is_attr_accessor :mode, :type => Symbol, :default => :date
         i_attr_accessor :format, :type => String
         i_attr_accessor :lformat, :type => Symbol, :default => :short
+        attribute :"change-month", :type => Spider::Bool, :default => false
+        attribute :"change-year", :type => Spider::Bool, :default => false
+        attribute :"year-range", :type => String, :default => "150:10"
         
         def prepare_value(val)
             return val if val.respond_to?(:strftime)
@@ -31,6 +34,12 @@ module Spider; module Forms
                 when :time then 8
                 end
             end
+            @additional_classes = []
+            @additional_classes << 'change-month' if @attributes[:"change-month"]
+            @additional_classes << 'change-year' if @attributes[:"change-year"]
+            yr = @attributes[:"year-range"].sub('-', 'm').sub('+', 'p').sub(':', '-') if @attributes[:"change-year"]
+            @additional_classes << "year-range-#{yr}" if yr 
+            @scene.additional_classes = @additional_classes
             super
         end
         

data/apps/core/forms/widgets/inputs/date_time/date_time.shtml

@@ -2,5 +2,5 @@
     <tpl:asset type="js" src="input.js" />
     <tpl:asset name="jquery-ui-datepicker" />
     <tpl:asset type="js" src="date_time.js" />
-    <input type="text" name="{ @name }" value="{ @formatted_value }" size="{ @size }" class="{ @mode }">
+    <input type="text" name="{ @name }" value="{ @formatted_value }" size="{ @size }" class="{ @mode } { @additional_classes.join(' ') }">
 </sp:template>

data/apps/core/forms/widgets/inputs/html_area/html_area.shtml

@@ -1,11 +1,11 @@
 <div>
+    <tpl:asset type="js" src="ckeditor/ckeditor.js" compressed="true" copy_dir="true"/>
+    <tpl:asset type="js" src="ckeditor/adapters/jquery.js" compressed="true" />
     <tpl:asset name="jquery" />
     <tpl:asset type="js" src="input.js" />
     <tpl:asset type="js" src="html_area.js" /><tpl:asset type="js" src="text_area.js" />
     <!--- <tpl:asset type="css" src="jwysiwyg/jquery.wysiwyg.css" />
     <tpl:asset type="js" src="jwysiwyg/jquery.wysiwyg.js" /> -->
-    <tpl:asset type="js" src="ckeditor/ckeditor.js" compressed="true"/>
-    <tpl:asset type="js" src="ckeditor/adapters/jquery.js" />
     <div class="initial_html" style="display:none">{ @initial_html }</div>
     <div class="css" style="display:none">{ @css }</div>
     <div class="options" style="display:none">{ @options }</div>

data/apps/core/forms/widgets/inputs/input/input.rb

@@ -7,9 +7,6 @@ module Spider; module Forms
         is_attr_accessor :label
         is_attr_accessor :required, :type => Spider::DataTypes::Bool
         
-        def self.template_path_parent
-            File.dirname(File.dirname(__FILE__))
-        end
         
         def init
             @done = true

data/apps/core/forms/widgets/inputs/select/select.shtml

@@ -1,8 +1,8 @@
 <select name="{ @value_param }" sp:attr-if="@multiple,multiple" title="">
 	<tpl:asset type="js" src="input.js" />
 	<tpl:asset type="js" src="select.js" />
-	<tpl:asset type="js" app="core/components" src="js/jquery/plugins/asmselect/jquery.asmselect.js" if="@multiple" />
-	<tpl:asset type="css" app="core/components" src="js/jquery/plugins/asmselect/jquery.asmselect.css" if="@multiple" />
+	<tpl:asset type="js" app="core/components" src="js/jquery/plugins/bsmselect/js/jquery.bsmselect.js" if="@multiple" />
+	<tpl:asset type="css" app="core/components" src="js/jquery/plugins/bsmselect/css/jquery.bsmselect.css" if="@multiple" />
     <option sp:if="@blank_option"> </option>
     <option sp:each_index="@data |i|" value="{ @values[i] }" sp:attr-if="@selected[values[i]],selected">
         { @data[i].to_s }

data/apps/messenger/backends/email/sendmail.rb

@@ -0,0 +1,20 @@
+require 'apps/messenger/lib/email_backend'
+
+module Spider; module Messenger; module Backends; module Email
+    
+    module Sendmail
+        include Messenger::EmailBackend
+        
+        def self.send_message(msg)
+            Spider.logger.debug("Sending e-mail #{msg.ticket}")
+            mail = prepare_mail(msg)
+            mail.delivery_method :sendmail
+            mail.deliver
+            return true
+        end
+        
+
+        
+    end
+    
+end; end; end; end

data/apps/messenger/backends/email/smtp.rb

@@ -1,5 +1,4 @@
 require 'apps/messenger/lib/email_backend'
-require 'net/smtp'
 
 module Spider; module Messenger; module Backends; module Email
     
@@ -8,19 +7,18 @@ module Spider; module Messenger; module Backends; module Email
         
         def self.send_message(msg)
             Spider.logger.debug("Sending e-mail #{msg.ticket}")
-            res = false
-            Net::SMTP.start(
-              Spider.conf.get('messenger.smtp.address'),
-              Spider.conf.get('messenger.smpt.port'),
-              Spider.conf.get('messenger.smtp.domain'),
-              Spider.conf.get('messenger.smtp.username'),
-              Spider.conf.get('messenger.smtp.password'),
-              Spider.conf.get('messenger.smtp.auth_scheme')
-            ) do |smtp|
-                msg_str = msg.headers+"\r\n\r\n"+msg.body
-                res = smtp.send_message msg_str, msg.from, msg.to
-            end
-            return res.string
+            mail = prepare_mail(msg)
+            mail.delivery_method :smtp, {
+                :address => Spider.conf.get('messenger.smtp.address'),
+                :port => Spider.conf.get('messenger.smpt.port'),
+                :domain => Spider.conf.get('messenger.smtp.domain'),
+                :user_name => Spider.conf.get('messenger.smtp.username'),
+                :password => Spider.conf.get('messenger.smtp.password'),
+                :authentication => Spider.conf.get('messenger.smtp.auth_scheme'),
+                :enable_starttls_auto => Spider.conf.get('messenger.smpt.enable_starttls_auto')
+            }
+            mail.deliver
+            return true
         end
         
         def self.update_statuses

data/apps/messenger/backends/email/test.rb

@@ -0,0 +1,20 @@
+require 'apps/messenger/lib/email_backend'
+
+module Spider; module Messenger; module Backends; module Email
+    
+    module Test
+        include Messenger::EmailBackend
+        
+        def self.send_message(msg)
+            Spider.logger.debug("Sending e-mail #{msg.ticket}")
+            res = false
+            mail = prepare_mail(msg)
+            mail.delivery_method :test
+            mail.deliver
+        end
+        
+
+        
+    end
+    
+end; end; end; end

data/apps/messenger/config/options.rb

@@ -7,6 +7,7 @@ module Spider
     config_option 'messenger.smtp.password', _("SMTP authentication password"), :default => nil
     config_option 'messenger.smtp.auth_scheme', _("SMTP authentication scheme"), :default => nil, :type => Symbol,
         :choices => [nil, :plain, :login, :cram_md5]
+    config_option 'messenger.smpt.enable_starttls_auto', _("Automatically start TLS for SMTP"), :default => false, :type => Spider::Bool
     config_option 'messenger.smtp.log_path', _("Smtp logfile (e.g. /var/log/mail.log)"), :default => nil
         
     config_option 'messenger.email.retries', _("How many times to retry sending an e-mail"), :type => Fixnum, :default => 5
@@ -14,15 +15,13 @@ module Spider
         :type => Fixnum, :default => 10
     config_option 'messenger.queue.run_every', _("Time in seconds between queue runs"), :type => Fixnum, :default => 60
     
-    config_option 'messenger.email.backends', _("The backends to use for sending mail (if more than one)"), :type => Array, :default => ['smtp']
-    config_option 'messenger.email.backend', _("The backend to use for sending sms"), :type => String, :do => lambda{ |val|
-        Spider.conf.set('messenger.email.backends', [val])
-    }
+    config_option 'messenger.email.backends', _("The backends to use for sending mail (if more than one)"), :type => Array,
+        :default => lambda{ Spider.conf.get('messenger.email.backend') ? [Spider.conf.get('messenger.email.backend')] : [] }
+    config_option 'messenger.email.backend', _("The backend to use for sending sms"), :type => String, :default => 'smtp'
     
-    config_option 'messenger.sms.backends', _("The backends to use for sending sms (if more than one)"), :type => Array, :default => []
-    config_option 'messenger.sms.backend', _("The backend to use for sending sms"), :type => String, :do => lambda{ |val|
-        Spider.conf.set('messenger.sms.backends', [val])
-    }
+    config_option 'messenger.sms.backends', _("The backends to use for sending sms (if more than one)"), :type => Array,
+        :default => lambda{ Spider.conf.get('messenger.sms.backend') ? [Spider.conf.get('messenger.sms.backend')] : [] }
+    config_option 'messenger.sms.backend', _("The backend to use for sending sms"), :type => String
     config_option 'messenger.sms.retries', _("How many times to retry sending an sms"), :type => Fixnum, :default => 5
     config_option 'messenger.sms.retry_time', _("Seconds to wait until retry (will be incremented at each retry)"), 
         :type => Fixnum, :default => 10
@@ -38,6 +37,7 @@ module Spider
     config_option 'messenger.smstools.remove_sent', _("Whether to remove failed messages from the smstools sent folder"),
         :type => Spider::Bool, :default => true
     config_option 'messenger.smstools.log_path', _("Smsd logfile"), :default => '/var/log/smsd.log'
-
+    config_option 'messenger.send_immediate', _("Send messages right after the controller action instead of waiting for worker"), 
+        :type => Spider::Bool, :default => true
     
 end

data/apps/messenger/config/test.config.yml

@@ -0,0 +1,2 @@
+set test:
+    messenger.email.backend: test

data/apps/messenger/controllers/mixins/messenger_helper.rb

@@ -1,5 +1,5 @@
 require 'erb'
-require 'mailfactory'
+require 'mail'
 
 Spider.register_resource_type(:email, :extensions => ['erb'], :path => 'templates/email')
 
@@ -11,14 +11,20 @@ module Spider; module Messenger
         # #Messenger::email
         # template is the template name (found in templates/email), without the extension
         # will use template.html.erb and template.txt.erb if they exist, template.erb otherwise.
-        # attachments must be an array of hashes like 
-        # {:file => '/full/file/path', :type => 'mime type', :file_name => 'optional email file name', 
-        # :headers => 'optional string or array of additional headers'}
+        # attachments must be an array, which items can be strings (the path to the file)
+        # or Hashes:
+        # {:filename => 'filename.png', :content => File.read('/path/to/file.jpg'),
+        #   :mime_type => 'mime/type'}
+        # Attachments will be passed to the Mail gem (https://github.com/mikel/mail), so any syntax allowed by Mail
+        # can be used
         def send_email(template, scene, from, to, headers={}, attachments=[], params={})
             klass = self.class if self.class.respond_to?(:find_resouce_path)
             klass ||= self.class.app if self.class.respond_to?(:app)
             klass ||= Spider.home
-            Spider::Messenger::MessengerHelper.send_email(klass, template, scene, from, to, headers, attachments, params)
+            msg = Spider::Messenger::MessengerHelper.send_email(klass, template, scene, from, to, headers, attachments, params)
+            @messenger_sent ||= {}
+            @messenger_sent[:email] ||= []
+            @messenger_sent[:email] << msg.ticket
         end
         
         def self.send_email(klass, template, scene, from, to, headers={}, attachments=[], params={})
@@ -34,20 +40,33 @@ module Spider; module Messenger
                 path = klass.find_resource_path(:email, template)
                 text = ERB.new(IO.read(path)).result(scene_binding)
             end
-            mail = MailFactory.new
-            mail.To = to
-            mail.From = from
+            mail = Mail.new
+            mail[:to] = to
+            mail[:from] = from
+            mail.charset = "UTF-8"
             headers.each do |key, value|
-                mail.add_header(key, value)
+                mail[key] = value
             end
-            mail.html = html if html
-            mail.text = text if text
-            if (attachments && !attachments.empty?)
+
+            if html
+                mail.text_part do
+                    body text
+                end
+                mail.html_part do
+                    content_type 'text/html; charset=UTF-8'
+                    body html
+                end
+            else
+                mail.body = text
+            end
+
+            if attachments && !attachments.empty?
                 attachments.each do |att|
-                    if (att[:file_name])
-                        mail.add_attachment_as(att[:file], att[:file_name], att[:type], att[:headers])
+                    if att.is_a?(Hash)
+                        filename = att.delete(:filename)
+                        mail.attachments[filename] = att
                     else
-                        mail.add_attachment(att[:file], att[:type], att[:headers])
+                        mail.add_file(att)
                     end
                 end
             end
@@ -55,6 +74,13 @@ module Spider; module Messenger
             mail_headers += "\r\n"
             Messenger.email(from, to, mail_headers, mail_body, params)
         end
+        
+        def after(action='', *params)
+            return super unless Spider.conf.get('messenger.send_immediate') && @messenger_sent
+            Spider::Messenger.process_queue(:email, @messenger_sent[:email]) if @messenger_sent[:email]
+            Spider::Messenger.process_queue(:sms, @messenger_sent[:sms]) if @messenger_sent[:sms]
+        end
+        
     end
     
 end; end