spiderfw 0.6.26 → 0.6.27

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.6.27
+* Clear caches when tmp/clear.txt touched
+* Bugfixes
+
 == 0.6.26
 * Added --no-rollback option to app update
 * Routes by HTTP methods, as a main test or as :http_method option; 

data/VERSION

@@ -1 +1 @@
-0.6.26
+0.6.27

data/apps/core/forms/_init.rb

@@ -20,6 +20,7 @@ require 'apps/core/forms/widgets/inputs/select/select'
 require 'apps/core/forms/widgets/inputs/search_select/search_select'
 require 'apps/core/forms/widgets/inputs/password/password'
 require 'apps/core/forms/widgets/inputs/checkbox/checkbox'
+require 'apps/core/forms/widgets/inputs/checkbox_list/checkbox_list'
 require 'apps/core/forms/widgets/inputs/file_input/file_input'
 require 'apps/core/forms/widgets/inputs/time_span/time_span'
 require 'apps/core/forms/widgets/inputs/html_area/html_area'

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

@@ -13,7 +13,6 @@ Spider.defineWidget('Spider.Forms.DateTime', {
             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.input.is('.date')) this.input.datepicker(conf);

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

@@ -22,7 +22,7 @@ Spider.defineWidget('Spider.Forms.HTMLArea', 'Spider.Forms.Input', {
         }
         options = $.parseJSON($('.options', this.el).text());
         var config = {
-            extraPlugins : 'autogrow'
+            // extraPlugins : 'autogrow'
         };
         config.toolbar_simple =
         [

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

@@ -3,6 +3,6 @@ Spider.defineWidget('Spider.Forms.TextArea', 'Spider.Forms.Input', {
 	autoInit: true,
 	
 	ready: function(){
-		this.el.autogrow();
-	}    
+		// this.el.autogrow();
+	}
 });

data/apps/core/forms/widgets/form/form.rb

@@ -97,6 +97,18 @@ module Spider; module Forms
             @model.each_element do |el|
                 @labels[el.name] = el.label
             end
+            #passo nome_elemento: full_class nella stringa
+            #es tariffa: Spider::Forms::CheckboxList
+            wt_string = @widget_types
+            if @widget_types.is_a?(String)
+                @widget_types = {}
+                parts = wt_string.split(/\s*,\s*/)
+                parts.each do |part|
+                    el_id, class_name = part.split(/\s*:\s+/)
+                    @widget_types[el_id] = class_name
+                end
+            end
+
             wt = @widget_types || {}
             @widget_types = {}
             wt.each do |key, value|
@@ -152,41 +164,30 @@ module Spider; module Forms
         
         def load_widgets(template=@template)
             super
-            if @action == :sub
-                if @sub_element.multiple?
-                    @crud = Spider::Components::Crud.new(@request, @response)
-                    @crud.id = "crud_#{@sub_element.name.to_s}"
-                    @crud.model = @sub_element.model
-                    add_widget(@crud)
-                    @scene.crud = @crud
-                    @obj = load
-                    cond = {}
-                    if @sub_element.integrated?
-                        @sub_element.integrated_from.model.primary_keys.each do |key|
-                            cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get("#{@sub_element.integrated_from.name}.#{key.name}")
-                        end
-                    else
-                        @model.primary_keys.each do |key|
-                            cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
-                        end
+            if (@action == :sub)
+                @crud = Spider::Components::Crud.new(@request, @response)
+                @crud.id = "crud_#{@sub_element.name.to_s}"
+                @crud.model = @sub_element.model
+                add_widget(@crud)
+                @scene.crud = @crud
+                @obj = load
+                cond = {}
+                if @sub_element.integrated?
+                    @sub_element.integrated_from.model.primary_keys.each do |key|
+                        cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get("#{@sub_element.integrated_from.name}.#{key.name}")
                     end
-                    @crud.fixed = cond
-                    sub_elements = []
-                    #sub_elements += @sub_element.model.primary_keys.map{ |k| k.name }
-                    @sub_element.model.elements_array.each do |el|
-                        sub_elements << el.name unless el.integrated? || el.model == @model
+                else
+                    @model.primary_keys.each do |key|
+                        cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
                     end
-                    @crud.attributes[:table_elements] = sub_elements
-                # else
-                #     @crud = Spider::Forms::Form.new(@request, @response)
-                #     @form.id = "crud_#{@sub_element.name.to_s}"
-                #     @form.model = @sub_element.model
-                #     add_widget(@crud)
-                #     @scene.crud = @crud
-                #     @obj.load
-                #     debugger
-                #     @form.pk = @obj.get(@sub_element).id
                 end
+                @crud.fixed = cond
+                sub_elements = []
+                #sub_elements += @sub_element.model.primary_keys.map{ |k| k.name }
+                @sub_element.model.elements_array.each do |el|
+                    sub_elements << el.name unless el.integrated? || el.model == @model
+                end
+                @crud.attributes[:table_elements] = sub_elements
             else
                 create_inputs
             end
@@ -267,7 +268,7 @@ module Spider; module Forms
                     if ([:choice, :multiple_choice, :state, :multiple_state].include?(el.association) && !el.extended?)
                         widget_type = el.type.attributes[:estimated_size] && el.type.attributes[:estimated_size] > 30 ? 
                             SearchSelect : Select
-                    elsif @attributes[:show_related] && @pk
+                    elsif @attributes[:show_related] && @pk && el.multiple?
                         @sub_links[el.name] = sub_link(el)
                     end
                 end
@@ -300,8 +301,8 @@ module Spider; module Forms
             input = create_widget(type, el.name)
             input.css_classes << "el-#{el.name}"
             case type.name
-            when 'Spider::Forms::Select', 'Spider::Forms::SearchSelect'
-                input.multiple = true if el.multiple?
+            when 'Spider::Forms::Select', 'Spider::Forms::SearchSelect', 'Spider::Forms::CheckboxList'
+                input.multiple = true if el.multiple? and type.name != 'Spider::Forms::CheckboxList'
                 input.model = el.type if input.respond_to?(:model)
                 input.condition = el.attributes[:choice_condition] || el.condition
             end
@@ -379,8 +380,7 @@ module Spider; module Forms
                 end
             end
             if inputs_done && !@error
-                if (@free_keys)
-                    # FIXME: lock!
+                if @free_keys
                     save_mode = obj.in_storage? ? :update : :insert
                 else
                     save_mode = obj.primary_keys_set? ? :update : :insert
@@ -388,6 +388,8 @@ module Spider; module Forms
                 before_save(obj, save_mode)
                 @before_save.call(obj, save_mode) if @before_save
                 trigger(:before_save, obj)
+            end
+            if inputs_done && !@error
                 begin
                     save_mode == :update ? obj.update : obj.insert
                     #debug("SAVED")
@@ -396,7 +398,7 @@ module Spider; module Forms
                 rescue => exc
                     if exc.is_a?(Spider::Model::MapperElementError)
                         Spider::Logger.error(exc)
-                        exc_element =  exc.element.name
+                        exc_element =  exc.element.is_a?(Spider::Model::Element) ? exc.element.name : exc_element
                         add_error(exc.message, exc_element, exc)
                     else
                         raise

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

@@ -0,0 +1,71 @@
+module Spider; module Forms
+    
+    class CheckboxList < Input
+        tag 'checkbox_list'
+        i_attr_accessor :model
+        is_attr_accessor :condition
+        attr_accessor :data
+        
+        def widget_init(action='')
+            super
+            @model = const_get_full(@model) if @model.is_a?(String)
+        end
+        
+        def prepare_value(p)
+            return @value unless p['val']
+            qs = Spider::Model::QuerySet.static(@model)
+            p['val'].each do |key, value|
+                if value == '1'
+                    obj = @model.new(str_to_pks(key))
+                    qs << obj
+                end
+            end
+            @value = qs
+            @value
+        end
+        
+        def prepare
+            super
+        end
+
+        def run
+            @scene.data = @data || @model.all
+            if @condition
+                @scene.data.condition = @condition
+            end
+            @scene.values = {}
+            @scene.selected = {}
+            if @value
+                val = @value
+                val.each do |v|
+                    @scene.selected[@model.primary_keys.map{|k| v.get(k) }.join(',')] = true
+                end
+            end
+            @scene.data.each_index do |i|
+                @scene.values[i] = @model.primary_keys.map{|k| @scene.data[i][k] }.join(',')
+            end
+            super
+        end
+
+        
+        def obj_to_key_str(obj)
+            @model.primary_keys.map{|k| obj.get(k) }.join(',')
+        end
+        
+        def str_to_pks(val)
+            if (val.is_a?(String))
+                parts = val.split(',')
+                pk = {}
+                @model.primary_keys.each{ |k| pk[k.name] = parts.shift}
+            else
+                pk = val
+            end
+            return pk
+        end
+        
+        
+    end
+
+
+
+end;end

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

@@ -0,0 +1,5 @@
+<sp:template>
+    <input sp:each_index="@data |i|" type="checkbox" name="{ @name }[val][{ @values[i] }]" value="1" 
+    sp:attr-if="@selected[@values[i]],checked"> { @data[i].to_s }
+    <br/>
+</sp:template>

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

@@ -8,7 +8,7 @@ module Spider; module Forms
         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"
+        attribute :"year-range", :type => String, :default => "m150:p10"
         
         def prepare_value(val)
             return val if val.respond_to?(:strftime)

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

@@ -20,7 +20,7 @@
         </option>
     </select>
     <div sp:if="@value_desc" class="value-desc{ (@clear ? ' changing' : '') }">
-        <tpl:pass sp:if="@clear">({ @value_desc })</tpl:pass>
+        <tpl:pass sp:if="@clear && !@value_desc.blank?">({ @value_desc })</tpl:pass>
         <tpl:pass sp:if="!@clear">{ @value_desc }</tpl:pass>
         <span sp:if="!@next_step">
 			<span class="change_action">
@@ -39,4 +39,4 @@
 	-->
 	<input sp:if="@multiple" class="hidden-val" type="hidden" name="{ @value_param }" sp:each="@keys |key|" value="{ key }" />
 	<input sp:if="!@multiple" class="hidden-val" type="hidden" name="{ @value_param }" value="{ @key }" />
-</div>
+</div>

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

@@ -0,0 +1,72 @@
+require 'apps/messenger/lib/sms_backend'
+require 'apps/messenger/lib/backends/mobyt'
+
+
+
+
+module Spider; module Messenger; module Backends; module SMS
+
+    module Mobyt
+        include Messenger::SMSBackend
+
+        def self.send_message(msg)
+            Spider.logger.debug("**Sending SMS with mobyt**")
+            username = Spider.conf.get('messenger.mobyt.username')
+            password = Spider.conf.get('messenger.mobyt.password')
+            from = Spider.conf.get('messenger.mobyt.from')    
+            to = msg.to
+            text = msg.text
+            uri = URI('http://smsweb.mobyt.it/sms-gw/sendsmart')
+            
+            testi = Hash.new
+            #se mando messaggio lungo spezzo in più messaggi
+            if text.size > 160
+                percorso_contatore = File.join(Spider.paths[:var], "contatore_mobyt")
+                sequence_index = ""
+                File.open(percorso_contatore, File::RDWR|File::CREAT) do |f|
+                    f.flock(File::LOCK_EX)
+                    sequence_index = f.read.to_i + 1
+                    f.rewind
+                    sequence_index = sequence_index % 99
+                    f.write("#{sequence_index}")                        
+                    f.flush
+                    f.truncate(f.pos)
+                end
+                tot_response = true
+                operation="MULTI"
+                cnt = 0
+                index = 1
+                mes = ""
+                (text + " ").scan(/.{1,153}\s/).map{ |s|
+                    testi[index] = s
+                    index += 1 
+                }
+                tot_testi = testi.size
+                #tolgo lo spazio che era stato aggiunto al testo nell'ultimo messaggio
+                testi[tot_testi] = testi[tot_testi].strip
+                #invio sms con testi in hash testi
+                testi.each{ |key,testo|
+                    sequence_index = sequence_index.to_s.rjust(2, '0')
+                    tot_testi = tot_testi.to_s.rjust(2, '0')
+                    key = key.to_s.rjust(2, '0')
+                    # udh=aabbcc: aa=id sequenza, bb=tot messaggi, cc=id del messaggio nella sequenza
+                    udh = "#{sequence_index}#{tot_testi}#{key}"  
+                    uri_params = Spider::Messenger::Mobyt.parametri(username,password,to,from,testo,operation,udh)
+                    response = Spider::Messenger::Mobyt.do_post_request(uri, uri_params)
+                    Spider::Messenger::Mobyt.check_response_http(response)
+                }
+
+            else
+                uri_params = Spider::Messenger::Mobyt.parametri(username,password,to,from,text)
+                response = Spider::Messenger::Mobyt.do_post_request(uri, uri_params)
+                Spider::Messenger::Mobyt.check_response_http(response)
+            end
+
+            true            
+        end
+
+    end
+
+
+
+end; end; end; end    

data/apps/messenger/config/options.rb

@@ -39,5 +39,10 @@ module Spider
     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
-    
+    config_option 'messenger.mobyt.username', _("Username for the Mobyt service"), 
+        :type => String    
+    config_option 'messenger.mobyt.password', _("Password for the Mobyt service"), 
+        :type => String
+    config_option 'messenger.mobyt.from', _("From parameter for the Mobyt service"), 
+        :type => String
 end

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

@@ -54,13 +54,15 @@ module Spider; module Messenger
             end
 
             if html
-                mail.text_part do
-                    body text
-                end
                 mail.html_part do
                     content_type 'text/html; charset=UTF-8'
                     body html
-                end
+                end 
+            end  
+            if attachments && !attachments.empty?
+                mail.text_part do
+                    body text
+                end       
             else
                 mail.body = text
             end

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

@@ -1,11 +1,50 @@
+require 'digest/md5'
+require 'net/http'
+require 'iconv'
+
 module Spider::Messenger
 
-    class Mobyt
+      module Mobyt
+
+            def self.parametri(username,password,to,from,testo,operation="TEXT",udh="")
+                  #cambio la codifica per gli accenti e caratteri particolari
+                  testo_codificato = Iconv.conv('ISO-8859-15', 'UTF-8', testo)
+                  string_digest = [username, operation, to, from, testo_codificato, password].map{ |val|
+                      val.to_s 
+                  }.join("")
+                  ticket = Digest::MD5.hexdigest(string_digest).downcase
+                  hash_parametri = {
+                      'rcpt'       => to, 
+                      'operation'  => operation,
+                      'from'       => from,
+                      'data'       => testo_codificato,
+                      'id'         => username,
+                      'qty'        => "h",
+                      'ticket'     => ticket,
+                      'udh'        => udh         
+                  }
+
+            end
+
+            def self.do_post_request(uri,data)
+                  response = Net::HTTP.post_form(uri,data) 
+            end
 
-        def self.parametri(username, password, from, to, testo)
 
-        end
+            def self.check_response_http(response)
+                  case response
+                  when Net::HTTPSuccess
+                      if response.body !~ /^OK/
+                          raise response.body
+                      else
+                          return true 
+                      end
+                  else
+                      #solleva un eccezione
+                      raise response.class.to_s
+                  end         
+            end
 
-    end
+      end      
 
 end

data/apps/messenger/test/features/mobyt.feature

@@ -0,0 +1,29 @@
+# language: it
+
+Funzionalità: Invio di sms con mobyt
+
+    Scenario: restituzione parametri semplice
+
+        Dato che lo username è "aaaa"
+        E che la password è "bbbb"
+        Quando invio un sms con i seguenti dati
+            |   to          |     from          |   testo   |
+            | +39123456789  |   mittente-prova  |   Ciao    |
+        Allora il backend deve restituire i seguenti dati
+            |   operation   |   TEXT                                |
+            |   from        |   mittente-prova                      |
+            |   data        |   Ciao                                |              
+            |   id          |   aaaa                                |
+            |   qty         |   a                                   |
+            |   password    |                                       |
+            |   ticket      |   3ad6bd5c1d3ea7b021b3f7ddad2398bd    |
+
+    Scenario: invio messaggio con backend mobyt
+    
+        Dato che il backend è solo di tipo "mobyt"
+        E che lo username è "aaaa"
+        E che la password è "bbbb"
+        E che il from è "mittente-prova"
+        Quando invio un messaggio con messenger
+        E faccio girare la coda dei messaggi
+        Allora deve essere fatta una chiamata in "POST" all'url "http://smsweb.mobyt.it/sms-gw/sendsmart"        

data/apps/messenger/test/features/step_definitions/mobyt_steps.rb

@@ -0,0 +1,59 @@
+require 'apps/messenger/lib/backends/mobyt'
+
+
+Dato /^che lo username è "([^\"]*)"$/ do |username|
+    @username = username
+    Spider.conf.set('messenger.mobyt.username',username)
+end
+
+Dato /^che la password è "([^\"]*)"$/ do |password|
+    @password = password
+    Spider.conf.set('messenger.mobyt.password',password)
+end
+
+Quando /^invio un sms con i seguenti dati$/ do |table|
+    to = table.hashes.first["to"] 
+    from = table.hashes.first["from"]
+    testo = table.hashes.first["testo"]
+    @risultato = Spider::Messenger::Mobyt.parametri(@username,@password,to,from,testo)  
+end
+
+Allora /^il backend deve restituire i seguenti dati$/ do |table|
+    table.rows_hash.each do |key, value|
+        @risultato[key.to_sym].should eq value
+    end
+end  
+
+Dato /^che il backend è solo di tipo "([^\"]*)"$/ do |backend|
+    require "apps/messenger/backends/sms/#{backend}"
+    Spider.conf.set('messenger.sms.backends', [backend])
+end
+
+
+Dato /^che il from è "([^\"]*)"$/ do |from|
+    Spider.conf.set('messenger.mobyt.from',from)
+end
+
+Quando /^invio un messaggio con messenger$/ do
+    Spider::Messenger.sms("+39123456789", "Ciao")   
+end
+
+Quando /^faccio girare la coda dei messaggi$/ do
+    require "net/http"
+
+    module Net
+        class HTTP 
+            def self.post_form(uri, data)
+                $uri_http = uri
+                $data_http = data
+            end
+
+        end
+
+    end
+    Spider::Messenger.process_queue(:sms)
+end
+
+Allora /^deve essere fatta una chiamata in "([^\"]*)" all.url "([^\"]*)"$/ do |post, url|
+    $uri_http.to_s.should eq url
+end

data/lib/spiderfw/app.rb

@@ -35,8 +35,6 @@ module Spider
         # 
         module ClassMethods
             
-            # @return [String] unique identifier for the app
-            attr_reader :id
             # @return [String] filesystem path of the app
             attr_reader :path
             # @return [String] path of the 'public' folder

data/lib/spiderfw/cmd/commands/model.rb

@@ -38,18 +38,22 @@ module Spider::CommandLine
                 req_models.each do |model_or_app|
                     models = []
                     mod = model_or_app.is_a?(Module) ? model_or_app : const_get_full(model_or_app)
-                    if (mod.is_a?(Module) && mod.include?(Spider::App))
+
+                    if mod.is_a?(Module) && mod.include?(Spider::App)
                         mod.models.each do |m|
-                            unless @non_managed || m < Spider::Model::Managed
+                            storage_instance = m.storage.respond_to?(:instance_name) ? m.storage.instance_name : nil
+                            if @non_managed || m < Spider::Model::Managed #|| storage_instance == 'default'
+                                models << m
+                            else
                                 unless m < Spider::Model::InlineModel || m.attributes[:sub_model]
                                     Spider.logger.warn("Skipping #{m} because it's non managed (use -m to override)")
                                 end
                                 next
                             end
-                            models << m
                         end
-                    elsif (mod.subclass_of?(Spider::Model::BaseModel))
-                        if @non_managed || mod < Spider::Model::Managed
+                    elsif mod.subclass_of?(Spider::Model::BaseModel)
+                        storage_instance = mod.storage.respond_to?(:instance_name) ? mod.storage.instance_name : nil
+                        if @non_managed || mod < Spider::Model::Managed #|| storage_instance == 'default'
                             models << mod
                         else
                             Spider.logger.warn("Skipping #{mod} because it's non managed (use -m to override)")
@@ -136,4 +140,4 @@ module Spider::CommandLine
 
     end
 
-end
+end

data/lib/spiderfw/config/configuration.rb

@@ -76,10 +76,7 @@ module Spider
             end
             return key.to_s
         end
- 
-        # Sets a configuration value
-        # @param [String] key
-        # @param [Object] val
+        
         def set(key, val)
             first, rest = key.split('.', 2)
             if rest

data/lib/spiderfw/config/options/spider.rb

@@ -85,9 +85,10 @@ module Spider
     config_option 'profiling.enable', _("Enable on-request profiling"), :type => Spider::DataTypes::Bool
     config_option 'request.mutex', _("Respond to requests sequentially"), :default => false
     
-    config_option 'locale', _("The locale to use") do |val|
-        Spider.locale = Locale.new(val)
-    end
+    config_option 'locale', _("The locale to use"), :process => lambda{ |val|
+        Spider.locale = val
+        val
+    }
     config_option 'i18n.rails_path', _("Path where rails-style locales are found"), :default => lambda{ Spider.paths[:root]+'/locales' }
     config_option 'i18n.default_locale', _("Fallback locale"), :default => 'en'
  

data/lib/spiderfw/controller/http_controller.rb

@@ -97,7 +97,11 @@ module Spider
             end
             Locale.clear
             Locale.init(:driver => :cgi)
-            Locale.set_request(@request.params['lang'], @request.cookies['lang'], @request.env['HTTP_ACCEPT_LANGUAGE'], @request.env['HTTP_ACCEPT_CHARSET'])
+            if Spider.conf.get('locale')
+                Spider.locale = Spider.conf.get('locale')
+            else
+                Locale.set_request(@request.params['lang'], @request.cookies['lang'], @request.env['HTTP_ACCEPT_LANGUAGE'], @request.env['HTTP_ACCEPT_CHARSET'])
+            end
             @request.locale = Locale.current[0]
             l = @request.locale.to_s
             l = $1 if l =~ /(\w\w)_+/

data/lib/spiderfw/http/adapters/rack.rb

@@ -84,7 +84,11 @@ module Spider; module HTTP
 
             w = nil
             controller_response = Spider::Response.new
-            multithread = env['rack.multithread'] || Spider.conf.get('webserver.force_threads')
+            if RUBY_PLATFORM =~ /mingw32/
+                multithread = false
+            else    
+                multithread = env['rack.multithread'] || Spider.conf.get('webserver.force_threads')
+            end
             if multithread
                 r, w = IO.pipe
                 rack_response_hash = {:body => r}