spiderfw 0.5.7 → 0.5.9

data/apps/saml/lib/messages/authn_request.rb

@@ -0,0 +1,52 @@
+require 'base64'
+require 'stringio'
+require 'zlib'
+
+module Spider; module SAML
+    
+    class AuthnRequest
+        
+        def initialize(xml_string=nil)
+            @version = '2.0'
+            parse_xml(xml_string) if (xml_string)
+        end
+        
+        def parse_xml(xml_string)
+            xml = Nokogiri::XML(xml_string)
+            @force_authn = xml.root['ForceAuthn'] == 'true'
+            @assertion_consumer_service_url = xml.root['AssertionConsumerServiceURL']
+            @attribute_consuming_service_index = xml.root['AttributeConsumingServiceIndex']
+            @provider_name = xml.root['ProviderName']
+            @id = xml.root['ID']
+            @version = xml.root['Version']
+            @issue_instant = DateTime.strptime(xml['IssueInstant'], '%Y-%m-%dT%H:%M:%S%Z')
+            @destination = xml.root['Destination']
+            @consent = xml.root['Consent']
+            issuer = xml.xpath('//issuer')
+            @issuer = issuer[0].content if issuer[0]
+        end
+        
+        def to_xml
+            xml = ''
+            xm = Builder::XmlMarkup.new(:target => xml, :indent => 2)
+            xm.samlp(:AuthnRequest,
+                'xmlns:samlp' => SAML::SAMLPNs,
+                'xmlns:saml' => SAML::SAMLNs,
+                'ID' => @id,
+                'Version' => @version,
+                'IssueInstant' => @issue_instant.strftime('%Y-%m-%dT%H:%M:%S%Z'),
+                'ForceAuthn' => @force_authn,
+                'IsPassive' => @is_passive,
+                'Destination' => @destination,
+                'Consent' => @consent
+            ) do
+                xm.saml(:Issuer, @issuer)
+            end
+        end
+        
+
+        
+    end
+    
+    
+end; end

data/apps/saml/lib/saml.rb

@@ -0,0 +1,10 @@
+module Spider;
+    
+    module Saml
+        
+        SAMLPNs = 'urn:oasis:names:tc:SAML:2.0:protocol'
+        SAMLNs = 'urn:oasis:names:tc:SAML:2.0:assertion'
+        
+    end
+    
+end

data/apps/soap/controllers/soap_controller.rb

@@ -122,6 +122,11 @@ module Spider
         end
 
         def before(action='', *params)
+            begin
+                # Debugger post mortem interferes with the mapping of exceptions
+                Debugger.post_mortem = false 
+            rescue NameError, RuntimeError
+            end
             method = @request.env['REQUEST_METHOD']
             @soap_proxy = SoapProxy.new(self, self.class.soap_methods)
             @soap_registry = SOAP::Mapping::Registry.new
@@ -129,6 +134,9 @@ module Spider
                 t.soap_controller = self.class
                 @soap_registry.add(t, t.soap_class, t.soap_factory, t.soap_info)
             end
+            unless Spider.runmode == 'devel'
+                @soap_registry.add(RuntimeError, SOAP::Mapping::SOAPException, CustomExceptionFactory.new, nil)
+            end
             if method == 'POST'
                 @router = ::SOAP::RPC::Router.new(self.class.name)
                 @router.mapping_registry = @soap_registry
@@ -262,11 +270,13 @@ module Spider
                 
 
                 # Service
-
+                
+                soap_address = request_url
+                soap_address += '/' unless soap_address[-1].chr == '/'
                 xm.service('name' => self.class.soap_service_name) do
                     xm.port('name' => self.class.soap_port_name, 'binding' => 'typens:'+self.class.soap_binding_name) do
                         xm.soap(:address, 
-                        'location' => request_url)
+                        'location' => soap_address)
                     end
                 end
 

data/apps/soap/lib/soap.rb

@@ -23,7 +23,7 @@ module SOAP; module Mapping
     end
     
 end; end
-
+    
 module Spider
     
     module Soap
@@ -78,6 +78,21 @@ module Spider
             end
         end
         
+        class CustomExceptionFactory < SOAP::Mapping::Factory
+            
+            def obj2soap(soap_class, obj, info, map)
+                soap_obj = ::SOAP::SOAPStruct.new
+                elename = ::SOAP::Mapping.name2elename("message")
+                soap_obj.add elename, ::SOAP::Mapping._obj2soap(obj.message, map)
+                soap_obj
+            end
+            
+            def soap2obj(obj_class, node, info, map)
+                return RuntimeError.new(node['message'].data)
+            end
+            
+        end
+        
         module SoapType
             def self.included(klass)
                 klass.extend(ClassMethods)

data/apps/soap/soap.gemspec

@@ -0,0 +1,10 @@
+Gem::Specification.new do |s|
+   s.name = "Soap"
+   s.version = "0.4.1"
+   s.date = "2009-06-15"
+   s.authors = ["Ivan Pirlik"]
+   s.email = %q{ivan.pirlik@gmail.com}
+   s.summary = %q{Soap controller}
+   s.description = %q{Soap Controller}
+   s.files = [ "README", "Changelog", "LICENSE", "demo.rb", "demo.conf", "lib/parseconfig.rb"]
+end

data/apps/webdav/lib/locking.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'uuid'
+require 'uuidtools'
 require 'spiderfw/utils/shared_store'
 
 module Locking
@@ -17,7 +17,7 @@ module Locking
 			@properties = properties
 			@created = Time.now
 			
-			@token = UUID.new.generate
+			@token = UUIDTools::UUID.random_create.to_s
 		end
 		
 		def [](key)

data/apps/worker/_init.rb

@@ -11,3 +11,5 @@ module Spider
     
 end
 
+
+Spider.register_resource_type :worker, :path => 'config/worker', :extensions => ['rb']

data/apps/worker/config/options.rb

@@ -1,5 +1,6 @@
 module Spider
     
+    config_option 'worker.enable', :type => Spider::DataTypes::Bool, :default => lambda{ Spider.config.get('runmode') == 'devel' ? false : true }
     config_option 'worker.fork', :type => Spider::DataTypes::Bool, :default => lambda{
       RUBY_PLATFORM =~ /win32|mingw32/ ? false : true
     }

data/apps/worker/worker.rb

@@ -29,10 +29,12 @@ module Spider
         end
         
         def self.app_startup
+            return unless Spider.conf.get('worker.enable')
             @runner = start_runner unless running?
         end
         
         def self.app_shutdown
+            return unless Spider.conf.get('worker.enable')
             @mutex.try_lock || return
             Spider::Logger.info("Shutting down worker in #{Process.pid}")
             if @runner
@@ -78,9 +80,18 @@ module Spider
                             load @scripts_dir+'/'+script
                         end
                     end
-                    # every(Spider.conf.get('worker.jobs_interval').to_s+'s') do
-                    #     self.run_jobs
-                    # end
+                    Spider.apps.each do |name, mod|
+                        if File.directory?(mod.path+'/config/worker')
+                            Dir.glob(mod.path+'/config/worker/*.rb').each do |path|
+                                file = File.basename(path, '.rb')
+                                next if file[0].chr == '.'
+                                res = Spider.find_resource(:worker, file, nil, mod)
+                                if res
+                                    load res.path
+                                end
+                            end
+                        end
+                    end
                     @mutex.unlock
                 end
             end
@@ -108,6 +119,8 @@ module Spider
             begin
                 Process::kill 0, pid
                 return pid
+            rescue Errno::EPERM
+                return pid
             rescue Errno::ESRCH
                 File.unlink(pid_file)
                 return false
@@ -165,4 +178,4 @@ module Spider
     end
 
 
-end
+end

data/blueprints/app/__APP__.appspec

@@ -0,0 +1,4 @@
+id "<%= app_name %>"
+name "<%= app_name.split('_').map{|part| part.capitalize }.join(' ') %>"
+version "0.1"
+author ""

data/blueprints/app/_init.rb

@@ -1,10 +1,7 @@
-require 'apps/<%= app_path %>/controllers/<%= app_name %>_controller.rb'<% tab = (modules.length > 1) ? "    " : "" %><%= "\n" if (modules.length > 1) %>
-<%= modules[0..-2].inject(""){ |s, mod| s+= "; " if (s.length > 0); s+="module #{mod}"}+"\n" if (modules.length > 1)%>
-<%=tab%>module <%=modules[-1]%>
-<%=tab%>    @description = ""
-<%=tab%>    @version = 0.1
-<%=tab%>    @path = File.dirname(__FILE__)
-<%=tab%>    @controller = :<%= module_name %>Controller
+<%= modules[0..-2].inject(""){ |s, mod| s+= "; " if (s.length > 0); s+="module #{mod}"}+"\n" if (modules.length > 1)%><%= "\n" if (modules.length > 1) %><% tab = (modules.length > 1) ? "    " : "" 
+%><%=tab%>module <%=modules[-1]%>
 <%=tab%>    include Spider::App
+<%=tab%>    @controller = :<%= module_name %>Controller
 <%=tab%>end
-<%= "\n"+modules[0..-2].inject(""){ |s, mod| s+= "; " if (s.length > 0); s+="end" if (modules.length > 1)} %>
+<%= "\n"+modules[0..-2].inject(""){ |s, mod| s+= "; " if (s.length > 0); s+="end" if (modules.length > 1)} 
+%>require 'apps/<%= app_path %>/controllers/<%= app_name %>_controller'

data/blueprints/app/controllers/__APP___controller.rb

@@ -1,9 +1,10 @@
 <%= modules[0..-2].inject(""){ |s, mod| s+= "module #{mod}; "} %>module <%=modules[-1]%>
     
-    class <%= module_name %>Controller < Spider::AppController
+    class <%= module_name %>Controller < Spider::PageController
         
         layout '<%= app_name %>'
     
+        __.html
         def index
             @scene.msg = 'Hello!'
             render('index')

data/blueprints/app/views/__APP__.layout.shtml

@@ -1,5 +1,8 @@
 <html>
-    <head></head>
+    <head>
+        <script sp:each='@assets[:js] |script|' type="text/javascript" src="{ script }"></script>
+        <link sp:each='@assets[:css] |css_file|' rel='stylesheet' href='{ css_file }' />
+    </head>
     <body>
         <div id="content">
             <sp:yield />

data/blueprints/install/config/config.yml

@@ -1,14 +1,12 @@
 runmode: 'devel'
-template.cache.disable: true
-client.text_editor: 'textmate'
-locale: 'it'
 session.store: 'file'
+client.text_editor: 'textmate'
 
-#set devel:
 storages:
     default: 
         url: 'db:sqlite://var/db.sqlite'
     
 set devel:
+    template.cache.disable: true
     debugger.start: true
     debug.console.level: DEBUG

data/blueprints/model.rb

@@ -0,0 +1,15 @@
+<%= modules[0..-2].inject(""){ |s, mod| s+= "module #{mod}; "} %>module <%=modules[-1]%>
+
+    class <%= model.name %> < Spider::Model::BaseModel
+        
+        layout '<%= app_name %>.layout'
+    
+        def index
+            @scene.msg = 'Hello!'
+            render('index')
+        end
+    
+    end
+    
+
+<%= modules[0..-2].inject("") { |str, mod| str+= 'end; '} %>end

data/lib/spiderfw/app.rb

@@ -1,4 +1,3 @@
-require 'spiderfw/controller/app_controller'
 require 'fileutils'
 
 module Spider
@@ -10,14 +9,19 @@ module Spider
                 
                 include Spider::DataTypes
                 
-                #@controller ||= :"Spider::AppController"
                 class << self
-                    attr_reader :path, :pub_path, :test_path, :setup_path, :widgets_path, :views_path, :tags_path, :models_path
+                    attr_reader :id, :path, :pub_path, :test_path, :setup_path, :widgets_path, :views_path, :tags_path, :models_path
                     attr_reader :short_name, :route_url, :label, :version
-                    attr_reader :short_prefix
+                    attr_accessor :short_prefix
                     attr_reader :command
+                    attr_reader :spec
                     
                     def init
+                        unless @path
+                          file = caller[1].split(':')[0]
+                          dir = File.expand_path(File.dirname(file))
+                          @path = dir
+                        end
                         @short_name ||= Inflector.underscore(self.name).gsub('/', '_')
                         @pub_path ||= @path+'/public'
                         @test_path ||= @path+'/test'
@@ -26,15 +30,19 @@ module Spider
                         @widgets_path ||= @path+'/widgets'
                         @views_path ||= @path+'/views'
                         @tags_path ||= @path+'/tags'
+                        @version = Gem::Version.new(@version.to_s) if @version && !@version.is_a?(Gem::Version)
+                        spec_path = "#{@path}/#{@short_name}.appspec"
+                        load_spec(spec_path) if File.exists?(spec_path)
                         @route_url ||= Inflector.underscore(self.name)
                         @label ||= @short_name.split('_').each{ |p| p[0] = p[0].chr.upcase }.join(' ')
-                        @version = Gem::Version.new(@version.to_s) unless @version.is_a?(Gem::Version)
+                        
                         find_tags
                     end
                     
                     def request_url
                         Spider::ControllerMixins::HTTPMixin.reverse_proxy_mapping('/'+@route_url)
                     end
+                    alias :url :request_url
                     
                     def pub_url
                         request_url+'/public'
@@ -44,7 +52,7 @@ module Spider
                         #controllers = self.const_get(:Controllers)
                         if (!@controller || !const_defined?(@controller))
                             @controller = :AppController
-                            return const_set(@controller, Spider::AppController.clone)
+                            return const_set(@controller, Spider::PageController.clone)
                             
                         end
                         return const_get(@controller)
@@ -117,7 +125,7 @@ module Spider
                             name = File.basename(entry, '.erb')
                             klass = Spider::Tag.new_class(@tags_path+'/'+entry)
                             const_set(Spider::Inflector.camelize(name).to_sym, klass)
-                            Spider::Logger.debug("REGISTERED TAG #{name}, #{klass}")
+                            #Spider::Logger.debug("REGISTERED TAG #{name}, #{klass}")
                             register_tag(name, klass)
                         end
                     end
@@ -150,37 +158,91 @@ module Spider
                         end
                     end
                     
+                    def load_spec(spec_path=nil)
+                        @spec = AppSpec.load(spec_path)
+                        @spec.app_id = File.basename(spec_path, 'appsec') unless @spec.app_id
+                        @version = @spec.version if @spec.version
+                    end
+                    
                     
                 end
-                
-                # controllers = Spider::App::Controllers.clone
-                # controllers.app = mod
-                # Spider.logger.debug("Controllers.app")
-                # Spider.logger.debug(controllers.to_s)
-                # Spider.logger.debug(controllers.app)
-                #     
-                # mod.const_set(:Controllers, controllers) unless mod.const_defined?(:Controllers)
-                # Spider.logger.debug(Controllers)
+
             end
             mod.init()
-            # routes_file = "#{mod.path}/routes.rb"
-            # if (File.exist?(routes_file))
-            #     load(routes_file)
-            # else
-            #     mod.controller.route('/', mod.name+'::MainController')
-            # end
             Spider::add_app(mod)
         end
         
-        # module Controllers
-        #     def self.app=(app)
-        #         @app = app
-        #     end
-        #     def self.app
-        #         @app
-        #     end
-        # 
-        # end
+        class AppSpec
+            @@attributes = []
+            
+            def self.attribute(name)
+                @@attributes << name
+                str = <<END_OF_EVAL
+                def #{name}(val=nil)
+                    @#{name} = val if val
+                    @#{name}
+                end
+END_OF_EVAL
+                class_eval(str)
+            end
+            
+            attribute :app_id
+            attribute :name
+            attribute :description
+            attribute :authors
+            attribute :git_repo
+            attribute :git_repo_ro
+            attribute :git_repo_rw
+            attribute :depends
+            attribute :gems
+            attribute :version
+            
+            def id(val=nil)
+                self.app_id(val)
+            end
+                        
+            def version(val=nil)
+                @version = Gem::Version.new(val) if val
+                @version
+            end
+
+            def author(val = nil)
+                @authors = [val] if val
+                @authors ||= []
+                @authors[0]
+            end
+            
+            def load(spec_path)
+                self.eval(File.read(spec_path), spec_path)
+                self
+            end
+            
+            def self.load(spec_path)
+                self.new.load(spec_path)
+            end
+            
+            def eval(text, path=nil)
+                self.instance_eval(text)
+                self
+            end
+            
+            def self.eval(text, path=nil)
+                self.new.eval(text, path)
+            end
+            
+            def to_h
+                h = {}
+                @@attributes.each do |a|
+                    h[a] = send(a)
+                end
+                h
+            end
+            
+            def to_json
+                to_h.to_json
+            end
+
+        end
         
     end
     

data/lib/spiderfw/autoload.rb

@@ -2,6 +2,7 @@ module Spider
     autoload :Logger,               "spiderfw/utils/logger"
     autoload :App,                  "spiderfw/app"
     autoload :Controller,           "spiderfw/controller/controller"
+    autoload :Widget,               "spiderfw/widget/widget"
     autoload :PageController,       "spiderfw/controller/page_controller"
     autoload :Dispatcher,           "spiderfw/controller/dispatcher"
     autoload :Router,               "spiderfw/controller/router"

data/lib/spiderfw/cmd/cmd.rb

@@ -7,6 +7,7 @@ require 'spiderfw/cmd/commands/console'
 require 'spiderfw/cmd/commands/test'
 require 'spiderfw/cmd/commands/setup'
 require 'spiderfw/cmd/commands/model'
+require 'spiderfw/cmd/commands/config'
 
 module Spider; module CommandLine
 
@@ -17,7 +18,12 @@ module Spider; module CommandLine
             @cmd.program_name = "spider"
             @cmd.options = CmdParse::OptionParserWrapper.new do |opt|
                 opt.separator _("Global options:")
-                opt.on("--verbose", _("Be verbose when outputting info"), "-v" ) {|t| $verbose = true }
+                opt.on("--version", _("Output Spider version and exit"), "-v"){ |v| 
+                    require 'spiderfw/version'
+                    puts Spider::VERSION
+                    exit
+                }
+                opt.on("--verbose", _("Be verbose when outputting info"), "-V" ) {|t| $verbose = true }
                 opt.on("--chdir", _("Cd to a directory before running"), "-c"){ |c| Dir.chdir(c) }
                 opt.on("--sets SETS", Array, _("Include configuration sets"), "-s"){ |sets|
                     $SPIDER_CONFIG_SETS = sets
@@ -40,6 +46,7 @@ module Spider; module CommandLine
             @cmd.add_command(TestCommand.new)
             @cmd.add_command(SetupCommand.new)
             @cmd.add_command(ModelCommand.new)
+            @cmd.add_command(ConfigCommand.new)
             # @cmd.add_command(ScaffoldCommand.new)
         end
 

data/lib/spiderfw/cmd/commands/config.rb

@@ -0,0 +1,54 @@
+class ConfigCommand < CmdParse::Command
+
+
+    def initialize
+        super( 'config', true, true )
+        @short_desc = _("Manage configuration")
+        
+        list = CmdParse::Command.new( 'list', false )
+        list.short_desc = _("List configuration options")
+        list.options = CmdParse::OptionParserWrapper.new do |opt|
+        end
+        
+        list.set_execution_block do |args|
+            require 'spiderfw'
+            Spider.config.options.sort.each{ |o| puts o }
+        end
+        
+        self.add_command(list)
+        
+        info = CmdParse::Command.new('info', false)
+        info.short_desc = _("Get information about a configuration option")
+        info.set_execution_block do |args|
+            require 'spiderfw'
+            option = Spider.config.option(args.first)
+            if option && option[:params]
+                print args[0]
+                print ":\n"+option[:description]+"\n" if option[:description] && !option[:description].empty?
+                puts
+                puts "#{(_('Type')+':').ljust(10)} #{option[:params][:type]}" if option[:params][:type]
+                default_str = nil
+                if default = option[:params][:default]
+                    default_str = default.is_a?(Proc) ? _('Dynamic') : default
+                end
+                puts "#{(_('Default')+':').ljust(10)} #{default_str}" if default_str
+                puts "#{(_('Choices')+':').ljust(10)} #{option[:params][:choices].join(', ')}" if option[:params][:choices]
+            else
+                puts _("Configuration option not found")
+            end
+        end
+        
+        self.add_command(info)
+        
+        get = CmdParse::Command.new('get', false)
+        get.short_desc = _("Get the current value of a configuration option")
+        get.set_execution_block do |args|
+            require 'spiderfw'
+            puts Spider.conf.get(args.first)
+        end
+        
+        self.add_command(get)
+    end
+    
+end
+        

data/lib/spiderfw/config/configuration.rb

@@ -150,6 +150,26 @@ module Spider
             end
         end
         
+        def options
+            options = []
+            def iterate_options(src, prefix, dst)
+                src.each do |key, val|
+                    full_key = prefix ? "#{prefix}.#{key}" : key
+                    if val[:params]
+                        if val[:params][:type] == :conf
+                            iterate_options(src[key]["x"], full_key+'.x', dst)
+                        else
+                            dst << full_key
+                        end
+                    else
+                        iterate_options(src[key], full_key, dst)
+                    end
+                end
+            end
+            iterate_options(@options, nil, options)
+            options
+        end
+        
         # Sets an allowed configuration option
         # Possible params are:
         # -:default     the default value for the option; if it is a proc, it will be called
@@ -171,6 +191,16 @@ module Spider
             o[first] = {:description => description, :params => params}
         end
         
+        def option(name)
+            o = @options
+            first, rest = name.split('.', 2)
+            while (rest)
+                o = (o[first] ||= {})
+                first, rest = rest.split('.', 2)
+            end
+            return o[first]
+        end
+        
 
         
         def get(key)