spiderfw 0.6.26 → 0.6.27

data/lib/spiderfw/model/base_model.rb

@@ -441,14 +441,14 @@ module Spider; module Model
                 element = self.class.elements[name]
                 raise "Internal error! Element method #{name} exists, but element not found" unless element
                 return element.attributes[:fixed] if element.attributes[:fixed]
-                if (element.integrated?)
+                if element.integrated?
                     integrated = get(element.integrated_from.name)
                     return integrated.send(element.integrated_from_element) if integrated
                     return nil
                 end
                 if element_has_value?(name) || element_loaded?(name)
                     val = instance_variable_get(ivar)
-                    val.set_parent(self, name) if val && element.model? && !val._parent # FIXME!!!
+                    val.set_parent(self, name) if val && element.model?
                     return val
                 end
 
@@ -472,7 +472,7 @@ module Spider; module Model
                     end
                     val = element.model.new(val) if element.model? && !val.is_a?(BaseModel)
                 end
-                val.set_parent(self, name) if element.model? && val && val.respond_to?(:parent) && !val._parent # FIXME!!!
+                val.set_parent(self, name) if element.model? && val && val.respond_to?(:parent)
                 return val
             end
 
@@ -1621,7 +1621,7 @@ module Spider; module Model
                 when 'String'
                 when 'Spider::DataTypes::Text'
                     value = value.to_s
-                when 'Fixnum'
+                when 'Fixnum', 'Spider::DataTypes::PK'
                     value = value.to_i
                 end
             end
@@ -1968,7 +1968,7 @@ module Spider; module Model
         
         # Returns true if no element has a value
         def empty?
-            return @_has_values
+            return !@_has_values
         end
         
         # Sets all values of obj on the current object

data/lib/spiderfw/model/identity_mapper.rb

@@ -95,8 +95,10 @@ module Spider; module Model
                 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
+                    if fail_if_exists
+                        #debugger
+                        raise IdentityMapperException, "A different instance of the same object #{obj.class}(#{obj.primary_keys.inspect}) already exists in the identity mapper" 
+                    end
                     existent.merge!(obj)
                     return existent
                 else

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

@@ -464,7 +464,7 @@ module Spider; module Model; module Mappers
                 has_join = false
                 cur.each do |cur_join|
                     if (cur_join[:keys] == join[:keys] && cur_join[:conditions] == join[:conditions])
-                        cur_join[:type] = :left if join[:type] == :left
+                        cur_join[:type] = :left if join[:type] == :left && !join[:order]
                         has_join = true
                         break
                     end
@@ -880,6 +880,9 @@ module Spider; module Model; module Mappers
                     fields << [field, direction]
                 else
                     el_joins, el_model, el = get_deep_join(order_element, :left)
+                    el_joins.each do |el_j|
+                        el_j[:order] = true
+                    end
                     if el.model?
                         if el_model.mapper.have_references?(el) || el.model.storage != storage
                             el.model.primary_keys.each do |pk|
@@ -1195,7 +1198,7 @@ module Spider; module Model; module Mappers
                             column_type = element.attributes[:db_column_type] || storage_column_type(key_storage_type, key_attributes)
                             unless column
                                 column_name = element.attributes[:db_column_name] || @storage.column_name("#{element.name}_#{key.name}")
-                                column_attributes = @storage.column_attributes(key_type, key_attributes)
+                                column_attributes = @storage.column_attributes(base_type(key_type), key_attributes)
                                 column = Field.new(schema.table, column_name, column_type, column_attributes)
                             end
                             column.type ||= column_type

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

@@ -168,10 +168,10 @@ module Spider; module Model
                         obj.set(el, set_data)
                     end
                 end
-                if (!el.integrated? && el.required? && (mode == :insert || obj.element_modified?(el)) && !obj.element_has_value?(el))
-                    raise RequiredError.new(el) 
+                if !el.integrated? && el.required? && (mode == :insert || obj.element_modified?(el)) && !obj.element_has_value?(el)
+                    raise RequiredError.new(el)
                 end
-                if (el.unique? && !el.integrated? && obj.element_modified?(el) && curr_val = obj.get(el))
+                if el.unique? && !el.integrated? && obj.element_modified?(el) && curr_val = obj.get(el)
                     existent = @model.where(el.name => curr_val)
                     if (mode == :insert && existent.length > 0) || (mode == :update && existent.length > 1)
                         raise NotUniqueError.new(el)
@@ -252,7 +252,6 @@ module Spider; module Model
         def after_save(obj, mode)
             obj.reset_modified_elements
             save_associations(obj, mode)
-            
         end
         
         # Hook called after a succesful save, when the object is not in save mode (see {BaseModel#save_mode}) anymore.
@@ -338,7 +337,7 @@ module Spider; module Model
         # @return [void]
         def save_associations(obj, mode)
             association_elements.select{ |el| obj.element_has_value?(el) }.each do |el|
-                save_element_associations(obj, el, mode)
+                save_element_associations(obj, el, mode) # if obj.element_modified?(el)
             end
         end
         
@@ -729,7 +728,14 @@ module Spider; module Model
                 seen[obj] = true
             end
             res = path.empty? ? obj : obj.all_children(path)
-            raise RuntimeError, "Broken object path" if (obj && !path.empty? &&  res.length < 1)
+            if obj && !path.empty? &&  res.length < 1
+                if Spider.runmode == 'production'
+                    Spider.logger.error("Internal error: broken object path")
+                    res = [orig_obj]
+                else
+                    raise RuntimeError, "Internal error: broken object path"
+                end
+            end
             res = QuerySet.new(@model, res) unless res.is_a?(QuerySet)
             res = res.select{ |obj| obj.primary_keys_set? }
             return res
@@ -1335,7 +1341,7 @@ module Spider; module Model
         # Makes the objects' mapper run the task
         # @return [void]
         def execute
-            debug_str = "Executing #{@action} on #{@object.inspect}"
+            debug_str = "Executing #{@action} on #{@object.class}(#{@object.primary_keys.inspect})"
             debug_str += " (#{@params.inspect})" unless @params.empty?
             Spider::Logger.debug debug_str
             @object.mapper.execute_action(@action, @object, @params)
@@ -1415,7 +1421,8 @@ module Spider; module Model
         end
         def message
             Spider::GetText.in_domain('spider') do
-                _(self.class.msg) % @element.label
+                element = @element.is_a?(Element) ? @element.label : @element
+                _(self.class.msg) % element
             end
         end
         def to_s

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

@@ -74,7 +74,7 @@ module Spider; module Model; module Storage; module Db
         class << self; attr_reader :reserved_kewords, :type_synonyms, :safe_conversions, :field_types, :field_flags end
         
         def self.new_connection(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil)
-            conn = ::Mysql.new(host, user, passwd, db, port, sock, flag)
+            conn = ::Mysql.new(host, user, passwd, db, port.to_i, sock, flag)
             conn.autocommit(true)
             conn.query("SET NAMES 'utf8'")
             return conn
@@ -222,56 +222,60 @@ module Spider; module Model; module Storage; module Db
                 query_finished
                 release if curr[:conn] && !in_transaction?
             end
-         end
+        end
          
-         def prepare(sql)
-             debug("mysql preparing: #{sql}")
-             return curr[:stmt] = connection.prepare(sql)
-         end
+        def prepare(sql)
+            debug("mysql preparing: #{sql}")
+            return curr[:stmt] = connection.prepare(sql)
+        end
 
-         def execute_statement(stmt, *bind_vars)
-             stmt.execute(*bind_vars)
-         end
+        def execute_statement(stmt, *bind_vars)
+            stmt.execute(*bind_vars)
+        end
          
-         def total_rows
-             return curr[:total_rows]
-         end
+        def total_rows
+            return curr[:total_rows]
+        end
          
-         def prepare_value(type, value)
-             value = super(type, value)
-             return value unless value
-             case type.name
-             when 'String'
-                 return value.to_s
-             when 'Date'
-                 return value.strftime("%Y-%m-%d")
-             when 'DateTime'
-                 return value.strftime("%Y-%m-%dT%H:%M:%S")
-             when 'Time'
-                 return value.strftime("%H:%M:%S")
-             when 'Fixnum'
-                 return value.to_i
-             end
-             return value
+        def prepare_value(type, value)
+            value = super(type, value)
+            return value unless value
+            case type.name
+            when 'String'
+                return value.to_s
+            when 'Date'
+                return value.strftime("%Y-%m-%d")
+            when 'DateTime'
+                return value.strftime("%Y-%m-%dT%H:%M:%S")
+            when 'Time'
+                return value.strftime("%H:%M:%S")
+            when 'Fixnum'
+                return value.to_i
+            end
+            return value
          end
          
-         def value_to_mapper(type, value)
-             return unless value
-             case type.name
-             when 'DateTime'
-                 @@time_offset ||= DateTime.now.offset
-                 return type.civil(value.year, value.month, value.day, value.hour, value.minute, value.second, @@time_offset)
-             when 'Date'
-                 return type.civil(value.year, value.month, value.day)
-             when 'Time'
-                 return type.local(2000, 1, 1, value.hour, value.minute, value.second)
-             end
-             return super(type, value)
-         end
+        def value_to_mapper(type, value)
+            return unless value
+            begin
+                case type.name
+                when 'DateTime'
+                    @@time_offset ||= DateTime.now.offset
+                    return type.civil(value.year, value.month, value.day, value.hour, value.minute, value.second, @@time_offset)
+                when 'Date'
+                    return type.civil(value.year, value.month, value.day)
+                when 'Time'
+                    return type.local(2000, 1, 1, value.hour, value.minute, value.second)
+                end
+                return super(type, value)    
+            rescue 
+                return nil    
+            end 
+        end
          
-         def last_insert_id
-             curr[:last_insert_id]
-         end
+        def last_insert_id
+            curr[:last_insert_id]
+        end
          
          ##############################################################
          #   SQL methods                                              #

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

@@ -0,0 +1,16 @@
+require 'mysql'
+
+module Spider; module Model; module Storage; module Db; module Connectors
+
+    module Mysql
+
+        def self.new_connection(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil)
+            conn = ::Mysql2::Client.new(
+                :host => host, :username => user, :password => passwd, :database => db, :port => port, :socket => sock
+            )
+            return conn
+        end
+
+    end
+
+end; end; end; end; end

data/lib/spiderfw/model/storage/db/connectors/mysql2.rb

@@ -0,0 +1,9 @@
+require 'mysql2'
+
+module Spider; module Model; module Storage; module Db; module Connectors
+
+    module Mysql2
+
+    end
+
+end; end; end; end; end

data/lib/spiderfw/setup/app_manager.rb

@@ -496,11 +496,6 @@ module Spider
 
         private
 
-        def git_command(command)
-            #`GIT_SSH='ssh -i #{File.join(Spider.paths[:data], 'keys', 'spider.rsa')}' git #{command}`
-            `git #{command}`
-        end
-
         def reset_git_env
             ENV['GIT_WORK_TREE'] = nil
             ENV["GIT_INDEX_FILE"] = nil

data/lib/spiderfw/spider.rb

@@ -191,6 +191,7 @@ module Spider
             if Spider.conf.get('template.cache.reload_on_restart')
                 FileUtils.touch("#{Spider.paths[:tmp]}/templates_reload.txt")
             end
+            check_clear_caches
             unless Spider.runmode == 'test'
                 if domain = Spider.conf.get('site.domain')
                     ssl_port = Spider.conf.get('site.ssl') ? Spider.conf.get('site.ssl_port') : nil
@@ -223,7 +224,6 @@ module Spider
                 monitor.path(Spider.paths[:tmp], 'restart.txt') do
                     create { |base, relative| Process.kill 'HUP', $$ }
                     update { |base, relative| Process.kill 'HUP', $$ }            
-
                 end
 
                 if Spider.conf.get('template.cache.use_fssm')
@@ -373,13 +373,38 @@ module Spider
         def current
             Spider::Request.current
         end
+
+
+       def check_clear_caches
+            if File.exists?(Spider.paths[:clear_file])
+                stat = File.stat(Spider.paths[:clear_file])
+                last_reset_file = File.join(Spider.paths[:var], 'cache_cleared')
+                last_stat = File.exists?(last_reset_file) ? File.stat(last_reset_file) : nil
+                if !last_stat || stat.mtime > last_stat.mtime
+                    Spider.clear_caches!
+                end
+            end
+        end
+
+        def clear_caches!
+            Spider.logger.info("Clearing caches")
+            FileUtils.touch(File.join(Spider.paths[:var], 'cache_cleared'))
+            Dir.new(Spider::Layout.compiled_folder_path).each do |entry|
+                next if ['.', '..'].include?(entry)
+                ::FileUtils.rm_rf(File.join(Spider::Layout.compiled_folder_path, entry))
+            end
+            FileUtils.rm_rf(Spider::Template.cache_path)
+        end
+
+        def multithread?
+            return false if $SPIDER_SINGLE_THREADED || Spider.current[:multithread] == false
+            return true
+        end
         
         # Called when a new request is started.
         # @return [void]
         def request_started
             @request_mutex.lock if (@request_mutex)
-            if File.file?(Spider.paths[:reset_file])
-            end
             Spider::Request.current = {
                 :_start => Time.now
             }
@@ -461,7 +486,7 @@ module Spider
             @paths[:data] = File.join(root, 'data')
             @paths[:log] = File.join(@paths[:var], 'log')
             @paths[:restart_file] = File.join(@paths[:tmp], 'restart.txt')
-            @paths[:reset_file] = File.join(@paths[:tmp], 'reset.txt')
+            @paths[:clear_file] = File.join(@paths[:tmp], 'clear.txt')
             @paths.each do |k, path|
                 @paths[k] = File.expand_path(File.readlink(path)) if File.symlink?(path)
             end
@@ -1084,9 +1109,13 @@ module Spider
                 # so use cached locale if Locale.current fails
                 l = @current_locale
                 l ||= Locale::Tag.parse(Spider.conf.get('locale')) if Spider.conf.get('locale')
-                l ||= Locale::Tag.parse('en')
+                l ||= Locale::Tag.parse(Spider.conf.get('i18n.default_locale'))
             end
         end
+
+        def locale=(val)
+            Locale.current = Locale::Tag.parse(val)
+        end
         
         # @param [Locale::Tag]
         # @return [Spider::I18n::Provider] A provider for the given locale

data/lib/spiderfw/templates/layout.rb

@@ -15,7 +15,7 @@ module Spider
         end
         
         def render(*args)
-            $PUB_URL = Spider::HomeController.pub_url
+            $PUB_URL = Spider.home.controller.pub_url
             prepare_assets unless @assets_prepared
             super
         end
@@ -67,7 +67,7 @@ module Spider
             assets[:js].each do |ass|
                 if ass[:cpr]
                     compressed = compress_javascript(ass)
-                    @template_assets[:js] << Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
+                    @template_assets[:js] << Spider.home.controller.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
                 else
                     ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
                     @template_assets[:js] << ass[:src]
@@ -76,7 +76,7 @@ module Spider
             assets[:css].each do |ass|
                 if ass[:cpr]
                     compressed = compress_css(ass)
-                    @template_assets[:css] << Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
+                    @template_assets[:css] << Spider.home.controller.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
                 else
                     ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
                     is_dyn = ass[:if_ie_lte] || ass[:media] || ass[:rel]
@@ -151,7 +151,7 @@ module Spider
                         end
                         src = name
                     end
-                    ass[:src] = Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+src
+                    ass[:src] = Spider.home.controller.pub_url+'/'+COMPILED_FOLDER+'/'+src
                     assets[type] << ass
                 else # needs compression
                     name = ass[:compress] || @cname
@@ -196,7 +196,7 @@ module Spider
         
         def all_assets
             tpl_assets = @template.is_a?(Layout) ? @template.all_assets : @template.assets
-            assets = tpl_assets + self.assets
+            assets = self.assets + tpl_assets
             if @only_asset_profiles
                 assets = assets.select{ |ass| ass[:profiles] && !(ass[:profiles] & @only_asset_profiles).empty? }
             end
@@ -209,7 +209,7 @@ module Spider
         COMPILED_FOLDER = '_c'
 
         def self.compiled_folder_path
-             File.join(Spider::HomeController.pub_path, COMPILED_FOLDER)
+             File.join(Spider.home.controller.pub_path, COMPILED_FOLDER)
         end
         
         def asset_gettext_messages_file(path)

data/lib/spiderfw/templates/resources/sass.rb

@@ -90,8 +90,7 @@ module Spider
                 config = Compass::Configuration::Data.new(:spider, options)
                 Compass.add_project_configuration(config)
                 compiler = Compass::Compiler.new(work_dir, File.dirname(src), File.dirname(dest), options)
-                
-                compiler.compile(src, dest) if compiler.out_of_date?
+                compiler.run
             else
                 engine = Sass::Engine.for_file(src, {})
                 output = engine.render

data/lib/spiderfw/templates/template.rb

@@ -45,9 +45,12 @@ module Spider
         
         class << self
             
+            def cache_path
+                File.join(Spider.paths[:var], 'cache', 'templates')
+            end
             # Returns the class TemplateCache instance
             def cache
-                @@cache ||= TemplateCache.new(File.join(Spider.paths[:var], 'cache', 'templates'))
+                @@cache ||= TemplateCache.new(self.cache_path)
             end
             
             # Sets allowed blocks
@@ -408,6 +411,7 @@ module Spider
             raise "Asset type not given for #{src}" unless type
             search_classes = [asset_owner]
             search_classes << @definer_class if @definer_class
+            search_classes << Spider.home
             dfnr = @definer_class.superclass if @definer_class && @definer_class.respond_to?(:superclass)
             while dfnr && dfnr < Spider::Widget
                 search_classes << dfnr