spiderfw 0.6.33 → 0.6.34

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 4873d682965b148d70ade3af10f990ce93457765fda2938ee24581e26aed8610763b6bc9c6e07f5d945c53fdaf4fa60283d8d0ec98bd4e69f6532531f45eee38
-  data.tar.gz: 5fdaa46959c9faceae5a35c09dc82bbfb5f1c2de98225b040a4d22193280f7a58645f3f50de5a1443d760b256408f3d8e1c5a4a1f63c53decfffa5c17f2c3ab9
 SHA1: 
-  metadata.gz: 29e74e4cba2547d4454dafb8a774f87038a09c15
-  data.tar.gz: 04caf2f5945b4807d75f4c6843a25a05a2e50dea
+  metadata.gz: 4c4bf569cdffcd4f4e64bd82183bbee9d4d10fab
+  data.tar.gz: 63357be8bf251700de9f892f52fd6b314c8d2414
+SHA512: 
+  metadata.gz: b044d2830210abc1e7351259d85d658e2cbe814ec75c9dc6da98a002a6fc704e865aa869cfdf63ba2cf7d35a79d0d69297fa6ef249a564c6cf5d23b8cf07e1b8
+  data.tar.gz: 7f404687644cbfd20f3ca935def886e8c42827724addd0ff034cf80e8f7885a2ad32eed2402165a432472833c18b2a7d135507242911772b193a76af16d1e3bf

data/VERSION

@@ -1 +1 @@
-0.6.33
+0.6.34

data/apps/app_server/lib/git_app.rb

@@ -33,7 +33,7 @@ module Spider; module AppServer
                     end
                 end
                 @last_modified = repo.commits.first.authored_date # FIXME
-                @spec.app_server ||= AppServer::AppServerController.http_url
+                @spec.app_server ||= AppServer::AppServerController.http_s_url
                 break
             end
             @repo = repo

data/apps/core/admin/controllers/admin_controller.rb

@@ -19,7 +19,7 @@ module Spider; module Admin
         end
         
         def self.logout_redirect
-            AdminController.http_url('login')
+            AdminController.http_s_url('login')
         end
     end
     
@@ -54,7 +54,7 @@ module Spider; module Admin
                     next if app[:options][:users] && (app[:options][:users] & (@request.users.map{ |u| u.class})).empty?
                     next if app[:options][:check] && !@request.users.any?{ |u| app[:options][:check].call(u) }
                 end
-                url = self.class.http_url(short_name)
+                url = self.class.http_s_url(short_name)
                 @scene.apps << {
                     :icon => app[:options][:icon] ? app[:module].pub_url+'/'+app[:options][:icon] : nil,
                     :url => self.class.http_s_url(short_name),
@@ -65,7 +65,7 @@ module Spider; module Admin
                 }
             end
             @scene.admin_breadcrumb = []
-            @scene.admin_breadcrumb << {:url => self.class.http_url, :label => _('Home')} if @scene.apps.length > 1
+            @scene.admin_breadcrumb << {:url => self.class.http_s_url, :label => _('Home')} if @scene.apps.length > 1
 
             # FIXME
             @scene.apps.sort!{ |a,b| b[:priority] <=> a[:priority] }

data/apps/core/admin/controllers/app_admin_controller.rb

@@ -6,7 +6,7 @@ module Spider; module Admin
         def before(action='', *params)
             @scene.admin_breadcrumb ||= []
             unless @_did_breadcrumb
-                @scene.admin_breadcrumb << {:url => self.class.http_url, :label => self.class.app.full_name}
+                @scene.admin_breadcrumb << {:url => self.class.http_s_url, :label => self.class.app.full_name}
             end
             @_did_breadcrumb = true
             super

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

@@ -804,3 +804,11 @@ function basename(path){
 function dirname(path){
     return path.replace(/\\/g, '/').replace(/\/[^\/]*$/, '');
 }
+
+if(!String.prototype.trim) {
+  String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g, '');};
+}
+
+
+
+

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

@@ -19,6 +19,9 @@ module Spider; module Components
         attribute :link_id, :type => Symbol
         attribute :link
         attribute :sort
+        #serve per i campi delle tabelle esterne che compaiono per il :reverse nel modello
+        #metterlo a false nella view per nascondere i campi
+        i_attribute :reverse_element, :type => TrueClass, :default => true
         i_attr_accessor :queryset
         i_attr_accessor :model
         attr_accessor :queryset, :condition, :page
@@ -83,6 +86,8 @@ module Spider; module Components
                     next if el.multiple? && el.association != :multiple_choice
                     next if el.type == Spider::DataTypes::Password
                     next if el.hidden?
+                    #serve per mostrare o no i campi delle chiavi esterne
+                    next if el.attributes[:added_reverse] && !@attributes[:reverse_element]
                 end
                 cnt += 1
                 els << el.name

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

@@ -4,19 +4,16 @@ Spider.defineWidget('Spider.Forms.FileInput', 'Spider.Forms.Input', {
 	
 	ready: function(){
 		var self = this;
-		var fileLink = $('.file-link', this.el);
+		var fileLink = $('.file-link', this.el.parent());
 		if (fileLink.size() == 1){
-			var changeLabel = $('.change-label', this.el).text();
-			var changeDiv = $('.change', this.el);
+			var changeLabel = $('.change-label', this.el.parent()).text();
+			var changeDiv = $('.change', this.el.parent());
 			changeDiv.hide();
-			$('.clear', this.el).hide();
-			var clearCheckBox = $('.clear input:checkbox', this.el);
-			var fileInput = $('.change input', this.el);
+			clearCheckBox = $('.clear input:checkbox', this.el.parent());
+			fileInput = $('.change input', this.el.parent());
 			
 			var link = $('<a href="#" class="js-change-link"/>');
-			link.text(changeLabel+'...')
-				.insertAfter(fileLink)
-				.click(function(e){
+			link.text(changeLabel+'...').insertAfter(fileLink).click(function(e){
 					e.preventDefault();
 					if (clearCheckBox.is(':checked')){
 						link.removeClass('open');

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

@@ -8,6 +8,13 @@ module Spider; module Forms
             return val ? true : false
         end
 
+        def value
+        	val = super
+            return ( val.blank? ? false : true )
+        end
+
+
+
     end
     
 end; end

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

@@ -20,8 +20,8 @@ module Spider; module Forms
                 :image_manager => attributes[:"image-manager"],
                 :link_manager => attributes[:"link-manager"] || attributes[:"file-manager"]
             }
-            options[:link_manager] ||= Spider::Files.http_url(:manager) if Spider.app?('spider_files')
-            options[:image_manager] ||= Spider::Images.http_url(:manager) if Spider.app?('spider_images')
+            options[:link_manager] ||= Spider::Files.http_s_url(:manager) if Spider.app?('spider_files')
+            options[:image_manager] ||= Spider::Images.http_s_url(:manager) if Spider.app?('spider_images')
             options[:full_page] = attributes[:"full-page"]
             @scene.options = options.to_json
         end

data/apps/messenger/controllers/messenger_admin_controller.rb

@@ -41,12 +41,12 @@ module Spider; module Messenger
             model = Spider::Messenger.const_get(q[:model])
             @scene.queue = @queue
             @scene.title = q[:label]
-            @scene.admin_breadcrumb << {:label => @scene.title, :url => self.class.url(@queue)}
+            @scene.admin_breadcrumb << {:label => @scene.title, :url => self.class.http_s_url(@queue)}
 
             if id
                 return view_message(@queue, id)
             end
-            @scene.msg_view_url = self.class.url(@queue)+'/'
+            @scene.msg_view_url = self.class.http_s_url(@queue)+'/'
             @scene.queued = model.queued_messages
             @scene.sent = model.sent_messages
             @scene.failed = model.failed_messages
@@ -58,7 +58,7 @@ module Spider; module Messenger
             model = Spider::Messenger.const_get(details[:model])
             @scene.message = model.load(:id => id)
             raise NotFound.new("Message #{queue} #{id}") unless @scene.message
-            @scene.admin_breadcrumb << {:label => id, :url => self.class.url("#{queue}/#{id}")}
+            @scene.admin_breadcrumb << {:label => id, :url => self.class.http_s_url("#{queue}/#{id}")}
             render("admin/view_#{queue}")
         end
 

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

@@ -62,16 +62,29 @@ module Spider; module Messenger
                 mail[key] = value.convert_object 
             end
 
-            if html
+            # if html
+            #     mail.html_part do
+            #         content_type 'text/html; charset=UTF-8'
+            #         body html
+            #     end 
+            # end  
+            # if attachments && !attachments.empty?
+            #     mail.text_part do
+            #         body text
+            #     end       
+            # else
+            #     mail.body = text
+            # end
+            #ritornato al vecchio metodo con piu controlli per problema con invio comunicazioni con immagini 5/2/2015
+
+            if html || text
+                mail.text_part do
+                    body text
+                end unless text.blank?
                 mail.html_part do
                     content_type 'text/html; charset=UTF-8'
                     body html
-                end 
-            end  
-            if attachments && !attachments.empty?
-                mail.text_part do
-                    body text
-                end       
+                end unless html.blank?
             else
                 mail.body = text
             end
@@ -79,8 +92,11 @@ module Spider; module Messenger
             if attachments && !attachments.empty?
                 attachments.each do |att|
                     if att.is_a?(Hash)
-                        filename = att.delete(:filename)
-                        mail.attachments[filename] = att
+                        #filename = att.delete(:filename)
+                        filename = att[:filename].dup
+                        mime_type = att[:mime_type].dup
+                        content = att[:content].dup
+                        mail.attachments[filename] = { :mime_type => mime_type, :content => content }
                     else
                         mail.add_file(att)
                     end

data/apps/messenger/views/admin/_admin.layout.shtml

@@ -3,10 +3,10 @@
          <tpl:include src="/core/admin/_app_info" />
          <ul>
             <li>
-                <a href="{ Spider::Messenger::AdminController.url }">_(Queues)</a>
+                <a href="{ Spider::Messenger::AdminController.http_s_url }">_(Queues)</a>
                 <ul>
                     <li sp:each="@queues |queue|">
-                        <a href="{ Spider::Messenger::AdminController.url(queue) }">{ @queue_info[queue][:label] }</a>
+                        <a href="{ Spider::Messenger::AdminController.http_s_url(queue) }">{ @queue_info[queue][:label] }</a>
                     </li>
                 </ul>
             </li>

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

@@ -2,7 +2,7 @@
     <h3>_(Queues)</h3>
     <ul>
         <li sp:each="@queues |name|">
-            <a href="{ Spider::Messenger::AdminController.http_url }/{ name }">{ @queue_info[name][:label] }</a>:
+            <a href="{ Spider::Messenger::AdminController.http_s_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/apps/worker/worker.rb

@@ -141,7 +141,7 @@ module Spider
         end
         
         def self.in(time, proc_string)
-            secs = Rufus.parse_time_string(time)
+            secs = Rufus::Scheduler.parse(time)
             self.at(Time.now+secs, proc_string)
         end
         

data/lib/spiderfw/app.rb

@@ -143,18 +143,26 @@ module Spider
             # The full url used to access the application from the browser, prefixed
             # with https
             # @return [String] 
-            def https_url
+            def https_url(action=nil)
+                if u = Spider.conf.get("#{@dotted_name}.https_url") 
+                    if action
+                        u += '/' if u[-1].chr != '/'
+                        u += action.to_s
+                    end
+                    return u 
+                end
                 return nil unless Spider.site && Spider.site.ssl?
                 u = "https://#{Spider.site.domain}"
                 u += ":#{Spider.site.ssl_port}" unless Spider.site.ssl_port == 443
                 u += url
+                u += "/"+action.to_s if action
                 u
             end
             
             # @return [String] If the site supports SSL, returns the #https_url; otherwise, the #http_url
-            def http_s_url
-                return https_url if Spider.site && Spider.site.ssl?
-                return http_url
+            def http_s_url(action=nil)
+                return https_url(action) if Spider.site && Spider.site.ssl?
+                return http_url(action)
             end
             
             # @return [String] The url to the app's public content. If the static_content.mode configuration

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

@@ -18,7 +18,7 @@ module Spider
                 require 'mongrel'
                 'mongrel'
             rescue LoadError
-                'webrick'
+                'thin'
             end
         },
         :type => String, :choices => ['webrick', 'mongrel', 'thin']

data/lib/spiderfw/model/base_model.rb

@@ -278,11 +278,11 @@ module Spider; module Model
                     create_junction = false
                 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
+                    if (assoc_type.respond_to?(:attributes) && !assoc_type.attributes[:sub_model]) # other kind of inline model
                         assoc_type_name += 'Junction'
                         create_junction = false if (first_model.const_defined?(assoc_type_name))
                     else
-                        create_junction = false
+                        createP_junction = false
                     end
                 end
                 attributes[:junction] = true
@@ -300,7 +300,12 @@ module Spider; module Model
                 end
                 other_name = attributes[:junction_their_element]
                 if (create_junction)
-                    assoc_type = first_model.const_set(assoc_type_name, Class.new(BaseModel))
+                    #evita il warning 'already initialized constant News' e 'already initialized constant Contents'
+                    if first_model.constant_defined?(assoc_type_name) 
+                        return nil
+                    else
+                        assoc_type = first_model.const_set(assoc_type_name, Class.new(BaseModel))
+                    end
                     assoc_type.attributes[:sub_model] = self
                     assoc_type.attributes[:sub_model_element] = name
                     embedder = attributes[:junction_embedded] == false ? false : true
@@ -1638,20 +1643,22 @@ module Spider; module Model
         def set_loaded_value(element, value, mark_loaded=true)
             element_name = element.is_a?(Element) ? element.name : element
             element = self.class.elements[element_name]
-            if element.integrated?
-                integrated = get(element.integrated_from)
-                integrated.set_loaded_value(element.integrated_from_element, value) if integrated
-            else
-                value = prepare_child(element.name, value)
-                current = instance_variable_get("@#{element_name}")
-                current.set_parent(nil, nil) if current && current.is_a?(BaseModel)
-                value.set_parent(self, element.name) if value.is_a?(BaseModel)
-                instance_variable_set("@#{element_name}", value)
+            unless element.blank?
+                if element.integrated?
+                    integrated = get(element.integrated_from)
+                    integrated.set_loaded_value(element.integrated_from_element, value) if integrated
+                else
+                    value = prepare_child(element.name, value)
+                    current = instance_variable_get("@#{element_name}")
+                    current.set_parent(nil, nil) if current && current.is_a?(BaseModel)
+                    value.set_parent(self, element.name) if value.is_a?(BaseModel)
+                    instance_variable_set("@#{element_name}", value)
+                end
+                value.loaded = true if (value.is_a?(QuerySet))
+                element_loaded(element_name) if mark_loaded
+                set_reverse(element, value) if element.model? && value
+                @_modified_elements[element_name] = false
             end
-            value.loaded = true if (value.is_a?(QuerySet))
-            element_loaded(element_name) if mark_loaded
-            set_reverse(element, value) if element.model? && value
-            @_modified_elements[element_name] = false
         end
         
         # Records that the element has been loaded.
@@ -2392,7 +2399,7 @@ module Spider; module Model
                 .map{ |el|
                     val = get(el.name).to_s
                     if RUBY_VERSION =~ /1.8/
-                        val = ic.iconv(val + ' ')[0..-2]
+                        val = ic.iconv(val + ' ')[0..-2] if val
                     else
                         begin
                             val = ((val+' ').encode('UTF-8', enc, :invalid => :replace, :undef => :replace))[0..-2] if val
@@ -2448,7 +2455,7 @@ module Spider; module Model
 
                     if (el.type == String || el.type == Text)
                         if RUBY_VERSION =~ /1.8/
-                            val = ic.iconv(val + ' ')[0..-2]
+                            val = ic.iconv(val + ' ')[0..-2] if val
                         else
                             begin
                                 val = ((val+' ').encode('UTF-8', enc, :invalid => :replace, :undef => :replace))[0..-2] if val

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

@@ -1290,6 +1290,14 @@ module Spider; module Model; module Mappers
                     end
                 end
             end
+            #debugger if ['civiliaopen__persona','civiliaopen__residente'].include?(schema.table.name)
+            @model.elements_array.select{ |el| el.attributes[:index] }.each do |el|
+                found = false
+                schema.table.fields.map{|field| found = (field.name == el.name.to_s); break if found }
+                sql = @storage.create_index(schema.table,el.name.to_s,el.attributes[:index]) if found
+                    
+            end if @model.extended_models.empty?
+
             seen = {}
             sequences.each do |sequence_table, table_sequences|
                 table_sequences.each do |element_name, db_name|

data/lib/spiderfw/model/model.rb

@@ -256,8 +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)
-		    m.after_sync if m.respond_to?(:after_sync)	
-		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/mssql.rb

@@ -82,7 +82,7 @@ module Spider; module Model; module Storage; module Db
                     bind_vars << query[:limit] + 1
                 end
                 replaced_fields.each do |f, repl|
-                    order = order.gsub(f, repl)
+                    order = order.gsub(f.to_s, repl)
                 end
                 sql = "SELECT * FROM (#{sql}) as RowConstrainedResult WHERE #{limit} order by #{order}"
             else

data/lib/spiderfw/model/storage/db/connectors/odbc.rb

@@ -13,6 +13,7 @@ module Spider; module Model; module Storage; module Db; module Connectors
             def new_connection(dsn=nil, user=nil, passwd=nil)
                 conn = ::ODBC.connect(dsn, user, passwd)
                 conn.autocommit = true
+
                 return conn
             end
         
@@ -82,7 +83,15 @@ module Spider; module Model; module Storage; module Db; module Connectors
                     debug("odbc executing:\n#{sql}\n[#{debug_vars_str}]")
                 end
                 @stmt = connection.prepare(sql)
-                res = @stmt.execute(*bind_vars)
+                rebind_vars = []
+                bind_vars.each do |var|
+                    if var.is_a?(Date)
+                        rebind_vars << var.to_s
+                    else
+                        rebind_vars << var
+                    end
+                end
+                res = @stmt.execute(*rebind_vars)
                 have_result = (@stmt.ncols != 0)
                 if (have_result)
                     result = []

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

@@ -543,7 +543,7 @@ module Spider; module Model; module Storage; module Db
             alter_fields = alter[:alter_fields]
             alter_attributes = alter[:attributes]
             sqls = []
-            
+
             add_fields.each do |field|
                 name, type, attributes = field
                 sqls += sql_add_field(table_name, field[:name], field[:type], field[:attributes])
@@ -576,7 +576,6 @@ module Spider; module Model; module Storage; module Db
             return sqls
         end
         
-        
         # Executes a create table structured description.
         def create_table(create)
             sqls = sql_create_table(create)
@@ -592,6 +591,28 @@ module Spider; module Model; module Storage; module Db
                 execute(sql)
             end
         end
+
+        # Executes a create index structured description.
+        def create_index(table_name, field_name, attribute)
+            sqls = sql_add_index(table_name, field_name, attribute)
+            begin
+                sqls.each{ |sql| execute(sql) }
+            rescue StorageException => exc
+                Spider.logger.error "Duplicate Key during create unique index into table #{table_name} and referred to column #{field_name}"
+            rescue => exc
+                drop_index(table_name, field_name)
+                retry
+            end
+        end
+
+        # Drop the index from DB.
+        def drop_index(table_name, field_name)
+            sqls = sql_drop_index(table_name, field_name)
+            begin
+                sqls.each{ |sql| execute(sql) }
+            rescue => exc
+            end
+        end
         
         # Drops a field from the DB.
         def drop_field(table_name, field_name)
@@ -663,6 +684,14 @@ module Spider; module Model; module Storage; module Db
         def sql_change_field(table_name, field, new_field, type, attributes)
             ["ALTER TABLE #{table_name} CHANGE #{field} #{sql_table_field(new_field, type, attributes)}"]
         end
+
+        def sql_add_index(table_name, field, attribute)
+            ["CREATE #{(attribute.to_s.upcase == 'UNIQUE' ? attribute.to_s.upcase : '')} INDEX #{field}_idx ON #{table_name} (#{field})"]
+        end
+
+        def sql_drop_index(table_name, field)
+            ["DROP INDEX #{field}_idx ON #{table_name}"]
+        end
         
         # Checks if a DB field is equal to a schema field.
         def schema_field_equal?(current, field)

data/lib/spiderfw/requires.rb

@@ -13,6 +13,7 @@ require 'spiderfw/utils/monkey/exception'
 require 'spiderfw/utils/monkey/nil_class'
 require 'spiderfw/utils/monkey/object'
 require 'spiderfw/utils/json'
+require 'spiderfw/utils/mixins'
 require 'spiderfw/utils/multi_level_hash'
 require 'spiderfw/utils/thread_out'
 require 'spiderfw/utils/inflector'
@@ -25,6 +26,7 @@ require 'spiderfw/utils/memory'
 require 'spiderfw/utils/secure_random'
 require 'spiderfw/utils/http_client'
 require 'spiderfw/utils/gems'
+require 'spiderfw/utils/openssl_wrapper'
 require 'spiderfw/config/configuration'
 require 'spiderfw/config/configurable'
 require 'spiderfw/app'

data/lib/spiderfw/spider.rb

@@ -1087,18 +1087,33 @@ module Spider
         def init_ruby_debug
             begin
                 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
-                else
-                    Debugger.start
+                    case RUBY_VERSION
+                        when /2/
+                            require 'byebug'
+                        else
+                            require 'ruby-debug'
+                    end
+		        rescue
+                    require 'debugger'
+		        end
+                case RUBY_VERSION
+                    when /2/
+                        if File.exists?(File.join($SPIDER_RUN_PATH,'tmp', 'debug.txt'))
+                            Byebug.wait_connection = true
+                            Byebug.start
+                        else
+                            Byebug.start
+                        end
+                    else
+                        if File.exists?(File.join($SPIDER_RUN_PATH,'tmp', 'debug.txt'))
+                            Debugger.wait_connection = true
+                            Debugger.start_remote
+                        else
+                            Debugger.start
+                        end
                 end
             rescue LoadError, RuntimeError => exc
-                msg = _('Unable to start debugger. Ensure ruby-debug is installed (or set debugger.start to false).')
+                msg = _('Unable to start debugger. Ensure ruby-debug or byebug is installed (or set debugger.start to false).')
                 Spider.output(exc.message)
                 Spider.output(msg)
             end

data/lib/spiderfw/utils/mixins.rb

@@ -0,0 +1,7 @@
+class String
+    def to_bool
+		return true if self == true || self =~ (/(true|Vero|t|yes|si|y|1)$/i)
+		return false if self == false || self.blank? || self =~ (/(false|Falso|f|no|n|0)$/i)
+		raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+    end
+end

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

@@ -55,7 +55,8 @@ class Object
                 require 'iconv'
                 self.replace(Iconv.iconv(encoding, encoding, self).first)
             elsif RUBY_VERSION =~ /1.9/
-                self.replace(self.force_encoding(encoding))
+                self_dup = self.dup
+                self.replace(self_dup.force_encoding(encoding)) unless self.frozen?
             end
         end
     end

data/lib/spiderfw/utils/openssl_wrapper.rb

@@ -0,0 +1,64 @@
+require 'openssl'
+
+module Spider
+
+    module OpenSslWrapper
+
+    	#metodo che verifica che il file sia firmato e che sia stato generato dal file originale passato senza alterazioni
+    	#ritorna un hash con una chave esito per capire se la verifica ha dato esito positivo e per ritornare o il
+    	#messaggio d'errore o un hash con i dati dei certificati
+    	def self.verify_p7m_short(original_file, signed_file)
+    		signature = OpenSSL::PKCS7.new(File.read(signed_file))
+			data = File.read(original_file)
+			cert_store = OpenSSL::X509::Store.new
+			cert_store.set_default_paths
+			#estraggo il certificato con cui viene firmato
+			certificati_firmatari = signature.certificates
+			firmatari = signature.signers
+			#OpenSSL::PKCS7::DETACHED
+			esito = signature.verify(certificati_firmatari, cert_store, data, OpenSSL::PKCS7::NOVERIFY)
+			if esito
+				#array con i dati dei certificati dei firmatari
+				array_cert_firmatari = []
+				certificati_firmatari.each{ |certificato|
+					hash_certificato = {}
+					hash_certificato[:issuer] = {}
+					certificato.issuer.to_a.each{ |item_of_name|
+						hash_certificato[:issuer][item_of_name[0].to_sym] = item_of_name[1]
+					} 
+					hash_certificato[:subject] = {}
+					certificato.subject.to_a.each{ |item_of_name|
+						hash_certificato[:subject][item_of_name[0].to_sym] = item_of_name[1]
+					} 
+					hash_certificato[:serial] = certificato.serial
+					hash_certificato[:not_after] = certificato.not_after
+					hash_certificato[:not_before] = certificato.not_before
+					array_cert_firmatari << hash_certificato
+				}
+
+				array_firmatari = []
+				firmatari.each{ |firmatario|
+					hash_firmatario = {}
+					hash_firmatario[:issuer] = {}
+					firmatario.issuer.to_a.each{ |item_of_name|
+						hash_firmatario[:issuer][item_of_name[0].to_sym] = item_of_name[1]
+					} 
+					hash_firmatario[:name] = {}
+					firmatario.name.to_a.each{ |item_of_name|
+						hash_firmatario[:name][item_of_name[0].to_sym] = item_of_name[1]
+					} 
+					hash_firmatario[:serial] = firmatario.serial
+					hash_firmatario[:signed_time] = firmatario.signed_time
+					array_firmatari << hash_firmatario
+				}
+				{ :esito => 'true', :firmatari => array_firmatari, :certificati => array_cert_firmatari }
+				
+			else
+				{ :esito => 'false', :error_string => signature.error_string }
+				
+			end
+    	end
+
+
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  version: 0.6.33
+  version: 0.6.34
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-19 00:00:00 Z
+date: 2015-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse
@@ -1503,6 +1503,7 @@ files:
 - lib/spiderfw/utils/logger.rb
 - lib/spiderfw/utils/loggers/apache_commons_logger.rb
 - lib/spiderfw/utils/memory.rb
+- lib/spiderfw/utils/mixins.rb
 - lib/spiderfw/utils/monkey/class.rb
 - lib/spiderfw/utils/monkey/date_time.rb
 - lib/spiderfw/utils/monkey/debugger.rb
@@ -1515,6 +1516,7 @@ files:
 - lib/spiderfw/utils/monkey/symbol.rb
 - lib/spiderfw/utils/monkey/time.rb
 - lib/spiderfw/utils/multi_level_hash.rb
+- lib/spiderfw/utils/openssl_wrapper.rb
 - lib/spiderfw/utils/ordered_hash.rb
 - lib/spiderfw/utils/periodic_runner.rb
 - lib/spiderfw/utils/profiling.rb