spiderfw 0.5.7 → 0.5.9

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

@@ -1,11 +1,18 @@
 <div class="{ @widget[:css_class] }">
-	<tpl:asset type="css" src="form.css" />
+	<tpl:asset type="css" src="css/form.css" />
 	<tpl:asset type="js" src="form.js" />
 	<div sp:if="@error" class='errors'>
-		Errori:
 		<ul>
-			<sp:pass sp:each="@errors |k, v|">
-				<li sp:each="v |err|">
+		    <li sp:if="@errors[nil]" sp:each="@errors[nil] |err|">
+		        { err }
+		    </li>
+			<sp:pass sp:each="@names |element|">
+				<li sp:if="@errors[element]" sp:each="@errors[element] |err|">
+					{ err }
+				</li>
+			</sp:pass>
+            <sp:pass sp:each="(@errors.keys - @names) |element|">
+				<li sp:if="@errors[element]" sp:each="@errors[element] |err|">
 					{ err }
 				</li>
 			</sp:pass>
@@ -19,7 +26,7 @@
 				<sp:run obj="input" />
 			</sp:pass>
 			<div class="fields">
-				<forms:element_row sp:each="@names |element|" element="element" error_condition="@errors[element]" />
+				<forms:element_row sp:each="@names |element|" element="element" required="@inputs[element].required?"/>
 			</div>
 			<div class="row buttons">
 				<input type='submit' name='_w{ @widget[:param] }[submit]' value='{ @submit_text }'>

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

@@ -1,4 +1,5 @@
 <sp:template>
+    <tpl:asset type="js" src="input.js" />
     <tpl:asset type="js" src="date_time.js" />
     <input type="text" name="{ @name }" value="{ @formatted_value }" size="{ @size }" class="{ @mode }">
 </sp:template>

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

@@ -0,0 +1,43 @@
+require 'ftools'
+
+module Spider; module Forms
+    
+    class FileInput < Input
+        tag 'file'
+        is_attr_accessor :save_path, :type => String, :default => lambda{ Spider.paths[:data]+'/uploaded_files' }
+        
+        def needs_multipart?
+            true
+        end
+        
+        def prepare
+            raise "No save path defined" unless @save_path
+            raise "Save path #{@save_path} is not a directory" unless File.directory?(@save_path)
+            super
+        end
+        
+        
+        def prepare_value(val)
+            return nil if !val || val.empty?
+            if val['file'] && !val['file'].is_a?(String)
+                dest_path = @save_path+'/'+val['file'].filename
+                File.copy(val['file'].path, dest_path)
+                return dest_path
+            elsif val['clear']
+                self.value = nil
+                return
+            end
+            return @value
+        end
+        
+        __.action
+        def view_file
+            raise NotFound.new(@value.to_s) unless @value && @value.file?
+            @response.headers['Content-Description'] = 'File Transfer'
+            @response.headers['Content-Disposition'] = "attachment; filename=\"#{@value.basename}\""
+            output_static(@value.to_s)
+        end
+        
+    end
+    
+end; end

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

@@ -0,0 +1,12 @@
+<div class="input">
+    <tpl:asset type="css" src="css/file_input.css" />
+    <tpl:asset type="js" src="input.js" />
+    <tpl:asset type="js" src="file_input.js" />
+    <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>
+    </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]" value="{ @value }" size="{ @size }">
+    </div>
+</div>

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

@@ -5,6 +5,7 @@ module Spider; module Forms
         i_attr_accessor :name
         is_attribute :value
         is_attr_accessor :label
+        is_attr_accessor :required, :type => Spider::DataTypes::Bool
         
         def self.template_path_parent
             File.dirname(File.dirname(__FILE__))
@@ -24,6 +25,8 @@ module Spider; module Forms
             return scene
         end
         
+        # Returns the value to be stored. If nil is returned, the value will not be unset; in this case,
+        # the method should modify the value directly.
         def prepare_value(val)
             val == {} ? nil : val
         end
@@ -43,7 +46,7 @@ module Spider; module Forms
         end
         
         def format_value
-            @value
+            @value.respond_to?(:format) ? @value.format : @value
         end
         
         def done?
@@ -63,6 +66,10 @@ module Spider; module Forms
             @modified
         end
         
+        def has_value?
+            @value && (!@value.is_a?(String) || !@value.empty?)
+        end
+        
         def read_only
             @read_only = true
             if template_exists?(@use_template+'_readonly')
@@ -78,7 +85,18 @@ module Spider; module Forms
             @read_only
         end
         
+        def required?
+            @attributes[:required]
+        end
+        
+        def check
+            if required? && !has_value?
+                add_error( _("%s is required") % self.label )
+            end
+        end
+        
         def parse_runtime_content(doc, src_path=nil)
+            doc = super
             doc.search('input:connect').each do |connect|
                 options = {}
                 options[:required] = connect.attributes['required'] ? true : false
@@ -93,6 +111,10 @@ module Spider; module Forms
             @css_classes << "connect-#{target}"
         end
         
+        def needs_multipart?
+            false
+        end
+        
         
         # def execute
         #     @scene.name = 

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

@@ -5,6 +5,7 @@ module Spider; module Forms
         is_attr_accessor :size, :type => Fixnum, :default => 25
 
         def prepare
+            super
             @modified = false
             if (params['pwd1'] && !params['pwd1'].empty? && params['pwd2'])
                 if (params['pwd1'] != params['pwd2'])

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

@@ -1,3 +1,3 @@
 <sp:template>
-    <input type="text" name="{ @name }" value="{ @value }" size="{ @size }">
+    <input type="text" name="{ @name }" value="{ @formatted_value }" size="{ @size }">
 </sp:template>

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

@@ -1,2 +1,2 @@
-<textarea name="{ @name }" rows="{ @rows }" cols="{ @cols }"><tpl:asset type="js" src="text_area.js" />
-<tpl:asset type="js" app="core/components" src="js/jquery/plugins/autogrow/jquery.autogrow.js" />{ @value }</textarea>
+<textarea name="{ @name }" rows="{ @rows }" cols="{ @cols }"><tpl:asset type="js" src="input.js" /><tpl:asset type="js" src="text_area.js" />
+<tpl:asset type="js" app="core/components" src="js/jquery/plugins/autogrow/jquery.autogrow.js" />{ @value }</textarea>

data/apps/git_model_versioning/models/mixins/git_versioned.rb

@@ -0,0 +1,91 @@
+require 'grit'
+require 'grit/git-ruby'
+
+module Spider; module GitModelVersioning;
+    
+    module GitVersioned
+        
+        def self.included(model)
+            model.extend(ClassMethods)
+            model.mapper_include(MapperMethods)
+        end
+        
+        def git_sha1
+            git_blob.sha1
+        end
+        
+        def git_blob
+            Grit::GitRuby::Blob.new(self.to_yaml)
+        end
+        
+        def ClassMethods
+            
+            def git_root
+                Spider.paths[:var]+'/model_git'
+            end
+            
+            def git_repo
+                @repo ||= Grit::GitRuby::Repository.new(git_root)
+            end
+            
+            def git_tree
+                commit = git_head
+                tree = git_repo.get_object_by_sha1(commit.tree)
+                tree.entry.each do |entry|
+                    return entry.sha1 if entry.name == self.name
+                end
+                return nil
+            end
+            
+            def git_head(sha1=nil)
+                if (sha1)
+                    File.open(git_root+'/refs/heads/master', 'w') do |f|
+                        f << sha1
+                    end
+                else
+                    sha1 = File.read(git_repo.git_dir+'/refs/heads/master')
+                end
+                return git_repo.get_object_by_sha1(sha1) || ""
+            end
+        end
+        
+        module MapperMethods
+        
+            # def before_save(obj, mode)
+            #     repo = @model.git_repo
+            #     tree = @model.git_repo.get_object_by_sha1(@model.git_tree)
+            #     pks_string = obj.primary_keys.join('$')
+            #     if (mode == :insert)
+            #         tree.entry.push(Grit::GitRuby::DirectoryEntry.new('0100000', pks_string, obj.git_sha1))
+            #     else
+            #         cur = nil
+            #         tree.entry.each do |e|
+            #             if (e.name == pks_string)
+            #                 cur = e
+            #                 break
+            #             end
+            #         end
+            #         raise "Object #{obj} not found in tree" unless cur
+            #         cur.sha1 = obj.git_sha1
+            #     end
+            #     tree_real_raw = tree_contents.collect{ |e| e.raw }.join("")
+            #     tree = GitRuby::Tree.from_raw(RawObject.new(tree_real_raw), repo)
+            #     tree_sha1 = repo.put_raw_object(tree_real_raw, 'tree')
+            #     commit = GitRuby::Commit.new(tree_sha1, [], 'spider', 'spider', "#{mode} #{DateTime.now}", @model.git_head, repo)
+            #     repo.put_raw_object(commit.raw_content, 'commit')
+            #     @model.git_head(commit.sha1)
+            # end
+            
+            def before_save(obj, mode)
+                git_index.add(obj.git_path, obj.to_yaml)
+                @model.write_git_index
+                super
+            end
+            
+        end
+        
+        
+    end
+    
+    
+end

data/apps/hippo/models/mixins/hippo_struct.rb

@@ -8,6 +8,7 @@ module Hippo
         def self.included(mod)
             mod.extend(ClassMethods)
             mod.mapper_include(Mapper)
+            mod.remove_element :id
             mod.element :id, Fixnum, :primary_key => true
             mod.element :cr_date, DateTime
             mod.element :mod_date, DateTime
@@ -25,8 +26,8 @@ module Hippo
                 el = super
                 if (el.attributes[:junction])
                     el.model.elements[:id].attributes[:primary_key] = false
-                    el.model.elements[el.attributes[:reverse]].attributes[:primary_key] = true
-                    el.model.elements[el.attributes[:junction_their_element]].attributes[:primary_key] = true
+                    el.model.elements[el.attributes[:reverse]].attributes[:primary_key] = false
+                    el.model.elements[el.attributes[:junction_their_element]].attributes[:primary_key] = false
                 end
                 return el
             end
@@ -134,26 +135,37 @@ module Hippo
             def generate_schema(schema=nil)
                 return super unless @model.binding
                 schema = Spider::Model::Storage::Db::DbSchema.new
-                schema.table = @model.binding[:table]
+                schema.table = Spider::Model::Storage::Db::Table.new(@model.binding[:table])
                 @model.binding[:elements].each do |el, binding|
                     element = @model.elements[el.to_sym]
                     next unless element
                     if (binding[:type] == 'mmbind')
                         junction = element.model.mapper.schema
-                        junction.table = binding[:table]
+                        junction.table = Spider::Model::Storage::Db::Table.new(binding[:table])
+                        junction.columns[:id] = Spider::Model::Storage::Db::Field.new(junction.table, 'ID', @storage.column_type(Fixnum, {}))
                         junction.foreign_keys[element.attributes[:reverse]] ||= {}
-                        junction.foreign_keys[element.attributes[:reverse]][@model.primary_keys[0].name] ||= {}
-                        junction.foreign_keys[element.attributes[:reverse]][@model.primary_keys[0].name][:name] = binding[:local_id]
+                        r_key_type = @storage.column_type(Spider::Model.base_type(@model.primary_keys[0].type), @model.primary_keys[0].attributes)
+                        r_key_field = Spider::Model::Storage::Db::Field.new(junction.table, binding[:local_id], r_key_type)
+                        junction.foreign_keys[element.attributes[:reverse]][@model.primary_keys[0].name] = r_key_field
                         junction.foreign_keys[element.attributes[:junction_their_element]] ||= {}
-                        junction.foreign_keys[element.attributes[:junction_their_element]][element.type.primary_keys[0].name] ||= {}
-                        junction.foreign_keys[element.attributes[:junction_their_element]][element.type.primary_keys[0].name][:name] = binding[:remote_id]
+                        t_key_type = @storage.column_type(Spider::Model.base_type(element.type.primary_keys[0].type), element.type.primary_keys[0].attributes)
+                        t_key_field = Spider::Model::Storage::Db::Field.new(junction.table, binding[:remote_id], t_key_type)
+                        junction.foreign_keys[element.attributes[:junction_their_element]][element.type.primary_keys[0].name] = t_key_field
+                        if (binding[:elements]) 
+                            binding[:elements].each do |j_el_name, j_el_binding|
+                                j_el = element.model.elements[j_el_name.to_sym]
+                                j_el_storage_type = Spider::Model.base_type(j_el.type)
+                                junction.columns[j_el.name] = Spider::Model::Storage::Db::Field.new(junction.table, j_el_binding[:field], @storage.column_type(j_el_storage_type, j_el.attributes))
+                            end
+                        end
                     elsif (element.model? && !element.multiple?)
+                        key_storage_type = Spider::Model.base_type(element.model.primary_keys[0].type)
+                        key_db_type = @storage.column_type(key_storage_type, element.model.primary_keys[0].attributes)
                         schema.foreign_keys[element.name] ||= {}
-                        schema.foreign_keys[element.name][element.model.primary_keys[0].name] ||= {}
-                        schema.foreign_keys[element.name][element.model.primary_keys[0].name][:name] = binding[:field]
+                        schema.foreign_keys[element.name][element.model.primary_keys[0].name] = Spider::Model::Storage::Db::Field.new(schema.table, binding[:field], key_db_type)
                     else
-                        schema.columns[element.name] ||= {}
-                        schema.columns[element.name][:name] = binding[:field]
+                        storage_type = Spider::Model.base_type(element.type)
+                        schema.columns[element.name] = Spider::Model::Storage::Db::Field.new(schema.table, binding[:field], @storage.column_type(storage_type, element.attributes))
                     end
                 end
                 if (@model.binding[:parent_ref])
@@ -163,33 +175,31 @@ module Hippo
                     element = @model.elements[@model.extended_models[extended]]
                     schema.foreign_keys.delete(@model.extended_models[extended])
                     junction = element.model.mapper.schema
-                    junction.table = pr[:table]
+                    junction.table = Spider::Model::Storage::Db::Table.new(pr[:table])
+                    junction.columns[:id] = Spider::Model::Storage::Db::Field.new(junction.table, 'ID', @storage.column_type(Fixnum, {}))
+                    r_key_type = @storage.column_type(Spider::Model.base_type(@model.primary_keys[0].type), @model.primary_keys[0].attributes)
+                    r_key_field = Spider::Model::Storage::Db::Field.new(junction.table, pr[:child_id], r_key_type)
                     junction.foreign_keys[element.attributes[:reverse]] ||= {}
-                    junction.foreign_keys[element.attributes[:reverse]][@model.primary_keys[0].name] ||= {}
-                    junction.foreign_keys[element.attributes[:reverse]][@model.primary_keys[0].name][:name] = pr[:child_id]
+                    junction.foreign_keys[element.attributes[:reverse]][@model.primary_keys[0].name] = r_key_field
                     junction.foreign_keys[element.attributes[:junction_their_element]] ||= {}
-                    junction.foreign_keys[element.attributes[:junction_their_element]][element.type.primary_keys[0].name] ||= {}
-                    junction.foreign_keys[element.attributes[:junction_their_element]][element.type.primary_keys[0].name][:name] = pr[:parent_id]
+                    t_key_type = @storage.column_type(Spider::Model.base_type(element.type.primary_keys[0].type), element.type.primary_keys[0].attributes)
+                    t_key_field = Spider::Model::Storage::Db::Field.new(junction.table, pr[:parent_id], t_key_type)
+                    junction.foreign_keys[element.attributes[:junction_their_element]][element.type.primary_keys[0].name] = t_key_field
                 end
                 @model.elements_array.each do |el|
                     unless @model.binding[:elements][el.name.to_s] || HippoStruct.base_elements.include?(el.name)
                         schema.pass[el.name] = true 
                     end
                 end
-#                debugger if @model.name.to_s == "AgendaHippo::Ordine"
                 return super(schema)
             end
-        
-        end
-        
-        module HippoStorage
-            
-            def column_type(type, attributes)
+
+            def storage_column_type(type, attributes)
                 return super(String, attributes) if (type == DateTime)
                 return super
             end
-            
-             def value_to_mapper(type, value)
+
+             def storage_value_to_mapper(type, value)
                  return value unless value
                  case type.name
                  when 'DateTime'
@@ -201,6 +211,12 @@ module Hippo
                  end
                  return super
              end
+        
+        end
+        
+        module HippoStorage
+            
+            
             
         end
     

data/apps/master/controllers/git.rb

@@ -0,0 +1,32 @@
+require 'apps/webdav/lib/vfs/local'
+
+module Spider; module Master
+    
+    class GitController < Spider::WebDAV::WebDAVController
+        
+        def init_vfs
+            Spider::WebDAV::VFS::Local.new(Spider.paths[:apps])
+        end
+        
+        def before(action='', *params)
+            action.gsub!(/[^a-zA-Z]+\//, '') # ??? sanitize
+            app = find_app(action)
+            if (app.access = :restricted)
+                redirect 'https://'+@request.env['HTTP_HOST']+request_path if @request.protocol != 'https'
+                raise Unauthorized.new(action) unless @request.ssl && @request.ssl.key
+                key = @request.ssl.key
+                host = Hosts.find1{ key == @request.ssl.key }
+                raise Unauthorized.new(action) unless host && host.allowed?(app)
+        end
+        
+        m.html, m.private
+        def find_app(action)
+            action = 
+        end
+        
+        def unauthorized
+        end
+        
+    end
+    
+end; end

data/apps/messenger/_init.rb

@@ -19,6 +19,6 @@ end
 
 require 'apps/messenger/messenger'
 require 'apps/messenger/controllers/messenger_controller'
-require 'apps/messenger/controllers/mixins/messenger_controller_mixin'
+require 'apps/messenger/controllers/mixins/messenger_helper'
 
 # gem dependencies: mailfactory for sending email from templates

data/apps/messenger/config/options.rb

@@ -11,5 +11,7 @@ module Spider
     config_option 'messenger.email.retries', :type => Fixnum, :default => 5
     config_option 'messenger.email.retry_time', _("Seconds to wait until retry (will be incremented at each retry)"), 
         :type => Fixnum, :default => 10
+    config_option 'messenger.queue.run_every', _("Time in seconds between queue runs"), :type => Fixnum, :default => 60
+    
     
 end

data/apps/messenger/config/worker/queue.rb

@@ -0,0 +1,3 @@
+Spider::Worker.every("#{Spider.conf.get('messenger.queue.run_every')}s") do
+    Spider::Messenger.process_queues
+end

data/apps/messenger/controllers/mixins/{messenger_controller_mixin.rb → messenger_helper.rb}

@@ -5,7 +5,7 @@ Spider.register_resource_type(:email, :extensions => ['erb'], :path => 'template
 
 module Spider; module Messenger
     
-    module MessengerControllerMixin
+    module MessengerHelper
         
         # Compiles an e-mail from given template and scene, and sends it using
         # #Messenger::email
@@ -15,16 +15,20 @@ module Spider; module Messenger
         # {:file => '/full/file/path', :type => 'mime type', :file_name => 'optional email file name', 
         # :headers => 'optional string or array of additional headers'}
         def email(template, scene, from, to, headers={}, attachments=[], params={})
-            path_txt = self.class.find_resource_path(:email, template+'.txt')
+            Spider::Messenger::MessengerHelper.email(self.class, template, scene, from, to, headers, attachments, params)
+        end
+        
+        def self.email(klass, template, scene, from, to, headers={}, attachments=[], params={})
+            path_txt = klass.find_resource_path(:email, template+'.txt')
             path_txt = nil unless File.exist?(path_txt)
-            path_html = self.class.find_resource_path(:email, template+'.txt')
+            path_html = klass.find_resource_path(:email, template+'.txt')
             path_html = nil unless File.exist?(path_html)
             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
             else
-                path = self.class.find_resource_path(:email, template)
+                path = klass.find_resource_path(:email, template)
                 text = ERB.new(IO.read(path)).result(scene_binding)
             end
             mail = MailFactory.new
@@ -35,7 +39,6 @@ module Spider; module Messenger
             end
             mail.html = html if html
             mail.text = text if text
-            debugger
             if (attachments && !attachments.empty?)
                 attachments.each do |att|
                     if (att[:file_name])
@@ -48,7 +51,6 @@ module Spider; module Messenger
             mail_headers, mail_body = mail.to_s.split("\r\n\r\n")
             Messenger.email(from, to, mail_headers, mail_body, params)
         end
-        
     end
     
 end; end

data/apps/messenger/messenger.rb

@@ -13,13 +13,20 @@ module Spider
                 }
             }
         end
+        
+        def self.process_queues
+            self.queues.each_key do |queue|
+                self.process_queue(queue)
+            end
+        end
                 
         def self.process_queue(queue)
-            @mutex ||= Mutex.new
-            return if @mutex.locked?
             raise ArgumentError, "Queue #{name} not found" unless self.queues[queue]
+            @mutexes ||= {}
+            mutex = @mutexes[queue] ||= Mutex.new
+            return if mutex.locked?
             model = self.queues[queue][:model]
-            @mutex.synchronize do
+            mutex.synchronize do
                 now = DateTime.now
                 list = model.where{ (sent == nil) & (next_try <= now) }
                 list.each do |msg|

data/apps/messenger/models/message.rb

@@ -1,4 +1,4 @@
-require 'uuid'
+require 'uuidtools'
 
 module Spider; module Messenger
     
@@ -34,7 +34,7 @@ module Spider; module Messenger
         
         with_mapper do
             def before_save(obj, mode)
-                obj.ticket = ::UUID.generate if mode == :insert
+                obj.ticket = UUIDTools::UUID.random_create.to_s if mode == :insert
                 super
             end
         end

data/apps/messenger/po/it/spider_messenger.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Messenger 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
+"POT-Creation-Date: 2010-03-24 16:27+0100\n"
 "PO-Revision-Date: 2009-06-30 16:44+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

data/apps/messenger/po/spider_messenger.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Messenger 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
+"POT-Creation-Date: 2010-03-24 16:27+0100\n"
 "PO-Revision-Date: 2009-06-30 16:44+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

data/apps/saml/_init.rb

@@ -0,0 +1,13 @@
+module Spider
+
+    module SAML
+
+        @description = ""
+        @version = 0.1
+        @path = File.dirname(__FILE__)
+        include Spider::App
+
+    end
+
+
+end

data/apps/saml/controllers/saml2idp.rb

@@ -0,0 +1,18 @@
+module Spider; module SAML
+    
+    class Saml2IDP < Spider::PageController
+        
+        def auth
+            if (@request.params['SAMLRequest'])
+                process_request
+            end
+        end
+        
+        def process_request
+            
+        end
+        
+        
+    end
+    
+end; end

data/apps/saml/lib/bindings/http_redirect_binding.rb

@@ -0,0 +1,14 @@
+module Spider; module SAML
+    
+    class HTTPRedirectBinding
+        
+        
+        def self.decode_request(saml_request)
+            request = Zlib::GzipReader.open(StringIO.new(Base64.decode(saml_request)){ |gz| gz.read }
+            return AuthnRequest.new(request)
+        end
+        
+    end
+    
+    
+end