spiderfw 0.6.29 → 0.6.30

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

@@ -5,8 +5,8 @@ module Spider; module Components
         is_attr_accessor :actions
         is_attribute :cancel_param
         is_attribute :ok_param
-        is_attribute :cancel_text, :default => lambda{ _('Cancel') }
-        is_attribute :ok_text, :default => lambda{ _('Ok') }
+        is_attribute :cancel_text, :default => Proc.new{ _('Cancel') }
+        is_attribute :ok_text, :default => Proc.new{ _('Ok') }
 
         
         def prepare

data/apps/core/components/widgets/list/plugins/exportable/exportable_list.rb

@@ -6,7 +6,6 @@ module Spider; module Components
         
         __.action
         def export_to_csv
-            debugger
             @queryset.each do |row|
                 $out << row.to_s+"\n"
             end

data/apps/messenger/backends/sms/skebby.rb

@@ -0,0 +1,61 @@
+require 'apps/messenger/lib/sms_backend'
+require 'apps/messenger/lib/backends/skebby'
+require 'net/http'
+require 'uri'
+require 'cgi'
+
+
+module Spider; module Messenger; module Backends; module SMS
+
+    module Skebby
+        include Messenger::SMSBackend
+
+
+        def self.send_message(msg)
+            Spider.logger.debug("**Sending SMS with skebby**")
+            username = Spider.conf.get('messenger.skebby.username')
+            password = Spider.conf.get('messenger.skebby.password')
+            from = Spider.conf.get('messenger.skebby.from')    
+            to = []
+            to << msg.to.gsub("+","");
+            text = msg.text
+            gw = Spider::Messenger::Skebby::SkebbyGatewaySendSMS.new(username, password)
+ 
+            #controllo il credito
+            credito_presente = gw.getCredit()
+            if credito_presente
+
+                #Invio SMS Basic
+                #result = gw.sendSMS('send_sms_basic', 'Hi Mike, how are you? By John', recipients )
+                 
+                #Invio SMS Classic con mittente personalizzato di tipo numerico
+                #result = gw.sendSMS('send_sms_classic', 'Hi Mike, how are you', recipients, { :senderNumber => '393471234567' } )
+                 
+                #Invio SMS Classic con notifica(report) con mittente personalizzato di tipo alfanumerico - Invio SMS Classic Plus
+                #result = gw.sendSMS('send_sms_classic_report', 'Hi Mike, how are you', recipients, { :senderString => 'Jhon' } )
+                 
+                #Invio SMS Classic con notifica(report) con mittente personalizzato di tipo numerico - Invio SMS Classic Plus
+                #result = gw.sendSMS('send_sms_classic_report', 'Hi Mike, how are you', recipients, { :senderNumber => '393471234567' } )
+
+                #Invio SMS Classic con mittente personalizzato di tipo alfanumerico
+                result = gw.sendSMS('send_sms_classic', text, to, { :senderString => from, :charset => 'UTF-8' } )
+                if result
+                    gw.printResponse
+                else
+                    raise "Errore nell'invio degli sms."
+                end  
+            else
+                raise "Il credito e insufficiente per mandare sms."
+            end
+                         
+            
+             
+                
+        end
+
+
+    end
+
+
+
+end; end; end; end    

data/apps/messenger/config/options.rb

@@ -45,4 +45,10 @@ module Spider
         :type => String
     config_option 'messenger.mobyt.from', _("From parameter for the Mobyt service"), 
         :type => String
+    config_option 'messenger.skebby.username', _("Username for the Skebby service"), 
+        :type => String    
+    config_option 'messenger.skebby.password', _("Password for the Skebby service"), 
+        :type => String
+    config_option 'messenger.skebby.from', _("From parameter for the Skebby service"), 
+        :type => String
 end

data/apps/messenger/lib/backends/skebby.rb

@@ -0,0 +1,106 @@
+require 'digest/md5'
+require 'net/http'
+require 'iconv'
+
+module Spider::Messenger
+
+    module Skebby
+
+      class SkebbyGatewaySendSMS
+   
+          def initialize(username = '', password = '')
+              @url = 'http://gateway.skebby.it/api/send/smseasy/advanced/http.php'
+       
+              @parameters = {
+                  'username'      => username,
+                  'password'      => password,
+              }
+          end
+       
+          def sendSMS(method, text, recipients, options = {})
+            unless recipients.kind_of?(Array)
+              raise("recipients must be an array")
+            end
+           
+            @parameters['method'] = method
+            @parameters['text'] = text
+             
+            @parameters["recipients[]"] = recipients
+         
+          unless options[:senderNumber].nil?
+           @parameters['sender_number'] = options[:senderNumber]
+          end
+       
+          unless options[:senderString].nil?
+           @parameters['sender_string'] = options[:senderString]
+          end
+       
+          unless options[:charset].nil?
+           @parameters['charset'] = options[:charset]
+          end
+               
+          #@parameters.each {|key, value| puts "#{key} is #{value}" }    
+               
+              @response = Net::HTTP.post_form(URI(@url), @parameters)
+              if @response.message == "OK"
+                  true
+              else
+                  false
+              end
+               
+          end
+           
+          def getCredit()
+             
+          @parameters['method']   = 'get_credit'
+           
+              @response = Net::HTTP.post_form(URI(@url), @parameters)
+              if @response.message == "OK"
+                  true
+              else
+                  false
+              end
+          end
+           
+          def getResponse
+              result = {}
+              @response.body.split('&').each do |res|
+                  if res != ''
+                      temp = res.split('=')
+                      if temp.size > 1
+                          result[temp[0]] = temp[1]
+                      end
+                  end
+              end
+              return result
+          end
+       
+          def printResponse
+              result = self.getResponse
+              if result.has_key?('status') and result['status'] == 'success'
+                  Spider.logger.debug "Sms mandato con successo a #{@parameters['recipients[]']}"
+                  # result.each do |key,value|
+                  #     Spider.logger.debug "\t#{key} => #{CGI::unescape(value)}"
+                  # end
+                  true
+              else
+                  # ------------------------------------------------------------------
+                  # Controlla la documentazione completa all'indirizzo http:#www.skebby.it/business/index/send-docs/ 
+                  # ------------------------------------------------------------------
+                  # Per i possibili errori si veda http:#www.skebby.it/business/index/send-docs/#errorCodesSection
+                  # ATTENZIONE: in caso di errore Non si deve riprovare l'invio, trattandosi di errori bloccanti
+                  # ------------------------------------------------------------------        
+                  Spider.logger.debug  "Error, trace is:"
+                  result.each do |key,value|
+                      Spider.logger.debug  "\t#{key} => #{CGI::unescape(value)}"
+                  end
+                  false
+              end
+          end
+       
+      end
+
+
+    end      
+
+end

data/apps/messenger/messenger.rb

@@ -59,7 +59,9 @@ module Spider
             return false if mutex.locked?
             model = Spider::Messenger.const_get(self.queues[queue][:model])
             lock_file = "#{self.lock_file}_#{queue}"
-            now = DateTime.now
+            #now = DateTime.now
+            #aggiungo un minuto al now per mandare message tra un minuto e non andare nel passato se sta finendo il minuto
+            now =(DateTime.now+((1.0/24)/60))
             mutex.synchronize do
                 FileUtils.touch(lock_file)
                 File.open(lock_file, 'r'){ |f| return false unless f.flock File::LOCK_EX | File::LOCK_NB }
@@ -127,7 +129,7 @@ module Spider
             msg = Email.new(
                 :from => from, :to => to, :headers => headers, :body => body
             )
-            msg.next_try = params[:send_from] || DateTime.now
+            msg.next_try = params[:send_from] || (DateTime.now+((1.0/24)/60))
             msg.save
             return msg
         end
@@ -136,7 +138,7 @@ module Spider
             msg = SMS.new(
                 :to => to, :text => text, :sender_name => sender_name
             )
-            msg.next_try = params[:send_from] || DateTime.now
+            msg.next_try = params[:send_from] || (DateTime.now+((1.0/24)/60))
             msg.save
             return msg
         end

data/apps/messenger/models/email.rb

@@ -8,7 +8,7 @@ module Spider; module Messenger
         element :to, String, :label => _("To")
         element :headers, Text, :label => _("Headers")
         element :subject, String, :label => _("Subject"), :computed_from => [:headers]
-        element :body, Text, :label => _("Body")
+        element :body, Text, :label => _("Body"), :length => 100000000 #mette un campo longtext 
         
         queue :email
         

data/apps/worker/lib/runner.rb

@@ -6,7 +6,11 @@ module Spider; module Worker
     class Runner
         
         def initialize
-            @scheduler = Rufus::Scheduler.start_new
+            if Gem.loaded_specs['rufus-scheduler'].version.to_s < "3.0.0"
+                @scheduler = Rufus::Scheduler.start_new
+            else
+                @scheduler = Rufus::Scheduler.new
+            end
         end
         
         def stop

data/lib/spiderfw/controller/controller.rb

@@ -251,7 +251,11 @@ module Spider
             @is_target
         end
         
-        
+        # If the site supports SSL, returns the #https_url; otherwise, the #http_url
+        def self.http_s_url(action=nil)
+            Spider.site.http_s_url + route_path(action)
+        end
+
         # The main controller's execution method. The Controller will dispatch
         # to another controller if a route is set; otherwise, it will call the 
         # method that should be executed according to action.

data/lib/spiderfw/controller/mixins/http_mixin.rb

@@ -52,7 +52,12 @@ module Spider; module ControllerMixins
         # @return [String] the request_path prefixed with http:// and the current host.
         def request_url
             return request_path unless @request.env['HTTP_HOST']
-            'http://'+@request.env['HTTP_HOST']+request_path
+            #'http://'+@request.env['HTTP_HOST']+request_path  vecchia versione con problemi con https
+            if @request.env["HTTPS"] == "on"
+                u = "https://#{@request.env['HTTP_HOST']}#{request_path}"
+            else
+                u = "http://#{@request.env['HTTP_HOST']}#{request_path}"
+            end
         end
         
         # @return [String] the request_url with query params, if any

data/lib/spiderfw/model/condition.rb

@@ -48,7 +48,7 @@ module Spider; module Model
             return c
         end
         
-        @comparison_operators = %w{= > < >= <= <> like}
+        @comparison_operators = %w{= > < >= <= <> like ilike nlike}
         @comparison_operators_regexp = @comparison_operators.inject('') do |str, op|
             str += '|' unless str.empty? 
             str += Regexp.quote(op)
@@ -230,7 +230,6 @@ module Spider; module Model
             unless field.is_a?(Spider::QueryFuncs::Function)
                 field = field.to_s
                 parts = field.split('.', 2)
-                debugger if parts[0].blank?
                 parts[0] = parts[0].to_sym
                 field = field.to_sym unless parts[1]
             end
@@ -540,11 +539,12 @@ module Spider; module Model
                 @condition_context = condition_context
             end
             
-            [:==, :<, :>, :<=, :>=, :like, :ilike, :not].each do |op|
+            [:==, :<, :>, :<=, :>=, :like, :ilike, :nlike, :not].each do |op|
                 define_method(op) do |val|
                     replace = {
                         :== => '=',
-                        :not => '<>'
+                        :not => '<>',
+                        :nlike => 'not like'
                     }
                     if replace[op]
                         op = replace[op]

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

@@ -64,7 +64,7 @@ module Spider; module Model; module Mappers
                     row[key] < value
                 when '<>'
                     row[key] != value
-                when 'like', 'ilike'
+                when 'like', 'ilike', 'nlike'
                     check_value = row[key]
                     if (comp == 'ilike')
                         value.upcase!

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

@@ -495,7 +495,9 @@ module Spider; module Model; module Storage; module Db
              when 'String'
                  'VARCHAR'
              when 'Spider::DataTypes::Text'
-                 'TEXT'
+                 return 'TEXT' if (attributes[:length].blank? || (!attributes[:length].blank? && attributes[:length] < 65536)) 
+                 return 'MEDIUMTEXT' if !attributes[:length].blank? && attributes[:length] >= 65536 && attributes[:length] < 16777216
+                 return 'LONGTEXT' if !attributes[:length].blank? && attributes[:length] >= 16777216
              when 'Fixnum'
                  'INT'
              when 'Float'
@@ -522,6 +524,8 @@ module Spider; module Model; module Storage; module Db
                  db_attributes[:length] = attributes[:length] || 255
              when 'Fixnum'
                  db_attributes[:length] = 11
+             when 'Spider::DataTypes::Text'
+                 db_attributes[:length] = nil
              end
              db_attributes[:autoincrement] = false if attributes[:autoincrement] && !attributes[:primary_key]
              return db_attributes
@@ -554,8 +558,8 @@ module Spider; module Model; module Storage; module Db
          end
          
          def schema_field_varchar_equal?(current, field)
-             # FIXME
-             return true
+             # modifica fatta per introduzione LONGTEXT
+             current[:type] == field[:type] && current[:length] == field[:attributes][:length]
          end
          
          

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

@@ -214,6 +214,10 @@ module Spider; module Model; module Storage; module Db
                  comp = 'like'
                  key = "UPPER(#{key})"
              end
+             if (comp.to_s.downcase == 'nlike')
+                comp = 'not like'
+                key = "UPPER(#{key})"
+             end
              if (value.nil?)
                  comp = comp == '=' ? "IS" : "IS NOT"
                  sql = "#{key} #{comp} NULL"

data/lib/spiderfw/model/storage/db/db_storage.rb

@@ -363,6 +363,10 @@ module Spider; module Model; module Storage; module Db
                 comp = 'like'
                 key = "UPPER(#{key})"
             end
+            if (comp.to_s.downcase == 'nlike')
+                comp = 'not like'
+                key = "UPPER(#{key})"
+            end
             if (value.nil?)
                 comp = comp == '=' ? "IS" : "IS NOT"
                 sql = "#{key} #{comp} NULL"

data/lib/spiderfw/site.rb

@@ -50,6 +50,11 @@ module Spider
             s
         end
         
+        def http_s_url
+            ssl? ? ssl_to_s : to_s
+        end
+
+
     end 
 
 end