spiderfw 0.5.5 → 0.5.6

data/apps/webdav/controllers/webdav_controller.rb

@@ -351,7 +351,7 @@ module Spider; module WebDAV
     			raise HTTPStatus.NO_CONTENT
     		else
     		    Spider::Logger.error("UNLOCK OF #{path} FAILED!!!")
-    			raise Forbidden
+    			raise Forbidden, "Unlock of path #{path}"
     		end
     	end
     	
@@ -362,7 +362,7 @@ module Spider; module WebDAV
     		begin
     			vfs.mkdir(path)
     		rescue Errno::ENOENT, Errno::EACCES
-    			raise Forbidden
+    			raise Forbidden, "MKCOL of path #{path}"
     		rescue Errno::ENOSPC
     			raise HTTPStatus.WEBDAV_INSUFFICIENT_STORAGE
     		rescue Errno::EEXIST
@@ -378,7 +378,7 @@ module Spider; module WebDAV
 
     			vfs.unlock_all(lock.resource) if vfs.locking? and lock
     		rescue Errno::EPERM
-    			raise Forbidden
+    			raise Forbidden, "DELETE #{path}"
     		end
     		raise HTTPStatus.NO_CONTENT
     	end
@@ -829,7 +829,7 @@ module Spider; module WebDAV
     		src	= path
     		dest = normalize_path(@request.env['HTTP_DESTINATION'])
 
-    		src == dest and raise Forbidden
+    		src == dest and raise Forbidden, "Copy or move #{src} on itself"
 
     		if @request.env['REQUEST_METHOD'] == 'MOVE'
     			# MOVE - check lock on source

data/apps/webdav/lib/vfs/mapped.rb

@@ -77,11 +77,11 @@ module Spider; module WebDAV; module VFS
         end
 
         def cp(src, dst, recursive=true)
-            raise Forbidden
+            raise Forbidden, "Copy #{src} -> #{dst}"
         end
 
         def mv(src, dst)
-            raise Forbidden
+            raise Forbidden, "Move #{src} -> #{dst}"
         end
 
         def exists?(path)

data/lib/spiderfw/app.rb

@@ -68,6 +68,7 @@ module Spider
                              ms << m
                              m.constants.each do |c|
                                  sub_mod = m.const_get(c)
+                                 next unless sub_mod.is_a?(Module)
                                  next if !sub_mod.subclass_of?(Spider::Model::BaseModel) || sub_mod.app != self
                                  next if sub_mod == m
                                  ms += get_models(sub_mod)

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

@@ -21,6 +21,7 @@ module Spider
     config_option 'webserver.port', _("Port to use for the http server"), :default => 8080
     config_option 'webserver.force_threads', _("Force threading on non-threaded adapters"),
         :default => Proc.new{ RUBY_VERSION_PARTS[1] == '8' ? true : false }
+    config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
     # Client
     config_option 'client.text_editor', _("The text editor installed on the client")
     

data/lib/spiderfw/controller/http_controller.rb

@@ -77,6 +77,8 @@ module Spider
         def try_rescue(exc)
             if exc.is_a?(Spider::Controller::NotFound)
                 Spider.logger.error("Not found: #{exc.path}")
+            elsif exc.is_a?(Spider::Controller::Forbidden)
+                Spider.logger.warn("Forbidden: #{exc.message}")
             else
                 super
             end

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

@@ -78,6 +78,17 @@ module Spider; module HTTP
         
         def initialize(server)
             @server = server
+            if (Spider.conf.get('webserver.timeout'))
+                begin
+                  require 'system_timer'
+                  @timer = SystemTimer
+                rescue LoadError
+                  require 'timeout'
+                  @timer = Timeout
+                end
+
+            end
+            
             #@request_notify = true
         end
         
@@ -113,16 +124,25 @@ module Spider; module HTTP
             end
 
             begin
-                controller = ::Spider::HTTPController.new(controller_request, controller_response)
-                controller.extend(Spider::FirstResponder)
-                Spider::Logger.debug("CONTROLLER: #{controller}")
-                controller.before(path)
-                MongrelIO.send_headers(controller_response, response) unless Spider.conf.get('http.auto_headers')
-                controller.execute(path)
-                Spider::Logger.debug("Response:")
-                Spider::Logger.debug(controller.response)
-                controller.after(path)
-                Spider::Logger.debug("Controller #{controller} DONE")
+                main_block = lambda do
+                    controller = ::Spider::HTTPController.new(controller_request, controller_response)
+                    controller.extend(Spider::FirstResponder)
+                    Spider::Logger.debug("CONTROLLER: #{controller}")
+                    controller.before(path)
+                    MongrelIO.send_headers(controller_response, response) unless Spider.conf.get('http.auto_headers')
+                    controller.execute(path)
+                    Spider::Logger.debug("Response:")
+                    Spider::Logger.debug(controller.response)
+                    controller.after(path)
+                    Spider::Logger.debug("Controller #{controller} DONE")
+                end
+                if (Spider.conf.get('webserver.timeout'))
+                    @timer.timeout(Spider.conf.get('webserver.timeout')) do
+                        main_block.call
+                    end
+                else
+                    main_block.call
+                end
             rescue => exc
                 Spider.logger.error(exc)
                 controller.ensure() if controller

data/lib/spiderfw/model/base_model.rb

@@ -210,7 +210,7 @@ module Spider; module Model
 
             orig_type = type
             assoc_type = nil
-            if (attributes[:junction] || (attributes[:multiple] && (!attributes[:add_reverse]) && (!attributes[:has_single_reverse]) && \
+            if (proc || attributes[:junction] || (attributes[:multiple] && (!attributes[:add_reverse]) && (!attributes[:has_single_reverse]) && \
                 # FIXME! the first check is needed when the referenced class has not been parsed yet 
                 # but now it assumes that the reverse is not multiple if it is not defined
                (attributes[:has_single_reverse] == false || !attributes[:reverse] ||  (!type.elements[attributes[:reverse]] || type.elements[attributes[:reverse]].multiple?))))
@@ -807,6 +807,11 @@ module Spider; module Model
             @mapper_modules << mod
         end
         
+        def self.mapper_include_for(params, mod)
+            @mapper_modules_for ||= []
+            @mapper_modules_for << [params, mod]
+        end
+        
         # The given proc will be mixed in the mapper used by this class
         # Note that the proc will be converted to a Module, so any overridden methods will still have 
         # access to the super method.
@@ -881,6 +886,13 @@ module Spider; module Model
             if (@mapper_modules)
                 @mapper_modules.each{ |mod| mapper.extend(mod) }
             end
+            if (@mapper_modules_for)
+                @mapper_modules_for.each do |params, mod|
+                    if params.is_a?(String)
+                        mapper.extend(mod) if self.use_storage == params
+                    end
+                end
+            end
             if (@mapper_procs)
                 @mapper_procs.each{ |proc| mapper.instance_eval(&proc) }
             end
@@ -1059,7 +1071,7 @@ module Spider; module Model
                     end
                 end
                 obj.identity_mapper = self.identity_mapper if obj.respond_to?(:identity_mapper)
-                if (element.attributes[:junction] && element.attributes[:keep_junction])
+                if (element.multiple? && element.attributes[:junction] && element.attributes[:keep_junction])
                     obj.append_element = element.attributes[:junction_their_element]
                 end
                 if (element.attributes[:set] && element.attributes[:set].is_a?(Hash))
@@ -1108,8 +1120,9 @@ module Spider; module Model
             element = element.name if (element.class == Spider::Model::Element)
             first, rest = element.to_s.split('.', 2)
             if (rest)
-                return nil unless element_has_value?(first.to_sym)
-                return send(first).get(rest)
+                sub_val = send(first)
+                return nil unless sub_val
+                return sub_val.get(rest)
             end
             return send(element)
         end

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

@@ -337,10 +337,11 @@ module Spider; module Model; module Mappers
                         primary_keys << field if model_pks.include?(el)
                         seen_fields[field.name] = true
                     end
-                elsif (!element.multiple?)
+                elsif (!element.attributes[:junction])
                     if (schema.has_foreign_fields?(el))
                         element.model.primary_keys.each do |key|
                             field = schema.foreign_key_field(el, key.name)
+                            raise "Can't find a foreign key field for key #{key.name} of element #{el} of model #{@model}" unless field
                             unless seen_fields[field.name]
                                 keys << field
                                 primary_keys << field if model_pks.include?(el)
@@ -459,10 +460,28 @@ module Spider; module Model; module Mappers
                 element = model.elements[k.to_sym]
                 if (!v.is_a?(Condition) && element.model?)
                     condition.delete(element.name)
-                    if (v.is_a?(BaseModel))
-                        element.model.primary_keys.each do |primary_key|
-                            condition.set("#{element.name}.#{primary_key.name}", '=', v.get(primary_key))
+                    def set_pks_condition(condition, el, val, prefix)
+                        el.model.primary_keys.each do |primary_key|
+                            new_prefix = "#{prefix}.#{primary_key.name}"
+                            if (primary_key.model?)
+                                if (primary_key.model.primary_keys.length == 1)
+                                    # FIXME: this should not be needed, see below
+                                    condition.set(new_prefix, '=', val.get(primary_key).get(primary_key.model.primary_keys[0]))
+                                else
+                                    # FIXME! does not work, the subcondition does not get processed
+                                    raise "Subonditions on multiple key elements not supported yet"
+                                    set_pks_condition(condition,  primary_key, val.get(primary_key), new_prefix)
+                                end
+                            else
+                                condition.set(new_prefix, '=', val.get(primary_key))
+                            end
                         end
+                    end
+                    if (v.is_a?(BaseModel))
+                        set_pks_condition(condition, element, v, element.name)
+                        # element.model.primary_keys.each do |primary_key|
+                        #                             condition.set("#{element.name}.#{primary_key.name}", '=', v.get(primary_key))
+                        #                         end
                     elsif (element.model.primary_keys.length == 1 )
                         new_v = Condition.new
                         if (model.mapper.have_references?(element.name))
@@ -892,7 +911,7 @@ module Spider; module Model; module Mappers
                     column.primary_key = true if element.primary_key?
                     schema.set_column(element.name, column)
                 elsif (true) # FIXME: must have condition element.storage == @storage in some of the subcases
-                    if (!element.multiple?) # 1/n <-> 1
+                    if (!element.multiple? && !element.attributes[:junction]) # 1/n <-> 1
                         current_schema = schema.foreign_keys[element.name] || {}
                         foreign_key_constraints = {}
                         element.type.primary_keys.each do |key|

data/lib/spiderfw/model/query_set.rb

@@ -315,7 +315,12 @@ module Spider; module Model
         def search_key(obj, name) # :nodoc:
             sub = obj.is_a?(Hash) ? obj[name] : obj.get(name.to_sym)
             if (sub.is_a?(Spider::Model::BaseModel))
-                @model.elements[name.to_sym].type.primary_keys.map{ |k| sub.get(k).to_s }.join(',')
+                name_parts = name.to_s.split('.')
+                model = @model
+                name_parts.each do |part|
+                    model = model.elements[part.to_sym].type
+                end
+                model.primary_keys.map{ |k| sub.get(k).to_s }.join(',')
             else
                 sub.to_s
             end

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

@@ -108,10 +108,13 @@ module Spider; module Model; module Storage; module Db
             case type.name
             when 'Date', 'DateTime'
                 return nil unless value
+                return value if value.is_a?(Type)
                 return value.to_datetime if type == DateTime
                 return value.to_date # FIXME: check what is returned, here we espect an OCI8::Date
             when 'Spider::DataTypes::Text'
                 value = value.read if value.respond_to?(:read)
+            when 'Spider::DataTypes::Decimal', 'BigDecimal'
+                value = value.to_s
             end
             return super(type, value)
         end
@@ -276,7 +279,7 @@ module Spider; module Model; module Storage; module Db
                      pk_sql = query[:primary_keys].join(', ')
                      distinct_sql = "SELECT DISTINCT #{pk_sql} FROM #{tables_sql}"
                      distinct_sql += " WHERE #{where}" if where && !where.empty?
-                     data_sql = "SELECT #{keys} FROM #{query[:tables].join(',')} WHERE #{pk_sql} IN (#{distinct_sql}) order by #{order}"
+                     data_sql = "SELECT #{keys} FROM #{tables_sql} WHERE #{pk_sql} IN (#{distinct_sql}) order by #{order}"
                  else
                      data_sql = "#{sql} order by #{order}"
                  end

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

@@ -172,6 +172,10 @@ module Spider; module Model; module Storage; module Db
             @name
         end
         
+        def inspect
+            "#<#{self.class.name}:#{self.object_id} @name=\"#{@name}\ >"
+        end
+        
     end
     
     class Field
@@ -203,7 +207,7 @@ module Spider; module Model; module Storage; module Db
         end
         
         def inspect
-            "#<#{self.class.name}:#{self.object_id} @name=\"#{@name}\", @table=#<Spider::Model::Storage::Db::Table:0x6d3ff94 #{@table.name}> >"
+            "#<#{self.class.name}:#{self.object_id} @name=\"#{@name}\", @table=#<Spider::Model::Storage::Db::Table:#{@table.object_id} #{@table.name}> >"
         end
         
     end

data/lib/spiderfw/utils/logger.rb

@@ -44,6 +44,9 @@ module Spider
             def send_to_loggers(action, *args)
                 return if $SAFE > 1
                 return unless @loggers
+                if args[0].is_a?(String)
+                    args[0] = "T#{Thread.current.object_id} #{args[0]}"
+                end
                 @loggers.each do |dest, logger| 
                     begin
                         logger.send(action, *args) 

data/lib/spiderfw.rb

@@ -368,7 +368,6 @@ module Spider
                         return Resource.new(first_found(extensions, File.dirname(cur_path)+path[2..-1]), owner_class)
                     end
                 end
-                app = nil
                 if (path[0].chr == '/')
                     Spider.apps_by_path.each do |p, a|
                         if (path.index(p) == 1)

data/spider.gemspec

@@ -2,8 +2,8 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name     = "spiderfw"
-  s.version  = "0.5.5"
-  s.date     = "2010-02-18"
+  s.version  = "0.5.6"
+  s.date     = "2010-02-26"
   s.summary  = "A (web) framework"
   s.email    = "abmajor7@gmail.com"
   s.homepage = "http://github.com/me/spider"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +01:00
+date: 2010-02-26 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency