spiderfw 0.5.13 → 0.5.14

data/lib/spiderfw/model/condition.rb

@@ -122,6 +122,13 @@ module Spider; module Model
             @polymorph = res.polymorph
         end
         
+        def conditions_array
+            self.hash_clone.map do |k, v|
+                k = k.to_sym if k.respond_to?(:to_sym)
+                [k, v, (@comparisons[k] || '==')]
+            end
+        end
+        
         # Yields each key, value and comparison.
         def each_with_comparison
             self.each do |k, v|
@@ -201,7 +208,7 @@ module Spider; module Model
         
         def [](key)
             # TODO: deep
-            key = key.name if key.class == Element
+            key = key.name if key.is_a?(Element)
             key = key.to_sym if key.respond_to?(:to_sym) # might be a QueryFunc
             super(key)
         end
@@ -335,6 +342,8 @@ module Spider; module Model
             @subconditions.uniq!
         end
         
+        alias :hash_clone :clone
+        
         # Returns a deep copy.
         def clone
             c = self.class.new
@@ -442,7 +451,7 @@ module Spider; module Model
                         op = replace[op]
                     end
                     op = op.to_s
-                    c = Condition.no_conjunction.set(@condition_element_name, op, val)
+                    c = Condition.and.set(@condition_element_name, op, val)
                     if (@condition_context)
                         @condition_context << c
                     end

data/lib/spiderfw/model/data_type.rb

@@ -57,7 +57,7 @@ module Spider
             
             # Is called by the BaseModel when creating an element of this type. Can modify the element's attributes.
             def set_element_attributes(attributes)
-                attributes[:auto] = true unless attributes[:auto] == false
+                attributes[:auto] = true if @autogenerated && attributes[:auto] != false
             end
             
         end

data/lib/spiderfw/model/datatypes/bool.rb

@@ -7,4 +7,6 @@ module Spider; module DataTypes
     end
     
     
-end; end
+end; end
+
+Spider::Bool = Spider::DataTypes::Bool

data/lib/spiderfw/model/datatypes/decimal.rb

@@ -26,6 +26,10 @@ module Spider; module DataTypes
             super(s)
         end
         
+        def as_json
+            to_f
+        end
+        
 
 
     end

data/lib/spiderfw/model/datatypes/password.rb

@@ -22,6 +22,7 @@ module Spider; module DataTypes
         take_attributes :hash, :salt
         
         def map(mapper_type)
+            return self.to_s if attributes[:hashed]
             salt = attributes[:salt] || Spider.conf.get('password.salt')
             # TODO: better salts
             salt ||= (0..10).inject('') { |r, i| r << rand(89) + 37 }

data/lib/spiderfw/model/datatypes/time_span.rb

@@ -0,0 +1,26 @@
+require 'delegate'
+
+module Spider; module DataTypes
+
+    class TimeSpan < DelegateClass(Fixnum)
+        include DataType
+        maps_to Fixnum
+        
+        def format(f=nil)
+            if self % 3600 == 0
+                val = self / 3600
+                "#{val} " + (val == 1 ? _('hour') : _('hours') )
+            elsif self % 60 == 0
+                val = self / 60
+                "#{val} " + (val == 1 ? _('minute') : _('minutes') )
+            else
+                val = self
+                "#{val} " + (val == 1 ? _('second') : _('seconds') )
+            end
+        end
+        
+
+    end
+    
+    
+end; end

data/lib/spiderfw/model/datatypes.rb

@@ -7,6 +7,7 @@ require 'spiderfw/model/datatypes/password'
 require 'spiderfw/model/datatypes/uuid'
 require 'spiderfw/model/datatypes/serialized_object'
 require 'spiderfw/model/datatypes/file_path'
+require 'spiderfw/model/datatypes/time_span'
 
 
 module Spider

data/lib/spiderfw/model/element.rb

@@ -5,7 +5,8 @@ require 'spiderfw/model/type'
 module Spider; module Model
 
     class Element
-        attr_reader :name, :attributes
+        attr_reader :name
+        attr_accessor :attributes
 
         def initialize(name, type, attributes={})
             @name = name
@@ -27,29 +28,29 @@ module Spider; module Model
         
         # True if the element model is a junction (for a many to many relationship).
         def junction?
-            @attributes[:junction]
+            self.attributes[:junction]
         end
         
         # The model used for the association. The BaseModel will automatically create a junction model for 
         # many to many relationships, unless one is supplied with the :through attribute. This will be set
         # for n <-> n relationships, and will be nil otherwise.
         def association_type
-            @association_type ||= @attributes[:association_type]
+            @association_type ||= self.attributes[:association_type]
         end
         
         # True if the element defines a 1|n -> n association.
         def multiple?
-            @attributes[:multiple]
+            self.attributes[:multiple]
         end
         
         # True if the element must have a value.
         def required?
-            @attributes[:required]
+            self.attributes[:required]
         end
         
         # True if no two model instances can have the same value for the element.
         def unique?
-            @attributes[:unique]
+            self.attributes[:unique]
         end
         
         # True if the element defines an association to another model.
@@ -74,73 +75,73 @@ module Spider; module Model
         #   Person.elements[:street].integrated_from_element => :street 
         def integrated?
             return @is_integrated if @is_integrated != nil
-            @is_integrated = @attributes[:integrated_from]
+            @is_integrated = self.attributes[:integrated_from]
         end
         
         # If the element is integrated, the element from which it is taken. See also #integrated?.
         def integrated_from
-            @attributes[:integrated_from]
+            self.attributes[:integrated_from]
         end
         
         # If the element is integrated, the element corresponding to this in the model corresponding to
         # the #integrated_from element. See also #integrated?.
         def integrated_from_element
-            @attributes[:integrated_from_element]
+            self.attributes[:integrated_from_element]
         end
         
         # True if the element is a primary key.
         def primary_key?
-            @primary_key ||= @attributes[:primary_key]
+            @primary_key ||= self.attributes[:primary_key]
         end
         
         # True if the element is read only.
         def read_only?
-            @attributes[:read_only]
+            self.attributes[:read_only]
         end
         
         # The reverse element in the relationship to another model.
         def reverse
-            @attributes[:reverse]
+            self.attributes[:reverse]
         end
         
         # True if the element has a reverse, and it is not multiple (i.e., the relationship is 1 <-> 1|n)
         def has_single_reverse?
-            return true if @attributes[:reverse] && !model.elements[@attributes[:reverse]].multiple?
+            return true if self.attributes[:reverse] && !model.elements[self.attributes[:reverse]].multiple?
         end
         
         # True if the element model is an InlineModel
         def inline?
-            @attributes[:inline]
+            self.attributes[:inline]
         end
         
         # True if the element type has been extended by passing a block to Model::BaseModel.element
         def extended?
-            @attributes[:extended]
+            self.attributes[:extended]
         end
         
         # True if the :hidden attribute is set.        
         def hidden?
-            @attributes[:hidden]
+            self.attributes[:hidden]
         end
         
         # True if only the defining BaseModel holds references to the associated
         def owned?
-            @attributes[:owned]
+            self.attributes[:owned]
         end
         
         # True if the element is generated on save by the model or the mapper.
         def autogenerated?
-            return (@attributes[:auto] || @attributes[:autoincrement])
+            return (self.attributes[:auto] || self.attributes[:autoincrement])
         end
         
         # Named association.
         def association
-            @attributes[:association]
+            self.attributes[:association]
         end
         
         # Label. Will use the :label attribute, or return the name split by '_' with each word capitalized.
         def label
-            return @attributes[:label] ? _(@attributes[:label]) : Inflector.underscore_to_upcasefirst(@name.to_s)
+            return self.attributes[:label] ? _(self.attributes[:label]) : Inflector.underscore_to_upcasefirst(@name.to_s)
         end
         
         def to_s
@@ -186,16 +187,16 @@ module Spider; module Model
         end
         
         def clone
-            self.class.new(@name, @type, @attributes.clone)
+            self.class.new(@name, @type, self.attributes.clone)
         end
         
         # def queryset
         #     return nil unless model?
-        #     set_model = @attributes[:queryset_model] ? @attributes[:queryset_model] : type
+        #     set_model = self.attributes[:queryset_model] ? self.attributes[:queryset_model] : type
         #     set = QuerySet.new(set_model)
-        #     set.query.condition = @attributes[:condition] if @attributes[:condition]
-        #     if (@attributes[:request])
-        #         set.query.request = @attributes[:request]
+        #     set.query.condition = self.attributes[:condition] if self.attributes[:condition]
+        #     if (self.attributes[:request])
+        #         set.query.request = self.attributes[:request]
         #     else
         #         set_model.elements.each do |name, el|
         #             set.query.request[name] = true unless el.model?
@@ -212,15 +213,15 @@ module Spider; module Model
         #     class_name = @type.name
         #     @type = Class.new(BaseModel)
         #     params = {}
-        #     if (@attributes[:association] == :multiple_choice)
+        #     if (self.attributes[:association] == :multiple_choice)
         #         params[:hide_elements] = true
         #         params[:hide_integrated] = false
         #     else
         #         params[:hide_integrated] = true
         #     end
         #     @type.extend_model(@original_model, params)
-        #     if (@attributes[:model_name])
-        #         new_name = @original_model.parent_module.name.to_s+'::'+@attributes[:model_name].to_s
+        #     if (self.attributes[:model_name])
+        #         new_name = @original_model.parent_module.name.to_s+'::'+self.attributes[:model_name].to_s
         #     else
         #         new_name = @original_model.name+'.'+@name.to_s
         #     end

data/lib/spiderfw/model/extended_models/managed.rb

@@ -30,9 +30,24 @@ module Spider; module Model
             true
         end
         
+        def self.no_set_dates=(bool)
+            @no_set_dates = bool
+        end
+        
+        def self.no_set_dates
+            @no_set_dates
+        end
+        
         def _set_dates(bool=nil)
+            return false if Spider::Model::Managed.no_set_dates
             @_set_dates = true if @_set_dates == nil
             @_set_dates = bool if bool != nil
+            if self.class.extended_models
+                self.class.extended_models.each do |mod, el|
+                    sup = self.get(el)
+                    sup._set_dates(bool) if sup
+                end
+            end
             @_set_dates
         end
         

data/lib/spiderfw/model/identity_mapper.rb

@@ -12,10 +12,15 @@ module Spider; module Model
         # If passed a block, will activate the IdentityMapper, yield, and then deactivate it.
         def initialize(&proc)
             @objects = {}
+            @pks = {}
             if (proc)
-                Thread.current[:identity_mapper] = self
-                yield self
-                Thread.current[:identity_mapper] = nil
+                prev_im = Spider::Model.identity_mapper
+                Spider::Model.identity_mapper = self
+                begin
+                    yield self
+                ensure
+                    Spider::Model.identity_mapper = prev_im
+                end
             end
         end
         
@@ -23,23 +28,49 @@ module Spider; module Model
         # If an object with the same primary keys is found, it will be used; otherwise, a new instance will be
         # created.
         # In any case, the given values will be set on the object, before it is returned.
-        def get(model, values)
+        #---
+        # FIXME: refactor avoiding set_loaded
+        def get(model, values=nil, set_loaded=false)
+            
+            if !values && model.is_a?(BaseModel)
+                curr = has?(model)
+                return curr ? curr : put(model)
+            end
+            
             @objects[model] ||= {}
             pks = {}
             has_pks = false
             model.primary_keys.each do |k| 
                 # dereference integrated primary keys
-                pks[k.name] = (k.integrated? && values[k.integrated_from.name]) ? 
+                v = (k.integrated? && values[k.integrated_from.name]) ? 
                     values[k.integrated_from.name].get(k.integrated_from_element) :
                     values[k.name]
-                has_pks = true if pks[k.name]
+                has_pks = true if v
+                pks[k.name] = model.prepare_value(k, v)
+            end
+            normalize_pks(model, pks)
+            unless has_pks
+                raise IdentityMapperException, "Can't get #{model} from IdentityMapper without all primary keys, #{values.inspect} given"
             end
-            raise IdentityMapperException, "Can't get without all primary keys" unless has_pks
             pks.extend(HashComparison)
-            obj = (@objects[model][pks] ||= model.new(pks))
+            current = @objects[model][pks]
+            obj = nil
+            if current
+                obj = current
+            else
+#                Spider.logger.debug("GETTING NEW #{model} FROM #{pks.inspect}")
+                obj = model.new(pks)
+                #@objects[model][pks] = obj
+            end
+            # obj = (@objects[model][pks] ||= model.new(pks))
             pks.each{ |k, v| obj.element_loaded(k) }
             values.reject{|k,v| model.elements[k].primary_key? }.each do |k, v|
-                obj.set_loaded_value(k, v)
+                v = get(v) if v.is_a?(BaseModel)
+                if set_loaded
+                    obj.set_loaded_value(k, v)
+                else
+                    obj.set(k, v)
+                end
             end
 #            Spider::Logger.debug("RETURNING #{obj.class} #{obj.object_id}")
             return obj
@@ -48,27 +79,62 @@ module Spider; module Model
         # Puts an object into the identity mapper.
         # If check is true, it will first check if the object exists, and if found merge it with the given obj;
         # if check is false, if a object with the same primary keys exists it will be overwritten.
-        def put(obj, check=false)
+        def put(obj, check=false, fail_if_exists=false)
             return nil unless obj
+            return obj if obj._no_identity_mapper
             if (obj.is_a?(QuerySet))
                 obj.each_current_index{ |i| obj[i] = put(obj[i], check) }
                 return obj
             else
+                return obj if @pks[obj.object_id]
                 raise IdentityMapperException, "Can't get without all primary keys" unless obj.primary_keys_set?
                 pks = {}
                 obj.class.primary_keys.each{ |key| pks[key.name] = obj.get(key) }
+                pks = normalize_pks(obj.class, pks)
+                pks.extend(HashComparison)
                 @objects[obj.class] ||= {}
                 if (check && (existent = @objects[obj.class][pks]) && existent.object_id != obj.object_id)
+                    #debugger if fail_if_exists
+                    raise IdentityMapperException, "A different instance of the same object #{obj.inspect} already exists in the identity mapper" if fail_if_exists
                     existent.merge!(obj)
                     return existent
                 else
                     @objects[obj.class][pks] = obj
                     @pks[obj.object_id] = pks
+                    traverse(obj)
+                    uow = Spider::Model.unit_of_work
+                    uow.add(obj) if uow && !uow.running?
                     return obj
                 end
             end
         end
         
+        def traverse(obj, check=false, fail_if_exists=false)
+            obj.class.elements_array.each do |el|
+                next unless obj.element_has_value?(el)
+                next unless el.model?
+                subs = obj.get(el)
+                subs = [subs] unless subs.is_a?(Enumerable)
+                subs.each do |sub|
+                    put(sub, check, fail_if_exists) if sub && sub.primary_keys_set? && has?(sub).object_id != sub.object_id
+                end
+            end
+            
+        end
+        
+        def put!(obj)
+            put(obj, true, true)
+        end
+        
+        
+        def has?(obj)
+            pks = {}
+            obj.class.primary_keys.each{ |key| pks[key.name] = obj.get(key) }
+            pks = normalize_pks(obj.class, pks)
+            pks.extend(HashComparison)
+            @objects[obj.class] && @objects[obj.class][pks]
+        end
+        
         def delete(klass, obj_id)
             pks = @pks[obj_id]
             return unless pks && @objects[klass]
@@ -80,6 +146,19 @@ module Spider; module Model
             @objects = {}
             @pks = {}
         end
+        
+        def normalize_pks(model, keys)
+            model_pks = model.primary_keys.map{ |k| k.name }
+            model_pks.each do |k|
+                if keys[k] && keys[k].is_a?(BaseModel)
+                    keys[k] = keys[k].class.primary_keys.length > 1 ? keys[k].primary_keys : keys[k].primary_keys[0]
+                end
+            end
+            keys.keys.each do |k|
+                keys.delete(k) unless model_pks.include?(k)
+            end
+            keys
+        end
 
         
     end

data/lib/spiderfw/model/inline_model.rb

@@ -16,12 +16,30 @@ module Spider; module Model
             # Sets/gets model data.
             def data(val=nil)
                 self.data = val if (val)
-                @data
+                d = @data
+                if self.translate?
+                    @data.each do |k, v|
+                        d[k] = _(v)
+                    end
+                end
+                d
+            end
+            
+            def translate=(val)
+                @translate = val
+            end
+            
+            def translate?
+                @translate
             end
             
             def mapper
                 return Mappers::HashMapper.new(self, self.data)
-            end 
+            end
+            
+            def get_storage(url='default')
+                self.data
+            end
             
         end
         

data/lib/spiderfw/model/integrated_element.rb

@@ -0,0 +1,41 @@
+module Spider; module Model
+    
+    class IntegratedElement < Element
+        attr_accessor :owner
+        
+        def initialize(name, owner, integrated_element, integrated_element_element, attributes={})
+            @name = name
+            @owner = owner
+            @integrated_element = integrated_element
+            @integrated_element_element = integrated_element_element
+            @attributes = ({
+                :integrated => true,
+                :integrated_from => @owner.elements[@integrated_element],
+                :integrated_from_element => @integrated_element_element
+            }).merge(attributes)
+        end
+        
+        def integrated?
+            true
+        end
+        
+        def target_element
+            @owner.elements[@integrated_element].type.elements[@integrated_element_element]
+        end
+        
+        def type
+            target_element.type
+        end
+        
+        def attributes
+            target_element.attributes.merge(@attributes)
+        end
+        
+        
+        def clone
+            self.class.new(@name, @owner, @integrated_element, @integrated_element_element, @attributes.clone)
+        end
+        
+    end
+    
+end; end