spiderfw 0.6.1 → 0.6.2

data/lib/spiderfw/model/base_model.rb

@@ -962,11 +962,13 @@ module Spider; module Model
         
         # Returns the model actually defining element_name; that could be the model
         # itself, a superclass, or an integrated model.
-        def self.first_definer(element_name, type)
-            if (@extended_models && @extended_models[self.superclass] && self.superclass.elements[element_name] && self.superclass.elements[element_name].type == type)
+        def self.first_definer(element_name, type=nil)
+            type ||= self.elements[element_name].type
+            if @extended_models && @extended_models[self.superclass] && self.superclass.elements[element_name] && \
+                    self.superclass.elements[element_name].type == type
                 return self.superclass.first_definer(element_name, type)
             end
-            if (self.attributes[:integrated_models])
+            if self.attributes[:integrated_models]
                 self.attributes[:integrated_models].keys.each do |mod|
                     return mod.first_definer(element_name, type) if (mod.elements[element_name] && mod.elements[element_name].type == type)
                 end
@@ -1117,6 +1119,12 @@ module Spider; module Model
             return self.where
         end
         
+        # Returns a queryset with the objects that should be shown to the user. By default
+        # returns self.all
+        def self.list
+            return self.all
+        end
+        
         # Constructs a Query based on params, and returns a QuerySet
         # Allowed parameters are:
         # * a Query object
@@ -1276,9 +1284,10 @@ module Spider; module Model
         # Returns a new instance for given element name.
         def instantiate_element(name)
             element = self.class.elements[name]
-            if (element.model?)
-                if (element.multiple?)
+            if element.model?
+                if element.multiple?
                     val = QuerySet.static(element.model)
+                    val.modified = true
                 else
                     val = element.type.new
                     val.autoload = autoload?
@@ -1292,8 +1301,11 @@ module Spider; module Model
         
         # Prepares an object that is being set as a child.
         def prepare_child(name, obj)
-            return obj if obj.nil?
             element = self.class.elements[name]
+            if obj.nil?
+                obj = QuerySet.static(element.model) if element.multiple?
+                return obj 
+            end
             if (element.model?)
                 # convert between junction and real type if needed
                 if element.attributes[:junction]
@@ -1763,8 +1775,11 @@ module Spider; module Model
                 return false unless integrated = get_no_load(element.integrated_from)
                 return integrated.element_modified?(element.integrated_from_element)
             end
-            if element_has_value?(element) && (val = get(element)).respond_to?(:modified?)
-                return val.modified?
+            if element_has_value?(element)
+                val = get(element)
+                # don't call modified? on QuerySets, since we don't need to query sub objects (this could lead to infinite loops)
+                return val.modified if val.is_a?(QuerySet) 
+                return val.modified? if val.respond_to?(:modified?)
             end
             return false
         end
@@ -1782,7 +1797,9 @@ module Spider; module Model
             self.class.elements_array.select{ |el| 
                 element_has_value?(el) && (el.type.is_a?(Spider::DataType) || el.multiple?)
             }.each do |el|
-                return true if get(el).modified?
+                obj = get(el)
+                check = obj.is_a?(QuerySet) ? obj.modified : obj.modified?
+                return true if check
             end
             return false
         end
@@ -1798,6 +1815,12 @@ module Spider; module Model
             request.each do |key, val| # FIXME: go deep
                 key = key.name if key.is_a?(Element)
                 @_modified_elements[key] = true
+                el = self.class.elements[key.to_sym]
+                next unless el
+                if el.integrated? && sub = self.get(el.integrated_from)
+                    sub.set_modified(el.integrated_from_element)
+                end
+                
             end
         end
         

data/lib/spiderfw/model/condition.rb

@@ -391,8 +391,15 @@ module Spider; module Model
     
     module ConditionMixin # :nodoc:
         
+        def __el(meth)
+            __create_condition_element(meth)
+        end
         
         def method_missing(meth, *arguments)
+            __create_condition_element(meth)
+        end
+        
+        def __create_condition_element(meth)
             if (meth == :q)
                 return ConditionElementCreator.new
             end

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

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

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

@@ -890,17 +890,27 @@ module Spider; module Model; module Mappers
                                 prev_task = nil
                                 set.each do |set_obj|
                                     sub_task = MapperTask.new(set_obj, :save)
-                                    set_obj.set_modified(element.reverse) if element.reverse
                                     if set_obj.class.attributes[:sub_model] && delete_ass
                                         set_obj.class.primary_keys.each{ |pk| set_obj.set(pk, nil) }
                                     end
                                     if prev_task
                                         deps << [sub_task, prev_task]
-                                    elsif delete_ass
-                                        deps << [sub_task, delete_ass]
                                     else
                                         deps << [sub_task, task]
                                     end
+                                    if delete_ass
+                                        del_dep = set_obj
+                                        if element.reverse
+                                            set_obj.set_modified(element.reverse)
+                                            el = set_obj.class.elements[element.reverse]
+                                            # ensure the real owner is added as a dependency
+                                            while el.integrated?
+                                                del_dep = set_obj.get(el.integrated_from)
+                                                el = del_dep.class.elements[el.integrated_from_element]
+                                            end
+                                        end
+                                        deps << [MapperTask.new(del_dep, :save), delete_ass]
+                                    end
                                     prev_task = sub_task
                                 end
                             else
@@ -967,6 +977,10 @@ module Spider; module Model; module Mappers
             @storage.column_type(type, attributes)
         end
         
+        def storage_column_attributes(type, attributes)
+            @storage.column_attributes(type, attributes)
+        end
+        
         def base_type(type)
             if type <= Spider::DataTypes::PK
                 Fixnum
@@ -998,7 +1012,7 @@ module Spider; module Model; module Mappers
                     storage_type = base_type(element.type)
                     db_attributes = column.attributes if column
                     if (!db_attributes || db_attributes.empty?)
-                        db_attributes = @storage.column_attributes(storage_type, element.attributes)
+                        db_attributes = storage_column_attributes(storage_type, element.attributes)
                         db_attributes.merge(element.attributes[:db]) if (element.attributes[:db]) 
                         if (element.attributes[:autoincrement] && !db_attributes[:autoincrement])
                             schema.set_sequence(element.name, @storage.sequence_name("#{schema.table}_#{element.name}"))
@@ -1151,7 +1165,7 @@ module Spider; module Model; module Mappers
 
         # Returns a create table structure description.
         def create_table(table_name, schema, attributes) # :nodoc:
-            fields = schema[:fields_order].map do |f| 
+            fields = schema[:fields_order].uniq.map do |f| 
                 details = schema[:columns][f.name]
                 {
                     :name => f.name,

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

@@ -603,7 +603,7 @@ module Spider; module Model
                     query.request.keys.each do |k, v|
                         set.element_loaded(k) if have_references?(k)
                     end
-                    set.each do |obj|
+                    set.each_current do |obj|
                         next if merged[obj.object_id]
                         query.request.keys.each do |element_name|
                             el = @model.elements[element_name]

data/lib/spiderfw/model/mixins/tree.rb

@@ -19,6 +19,7 @@ module Spider; module Model
             q = Query.new(c)
             q.order_by(left_el)
             res = element.model.find(q)
+            return [] unless res
             right_stack = []
             res.each do |obj|
                 if (right_stack.length > 0)
@@ -89,7 +90,7 @@ module Spider; module Model
                    end
                    
                    define_method("#{name}_all") do
-                       qs = QuerySet.new(self)
+                       qs = QuerySet.static(self)
                        self.send("#{name}_roots").each do |root|
                            qs += root.tree_all(name)
                        end

data/lib/spiderfw/model/query_set.rb

@@ -358,27 +358,19 @@ module Spider; module Model
 
         # Iterates on objects, loading when needed.
         def each
-            tmp = []
-            prev_parents = []
-            self.each_index do |i|
+            self.each_rolling_index do |i|
                 obj = @objects[i]
                 prev_parent = obj._parent
                 prev_parent_element = obj._parent_element
                 obj.set_parent(self, nil)
-                tmp << obj
-                prev_parents << [prev_parent, prev_parent_element]
-            end
-            tmp.each do |obj|
                 yield obj
-            end
-            tmp.each_index do |i|
-                prev_parent, prev_parent_element = prev_parents[i]
-                tmp[i].set_parent(prev_parent, prev_parent_element)
+                obj.set_parent(prev_parent, prev_parent_element)
             end
         end
 
-        # Iterates yielding objects index. Will load when needed.
-        def each_index
+        # Iterates yielding the internal objects index. Will load when needed. If a window is
+        # used, the index will roll back to 0 on every window.
+        def each_rolling_index
             @window_current_start = nil if (@fetch_window)
             while (!@fetch_window || has_more?)
                 load_next unless !autoload? || (!@fetch_window && @loaded)
@@ -389,6 +381,14 @@ module Spider; module Model
             end
         end
         
+        # Iterates yielding the queryset index. Will load when needed.
+        def each_index
+            self.each_rolling_index do |i|
+                i += @window_current_start-1 if @window_current_start
+                yield i
+            end
+        end
+
         # Iterates on indexes without loading.
         def each_current_index
             @objects.each_index do |i|
@@ -810,6 +810,7 @@ module Spider; module Model
         # Performs a deep copy
         def clone
             c = self.class.new(self.model, self.query.clone)
+            c.autoload = self.autoload?
             c_objects = c.instance_variable_get(:@objects)
             @objects.each do |o|
                 c_objects << o.clone

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

@@ -49,7 +49,7 @@ module Spider; module Model; module Storage; module Db
             251 => 'LONG_BLOB',
             252 => 'BLOB',
             253 => 'VARCHAR',
-            254 => 'STRING',
+            254 => 'CHAR',
             255 => 'GEOMETRY'
         }
         @field_flags = {
@@ -343,7 +343,7 @@ module Spider; module Model; module Storage; module Db
                  fields.each do |f|
                      type =  self.class.field_types[f.type]
                      length = f.length;
-                     length /= 3 if (type == 'VARCHAR')
+                     length /= 3 if ['CHAR', 'VARCHAR'].include?(type)
                      scale = nil
                      precision = f.decimals
                      # FIXME
@@ -446,6 +446,11 @@ module Spider; module Model; module Storage; module Db
              end
          end
          
+         def schema_field_int_equal?(current, field)
+             # FIXME
+             return true
+         end
+         
          def schema_field_text_equal?(current, field)
              # FIXME
              return true

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

@@ -98,8 +98,9 @@ module Spider; module Model; module Storage; module Db
         # Sets the column name for an element.
         def set_column(element_name, field)
             field = Field.new(@table, field[:name], field[:type], field[:attributes] || {}) if field.is_a?(Hash)
+            had_column = @columns[element_name]
             @columns[element_name] = field
-            @order << field
+            @order << field unless had_column
         end
         
         # Sets a foreign key to the primary key of an element.
@@ -115,8 +116,9 @@ module Spider; module Model; module Storage; module Db
                 end
             end
             @foreign_keys[element_name] ||= {}
+            had_fk = @foreign_keys[element_name][element_key]
             @foreign_keys[element_name][element_key] = field
-            @order << field
+            @order << field unless had_fk
         end
         
         def set_foreign_key_constraint(name, table, keys, options={})

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

@@ -341,11 +341,11 @@ module Spider; module Model; module Storage; module Db
                 comp = comp == '=' ? "IS" : "IS NOT"
                 sql = "#{key} #{comp} NULL"
             else
-                if (comp.to_s.downcase == 'between')
-                    if (bound_vars)
-                        val0, val1 = value
+                if comp.to_s.downcase == 'between'
+                    if bound_vars
+                        val0 = val1 = '?' 
                     else
-                        val0 = val1 = '?'
+                        val0, val1 = value
                     end
                     sql = "#{key} #{comp} #{val0} AND #{val1}"
                 else

data/lib/spiderfw/model/unit_of_work.rb

@@ -142,8 +142,10 @@ module Spider; module Model
             @new_objects << obj unless curr
             if action == :save
                 children = obj.mapper.children_for_unit_of_work(obj, action)
+                prms = params.clone
+                prms.delete(:force)
                 children.each do |child|
-                    add(child, action, params)
+                    add(child, action, prms)
                 end
             end
         end

data/lib/spiderfw/templates/blocks/html.rb

@@ -3,7 +3,7 @@ require 'spiderfw/templates/template_blocks'
 module Spider; module TemplateBlocks
     
     class HTML < Block
-        HTML_NO_CLOSE = ['br', 'img']
+        HTML_NO_CLOSE = ['br', 'img', 'input']
         
         def compile(options={})
             c = ""
@@ -41,7 +41,7 @@ module Spider; module TemplateBlocks
                     cl += ' ' unless cl.empty?
                     cl += '{ @widget[:css_classes] }'
                 end
-                @el.set_attribute('class', cl)
+                @el.set_attribute('class', cl) unless cl.blank?
             end
             start = "$out << '<"+@el.name
             @el.attributes.to_hash.each do |key, val|

data/lib/spiderfw/templates/blocks/lambda.rb

@@ -0,0 +1,25 @@
+require 'spiderfw/templates/template_blocks'
+
+module Spider; module TemplateBlocks
+    
+    class Lambda < Block
+        
+        def compile(options={})
+            init = ""
+            lambda_name = @el.attributes['sp:lambda']
+            @el.remove_attribute('sp:lambda')
+            c = "#{lambda_name} = lambda do\n"            
+            content = Spider::TemplateBlocks.parse_element(@el, @allowed_blocks, @template).compile(options)
+            content.run_code.each_line do |line|
+                c += '  '+line
+            end
+            c += "end\n"
+            c += "#{lambda_name}.call"
+            return CompiledBlock.new(init, c)
+        end
+        
+        
+    end
+    
+    
+end; end

data/lib/spiderfw/templates/blocks/recurse.rb

@@ -0,0 +1,41 @@
+require 'spiderfw/templates/template_blocks'
+
+module Spider; module TemplateBlocks
+    
+    class Recurse < Block
+        
+        def compile(options={})
+            init = ""
+            c = ""
+            lambda_name = @el.attributes['lambda']
+            vars_attr = @el.attributes['vars']
+            vars = nil
+            unless vars_attr.blank?
+                vars = {}
+                var_pairs = vars_attr.split(/\s*,\s*/)
+                var_pairs.each do |pair|
+                    from, to = pair.split(/\s*=>\s*/)
+                    vars[from] = to
+                end
+                c += "___prev_vars = {}\n"
+                vars.each do |from, to|
+                    c += "___prev_vars[:#{from}] = #{from}\n"
+                end
+                vars.each do |from, to|
+                    c += "#{from} = #{to}\n"
+                end
+            end
+            c += "#{lambda_name}.call\n"
+            if vars
+                vars.each do |from, to|
+                    c += "#{from} = ___prev_vars[:#{from}]\n"
+                end
+            end            
+            return CompiledBlock.new(init, c)
+        end
+        
+        
+    end
+    
+    
+end; end

data/lib/spiderfw/templates/blocks/widget.rb

@@ -51,14 +51,13 @@ module Spider; module TemplateBlocks
             
             template = klass.load_template(template_attr || klass.default_template)
             template.asset_profiles = asset_profiles if asset_profiles
-            if (overrides.length > 0)
-                #template_name = klass.find_template(template_attr)
+            # @template is the containing template, template is the widget's template
+            if overrides.length > 0
                 template.add_overrides overrides
                 @template.add_subtemplate(id, template, klass)
             else
                 @template.add_widget_template(template, klass)
             end
-            # end
 
             init = ""
             t_param = 'nil'

data/lib/spiderfw/templates/layout.rb

@@ -249,6 +249,7 @@ module Spider
                         app_relative_path = 'spider'
                         app_path = Spider::SpiderController.pub_path
                     end
+                    app_pathname = Pathname.new(app_path)
 
                     pub_app = "#{pub_dest}/#{app_relative_path}"
                     FileUtils.mkdir_p(pub_app)
@@ -263,14 +264,20 @@ module Spider
                         url = url.first
                         next if url =~ %r{^/} || url =~ %r{^[a-z]+://}
                         path = ""
-                        url_dest = File.expand_path(File.join(pub_app, url))
                         url_src = File.expand_path(File.join(src_dir, url))
-                        unless url_src.index(app_path) == 0
+                        src_pathname = Pathname.new(url_src)
+                        src_rel = nil
+                        begin
+                            src_rel = src_pathname.relative_path_from(app_pathname)
+                        rescue ArgumentError
                             raise "Can't combine CSS if paths go outside app: #{url} in #{path}"
                         end
+                        
+                        url_dest = File.join(pub_app, src_rel.to_s)
+                        
                         FileUtils.mkdir_p(File.dirname(url_dest))
                         cachebuster = Spider.conf.get('css.cachebuster')
-                        new_url = "#{app_relative_path}/#{url}"
+                        new_url = "#{app_relative_path}/#{src_rel}"
                         if File.exist?(url_src)
                             mtime = File.mtime(url_src).to_i
                             if cachebuster && File.exist?(url_dest) && mtime > File.mtime(url_dest).to_i
@@ -341,6 +348,16 @@ module Spider
                     ass = {:src => ass} if ass.is_a?(String)
                     $out << "<script type=\"text/javascript\" src=\"#{ass[:src]}\"></script>\n"
                 end
+                unless @not_first_js
+                    $out << "<script type=\"text/javascript\">"
+                    @not_first_js = true
+                    $out << "window.SPIDER_BASE_URL = '#{self[:base_url]}'; "
+                    $out << "if (window.Spider) Spider.baseUrl = window.SPIDER_BASE_URL;\n"
+                    unless self[:js_translations].blank?
+                        $out << self[:js_translations]+"\n"
+                    end
+                    $out << "</script>"
+                end
             end
             if types.include?(:css)
                 self.assets[:css].each do |ass|