spiderfw 0.5.19 → 0.6.0

data/lib/spiderfw/model/storage.rb

@@ -9,16 +9,17 @@ module Spider; module Model
             Thread.current[:storages] ||= {}
             Thread.current[:storages][type] ||= {}
             return Thread.current[:storages][type][url] if Thread.current[:storages][type][url]
+            klass = nil
+            matches = url.match(/^(.+?):\/\/(.+)/)
+            adapter = matches[1]
+            rest = matches[2]
+            if (adapter =~ /(.+):(.+)/)
+                connector = $1
+                adapter = $2
+                url = "#{adapter}://#{rest}"
+            end
             case type
-            when 'db'
-                matches = url.match(/^(.+?):\/\/(.+)/)
-                adapter = matches[1]
-                rest = matches[2]
-                if (adapter =~ /(.+):(.+)/)
-                    connector = $1
-                    adapter = $2
-                    url = "#{adapter}://#{rest}"
-                end
+            when 'db' 
                 class_name = case adapter
                 when 'sqlite'
                     :SQLite
@@ -54,9 +55,19 @@ module Spider; module Model
                         klass.instance_eval{ include conn_mod }
                     end
                 end
-                Thread.current[:storages][type][url] = klass.new(url)
-                return Thread.current[:storages][type][url]
+            when 'doc'
+                class_name = case adapter
+                when 'mongodb'
+                    :Mongodb
+                end
+                klass = Spider::Model::Storage::Document.const_get(class_name)
+            when 'stub'
+                require 'spiderfw/test/stubs/storage_stub'
+                klass = Spider::Test::StorageStub
             end
+            return nil unless klass
+            Thread.current[:storages][type][url] = klass.new(url)
+            return Thread.current[:storages][type][url]
         end
         
         module StorageResult
@@ -81,3 +92,4 @@ module Spider; module Model
 end; end
 
 require 'spiderfw/model/storage/db/db'
+require 'spiderfw/model/storage/document/document'

data/lib/spiderfw/model/unit_of_work.rb

@@ -11,9 +11,11 @@ module Spider; module Model
             @to_delete = {}
             @new_objects = []
             if (proc)
+                prev_uow = Spider.current[:unit_of_work]
                 start
                 yield self
                 stop
+                Spider.current[:unit_of_work] = prev_uow
             end
         end
         
@@ -27,6 +29,8 @@ module Spider; module Model
         
         def run #(&proc)
             #proc.call
+            prev_uow = Spider.current[:unit_of_work]
+            Spider.current[:unit_of_work] = self
             @tasks = {}
             @processed_tasks = {}
             while objs = new_objects
@@ -47,29 +51,37 @@ module Spider; module Model
             @running = true
             @objects.each do |obj_id, obj|
                 @actions[obj_id].each do |action, params|
-                    if action == :save
-                        next unless obj.mapper && obj.mapper.class.write?
-                        next unless obj.modified?
-                    end
                     task = Spider::Model::MapperTask.new(obj, action, params)
                     @tasks[task] = task
-                    find_dependencies(task)
                 end
             end
+            @tasks.clone.each do |k, task|
+                find_dependencies(task)
+            end
             tasks = tsort()
             
-            Spider.logger.debug("Tasks:")
-            tasks.each do |task| 
-                Spider.logger.debug "-- #{task.action} on #{task.object.class} #{task.object.primary_keys}"
+            if Spider.logger.debug?
+                Spider.logger.debug("Tasks:")
+                tasks.each do |task| 
+                    debug_str = "-- #{task.action} on #{task.object.class} #{task.object.primary_keys}"
+                    debug_str += " #{task.params.inspect}" unless task.params.blank?
+                    Spider.logger.debug debug_str
+                end
             end
-            
+                        
             tasks.each do |task|
+                obj = task.object
+                if task.action == :save
+                    next unless obj.mapper && obj.mapper.class.write?
+                    next if !obj.modified? && obj.primary_keys_set?
+                end
                 #Spider::Logger.debug("Executing task #{task.inspect}")
                 task.execute()
             end
             @objects = {}
             @new_objects = []
             @running = false
+            Spider.current[:unit_of_work] = prev_uow
         end
         
         def running?
@@ -81,22 +93,36 @@ module Spider; module Model
         def find_dependencies(model_task)
             return if (@processed_tasks[model_task])
             @processed_tasks[model_task] = true
-            dependencies = model_task.object.mapper.get_dependencies(model_task.object, model_task.action).uniq
+            dependencies = model_task.object.mapper.get_dependencies(model_task)
             dependencies.each do |dep|
                 had0 = @tasks[dep[0]]
-                @tasks[dep[0]] ||= dep[0]
+                @tasks[dep[0]] = dep[0] unless had0
                 had1 = @tasks[dep[1]]
-                @tasks[dep[1]] ||= dep[1]
+                @tasks[dep[1]] = dep[1] unless had1
                 @tasks[dep[0]] << @tasks[dep[1]]
                 find_dependencies(dep[0]) unless had0
                 find_dependencies(dep[1]) unless had1
             end
         end
+        
+        def has?(obj)
+            if obj.class == QuerySet
+                obj.each do |item|
+                    return false unless has?(item)
+                end
+                return true
+            end
+            @actions[obj.object_id] && !@actions[obj.object_id].empty?
+        end
                 
         
         def add(obj, action = :save, params = {})
             raise "Objects can't be added to the UnitOfWork while it is running" if @running
-            if (obj.class == QuerySet)
+            if [:insert, :update].include?(action)
+                params[:force] = action
+                action = :save
+            end
+            if obj.class == QuerySet
                 obj.each do |item|
                     add(item, action, params)
                 end
@@ -114,18 +140,15 @@ module Spider; module Model
             @actions[obj.object_id] << [action, params]
             @objects[obj.object_id] = obj
             @new_objects << obj unless curr
-            traverse(obj, action, params) if action == :save
-        end
-        
-        def traverse(obj, action, params)
-            obj.class.elements_array.each do |el|
-                next unless obj.element_has_value?(el)
-                next unless el.model?
-                add(obj.get(el), action, params)
+            if action == :save
+                children = obj.mapper.children_for_unit_of_work(obj, action)
+                children.each do |child|
+                    add(child, action, params)
+                end
             end
-            
         end
         
+        
         def to_delete(obj)
             
         end