spiderfw 0.6.32 → 0.6.33

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: ed9ddb5b4c1865b4c31b437e6bb1460d3f5f5392
-  metadata.gz: bde80c29ac3242b2ece307d7d44c5ff87bc68c94
 SHA512: 
-  data.tar.gz: 1b78d54308ecddb3ed944e14b8b3e894b31ef34d7138b8e0027df687ee9b284d036030258c6190527d75096cd1097e11cd05b5e6e9d4e94e10672cac6f992131
-  metadata.gz: dcc373c6206c502c4b402bf7c376fcd26d4c99b38d1ec10d4ee0a9afa803ef983f476115c476e7e1f8f4e54b2b1d9d02dddc9497e3748ad7ffec0d1bc0c9b6a4
+  metadata.gz: 4873d682965b148d70ade3af10f990ce93457765fda2938ee24581e26aed8610763b6bc9c6e07f5d945c53fdaf4fa60283d8d0ec98bd4e69f6532531f45eee38
+  data.tar.gz: 5fdaa46959c9faceae5a35c09dc82bbfb5f1c2de98225b040a4d22193280f7a58645f3f50de5a1443d760b256408f3d8e1c5a4a1f63c53decfffa5c17f2c3ab9
+SHA1: 
+  metadata.gz: 29e74e4cba2547d4454dafb8a774f87038a09c15
+  data.tar.gz: 04caf2f5945b4807d75f4c6843a25a05a2e50dea

data/CHANGELOG

@@ -1,3 +1,15 @@
+== 0.6.33
+* Modifiche per problemi con accenti e chiamate json
+* Encode aggiunto su funzione inspect
+* Corretto problemi in search_table che mantiene il parametro per la ricerca
+* Fatta conversione per invio delle mail con dati nella scene accentati
+* Usato force_encoding per invio della mail su tutti i campi della scene
+* Settato a true il single sign out del Cas
+* Fatto metodo ricorsivo per convertire un oggetto ruby in utf8 e cambiato il messenger helper
+* Aggiunto a livello di classe Object un metodo per convertire ricorsivamente in utf8 le stringhe nell'oggetto passato
+* Implementato metodo logout_cas in cas_login_mixin
+* Modifiche per CAS, cambiato lambda con Proc.new
+
 == 0.6.32
 * Correzioni per gestione transazioni e metodi per lista per mod cms
 * Aggiunto il force_encoding sui campi della mail per problemi con accenti

data/VERSION

@@ -1 +1 @@
-0.6.32
+0.6.33

data/apps/cas_server/config/options.rb

@@ -6,6 +6,7 @@ module Spider
     config_option 'cas.proxy_granting_ticket_expiry', :type => Fixnum, :default => 48*60*60
     config_option 'cas.ticket_granting_ticket_expiry', :type => Fixnum, :default => 48*60*60
     config_option 'cas.saml1_1_compatible', :type => Spider::DataTypes::Bool, :default => false
+    config_option 'cas.enable_single_sign_out', :type => Spider::DataTypes::Bool, :default => true
     config_option 'cas.saml_compliant_tickets', :type => String, :choices => [false, '1', '2', '4'], :default => lambda{
         Spider.conf.get('cas.saml1_1_compatible') ? '1' : false
     }

data/apps/cas_server/controllers/mixins/cas_login_mixin.rb

@@ -185,19 +185,6 @@ module Spider; module CASServer
                     $LOG.debug("Deleting #{tgt.class.name} '#{tgt}' for user '#{tgt.username}'")
                     tgt.delete
 
-                    if Spider.conf.get('cas.enable_single_sign_out')
-                        $LOG.debug("Deleting Service/Proxy Tickets for '#{tgt}' for user '#{tgt.username}'")
-                        tgt.service_tickets.each do |st|
-                            send_logout_notification_for_service_ticket(st)
-                            # TODO: Maybe we should do some special handling if send_logout_notification_for_service_ticket fails? 
-                            #       (the above method returns false if the POST results in a non-200 HTTP response).
-                            $LOG.debug "Deleting #{st.class.name} #{st.ticket.inspect}."
-                            st.delete
-                        end
-                    end
-
-                    $LOG.debug("Deleting #{tgt.class.name} '#{tgt}' for user '#{tgt.username}'")
-                    tgt.delete
                 end  
 
                 $LOG.info("User '#{tgt.username}' logged out.")
@@ -214,6 +201,54 @@ module Spider; module CASServer
             end
         end
 
+        #metodo chiamato dal logout del portale
+        def logout_cas(username) 
+            tgt_qs = TicketGrantingTicket.where(:username => username)
+            if tgt_qs
+                tgt_qs.each{ |tgt| 
+                    #inizio la transazione
+                    TicketGrantingTicket.storage.start_transaction
+                    begin
+                        # cancello i ServiceTicket
+                        service_tickets = tgt.service_tickets
+                        unless service_tickets.blank?
+                            service_tickets.each { |st|
+                                send_logout_notification_for_service_ticket(st)
+                                $LOG.debug "Deleting #{st.class.name} #{st.ticket.inspect}."
+                                st.delete
+                            }
+                        end
+                        $LOG.info("User '#{tgt.username}' logged out.")
+                        TicketGrantingTicket.storage.commit
+                    rescue Exception => exc
+                        TicketGrantingTicket.storage.rollback
+                        Spider.logger.error "** Errore logout cas"
+
+                    end
+
+                }
+                #cancello i TicketGrantingTicket
+                TicketGrantingTicket.storage.start_transaction
+                begin
+                    tgt_qs.each{ |tgt| 
+                        tgt.delete
+                    }
+                TicketGrantingTicket.storage.commit
+                rescue Exception => exc
+                    TicketGrantingTicket.storage.rollback
+                    Spider.logger.error "** Errore logout cas"
+                end
+                @request.cookies['tgt'] = nil
+
+            else
+                $LOG.warn("User tried to log out without a valid ticket-granting ticket")
+            end
+        end
+
+
+        
+
+
         def validate
             @service = clean_service_url(@request.params['service'])
             @ticket = @request.params['ticket']

data/apps/core/components/public/js/jquery/plugins/bsmselect/js/jquery.bsmselect.js

@@ -183,9 +183,14 @@
      * Select the first item of the new select
      */
     selectFirstItem: function() {
-      setTimeout(function(){
-        $('option:eq(0)', this.$select).attr('selected', 'selected');
-      }, 1000);
+      $('option:eq(0)', this.$select).attr('selected', 'selected');
+        /* tolto la modifica del commit e3a8027037d4d02601d910f40794f103968088c2 
+        per mettere selected su select dei permessi, rendeva lo stato bianco in modifica utente da admin */
+        /*
+        setTimeout(function(){
+         $('option:eq(0)', this.$select).attr('selected', 'selected');
+        }, 1000);
+        */
     },
 
     /**

data/apps/core/components/public/js/spider.js

@@ -525,7 +525,10 @@ Spider.Controller = Class.extend({
 		    params = null;
 		}
 		if (!callback) callback = function(){};
-		var url = this.url+'/'+method+'.json';
+		var url = this.url+'/'+method;
+		if( options == null || options['dataType'] == null || options['dataType'] == 'json'){
+			url = url+'.json';
+		}
 		var defaults = {
 			url: url,
 			type: 'POST',

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

@@ -16,6 +16,10 @@ module Spider; module Components
             end
             return qs
         end
+
+        def run
+            super
+        end
         
     end
     

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

@@ -32,20 +32,20 @@
     <div sp:if="!@pages.blank? && @pages > 1" class="pagination">
         <ul>
             <li sp:if="@page > 1">
-                <a class="prev" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }">&larr; _(Previous)</a>
+                <a class="prev" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }">&larr; _(Previous)</a>
             </li>
             <li sp:if="@page == 1" class="disabled">
                 <a class="prev disabled">&larr; _(Previous)</a>
             </li>
             <sp:pass sp:if="@paginate_first > 1">
                 <li>
-                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1" class="page">1</a>
+                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }" class="page">1</a>
                 </li>
                 <li class="disabled"><a>...</a></li>
             </sp:pass>
             <sp:pass sp:each="(@paginate_first..@paginate_last) |i|" >
                 <li sp:if="i != @page">
-                    <a  href="{ @request[:path] }?_w{ @widget[:param] }[page]={ i }" class="page">
+                    <a  href="{ @request[:path] }?_w{ @widget[:param] }[page]={ i }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }" class="page">
                         { i }
                     </a>
                 </li>
@@ -58,11 +58,11 @@
                     <a>...</a>
                 </li>
                 <li>
-                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }" class="page">{ @pages }</a> 
+                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }" class="page">{ @pages }</a> 
                 </li>
             </sp:pass>
             <li sp:if="@has_more">
-                <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }">_(Next) &rarr;</a>
+                <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }">_(Next) &rarr;</a>
             </li>
             <li sp:if="!@has_more" class="disabled">
                 <a class="next disabled">_(Next) &rarr;</a>

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

@@ -7,7 +7,7 @@ module Spider; module Forms
     
     class FileInput < Input
         tag 'file'
-        is_attr_accessor :save_path, :type => String, :default => lambda{ Spider.paths[:var]+'/data/uploaded_files' }
+        is_attr_accessor :save_path, :type => String, :default => Proc.new{ Spider.paths[:var]+'/data/uploaded_files' }
         
         def needs_multipart?
             true

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

@@ -33,25 +33,33 @@ module Spider; module Messenger
             msg
         end
         
+
+
+
         def self.send_email(klass, template, scene, from, to, headers={}, attachments=[], params={})
             path_txt = klass.find_resource_path(:email, template+'.txt')
             path_txt = nil unless path_txt && File.exist?(path_txt)
             path_html = klass.find_resource_path(:email, template+'.html')
             path_html = nil unless path_html && File.exist?(path_html)
+
+            #converte l'intera scene con ricorsione in utf-8 per evitare problemi in invio mail             
+            scene.convert_object
+
             scene_binding = scene.instance_eval{ binding }
             if (path_txt || path_html)
-                text = ERB.new(IO.read(path_txt)).result(scene_binding) if path_txt
-                html = ERB.new(IO.read(path_html)).result(scene_binding) if path_html
+                text = ERB.new( IO.read(path_txt) ).result(scene_binding) if path_txt
+                html = ERB.new( IO.read(path_html) ).result(scene_binding) if path_html
             else
                 path = klass.find_resource_path(:email, template)
-                text = ERB.new(IO.read(path)).result(scene_binding)
+                text = ERB.new( IO.read(path) ).result(scene_binding)
             end
+
             mail = Mail.new
-            mail[:to] = (to.respond_to?(:force_encoding) ? to.force_encoding('UTF-8') : to)
-            mail[:from] = (from.respond_to?(:force_encoding) ? from.force_encoding('UTF-8') : from)
+            mail[:to] = to.convert_object 
+            mail[:from] = from.convert_object 
             mail.charset = "UTF-8"
             headers.each do |key, value|
-                mail[key] = (value.respond_to?(:force_encoding) ? value.force_encoding('UTF-8') : value)
+                mail[key] = value.convert_object 
             end
 
             if html

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

@@ -32,8 +32,13 @@ module Spider; module HTTP
         def write(msg)
             send_headers unless @headers_sent
             #workaround per ruby 1.9.3, problemi su parte di admin, faccio force encoding a utf8
-	    msg_dup = msg.to_s.dup
-            @w.write(msg_dup.respond_to?(:force_encoding) ? msg_dup.force_encoding('UTF-8') : msg_dup)
+	        unless msg.to_s.blank?
+                msg_dup = msg.to_s.dup
+                @w.write(msg_dup.respond_to?(:force_encoding) ? msg_dup.force_encoding('UTF-8') : msg_dup)
+            else
+                @w.write(msg)
+            end
+            
         end
 
         def send_headers
@@ -104,8 +109,8 @@ module Spider; module HTTP
 
             controller = nil
             controller_done = false
-
-            run_block = lambda do
+            
+            run_block = Proc.new do
                 begin
                     controller = ::Spider::HTTPController.new(controller_request, controller_response)
                     controller.extend(Spider::FirstResponder)

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

@@ -127,8 +127,8 @@ module Spider; module HTTP
 
 
             controller_done = false
-
-            run_block = lambda do
+            
+            run_block = Proc.new do
                 begin
                     controller = ::Spider::HTTPController.new(controller_request, controller_response)
                     controller.extend(Spider::FirstResponder)

data/lib/spiderfw/http/server.rb

@@ -114,14 +114,16 @@ module Spider; module HTTP
                         ssl_server = ssl_rack.server if ssl_rack
                     end
                 end
-                do_shutdown = lambda{
+                do_shutdown = Proc.new{
                     Debugger.post_mortem = false if defined?(Debugger)
                     server.shutdown if server
                     ssl_server.shutdown if ssl_server
+
                     pid_file = File.join(Spider.paths[:var], 'run/server.pid')
                     begin
                         File.unlink(pid_file)
                     rescue Errno::ENOENT
+                        Spider.logger.info "Unlink del pid file non riuscito"
                     end
                 }
                 Spider.on_shutdown(&do_shutdown)
@@ -205,7 +207,7 @@ module Spider; module HTTP
 
                 unless @already_forked
                     Spider.main_process_startup
-                    exit_spawner = lambda{ 
+                    exit_spawner = Proc.new{ 
                         Spider.logger.debug "Spawner exiting" 
                         Process.kill 'KILL', @monitor_thread[:spawner_child_pid]
                     }

data/lib/spiderfw/model/base_model.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spiderfw/model/mixins/state_machine'
 require 'spiderfw/model/element'
 require 'spiderfw/model/integrated_element'
@@ -2382,9 +2383,24 @@ module Spider; module Model
         # A compact representation of the object.
         # Note: inspect will not autoload the object.
         def inspect
+            ic = Iconv.new('UTF-8//IGNORE', 'UTF-8') if RUBY_VERSION =~ /1.8/
+            enc = Spider.conf.get('storages')['default']['encoding']
+            enc ||= 'UTF-8'
+            
             self.class.name+': {' +
             self.class.elements_array.select{ |el| (element_loaded?(el) || element_has_value?(el)) && !el.hidden? } \
-                .map{ |el| ":#{el.name} => #{get(el.name).to_s}"}.join(',') + '}'
+                .map{ |el|
+                    val = get(el.name).to_s
+                    if RUBY_VERSION =~ /1.8/
+                        val = ic.iconv(val + ' ')[0..-2]
+                    else
+                        begin
+                            val = ((val+' ').encode('UTF-8', enc, :invalid => :replace, :undef => :replace))[0..-2] if val
+                        rescue EncodingError  
+                            val = ''  
+                        end 
+                    end
+                 ":#{el.name} => #{val}"}.join(',') + '}'
         end
         
         # Returns a JSON representation of the object.
@@ -2427,11 +2443,18 @@ module Spider; module Model
                     val ? "#{name.to_json}: #{val.to_json}" : nil
                 else
                     val = get(name)
+                    enc = Spider.conf.get('storages')['default']['encoding']
+                    enc ||= 'UTF-8'
+
                     if (el.type == String || el.type == Text)
                         if RUBY_VERSION =~ /1.8/
                             val = ic.iconv(val + ' ')[0..-2]
                         else
-                            val = (val + ' ').encode('UTF-8')[0..-2]
+                            begin
+                                val = ((val+' ').encode('UTF-8', enc, :invalid => :replace, :undef => :replace))[0..-2] if val
+                            rescue EncodingError  
+                                val = ''  
+                            end 
                         end
                     end
                     val = val.to_json

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

@@ -21,8 +21,22 @@ module Spider; module Model; module Storage; module Db
             super << Spider::DataTypes::Binary
         end
         
+        def self.parse_url(url)
+            # db:oracle://<username:password>:connect_role@<database>
+            # where database is
+            # the net8 connect descriptor (TNS) or
+            # for Oracle client 10g or later, hostname_or_ip:port_no/oracle_sid
+            if (url =~ /.+:\/\/(?:(.+):(.+)(?::(.+))?@)?(.+)/)
+                @user = $1
+                @pass = $2
+                @role = $3
+                @dbname = $4
+            else
+                raise ArgumentError, "Oracle url '#{url}' is invalid"
+            end
+            @connection_params = [@user, @pass, @dbname, @role]
+        end
 
-        
         def parse_url(url)
             # db:oracle://<username:password>:connect_role@<database>
             # where database is
@@ -39,8 +53,6 @@ module Spider; module Model; module Storage; module Db
             @connection_params = [@user, @pass, @dbname, @role]
         end
         
-
-        
         def value_for_condition(type, value)
             return value if value.nil?
             super

data/lib/spiderfw/setup/spider_setup_wizard.rb

@@ -16,7 +16,7 @@ module Spider
         end
         
         def ask_error
-            res = ask?(_("Do you want to change your settings?"), :default => true)
+            res = (ask? _("Do you want to change your settings?"), :default => true)
             !res
         end
         
@@ -69,7 +69,7 @@ module Spider
 
                 print prompt
             
-                res = $stdin.gets.strip.downcase
+                res = $stdin.gets.strip
                 
                 good = true
                 if options[:type] == Spider::Bool
@@ -181,13 +181,14 @@ module Spider
         
     end
     
+
     class SpiderSetupWizard < Wizard
         attr_accessor :first_run
         
         def run
         
             if ask? _("Do you want to configure a database?"), :default => (@first_run ? true : nil)
-                ask _("Which database do you want to configure?"), :db_label, :default => 'default'
+                ask _("Which database do you want to configure?"), :db_label, :choices => ['default', 'civiliaopen', 'tracciatointermedio'], :default => 'default'
                 conf = Spider.conf.get("storages.#{@db_label}")
                 url_db_type = nil
                 if conf && conf["url"]    
@@ -372,6 +373,108 @@ module Spider
     end
     
     class OracleSetupWizard < Wizard
+        def run
+            
+            require 'rubygems'
+            require 'rubygems/command.rb'
+            require 'rubygems/dependency_installer.rb'
+            unless Spider.gem_available?('ruby-oci8')
+                if ask? _("Oracle gem is not available. Install?")
+                    ok = false
+                    while !ok
+                        inst = Gem::DependencyInstaller.new
+                        begin
+                            inst.install 'ruby-oci8'
+                        rescue
+                            error _("Installation of oracle gem failed.")
+                            puts _(
+                            "The oracle gem failed to compile, so the pure-ruby version was installed.
+                            You should install the compiled version manually for better performance.")
+                        end
+                    end
+                else
+                    error _("Can't configure oracle without the ruby-oci8 gem.")
+                    return
+                end
+            end
+            require 'oci8'
+            
+            ok = false
+            while !ok
+                if (ask _("Do you want to connect via tns or direct connection?"), 
+                    :choices => ['tns', 'direct']) == 'tns'
+                    ask! _("Tns:"), :tns, :default => 'ORCL'
+                    ask _("Username"), :user
+                    ask _("Password"), :pass
+                    begin
+                        m = ::OCI8.new(@user, @pass, @tns)
+                        m.ping
+                        m.logoff
+                        connect_ok = true
+                        ok = true
+                        notify_partial("Ok.", true)
+                    rescue => myerr
+                        if myerr.exception.code == 1017
+                            notify_partial("Connection failed.", true)
+                            error _("Username or Password invalid.")
+                        elsif myerr.exception.code == 12154
+                            notify_partial("Connection failed.", true)
+                            error _("Tns seems not responding.")
+                        else
+                            notify_partial("", true)
+                            error _("Connection failed.")
+                        end
+                        ok = ask_error
+                    end
+                else
+                    ask _("Host:"), :host, :default => 'localhost'
+                    ask _("Port:"), :port, :default => 1521
+                    ask _("Tns:"), :tns, :default => 'ORCL'
+                    ask _("Username"), :user
+                    ask _("Password"), :pass
+                    @db_name = "//#{@host}:#{@port}/#{@tns}"
+                    begin
+                        m = ::OCI8.new(@user, @pass, @db_name)
+                        ok = true
+                        m.logoff
+                    rescue => myerr
+                        if myerr.exception.code == 1017
+                            notify_partial("Connection failed.", true)
+                            error _("Username or Password invalid.")
+                        elsif myerr.exception.code == 12154
+                            notify_partial("Connection failed.", true)
+                            error _("Server seems not responding.")
+                        else
+                            notify_partial("", true)
+                            error _("Connection failed.")
+                        end
+                        ok = ask_error
+                    end
+                end
+            end
+        end
+
+        def self.parse_db_name(db_name)
+            if (db_name =~ /(?:(.+):(.+))\/(?:(.+))/)
+                @host =$1
+                @port = $2
+                @tns = $3
+            else
+                @tns = db_name
+            end
+        end
+
+        def get_url
+            return "db:oracle://#{@user}:#{@pass}@#{@host}:#{@port}/#{@tns}" if @user && @pass && @host && @port && @tns
+            return "db:oracle://#{@user}:#{@pass}@#{@tns}" if @user && @pass && @tns
+            return nil
+        end
+        
+        def parse_url(url)
+            @user, @pass, @db_name, @role = Spider::Model::Storage::Db::Oracle.parse_url(url)
+            self.class.parse_db_name(@db_name)
+        end
+
     end
     
 end

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

@@ -29,5 +29,37 @@ class Object
     def blank?
         respond_to?(:empty?) ? empty? : !self
     end
+
+    #metodo ricorsivo per convertire in utf-8 tutto un oggetto con array o hash all'interno
+    def convert_object(encoding='UTF-8')
+        if self.respond_to?(:each_pair)
+            self.each_pair{ |chiave, valore|
+                valore.convert_object
+            }
+        elsif self.respond_to?(:each) && !self.is_a?(String)
+            #controllo se sto ciclando su un modello
+            if self.class < Spider::Model::BaseModel
+                #ritorna le chiavi degli elementi
+                
+                self.class.elements.each_pair{ |chiave_hash_modello, valore_hash_modello|
+                    self[chiave_hash_modello].convert_object unless self[chiave_hash_modello].respond_to?(:model)
+                }
+            else
+                #converto i singoli valori
+                self.each{ |valore_array|
+                    valore_array.convert_object
+                }
+            end
+        elsif self.is_a?(String)
+            if RUBY_VERSION =~ /1.8/
+                require 'iconv'
+                self.replace(Iconv.iconv(encoding, encoding, self).first)
+            elsif RUBY_VERSION =~ /1.9/
+                self.replace(self.force_encoding(encoding))
+            end
+        end
+    end
+
+
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  version: 0.6.32
+  version: 0.6.33
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-19 00:00:00 Z
+date: 2014-11-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse