spiderfw 0.6.27 → 0.6.28

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

@@ -58,7 +58,9 @@ module Spider; module Forms
                     tree_el = @model.elements_array.select{ |el| el.association == :tree }.first
                 end
                 if tree_el
-                    @scene.data = @scene.data.model.send("#{tree_el.name}_all", @scene.data.condition)
+                    #chiamata al metodo modificata dopo modifica in tree.rb nel define_method senza la condizione
+                    #@scene.data = @scene.data.model.send("#{tree_el.name}_all", @scene.data.condition)
+                    @scene.data = @scene.data.model.send("#{tree_el.name}_all")
                     @scene.data.reject!{ |obj| obj == @form.obj } if @form && @form.obj
                     @scene.tree_depth = tree_el.attributes[:tree_depth]
                 end
@@ -66,25 +68,25 @@ module Spider; module Forms
             if @value
                 val = @multiple ? @value : [@value]
                 val.each do |v|
-                    @scene.selected[@model.primary_keys.map{|k| v.get(k) }.join(',')] = true
+                    @scene.selected[obj_to_key_str(v)] = true
                 end
             end
             @scene.data.each_index do |i|
-                @scene.values[i] = @model.primary_keys.map{|k| @scene.data[i][k] }.join(',')
+                @scene.values[i] = obj_to_key_str(@scene.data[i])
             end
             super
         end
 
         
         def value=(val)
-            if (val.nil? || (val.is_a?(String) && val.empty?))
+            if val.blank?
                 @value = nil
                 return
             end
-            if (val.is_a?(@model) || val.is_a?(Spider::Model::QuerySet))
+            if val.is_a?(@model) || val.is_a?(Spider::Model::QuerySet)
                 return super
             else
-                if (@multiple)
+                if @multiple
                     val = [val] unless val.is_a?(Array)
                     qs = Spider::Model::QuerySet.static(@model)
                     val.each do |v|
@@ -99,22 +101,15 @@ module Spider; module Forms
         end
         
         def obj_to_key_str(obj)
-            @model.primary_keys.map{|k| obj.get(k) }.join(',')
+            obj.keys_string
         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
+            val.is_a?(String) ? @model.split_keys_string(val) : val
         end
         
         def connection_condition
-            if (@connections && @form)
+            if @connections && @form
                 conn_cond = Spider::Model::Condition.and
                 conn_param = params['connected'] || {}
                 @connections.each do |el, conn|

data/apps/messenger/config/options.rb

@@ -16,22 +16,22 @@ module Spider
     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 => lambda{ Spider.conf.get('messenger.email.backend') ? [Spider.conf.get('messenger.email.backend')] : [] }
+        :default => Proc.new{ 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 => lambda{ Spider.conf.get('messenger.sms.backend') ? [Spider.conf.get('messenger.sms.backend')] : [] }
+        :default => Proc.new{ 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
     config_option 'messenger.smstools.path_spool', _("The path to the smstools 'spool' folder"), :default => '/var/spool/sms'
     config_option 'messenger.smstools.path_outgoing', _("The path to the smstools 'outgoing' folder"), 
-        :default => lambda{ File.join(Spider.conf.get('messenger.smstools.path_spool'), 'outgoing')}
+        :default => Proc.new{ File.join(Spider.conf.get('messenger.smstools.path_spool'), 'outgoing')}
     config_option 'messenger.smstools.path_failed', _("The path to the smstools 'failed' folder"), 
-        :default => lambda{ File.join(Spider.conf.get('messenger.smstools.path_spool'), 'failed')}    
+        :default => Proc.new{ File.join(Spider.conf.get('messenger.smstools.path_spool'), 'failed')}    
     config_option 'messenger.smstools.path_sent', _("The path to the smstools 'sent' folder"), 
-        :default => lambda{ File.join(Spider.conf.get('messenger.smstools.path_sent'), 'sent')}    
+        :default => Proc.new{ File.join(Spider.conf.get('messenger.smstools.path_sent'), 'sent')}    
     config_option 'messenger.smstools.remove_failed', _("Whether to remove failed messages from the smstools failed folder"),
         :type => Spider::Bool, :default => true
     config_option 'messenger.smstools.remove_sent', _("Whether to remove failed messages from the smstools sent folder"),

data/apps/messenger/controllers/messenger_admin_controller.rb

@@ -4,7 +4,7 @@ module Spider; module Messenger
         layout ['/core/admin/admin', 'admin/_admin'], :assets => 'messenger'
 
         Messenger.queues.keys.each do |queue|
-            route queue.to_s, :queue, :do => lambda{ |action| @queue = action.to_sym }
+            route queue.to_s, :queue, :do => Proc.new{ |action| @queue = action.to_sym }
         end
 
         def before(action='', *params)

data/apps/messenger/controllers/messenger_controller.rb

@@ -6,7 +6,7 @@ module Spider; module Messenger
         layout [:spider_admin, 'messenger.layout']
         
         Messenger.queues.keys.each do |queue|
-            route queue.to_s, self, :do => lambda{ |action| @queue = @dispatch_action }
+            route queue.to_s, self, :do => Proc.new{ |action| @queue = @dispatch_action }
         end
 
         def before(action='', *params)

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

@@ -35,7 +35,7 @@ module Spider::Messenger
                   case response
                   when Net::HTTPSuccess
                       if response.body !~ /^OK/
-                          raise response.body
+                          raise response.body.to_s
                       else
                           return true 
                       end

data/apps/messenger/messenger.rb

@@ -108,8 +108,10 @@ module Spider
                             
                     end
                 ensure
-                    File.open(lock_file, 'r'){ |f| f.flock File::LOCK_UN }
-                    File.unlink(lock_file)
+                    if File.exists?(lock_file)
+                        File.open(lock_file, 'r'){ |f| f.flock File::LOCK_UN }
+                        File.unlink(lock_file)
+                    end
                 end
             end
         end

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

@@ -2,7 +2,7 @@
     <h3>_(Queues)</h3>
     <ul>
         <li sp:each="@queues |name|">
-            <a href="{ @controller[:url] }/{ name }">{ @queue_info[name][:label] }</a>:
+            <a href="{ Spider::Messenger::AdminController.http_url }/{ name }">{ @queue_info[name][:label] }</a>:
             <ul>
                 <li>_(Sent messages): <span class="label success">{ @queue_info[name][:sent] }</span></li>
                 <li>_(Queued messages): <span class="label warning">{ @queue_info[name][:queued] }</span></li>

data/lib/spiderfw/controller/dispatcher.rb

@@ -109,7 +109,7 @@ module Spider
         end
 
         def dispatcher_get_route(path)
-            route = get_route(path)
+	    route = get_route(path)
             return route if !route || route.obj
             obj = dispatched_object(route)
             obj.dispatch_previous = self if obj.respond_to?(:dispatch_previous=) && obj != self
@@ -124,13 +124,13 @@ module Spider
         
         # Looks in defined routes, and returns the first matching Route for path.
         def get_route(path)
-            path ||= ''
+	    path ||= ''
             r = routes + self.class.routes
             if nil_route = self.class.nil_route
                 r << [nil, nil_route[0], nil_route[1]]
             end
             r.each do |route|
-                try, dest, options = route
+		try, dest, options = route
                 action = nil
                 nil_route = false
                 next if options[:http_method] && @request.http_method != options[:http_method]
@@ -145,8 +145,8 @@ module Spider
                         test_path = path.downcase
                         try.downcase!
                     end
-                    if (test_path[0..(try.length-1)] == try)
-                        action = path[(try.length)..-1]
+		    if (test_path == try || (test_path[0..(try.length-1)] == try && (try[-1].chr == '/' || test_path[try.length].chr == '/'))) 	
+			action = path[(try.length)..-1]
                         matched = try
                     end
                 when Regexp

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

@@ -29,9 +29,10 @@ module Spider; module ControllerMixins
                 obj = n_route.obj if n_route
                 if obj.is_a?(Visual) && !(obj.respond_to?(:serving_static?) && obj.serving_static?)
                     set_layout = @layout
+                    layout_params = self.class.layout_params[@layout]
                     if set_layout
                         set_layout = [set_layout] unless set_layout.is_a?(Array)
-                        set_layout.map{ |l| self.class.load_layout(l) }
+                        set_layout.map{ |l| self.class.load_layout(l, layout_params) }
                         obj.dispatcher_layout = set_layout
                     end
                 end
@@ -206,8 +207,8 @@ module Spider; module ControllerMixins
             return template
         end
                 
-        def init_layout(layout)
-            l = layout.is_a?(Layout) ? layout : self.class.load_layout(layout)
+        def init_layout(layout, params={})
+            l = layout.is_a?(Layout) ? layout : self.class.load_layout(layout, params)
             prepare_template(l)
             return l
         end
@@ -226,12 +227,14 @@ module Spider; module ControllerMixins
             layout = nil
             unless options.key?(:layout) && !options[:layout]
                 chosen_layouts = options[:layout] || @layout
+                layout_params = self.class.layout_params[chosen_layouts]
                 chosen_layouts = [chosen_layouts] if chosen_layouts && !chosen_layouts.is_a?(Array)
                 if (chosen_layouts)
                     t = template
                     layout = nil
                     (chosen_layouts.length-1).downto(0) do |i|
-                        layout = init_layout(chosen_layouts[i])
+                        l_params = layout_params if layout_params && i == 0
+                        layout = init_layout(chosen_layouts[i], layout_params)
                         layout.template = t
                         t = layout
                     end
@@ -587,11 +590,11 @@ module Spider; module ControllerMixins
                 return false
             end
             
-            def load_layout(path)
+            def load_layout(path, params={})
                 unless respond_to?(:layout_path)
                     raise NotImplementedError, "The layout_path class method must be implemented by object using the Visual mixin, but #{self} does not"
                 end
-                params = self.layout_params[path] || {}
+                params ||= self.layout_params[path] || {}
                 if (path.is_a?(Symbol))
                     path = Spider::Layout.named_layouts[path]
                 end
@@ -604,8 +607,7 @@ module Spider; module ControllerMixins
                 layout.only_asset_profiles(params[:only_asset_profiles]) if params[:only_asset_profiles]
                 layout
             end
-            
-            
+
             def current_default_template
                 Spider::Inflector.underscore(self.to_s.split('::')[-1])
             end

data/lib/spiderfw/http/http.rb

@@ -253,7 +253,7 @@ module Spider
           content_length -= boundary_size
           status = input.read(boundary_size)
           raise ArgumentError, "bad content body:\n'#{status}' should == '#{boundary + EOL}'"  unless status == boundary + EOL
-          rx = /(?:#{EOL})?#{Regexp.quote(boundary,'n')}(#{EOL}|--)/
+          rx = /(?:#{EOL})?#{Regexp.quote(boundary)}(#{EOL}|--)/
           files = []
           loop {
             head = nil

data/lib/spiderfw/model/base_model.rb

@@ -274,7 +274,7 @@ module Spider; module Model
                 if (attributes[:through])
                     assoc_type = attributes[:through]
                     create_junction = false
-                elsif (first_model.const_defined?(assoc_type_name) )
+                elsif (first_model.constant_defined?(assoc_type_name) )
                     assoc_type = first_model.const_get(assoc_type_name)
                     if (!assoc_type.attributes[:sub_model]) # other kind of inline model
                         assoc_type_name += 'Junction'
@@ -2426,7 +2426,7 @@ module Spider; module Model
                     val ? "#{name.to_json}: #{val.to_json}" : nil
                 else
                     val = get(name)
-                    if (el.type == 'text' || el.type == 'longText')
+                    if (el.type == String || el.type == Text)
                         val = ic.iconv(val + ' ')[0..-2]
                     end
                     val = val.to_json

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

@@ -1015,7 +1015,8 @@ module Spider; module Model; module Mappers
                                     set = obj.send("#{element.name}_junction")
                                 end
                                 delete_ass = nil
-                                if set.modified # queryset modified
+                                #if set.modified # queryset modified
+                                if set.modified && obj.primary_keys_set? # queryset modified
                                     delete_ass = MapperTask.new(obj, :delete_associations, :element => element.name)
                                     deps << [task, delete_ass]
                                 end
@@ -1047,7 +1048,8 @@ module Spider; module Model; module Mappers
                                 end
                             else
                                 el_val.set_modified(element.reverse)
-                                deps << [task, MapperTask.new(el_val, :save)]
+                                #deps << [task, MapperTask.new(el_val, :save)]
+                                deps << [MapperTask.new(el_val, :save), task]
                             end
                         end
                     end

data/lib/spiderfw/model/mixins/tree.rb

@@ -103,7 +103,7 @@ module Spider; module Model
                @elements[name].attributes[:queryset_module] = qs_module
                
                def extend_queryset(qs)
-                   super
+		   super
                    @elements.each do |name, el|
                        qs_module = el.attributes[:queryset_module]
                        qs.extend(qs_module) if qs_module
@@ -111,7 +111,6 @@ module Spider; module Model
                end
                
                (class << self; self; end).instance_eval do
-                   
                    define_method("#{name}_roots") do
                        QuerySet.autoloading(self).send("#{name}_roots")
                    end
@@ -120,9 +119,9 @@ module Spider; module Model
                        QuerySet.autoloading(self).send("#{name}_leafs")
                       
                    end
-                   
-                   define_method("#{name}_all") do
-                       qs = QuerySet.static(self)
+                   #TODO:la condizione non viene gestita, tolta per problemi in ruby 1.9.3 nel rebuild_menu
+                   define_method("#{name}_all") do #|condition|
+		                  qs = QuerySet.static(self)
                        self.send("#{name}_roots").each do |root|
                            ta = root.tree_all(name)
                            qs += ta if ta

data/lib/spiderfw/model/model.rb

@@ -256,7 +256,8 @@ module Spider
                 unless (options[:no_sync])
                     Spider::Logger.debug("SYNCING #{m}")
                     m.mapper.sync_schema(force, options) if m.mapper.respond_to?(:sync_schema)
-                end
+		    m.after_sync if m.respond_to?(:after_sync)	
+		end
                 if (options[:drop_tables] && m.mapper.respond_to?(:schema))
                     storages << m.mapper.storage unless storages.include?(m.mapper.storage)
                     tables += m.mapper.schema.get_schemas.keys

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

@@ -73,7 +73,7 @@ module Spider; module Model; module Storage; module Db
 
         class << self; attr_reader :reserved_kewords, :type_synonyms, :safe_conversions, :field_types, :field_flags end
         
-        def self.new_connection(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil)
+        def self.new_connection(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=0)
             conn = ::Mysql.new(host, user, passwd, db, port.to_i, sock, flag)
             conn.autocommit(true)
             conn.query("SET NAMES 'utf8'")
@@ -342,17 +342,23 @@ module Spider; module Model; module Storage; module Db
             nil # done in add field or alter field
         end
          
-         def function(func)
-             return super unless func.func_name == :concat
-             fields = func.elements.map{ |func_el|
-                 if (func_el.is_a?(Spider::QueryFuncs::Function))
-                     function(func_el)
-                 else
-                     func.mapper_fields[func_el]
-                 end
-             }
-             return "CONCAT(#{fields.map{ |f| "COALESCE(#{f}, '')" }.join(', ')})"
-         end
+        def function(func)
+            case func.func_name
+            when :rownum
+                "if(@rn, @rn:=@rn+1, @rn:=1)-1"
+            when :concat
+                fields = func.elements.map{ |func_el|
+                    if (func_el.is_a?(Spider::QueryFuncs::Function))
+                        function(func_el)
+                    else
+                        func.mapper_fields[func_el.to_s]
+                    end
+                }
+                "CONCAT(#{fields.map{ |f| "COALESCE(#{f}, '')" }.join(', ')})"
+            else
+                super
+            end
+        end
          
          ##############################################################
          #   Methods to get information from the db                   #
@@ -521,14 +527,6 @@ module Spider; module Model; module Storage; module Db
              return db_attributes
          end
          
-         def function(func)
-             case func.func_name
-             when :rownum
-                 "if(@rn, @rn:=@rn+1, @rn:=1)-1"
-             else
-                 super
-             end
-         end
          
          def schema_field_int_equal?(current, field)
              # FIXME

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

@@ -130,7 +130,7 @@ module Spider; module Model; module Storage; module Db
                      end
                      field_expr = field.is_a?(FieldExpression) ? field.expression : field.to_s
                      
-                     unless query[:keys].include?(field) || field.is_a?(FieldExpression)
+                     unless field.is_a?(FieldFunction) || field.is_a?(FieldExpression) || query[:keys].include?(field)
                         transformed = "O#{replace_cnt += 1}"
                         query[:order_replacements][field.to_s] = transformed
 

data/lib/spiderfw/spider.rb

@@ -1086,7 +1086,11 @@ module Spider
         # @return [void]
         def init_ruby_debug
             begin
-                require 'ruby-debug'
+                begin
+		   require 'ruby-debug'
+		rescue
+		   require 'debugger'
+		end
                 if File.exists?(File.join($SPIDER_RUN_PATH,'tmp', 'debug.txt'))
                     Debugger.wait_connection = true
                     Debugger.start_remote

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

@@ -7,9 +7,12 @@ module Spider; module TemplateBlocks
         def compile(options={})
             init = ""
             c = ""
-            type = @el.get_attribute('type')
+            type = @el.get_attribute('type') || 'nil'
+            prefix = @el.get_attribute('prefix')
             c += "output_assets"
-            c+= "(:#{type})" if type
+            c+= "(:#{type}"
+            c += ", :prefix => '#{prefix}'" if prefix
+            c += ")"
             c += "\n"
             return CompiledBlock.new(init, c)
         end

data/lib/spiderfw/templates/layout.rb

@@ -481,12 +481,14 @@ module Spider
             end
         end
         
-        def output_assets(type=nil)
+        def output_assets(type=nil, options={})
             types = type ? [type] : self.assets.keys
             if types.include?(:js)
                 self.assets[:js].each do |ass|
                     ass = {:src => ass} if ass.is_a?(String)
-                    $out << "<script type=\"text/javascript\" src=\"#{ass[:src]}\"></script>\n"
+                    src = ass[:src]
+                    src = "#{options[:prefix]}#{ass[:src]}" if options[:prefix] && !src =~ /^http/
+                    $out << "<script type=\"text/javascript\" src=\"#{src}\"></script>\n"
                 end
                 unless @not_first_js
                     $out << "<script type=\"text/javascript\">"
@@ -503,7 +505,9 @@ module Spider
                 self.assets[:css].each do |ass|
                     ass = {:src => ass} if ass.is_a?(String)
                     rel = ass[:rel] || 'stylesheet'
-                    link = "<link rel=\"#{rel}\" type=\"text/css\" href=\"#{ass[:src]}\""
+                    src = ass[:src]
+                    src = "#{options[:prefix]}#{ass[:src]}" if options[:prefix] && !src =~ /^http/
+                    link = "<link rel=\"#{rel}\" type=\"text/css\" href=\"#{src}\""
                     link += " media=\"#{ass[:media]}\"" if ass[:media]
                     link += ">\n"
                     if ass[:if_ie_lte]

data/lib/spiderfw/templates/template.rb

@@ -569,7 +569,14 @@ module Spider
                                 ass.set_attribute('home', 'true')
                             else
                             # ass.set_attribute('src', "/#{resource.definer.relative_path}/#{ass_src}")
-                                ass.set_attribute('app', resource.definer.relative_path)
+                                res_rel_path = if resource.definer.respond_to?(:app)
+                                    resource.definer.app.relative_path
+                                elsif resource.definer.respond_to?(:relative_path)
+                                    resource.definer.relative_path
+                                else
+                                    nil
+                                end
+                                ass.set_attribute('app', res_rel_path) if res_rel_path
                             end
                         end
                         assets_html += ass.to_html 

data/lib/spiderfw/utils/monkey/date_time.rb

@@ -9,8 +9,8 @@ class Date
     end
 
     # Converts to a Time object in the local timezone.
-    def to_local_time
-        conv_to_time(new_offset(DateTime.now.offset), :local)
+    def to_local_time   
+	conv_to_time(new_offset(DateTime.now.offset), :local)
     end
     
     def to_date
@@ -40,8 +40,10 @@ class Date
     private
     def conv_to_time(dest, method)
         #Convert a fraction of a day to a number of microseconds
-        usec = (dest.send(:sec_fraction) * 60 * 60 * 24 * (10**6)).to_i
-        if dest.respond_to?(:hour)
+	#usec calcolato così da problemi in ruby 1.9
+	#usec = (dest.send(:sec_fraction) * 60 * 60 * 24 * (10**6)).to_i
+        usec = (dest.send(:sec_fraction) * 1000).to_i
+	if dest.respond_to?(:hour)
             Time.send(method, dest.year, dest.month, dest.day, dest.hour, dest.min, dest.sec, usec)
         else
             Time.send(method, dest.year, dest.month, dest.day)
@@ -65,4 +67,4 @@ class Time
     #     
     # end
     
-end
+end

data/lib/spiderfw/utils/monkey/module.rb

@@ -26,5 +26,17 @@ class Module #:nodoc:
         end
         mod.const_set(parts[-1].to_sym, val)
     end
+
+    # const_defined? in Ruby 1.9 behaves differently in terms
+    # of which class hierarchy it polls for nested namespaces
+    #
+    # See http://redmine.ruby-lang.org/issues/show/1915
+    def constant_defined?(const)
+      if ::RUBY_VERSION =~ /1.9/
+        const_defined?(const, false)
+      else
+        const_defined?(const)
+      end
+    end
     
 end