spiderfw 0.6.28 → 0.6.29

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.6.29
+* Sostituito metodo lambda per problemi con ruby 1.9.3 in site_map del cms
+* Cambiata gestione invio sms con sender_name e prefisso internazionele, mail (smpt -> smtp )
+* Modifiche alla widget table per paginazione per gestione pagina di dettaglio e ritorno a pagina corrente in elenco
+* Corretto db_mapper per condition sugli elementi di un modello
+
 == 0.6.28
 * Visualizzazione in core:table dei dati collegati, eliminazione dipendenze circolari in uow
 * Bugfixes

data/VERSION

@@ -1 +1 @@
-0.6.28
+0.6.29

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

@@ -71,7 +71,6 @@ module Spider; module Components
                     @widgets[:ask_delete].scene.rows_to_del = rows
                 end
             elsif @action == :form
-           #     debugger
                 if @widgets[:form].saved?
                     flash[:saved] = true
                     if @widgets[:form].saved_and_new?

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

@@ -67,6 +67,7 @@ module Spider; module Components
             end
             @sort_el = [@sort_el] if @sort_el && !@sort_el.is_a?(Array)
             @scene.link_el = @attributes[:link_el]
+            @scene.current_page = @page
             @scene.link = @attributes[:link]
             @scene.link_id = @attributes[:link_id] || @attributes[:link_el]
             super

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

@@ -15,9 +15,15 @@
             <tpl:pass sp:each_index="@rows |row_i|">
                 <tr class="{ (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(@data[row_i][@link_id]) }">
+                        <a sp:if="((!@link_el.blank? && element == @link_el) && @link.blank?)" href="{ Spider::HTTP.urlencode(@data[row_i][@link_id]) }?current_page={ @page }">
+                            { @rows[row_i][element] }
+                        </a>   
+                        <a sp:if="@link_el && element == @link_el && !@link.blank?" href="{ @link }{ Spider::HTTP.urlencode(@data[row_i][@link_id]) }&current_page={ @page }">
                             { @rows[row_i][element] }
                         </a>
+                        <span sp:if="element != @link_el" >
+                            { @rows[row_i][element] }
+                        </span>
                     </td>
                 </tr>
             </tpl:pass>

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

@@ -20,7 +20,7 @@ module Spider; module Messenger; module Backends; module Email
                 :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')
+                :enable_starttls_auto => Spider.conf.get('messenger.smtp.enable_starttls_auto')
             }
             mail.deliver
             return true

data/apps/messenger/config/options.rb

@@ -7,7 +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.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

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

@@ -27,6 +27,7 @@ module Spider; module Messenger
         end
 
         def send_sms(to, text, params={})
+            to = "+39"+to if !to.include?("+")
             msg = Spider::Messenger.sms(to, text, params)
             sent_sms(msg.ticket)
             msg

data/apps/messenger/messenger.rb

@@ -132,9 +132,9 @@ module Spider
             return msg
         end
         
-        def self.sms(to, text, params={})
+        def self.sms(to, text, sender_name=nil, params={})
             msg = SMS.new(
-                :to => to, :text => text
+                :to => to, :text => text, :sender_name => sender_name
             )
             msg.next_try = params[:send_from] || DateTime.now
             msg.save

data/apps/messenger/models/sms.rb

@@ -4,6 +4,7 @@ module Spider; module Messenger
     
     class SMS < Message
         class_table_inheritance :add_polymorphic => true
+        element :sender_name, String, :label => "Nome Ente"
         element :to, String, :label => _("To")
         element :text, Text, :label => _("Text")
         

data/apps/messenger/views/admin/queue.shtml

@@ -13,13 +13,13 @@
     <div sp:if="@queue == :sms" class="queue">
         <h4>_(Sent messages) - { @sent.total_rows }</h4>
         <core:table id='sent' queryset='@sent' row_limit="5" link="@msg_view_url" link_el="id"
-            elements="id,to,ticket,sent,text" sort="sent,desc"/><br>
+            elements="id,to,sender_name,ticket,sent,text" sort="sent,desc"/><br>
         <h4>_(Queued messages) - { @queued.total_rows }</h4>
         <core:table id='queued' queryset='@queued' row_limit="5" link="@msg_view_url" link_el="id"
-            elements="id,to,ticket,last_try,next_try,attempts,backend_response" sort="next_try,desc"/><br>
+            elements="id,to,sender_name,ticket,last_try,next_try,attempts,backend_response" sort="next_try,desc"/><br>
         <h4>_(Failed messages) - { @failed.total_rows }</h4>
         <core:table id='failed' queryset='@failed' row_limit="5" link="@msg_view_url" link_el="id"
-            elements="id,to,ticket,last_try,backend_response" sort="last_try,desc"/><br>
+            elements="id,to,sender_name,ticket,last_try,backend_response" sort="last_try,desc"/><br>
     </div>
 
 </div>

data/lib/spiderfw/model/base_model.rb

@@ -262,6 +262,7 @@ module Spider; module Model
 
             orig_type = type
             assoc_type = nil
+            attributes[:reverse] ||= attributes[:reverse_of]
             if (proc || attributes[:junction] || (attributes[:multiple] && (!attributes[:add_reverse]) && (!attributes[:has_single_reverse]) && \
                 # FIXME! the first check is needed when the referenced class has not been parsed yet 
                 # but now it assumes that the reverse is not multiple if it is not defined

data/lib/spiderfw/model/mappers/db_mapper.rb

@@ -1174,7 +1174,7 @@ module Spider; module Model; module Mappers
                     column.primary_key = true if element.primary_key?
                     schema.set_column(element.name, column)
                 elsif (true) # FIXME: must have condition element.storage == @storage in some of the subcases
-                    if (!element.multiple? && !element.attributes[:junction] && !element.attributes[:condition]) # 1/n <-> 1
+                    if (!element.multiple? && !element.attributes[:junction] && !element.attributes[:reverse_of]) # 1/n <-> 1
                         current_schema = schema.foreign_keys[element.name] || {}
                         foreign_key_constraints = {}
                         el_mapper = element.type.mapper

data/lib/spiderfw/model/mappers/mapper.rb

@@ -279,15 +279,20 @@ module Spider; module Model
             prev_autoload = obj.autoload?
             obj.save_mode
             storage.in_transaction
-            save_mode = determine_save_mode(obj)
-            before_save(obj, save_mode)
-            if save_mode == :update
-                do_update(obj)
-            else
-                do_insert(obj)
+            begin
+                save_mode = determine_save_mode(obj)
+                before_save(obj, save_mode)
+                if save_mode == :update
+                    do_update(obj)
+                else
+                    do_insert(obj)
+                end
+                after_save(obj, save_mode)
+                storage.commit_or_continue
+            rescue
+                storage.rollback_or_continue
+                raise
             end
-            after_save(obj, save_mode)
-            storage.commit_or_continue
             obj.autoload = prev_autoload
             unless @doing_save_done
                 @doing_save_done = true
@@ -466,10 +471,15 @@ module Spider; module Model
         def insert(obj)
             prev_autoload = obj.save_mode()
             storage.in_transaction
-            before_save(obj, :insert)
-            do_insert(obj)
-            after_save(obj, :insert)
-            storage.commit_or_continue
+            begin
+                before_save(obj, :insert)
+                do_insert(obj)
+                after_save(obj, :insert)
+                storage.commit_or_continue
+            rescue
+                storage.rollback_or_continue
+                raise
+            end
             obj.autoload = prev_autoload
         end
         
@@ -479,10 +489,15 @@ module Spider; module Model
         def update(obj)
             prev_autoload = obj.save_mode()
             storage.in_transaction
-            before_save(obj, :update)
-            do_update(obj)
-            after_save(obj, :update)
-            storage.commit_or_continue
+            begin
+                before_save(obj, :update)
+                do_update(obj)
+                after_save(obj, :update)
+                storage.commit_or_continue
+            rescue
+                storage.rollback_or_continue
+                raise
+            end
             obj.autoload = prev_autoload
         end
         
@@ -504,7 +519,7 @@ module Spider; module Model
         #                         Useful when an object will be re-inserted with the same keys.
         # @return [void]
         def delete(obj_or_condition, force=false, options={})
-            
+        
             def prepare_delete_condition(obj)
                 condition = Condition.and
                 @model.primary_keys.each do |key|
@@ -536,36 +551,41 @@ module Spider; module Model
             before_delete(curr)
             vals = []
             started_transaction = false
-            unless cascade.empty? && assocs.empty?
-                storage.in_transaction
-                started_transaction = true
-                curr.each do |curr_obj|
-                    obj_vals = {}
-                    cascade.each do |el|
-                        obj_vals[el] = curr_obj.get(el)
-                    end
-                    vals << obj_vals
-                    assocs.each do |el|
-                        next if el.has_single_reverse? && options[:keep_single_reverse]
-                        delete_element_associations(curr_obj, el)
+            begin
+                unless cascade.empty? && assocs.empty?
+                    storage.in_transaction
+                    started_transaction = true
+                    curr.each do |curr_obj|
+                        obj_vals = {}
+                        cascade.each do |el|
+                            obj_vals[el] = curr_obj.get(el)
+                        end
+                        vals << obj_vals
+                        assocs.each do |el|
+                            next if el.has_single_reverse? && options[:keep_single_reverse]
+                            delete_element_associations(curr_obj, el)
+                        end
                     end
                 end
-            end
-            @model.referenced_by_junctions.each do |junction, element|
-                curr.each do |curr_obj|
-                    junction_condition = Spider::Model::Condition.new
-                    junction_condition[element] = curr_obj
-                    junction.mapper.delete(junction_condition)
+                @model.referenced_by_junctions.each do |junction, element|
+                    curr.each do |curr_obj|
+                        junction_condition = Spider::Model::Condition.new
+                        junction_condition[element] = curr_obj
+                        junction.mapper.delete(junction_condition)
+                    end
                 end
-            end
-            do_delete(condition, force)
-            vals.each do |obj_vals|
-                obj_vals.each do |el, val|
-                    el.model.mapper.delete(val)
+                do_delete(condition, force)
+                vals.each do |obj_vals|
+                    obj_vals.each do |el, val|
+                        el.model.mapper.delete(val)
+                    end
                 end
+                after_delete(curr)
+                storage.commit_or_continue if started_transaction
+            rescue
+                storage.rollback_or_continue if started_transaction
+                raise
             end
-            after_delete(curr)
-            storage.commit_or_continue if started_transaction
         end
         
         # Deletes all objects from the storage.

data/lib/spiderfw/model/storage/base_storage.rb

@@ -364,6 +364,14 @@ module Spider; module Model; module Storage
             curr[:savepoints] = []
             release
         end
+
+        def rollback_or_continue
+            if curr[:transaction_nesting] == 1
+                rollback
+            else
+                curr[:transaction_nesting] -= 1 if curr[:transaction_nesting] > 1
+            end
+        end
         
         # @abstract
         # Implemented by subclasses to interact with the backend

data/lib/spiderfw/model/storage/db/adapters/mysql.rb

@@ -92,12 +92,12 @@ module Spider; module Model; module Storage; module Db
         def release
             begin
                 #Spider::Logger.debug("MYSQL #{self.object_id} in thread #{Thread.current} releasing connection #{@conn}")
-                @conn.autocommit(true) if @conn && !Spider.conf.get('storage.db.shared_connection')
+                curr[:conn].autocommit(true) if curr[:conn] && !Spider.conf.get('storage.db.shared_connection')
                 super
             rescue => exc
-                Spider::Logger.error("MYSQL #{self.object_id} in thread #{Thread.current} exception #{exc.message} while trying to release connection #{@conn}")
-                self.class.remove_connection(@conn, @connection_params)
-                @conn = nil
+                Spider::Logger.error("MYSQL #{self.object_id} in thread #{Thread.current} exception #{exc.message} while trying to release connection #{curr[:conn]}")
+                self.class.remove_connection(curr[:conn], @connection_params)
+                curr[:conn] = nil
             end
         end
         

data/lib/spiderfw/templates/blocks/lambda.rb

@@ -8,7 +8,7 @@ module Spider; module TemplateBlocks
             init = ""
             lambda_name = @el.attributes['sp:lambda']
             @el.remove_attribute('sp:lambda')
-            c = "#{lambda_name} = lambda do\n"            
+            c = "#{lambda_name} = Proc.new do\n"            
             content = Spider::TemplateBlocks.parse_element(@el, @allowed_blocks, @template).compile(options)
             content.run_code.each_line do |line|
                 c += '  '+line

data/lib/spiderfw/widget/widget.rb

@@ -290,11 +290,10 @@ module Spider
         def widget_target=(target)
             @widget_target = target
         end
-        
+
         def widget_request_path
             p = @request.path
-            i = p.index(@_action) if @_action && !@_action.empty?
-            p = p[0..i-2] if i
+            p = p.sub(/\/#{Regexp.escape(@_action)}$/, '') unless @_action.blank?
             p = p.sub(/\/+$/, '')
             return p
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 6
-  - 28
-  version: 0.6.28
+  - 29
+  version: 0.6.29
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-13 00:00:00 Z
+date: 2013-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse