spiderfw 0.6.22 → 0.6.23

data/apps/messenger/views/admin/view_email.shtml

@@ -0,0 +1,7 @@
+<div>
+    <h4>{ @message.subject }</h4>
+    <pre>{ @message.headers }
+
+{ @message.body }    
+    </pre>
+</div>

data/apps/messenger/views/admin/view_sms.shtml

@@ -0,0 +1,4 @@
+<div>
+    <h4>{ @message.to }</h4>
+    <pre>{ @message.text }</pre>
+</div>

data/blueprints/app/.dirs

@@ -2,4 +2,5 @@ controllers
 models
 public
 views
-widgets
+widgets
+test/features/step_definitions

data/blueprints/app/test/features/support/env.rb

@@ -0,0 +1,4 @@
+$SPIDER_RUNMODE = 'test'
+require 'spiderfw/test/cucumber'
+require 'spiderfw/test/capybara'
+Spider.init

data/lib/spiderfw/cmd/commands/config.rb

@@ -43,13 +43,16 @@ class ConfigCommand < CmdParse::Command
                 print args[0]
                 print ":\n"+option[:description]+"\n" if option[:description] && !option[:description].empty?
                 puts
-                puts "#{(_('Type')+':').ljust(10)} #{option[:params][:type]}" if option[:params][:type]
+                puts "#{( _('Type') +':').ljust(10)} #{option[:params][:type]}" if option[:params][:type]
                 default_str = nil
                 if default = option[:params][:default]
                     default_str = default.is_a?(Proc) ? _('Dynamic') : default
                 end
-                puts "#{(_('Default')+':').ljust(10)} #{default_str}" if default_str
-                puts "#{(_('Choices')+':').ljust(10)} #{option[:params][:choices].join(', ')}" if option[:params][:choices]
+                puts "#{( _('Default') +':').ljust(10)} #{default_str}" if default_str
+                if choices = option[:params][:choices]
+                    choices = choices.call if choices.is_a?(Proc)
+                    puts "#{( _('Choices') +':').ljust(10)} #{choices.join(', ')}" 
+                end
             else
                 puts _("Configuration option not found")
             end

data/lib/spiderfw/config/configuration.rb

@@ -139,8 +139,16 @@ module Spider
         def [](key)
             key = translate_key(key)
             val = @values[key]
+            return val unless @options[key]
             
-            if (val.nil? && @options[key] && @options[key][:params][:default])
+            if val.nil? && fallback = @options[key][:params][:fallback]
+                fallback = [fallback] unless fallback.is_a?(Array)
+                fallback.each do |fb|
+                    val = Spider.conf.get(fb)
+                    break if val
+                end
+            end
+            if val.nil? && @options[key][:params][:default]
                 default = @options[key][:params][:default]
                 val = default
                 if (default.class == Proc)
@@ -185,7 +193,8 @@ module Spider
         # Sets an allowed configuration option
         # Possible params are:
         # -:default     the default value for the option; if it is a proc, it will be called
-        # -:choiches    an array of allowed values
+        # -:fallback    like default, but use another config key instead (an array may be specified)
+        # -:choices    an array of allowed values
         # -:type        parameter type; can be one of int, string, bool
         def config_option(name, description=nil, params={}, &proc)
             name = name.to_s

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

@@ -130,7 +130,7 @@ module Spider
         :default => :ERROR,
         :choices => [false, :DEBUG, :WARN, :INFO, :ERROR]
     config_option 'log.non_static_extensions_list', _('Allow logging for some file extensions'), 
-        :type => Array, :default => []
+        :type => Array, :default => ['html', 'xml', 'json']
     
 
 

data/lib/spiderfw/controller/controller.rb

@@ -183,6 +183,7 @@ module Spider
                 method = action
             end
             method = method[0..-2] if !method.blank? && method[-1].chr == '/'
+            method, rest = method.split('.', 2) if method
             method = self.class.default_action if !method || method.empty?
             return nil if method.empty?
             return [method.to_sym, additional_arguments]
@@ -202,11 +203,7 @@ module Spider
         
         def execute(action='', *arguments)
             return if @__done
-            # return if self.is_a?(Spider::Widget) # FIXME: this is obviously wrong. Widgets must override the behaviour
-            # # somewhere else, or probably just not inherit controller.
             debug("Controller #{self} executing #{action} with arguments #{arguments}")
-            # before(action, *arguments)
-            # do_dispatch(:before, action, *arguments)
             catch(:done) do
                 if can_dispatch?(:execute, action)
                     d_next = dispatch_next(action)
@@ -216,10 +213,9 @@ module Spider
                     arguments = d_next.params
                 end
                 if d_next && d_next.dest == self
-                    @executed_method = d_next.action.to_sym
-                    @executed_method_arguments = []
+                    set_executed_method(d_next.action)
                 end
-                if (@executed_method)
+                if @executed_method
                     meth = self.method(@executed_method)
                     args = arguments + @executed_method_arguments
                     @controller_action = args[0]
@@ -230,6 +226,7 @@ module Spider
                         args = [nil] if meth.arity == 1 && args.empty?
                     end
                     Spider.logger.info("Executing: #{self.class.name}##{@executed_method}.#{@request.format}")
+                    spider_main_controller_send = true
                     send(@executed_method, *args)
                 else
                     raise NotFound.new(action)
@@ -313,14 +310,24 @@ module Spider
             return scene
         end
 
+        def get_route(*args)
+            route = super
+            return route unless route
+            action = route.path.split('/').first
+            action_method, action_params = get_action_method(action)
+            if route.nil_route && !action.blank? && self.respond_to?(action_method)
+                route.action = action
+            end
+            route
+        end
+
         protected
 
         def dispatched_object(route)
             klass = route.dest
             if klass.class != Class
-                if (klass == self) # route to self
-                    @executed_method = route.action.to_sym
-                    @executed_method_arguments = []
+                if klass == self # route to self
+                    set_executed_method(route.action)
                 end
                 return klass
             end
@@ -340,12 +347,17 @@ module Spider
             @executed_method = nil
             @executed_method_arguments = nil
             if !can_dispatch?(:execute, action)
-                method, additional_arguments = get_action_method(action)
-                if (method && controller_action?(method))
-                    @executed_method = method.to_sym
-                    @executed_method_arguments = additional_arguments || []
-                end
+                set_executed_method(action)
+            end
+        end
+
+        def set_executed_method(action)
+            method, additional_arguments = get_action_method(action)
+            if (method && controller_action?(method))
+                @executed_method = method.to_sym
+                @executed_method_arguments = additional_arguments || []
             end
+            return @executed_method
         end
         
 

data/lib/spiderfw/controller/dispatcher.rb

@@ -130,10 +130,12 @@ module Spider
             r.each do |route|
                 try, dest, options = route
                 action = nil
+                nil_route = false
                 case try
                 when true, nil
                     action = path
-                    matched = ''
+                    matched = nil
+                    nil_route = true
                 when String
                     test_path = path
                     if (options[:ignore_case])
@@ -165,7 +167,8 @@ module Spider
                         end
                     end
                 end
-                if (action)
+                if action
+                    action = action[1..-1] if action[0] && action[0].chr == '/'
                     if (options[:prepend])
                         action = options[:prepend] + action
                     end
@@ -181,7 +184,7 @@ module Spider
                     action.sub!(/^\/+/, '') # no leading slash
 
                     return Route.new(:path => path, :dest => dest, :action => action, :matched => matched,
-                                     :params => params, :options => options)
+                                     :nil_route => nil_route, :params => params, :options => options)
                 end
             end
             return nil
@@ -270,7 +273,7 @@ module Spider
         end
         
         class Route
-            attr_accessor :path, :dest, :action, :params, :options, :matched, :obj
+            attr_accessor :path, :dest, :action, :params, :options, :matched, :obj, :nil_route
             
             def initialize(args)
                 @path = args[:path]
@@ -279,6 +282,7 @@ module Spider
                 @params = args[:params] || []
                 @options = args[:options] || {}
                 @matched = args[:matched]
+                @nil_route = args[:nil_route]
                 @obj = nil
             end
             

data/lib/spiderfw/controller/http_controller.rb

@@ -21,6 +21,14 @@ module Spider
             request.extend(HTTPRequest)
             super(request, response, scene)
         end
+
+        def call_before(action, *arguments)
+            if action =~ /(.+)\.(\w+)$/ # strip extension, set format
+                action = $1
+                @request.format = $2.to_sym
+            end
+            super(action, *arguments)
+        end
         
         def before(action='', *arguments)
             if (@request.env['HTTP_TRANSFER_ENCODING'] == 'Chunked' && !@request.server.supports?(:chunked_request))
@@ -94,17 +102,13 @@ module Spider
             l = $1 if l =~ /(\w\w)_+/
             FastGettext.locale = l
             FastGettext.text_domain = 'spider'
-            if (action =~ /(.+)\.(\w+)$/) # strip extension, set format
-                action = $1
-                @request.format = $2.to_sym
-            end
 #            Spider.reload_sources if Spider.conf.get('webserver.reload_sources')
             static_level = Spider.conf.get('log.static_extensions')
             if @request.format && @request.get? && static_level != true
                 allowed = Spider.conf.get('log.non_static_extensions_list')
                 unless allowed.include?(@request.format.to_s)
                     Spider.logger.info("GET #{@request.path}")
-                    @logger_static_prev = Spider.logger.set_thread_level(static_level)
+                    @logger_static_prev = Spider.logger.set_request_level(static_level)
                 end
             end
             Spider::Logger.debug("REQUEST:")

data/lib/spiderfw/controller/mixins/static_content.rb

@@ -11,6 +11,7 @@ module Spider; module ControllerMixins
         def self.included(klass)
             super
             @static_content_route ||= 'public/'
+            klass.controller_actions(:serve_static)
             klass.route(@static_content_route, :serve_static, :do => lambda{ @serving_static = true })
             if (klass < Visual)
                 klass.no_layout('public')

data/lib/spiderfw/controller/mixins/visual.rb

@@ -24,6 +24,7 @@ module Spider; module ControllerMixins
         def before(action='', *params)
             @layout ||= self.class.get_layout(action)
             @layout ||= @dispatcher_layout
+            return super unless action_target?
             format = nil
             req_format = self.is_a?(Widget) && @is_target && @request.params['_wf'] ? @request.params['_wf'].to_sym : @request.format
             if (req_format && self.class.output_formats[@executed_method])
@@ -45,7 +46,7 @@ module Spider; module ControllerMixins
             end
             n_route = dispatch_next(action)
             obj = n_route.obj if n_route
-            if obj.is_a?(Visual) && !(obj.respond_to?(:serving_static?) && obj.serving_static?(n_route.path))
+            if obj.is_a?(Visual) && !(obj.respond_to?(:serving_static?) && obj.serving_static?)
                 set_layout = @layout || @dispatcher_layout
                 if set_layout
                     set_layout = [set_layout] unless set_layout.is_a?(Array)
@@ -228,6 +229,15 @@ module Spider; module ControllerMixins
             end
             return template
         end
+
+        def render_to_string(*args)
+            res = StringIO.new
+            $out.output_to(res) do
+                render(*args)
+            end
+            res.rewind
+            res.read
+        end
         
         def render_error(path, options)
             options[:no_prepare_scene] = true
@@ -249,7 +259,7 @@ module Spider; module ControllerMixins
         def try_rescue(exc)
             if exc.respond_to?(:uuid=)
                 return super if exc.uuid # Error page already outputted
-                exc.uuid = UUIDTools::UUID.random_create.to_s 
+                exc.uuid = SecureRandom.hex(12)
             end
             format = self.class.output_format(:error) || :html
             unless exc.is_a?(Spider::Controller::Maintenance) || exc.is_a?(Spider::Controller::NotFound)
@@ -355,12 +365,17 @@ module Spider; module ControllerMixins
                 return bt
             end
             context = exc.__debug_context
+            seen_obj = {}
             0.upto(Debugger.current_context.stack_size - 2) do |i|
                 begin
                     file = context.frame_file(i)
                     line = context.frame_line(i)
                     klass = context.frame_class(i)
                     method = context.frame_method(i)
+                    #break if File.basename(file) == 'controller.rb' && locals.key?("spider_main_controller_send")
+                    unless Spider.conf.get('devel.trace.show_framework')
+                        next if file.index($SPIDER_PATH) == 0
+                    end
                     args = context.frame_args(i)
                     locals = context.frame_locals(i)
                     frame_self = context.frame_self(i)
@@ -379,35 +394,34 @@ module Spider; module ControllerMixins
                         dest_str = ""
                     end
                     self_str = frame_self.is_a?(Class) ? frame_self.inspect : "#<#{frame_self.class}:#{frame_self.object_id}>"
-                    if (i == -1)
-                        info = ""
-                    else
-                        # if (frame_self == dest)
-                        #                        info = "#{dest_str}"
-                        #                    else
-                        #                        info = "#{self_str}: #{dest_str}"
-                        #                    end
-                        info = "#{self_str}: #{dest_str}"
-                        info += ".#{ex_method}("
-                        info += args.map{ |arg|
-                            val = locals[arg]
-                            arg_str = "#{arg}##{val.class}"
-                            val_str = nil
-                            if (val.is_a?(String))
-                                if (val.length > 20)
-                                    val_str = (val[0..20]+'...').inspect
-                                else
-                                    val_str = val.inspect
-                                end
-                            elsif (val.is_a?(Symbol) || val.is_a?(Fixnum) || val.is_a?(Float) || val.is_a?(BigDecimal) || val.is_a?(Date) || val.is_a?(Time))
+
+                    # if (frame_self == dest)
+                    #                        info = "#{dest_str}"
+                    #                    else
+                    #                        info = "#{self_str}: #{dest_str}"
+                    #                    end
+                    info = "#{self_str}: #{dest_str}"
+                    info += ".#{ex_method}("
+                    info += args.map{ |arg|
+                        val = locals[arg]
+                        arg_str = "#{arg}##{val.class}"
+                        val_str = nil
+                        if (val.is_a?(String))
+                            if (val.length > 20)
+                                val_str = (val[0..20]+'...').inspect
+                            else
                                 val_str = val.inspect
                             end
-                            arg_str += "=#{val_str}" if val_str
-                            arg_str
-                        }.join(', ')
-                        info += ")"
-                    end
-                    if (Spider.conf.get('devel.trace.show_instance_variables'))
+                        elsif (val.is_a?(Symbol) || val.is_a?(Fixnum) || val.is_a?(Float) || val.is_a?(BigDecimal) || val.is_a?(Date) || val.is_a?(Time))
+                            val_str = val.inspect
+                        end
+                        arg_str += "=#{val_str}" if val_str
+                        arg_str
+                    }.join(', ')
+                    info += ")"
+
+                    iv = nil
+                    if !seen_obj[frame_self.object_id] && Spider.conf.get('devel.trace.show_instance_variables')
                         iv = {}
                         frame_self.instance_variables.each{ |var| iv[var] = frame_self.instance_variable_get(var) }
                         iv.reject{ |k, v| v.nil? }
@@ -416,8 +430,11 @@ module Spider; module ControllerMixins
                     bt << {
                         :text => str, :info => info, 
                         :path => File.expand_path(file), :line => line, :method => method, :klass => klass, :locals => locals,
-                        :instance_variables => iv
+                        :self => frame_self.object_id,
+                        :instance_variables => iv,
+                        :first_seen => !seen_obj[frame_self.object_id]
                     }
+                    seen_obj[frame_self.object_id] = true
                 rescue => exc2
                 end
             end
@@ -493,7 +510,7 @@ module Spider; module ControllerMixins
                         return nil if check_action(action, check)
                     end
                 end
-                action = (action && !action.empty?) ? action.to_sym : self.default_action
+                action = (action && !action.empty?) ? action.to_s.split('/').first.to_sym : self.default_action
                 layouts.each do |name|
                     params = @layout_params[name]
                     if (params[:for])

data/lib/spiderfw/home.rb

@@ -30,6 +30,14 @@ module Spider
             @apps_path ||= File.join(@path, 'apps')
         end
 
+        def pub_path
+            controller.pub_path
+        end
+
+        def pub_url
+            controller.pub_url
+        end
+
         def list_apps
             apps_dir = Pathname.new(self.apps_path)
             paths = Spider.find_all_apps(self.apps_path)

data/lib/spiderfw/i18n/cldr.rb

@@ -14,6 +14,7 @@ module Spider; module I18n
         end
 
         def localize_date_time(object, format = 'medium', options={})
+            raise "Localize format is nil" unless format
             options[:calendar] ||= 'gregorian'
             format = 'medium' if format == :default
                         

data/lib/spiderfw/model/base_model.rb

@@ -1602,7 +1602,7 @@ module Spider; module Model
             element = self.class.elements[name]
             element.type.check(val) if (element.type.respond_to?(:check))
             if (checks = element.attributes[:check])
-                checks = {("'%s' is not in the correct format") => checks} unless checks.is_a?(Hash)
+                checks = {_("'%s' is not in the correct format") => checks} unless checks.is_a?(Hash)
                 checks.each do |msg, check|
                     test = case check
                     when Regexp
@@ -2154,7 +2154,7 @@ module Spider; module Model
         
         def after_save
             reset_modified_elements
-            autoload(@_saving[:prev_autoload]) if @_saving
+            self.autoload = @_saving[:prev_autoload] if @_saving
             @_saving = nil
         end
         

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

@@ -363,6 +363,7 @@ module Spider; module Model; module Mappers
                 next if !element || !element.type || element.integrated?
                 if !element.model?
                     field = schema.field(el)
+                    raise "Element #{el} in #{@model} does not have a schema field" unless field
                     primary_keys << field if model_pks.include?(el)
                     unless seen_fields[field.name]
                         keys << field

data/lib/spiderfw/model/unit_of_work.rb

@@ -73,7 +73,7 @@ module Spider; module Model
                 obj = task.object
                 if task.action == :save
                     next unless obj.mapper && obj.mapper.class.write?
-                    next if !obj.modified? && obj.primary_keys_set?
+                    next if task.params[:force] != :insert && !obj.modified? && obj.primary_keys_set?
                 end
                 #Spider::Logger.debug("Executing task #{task.inspect}")
                 task.execute()
@@ -130,7 +130,7 @@ module Spider; module Model
             end
             curr = @actions[obj.object_id]
             if curr && (curr_act = curr.select{ |c| c[0] == action }).length > 0
-                curr_act.each{ |c| c[1] = params}
+                curr_act.each{ |c| c[1].merge!(params)}
                 return
             end
             if action == :delete # FIXME: abstract

data/lib/spiderfw/requires.rb

@@ -31,4 +31,5 @@ require 'spiderfw/model/model'
 require 'spiderfw/home'
 require 'spiderfw/site'
 require 'spiderfw/resource'
+require 'spiderfw/controller/request'
 require 'rational'

data/lib/spiderfw/setup/app_manager.rb

@@ -222,7 +222,9 @@ module Spider
                 puts "\n\n"
                 @done_tasks.each do |app, tasks|
                     next unless tasks
-                    task.print_release_notes 
+                    tasks.each do |task|
+                        task.print_release_notes 
+                    end
                 end
             end
             if options[:clear_cache]
@@ -336,13 +338,19 @@ module Spider
             Spider.output _("Updating %s from %s") % [spec.app_id, spec.git_repo]
             options[:branch] ||= 'master'
             Dir.chdir(app_path) do
-                app_repo.fetch
-                if app_repo.is_branch?(options[:branch])
-                    app_repo.checkout(options[:branch])
-                else 
-                    app_repo.checkout("origin/#{options[:branch]}", :new_branch => options[:branch])
-                end
-                app_repo.merge("origin/#{options[:branch]}")
+                app_repo.branch('master').checkout
+            end
+            response = err = nil
+            Dir.chdir(app_path) do
+                response = `git --git-dir='#{app_path}/.git' pull origin master`
+            end
+            if response =~ /Aborting/
+                Spider.output err, :ERROR
+                raise "Unable to update"
+            end
+            Dir.chdir(app_path) do
+                app_repo.reset('HEAD', :hard => true)
+                app_repo.branch('master').checkout
             end
             # response = err = nil
             # Dir.chdir(app_path) do

data/lib/spiderfw/spider.rb

@@ -643,8 +643,6 @@ module Spider
             
             search_paths ||= []
             owner_classes.each do |owner_class| # FIXME: refactor
-                next if owner_class.is_a?(Spider::Home) # home is already checked for other owner_classes
-                                                        # FIXME: maybe it shouldn't get here?
                 owner_class = nil if owner_class == NilClass
                 resource_config = @resource_types[resource_type]
                 raise "Unknown resource type #{resource_type}" unless resource_config
@@ -677,6 +675,8 @@ module Spider
                         end
                     end
                     app = path_app
+                elsif owner_class.is_a?(Spider::Home)
+                    app = owner_class
                 elsif owner_class <= Spider::App || owner_class == Spider
                     app = owner_class
                 else

data/lib/spiderfw/templates/layout.rb

@@ -45,6 +45,7 @@ module Spider
                 next if ass[:src].blank? && !ass[:runtime]
                 next if seen[seen_check]
                 seen[seen_check] = true
+                ass[:app] = Spider.home if ass[:app] == :home
                 
                 ass = compile_asset(ass)
 
@@ -190,7 +191,8 @@ module Spider
         end
         
         def all_assets
-            assets = @template.assets + self.assets
+            tpl_assets = @template.is_a?(Layout) ? @template.all_assets : @template.assets
+            assets = tpl_assets + self.assets
             if @only_asset_profiles
                 assets = assets.select{ |ass| ass[:profiles] && !(ass[:profiles] & @only_asset_profiles).empty? }
             end
@@ -253,13 +255,13 @@ module Spider
                     FileUtils.mkdir_p(destdir)
                     dest = File.join(destdir, newname)
                     if Spider.conf.get('css.compile')
-                        compiler_class = if ass_type == :sass
-                            require 'spiderfw/templates/resources/sass'
-                            Spider::SassCompiler
-                        elsif ass_type == :less
-                            Spider::LessCompiler
-                        end
                         begin
+                            compiler_class = if ass_type == :sass
+                                require 'spiderfw/templates/resources/sass'
+                                Spider::SassCompiler
+                            elsif ass_type == :less
+                                Spider::LessCompiler
+                            end
                             compiler = compiler_class.new(ass[:app].pub_path)
                             compiler.compile(ass[:path], dest)
                         rescue Exception
@@ -368,7 +370,8 @@ module Spider
 
                     src.scan(/url\([\s"']*([^\)"'\s]*)[\s"']*\)/m).uniq.collect do |url|
                         url = url.first
-                        next if url =~ %r{^/} || url =~ %r{^[a-z]+://}
+                        next if url =~ %r{^/} || url =~ %r{^[a-z]+://} 
+                        url, cb = url.split('?', 2)
                         path = ""
                         url_src = File.expand_path(File.join(src_dir, url))
                         src_pathname = Pathname.new(url_src)
@@ -409,7 +412,11 @@ module Spider
                         else
                             Spider.logger.error("CSS referenced file not found: #{url_src}")
                         end
-                        src.gsub!(/\([\s"']*#{url}[\s"']*\)/m, "(#{new_url})")
+                        if cb
+                            url += "?#{cb}"
+                            new_url += "?#{cb}"
+                        end
+                        src.gsub!(/\([\s"']*#{Regexp.quote(url)}[\s"']*\)/m, "(#{new_url})")
                     end
                     f.write(src+"\n") 
                 end