spiderfw 0.6.37 → 0.6.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd306987f2889111e541450c6b4b3140a380111e
-  data.tar.gz: 6941bf11587b4802e48bf4ac0c8195f305a64c72
+  metadata.gz: bbf6ae93620ab61203cc996d8fbcbbc097a4b737
+  data.tar.gz: 0f4de9878544dc7b5b4bc5876ffaa250a4290465
 SHA512:
-  metadata.gz: 225d9c4ff0e49be66e331a48fe7f15b04ed418ed1612755b2c8c429eb407ef3343f829a110713c6d25f11aeefc3cb85db5615111572c63713267fed4ca511541
-  data.tar.gz: 4b1bb18864a2a3c73f4a0d5965493c8b82a167f2fefae382b3f265cb244c626c1970c60ac2c60c6e4fe723214c77206b22b5aa09dc8d92aa5f61cbc1cea2d996
+  metadata.gz: 614afbce4f39464a467282fdd6a51b7e8ffba870c5261eec57b4248735c3a45558060dcb10c4140c22011860819c49096cd962ed4db5601bd62446c8d1ec9e21
+  data.tar.gz: db21914ca3d1859a8e02023d086b15ed580920a98ba4053dfa56afc84eeef0087a3ef07cb328cf6bbdc21126e4ebbaa38f5d10e65a81ac55af2f1dd14692b53d

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 0.6.38
+* Aggiunto path per fare il logout cas
+* Modificato cas.rb e log vari
+* aggiunto controllo per ruby 1.8
+* Cancellazione di un file caricato con widget file input
+* aggiunta options host per webserver, a seguito di modifiche intervenute su gem rack ver 1.6.0
+* aggiunta gestione encoding per ruby > 1.8.7 nella funzione to_json
+* aggiunta gestione corretta per usare pry e pry-byebug
+* Ricavo encoding da request per creare un tempfile con upload file da form
+== 0.6.37
 == 0.6.36
 * correzioni bugs
 * gestione di caricamento del path dell'app rivisto e corretto anche per windows

data/VERSION

@@ -1 +1 @@
-0.6.37
+0.6.38

data/apps/cas_server/config/options.rb

@@ -10,5 +10,6 @@ module Spider
     config_option 'cas.saml_compliant_tickets', :type => String, :choices => [false, '1', '2', '4'], :default => lambda{
         Spider.conf.get('cas.saml1_1_compatible') ? '1' : false
     }
+    config_option 'cas.url_logout_cas', "Indirizzo url assoluto per il logout generale tramite CAS dei servizi php", :type => String
     
 end

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

@@ -222,7 +222,7 @@ module Spider; module CASServer
                         TicketGrantingTicket.storage.commit
                     rescue Exception => exc
                         TicketGrantingTicket.storage.rollback
-                        Spider.logger.error "** Errore logout cas"
+                        $LOG.error "** Errore logout cas"
 
                     end
 

data/apps/cas_server/lib/cas.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'net/https'
+require "net/http"
 require 'apps/cas_server/lib/utils'
 
 # Encapsulates CAS functionality. This module is meant to be included in
@@ -273,13 +274,19 @@ module Spider; module CASServer::CAS
     path = uri.path
     path = '/' if path.empty?
     
+    url_logout_cas = Spider.conf.get('cas.url_logout_cas')
+    path = url_logout_cas unless url_logout_cas.blank?
+
     req = Net::HTTP::Post.new(path)
+    str_saml_logout =  %{<samlp:LogoutRequest ID="#{rand}" Version="2.0" IssueInstant="#{time.rfc2822}">
+      <saml:NameID></saml:NameID>
+      <samlp:SessionIndex>#{st.ticket}</samlp:SessionIndex>
+      </samlp:LogoutRequest>}
+    
+    Spider.logger.debug "*** Logout saml#{str_saml_logout}"
     req.set_form_data(
-      'logoutRequest' => %{<samlp:LogoutRequest ID="#{rand}" Version="2.0" IssueInstant="#{time.rfc2822}">
-<saml:NameID></saml:NameID>
-<samlp:SessionIndex>#{st.ticket}</samlp:SessionIndex>
-</samlp:LogoutRequest>}
-    )
+      'logoutRequest' => str_saml_logout
+      )
     
     http.start do |conn|
       response = conn.request(req)

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

@@ -27,12 +27,14 @@ module Spider; module Forms
             if val['file'] && !val['file'].is_a?(String)
                 dest_path = @save_path+'/'+val['file'].filename
                 FileUtils.copy(val['file'].path, dest_path)
-                return dest_path
-            elsif val['clear']
+            end
+            #se clicco su pulisci cancello il file
+            if val['clear'] == 'on'
+                FileUtils.rm_f(val['file_name']) if File.exist?(val['file_name'])
                 self.value = nil
-                return
+                return 'cancellato' if val['file'].blank?
             end
-            return @value
+            return (dest_path.blank? ? self.value : dest_path)
         end
         
         __.action

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

@@ -5,6 +5,7 @@
     <div sp:if="@value && !@value.to_s.empty?">
         <a class="file-link" href="{ widget_action('view_file') }">{ @formatted_value }</a>
         <span class="clear">(<input type="checkbox" name="{ @name }[clear]"> _(Clear))</span>
+        <input type="hidden" name="{ @name }[file_name]" id="input_name_file" value="{ @value }">
     </div>
     <div class="change"><span sp:if="@value && !@value.to_s.empty?"><span class="change-label">_(Change)</span>:</span>
         <input type="file" name="{ @name }[file]" id="input" value="{ @value }" size="{ @size }">

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

@@ -28,6 +28,7 @@ module Spider
     config_option 'webserver.reload_sources', _("Reload application and spider sources on each request"), 
         :type => Spider::DataTypes::Bool,
         :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? true : false }
+    config_option 'webserver.host', _("Port to use for the http server"), :type => Fixnum, :default => '0.0.0.0'
     config_option 'webserver.port', _("Port to use for the http server"), :type => Fixnum, :default => 8080
     config_option 'webserver.force_threads', _("Force threading on non-threaded adapters"), :type => Spider::DataTypes::Bool,
         :default => Proc.new{ Spider.runmode != 'test' && RUBY_VERSION_PARTS[1] == '8'}

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

@@ -12,7 +12,7 @@ module Spider; module HTTP
         def options(opts)
             opts = super(opts)
             defaults = {
-                :host   => 'localhost',
+                :Host   => '0.0.0.0',
                 :app    => 'spider'
             }
             return defaults.merge(opts)
@@ -22,10 +22,13 @@ module Spider; module HTTP
         def start_server(opts={})
             opts = options(opts)
             options = {
-                :Port           => opts[:port],
-                :BindAddress    => opts[:host]
+                :Port           => opts[:Port],
+                :BindAddress    => opts[:Host]
             }
-            @server = ::Thin::Server.start(opts[:host], opts[:port].to_i, Spider::HTTP::RackApplication.new)
+            @server = ::Thin::Server.start(opts[:Host], opts[:Port].to_i, Spider::HTTP::RackApplication.new) do 
+                use Rack::CommonLogger
+                use Rack::ShowExceptions
+            end
         end
 
         def shutdown_server

data/lib/spiderfw/http/http.rb

@@ -272,9 +272,9 @@ module Spider
                 filename = head[FILENAME_REGEX, 1]
                 content_type = head[CONTENT_TYPE_REGEX, 1]
                 name = head[NAME_REGEX, 1]
-
                 if filename && !filename.empty?
-                  body = UploadedFile.new(filename, content_type)
+                    #se sono con ruby >= 1.9 ricavo l'encoding
+                    body = UploadedFile.new(filename, content_type, (buf.respond_to?(:encoding) ? buf.encoding.to_s : nil) )
                 end
                 next
               end
@@ -317,13 +317,18 @@ module Spider
     
     
     class UploadedFile < ::Tempfile
-        attr_reader :filename, :content_type
+        #aggiunto encoding per problemi con upload file "\xFF" from ASCII-8BIT to UTF-8 (Encoding::UndefinedConversionError)
+        attr_reader :filename, :content_type, :encoding
         
-        def initialize(filename, content_type)
+        def initialize(filename, content_type, encoding)
             @filename = filename
             @content_type = content_type
-            super('uploaded', Spider.paths[:tmp])
-            
+            @encoding = encoding
+            if RUBY_VERSION >= "1.9"
+                super('uploaded', Spider.paths[:tmp], content_type, :encoding => encoding)
+            else #caso con ruby 1.8.7
+                super('uploaded', Spider.paths[:tmp])
+            end
         end
         
     end

data/lib/spiderfw/http/server.rb

@@ -20,7 +20,7 @@ module Spider; module HTTP
                 :host => '0.0.0.0',
                 :port => 8080
             }
-            return defaults.merge(opts)
+            return defaults.merge!(opts)
         end
         
         def start(opts={})
@@ -39,9 +39,11 @@ module Spider; module HTTP
 
         def self.get_opts(server_name, options)
             server_name ||= Spider.conf.get('http.server')
+            options[:host] ||= Spider.conf.get('webserver.host')
             options[:port] ||= Spider.conf.get('webserver.port')
             opts = {
                 :server => server_name,
+                :Host => options[:host],
                 :Port => options[:port],
                 :config => File.join(Spider.paths[:root], 'config.ru')
             }
@@ -84,12 +86,12 @@ module Spider; module HTTP
         end
         
         def self.start(server_name, options={})
-            start = lambda{
+            start = Proc.new{
                 
                 
                 pid_file = File.join(Spider.paths[:var], 'run/server.pid')
                 puts _("Using webserver %s") % server_name if options[:verbose]
-                puts _("Listening on port %s") % opts[:port] if options[:verbose]
+                puts _("Listening on port %s") % opts[:Port] if options[:verbose]
                 rack = nil
                 ssl_rack = nil
                 server = nil
@@ -132,11 +134,11 @@ module Spider; module HTTP
                     end
                 }
                 Spider.on_shutdown(&do_shutdown)
-                
                 begin
                     thread.join if thread
                     ssl_thread.join if ssl_thread
                 rescue SystemExit
+                    Spider.logger.error "Problema nella creazione di un thread"
                 end
             }
             if options[:daemonize]

data/lib/spiderfw/model/base_model.rb

@@ -1,3 +1,4 @@
+# coding: UTF-8
 # -*- encoding : utf-8 -*-
 require 'spiderfw/model/mixins/state_machine'
 require 'spiderfw/model/element'
@@ -2452,16 +2453,25 @@ module Spider; module Model
                     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] if val
-                        else
+                        elsif val.encoding == "ASCII-8BIT" && val.is_a?(String)
+                                begin
+                                    val = ((val+' ').force_encoding("UTF-8").encode('UTF-8', :invalid => :replace, :undef => :replace))[0..-2] if val
+                                rescue
+                                    Spider.logger.error("Errore di encoding relativamente al seguente valore inserito in json #{val}")
+                                ensure
+                                    val ||= ''
+                                end
+                        elsif val.is_a?(String)
                             begin
-                                val = ((val+' ').encode('UTF-8', enc, :invalid => :replace, :undef => :replace))[0..-2] if val
-                            rescue EncodingError  
-                                val = ''  
-                            end 
+                                val = ((val+' ').encode('UTF-8', enc))[0..-2] if val
+                            rescue EncodingError 
+                                val = ((val+' ').encode('UTF-8', 'UTF-8', :invalid => :replace, :undef => :replace))[0..-2] if val
+                            ensure
+                                val ||= ''
+                            end
                         end
                     end
                     val = val.to_json
@@ -2628,7 +2638,7 @@ module Spider; module Model
                 return pks[0] if pks.length == 1
                 return pks
             end 
-
+            ic = Iconv.new('UTF-8//IGNORE', 'UTF-8') if RUBY_VERSION =~ /1.8/
             self.class.elements_array.each do |el|
                 next unless mapper.have_references?(el) || (el.junction? && el.model.attributes[:sub_model] == self.class)
                 if (el.model?)
@@ -2646,6 +2656,12 @@ module Spider; module Model
                         case val.class.name.to_sym
                         when :Date, :DateTime, :Time
                             val = val.strftime
+                        when :String
+                            if RUBY_VERSION =~ /1.8/
+                                val = ic.iconv(val) if val
+                            else
+                                val = val = val.force_encoding(Encoding::UTF_8).encode(Encoding::UTF_8) if val && val.encoding == Encoding::ASCII_8BIT
+                            end
                         end
                     end
                     h[el.name] = val

data/lib/spiderfw/model/datatypes/password.rb

@@ -25,6 +25,9 @@ module Spider; module DataTypes
             return self.to_s if attributes[:hashed]
             salt = attributes[:salt] || Spider.conf.get('password.salt')
             # TODO: better salts
+            #(0..10) -> ruby range, cioe crea un array da 0 a 10
+            #rand(89) numero casuale tra 0 e 88
+            #si ottiene un salt di 11 caratteri casuali che serve per effettuare l'hash
             salt ||= (0..10).inject('') { |r, i| r << rand(89) + 37 }
             hash_type = attributes[:hash] || Spider.conf.get('password.hash')
             return "#{hash_type}$#{salt}$#{self.class.do_hash(hash_type, self.to_s, salt)}"

data/lib/spiderfw/spider.rb

@@ -1119,7 +1119,7 @@ module Spider
         def init_pry_debug
             begin
                 require 'pry'
-                require 'pry-nav'
+                #require 'pry-nav'
                 require 'pry-stack_explorer'
                 if File.exists?(File.join($SPIDER_RUN_PATH,'tmp', 'debug.txt'))
                     require 'pry-remote'
@@ -1132,8 +1132,10 @@ module Spider
                     case RUBY_VERSION
                         when /2/
                             require 'byebug'
+                            require 'pry-byebug'
                         else
                             require 'ruby-debug'
+                            require 'pry-debugger'
                     end
                 rescue
                     require 'debugger'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spiderfw
 version: !ruby/object:Gem::Version
-  version: 0.6.37
+  version: 0.6.38
 platform: ruby
 authors:
 - Ivan Pirlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse