spiderfw 0.6.5 → 0.6.6

data/lib/spiderfw/app.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'tsort'
 
 module Spider
     
@@ -244,6 +245,7 @@ module Spider
                     @#{name} ||= #{options[:default].inspect}
                     @#{name}
                 end
+                alias :#{name}= :#{name}
 END_OF_EVAL
                 class_eval(str)
             end
@@ -268,6 +270,7 @@ END_OF_EVAL
             array_attribute :authors
             array_attribute :depends
             array_attribute :depends_optional
+            array_attribute :load_after
             array_attribute :can_use
             array_attribute :gems
             array_attribute :gems_optional
@@ -315,20 +318,65 @@ END_OF_EVAL
                 h
             end
             
-            def to_json
+            def to_json(opts=nil)
                 to_h.to_json
             end
             
             def self.parse_hash(h)
                 spec = self.new
                 h.each do |key, value|
-                    spec.send(:"#{key}", value)
+                    if value.is_a?(Array)
+                        spec.send(:"#{key}", *value)
+                    else
+                        spec.send(:"#{key}", value)
+                    end
                 end
                 spec
             end
+            
+            def load_after(*vals)
+                @load_after = vals unless vals.empty?
+                unless @load_after
+                    return self.depends + self.depends_optional
+                end
+            end
 
         end
         
+        class RuntimeSort
+            
+            def initialize
+                @apps = []
+                @apps_hash = {}
+            end
+            
+            def add(app)
+                @apps << app
+                if app.is_a?(AppSpec)
+                    @apps_hash[app.app_id] = app
+                else
+                    @apps_hash[app] = app
+                end
+            end
+            
+            def tsort_each_node(&block)
+                @apps.each(&block)
+            end
+            
+            def tsort_each_child(node, &block)
+                return unless node.is_a?(AppSpec)
+                node.load_after.map{ |a| @apps_hash[a] }.each(&block)
+            end
+            
+            def tsort
+                sorted = super
+                sorted.map{ |a| a.is_a?(AppSpec) ? a.app_id : a }
+            end
+            
+            include TSort
+            
+        end
+        
     end
     
 end

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

@@ -39,17 +39,19 @@ class AppCommand < CmdParse::Command
         end
         list.set_execution_block do |args|
             if @installed
-                require 'spiderfw'
+                require 'spiderfw/home'
+                home = Spider::Home.new(Dir.pwd)
                 installed = {}
-                Spider.home.list_apps.each do |app|
+                Spider.init_base
+                active = Spider.config.get('apps')
+                Spider.home.apps.each do |app, info|
                     installed[app] = {
-                        :active => Spider.apps_by_path[app] ? true : false
+                        :active => active.include?(app)
                     }
-                    if appspec = Dir.glob("#{Spider.paths[:apps]}/#{app}/*.appspec")[0]
-                        info = Spider::App::AppSpec.load(appspec)
+                    if spec = info[:spec]
                         installed[app].merge!({
-                            :version => info.version
-                        })
+                            :version => spec.version
+                        })                        
                     end
                 end
             end
@@ -71,19 +73,19 @@ class AppCommand < CmdParse::Command
             end
             if @installed
                 puts
-                puts "*** INSTALLED APPS ***"
+                puts "*** "+_('INSTALLED APPS')+" ***"
                 puts  
                 installed.keys.sort.each do |app|                  
                     details = installed[app]
                     str = app
                     str += " #{details[:version]}" if details[:version]
-                    str += " (#{_('active')})" if details[:active]
+                    str += " (#{_('not loaded')})" unless details[:active]
                     puts str
                 end
             end
             if @remote
                 puts
-                puts "*** REMOTE APPS ***"
+                puts "*** "+_('REMOTE APPS')+" ***"
                 puts
                 remote.keys.sort.each do |app|
                     details = remote[app]
@@ -110,6 +112,7 @@ class AppCommand < CmdParse::Command
                 @no_optional_gems = true
             }
             opt.on("--ssh-user [USERNAME]", _("SSH user")){ |s| @ssh_user = s }
+            opt.on("--no-activate", _("Don't activate installed apps")){ |s| @no_activate = true }
         end
         install.set_execution_block do |args|
             unless File.exist?('init.rb') && File.directory?('apps')
@@ -127,6 +130,7 @@ class AppCommand < CmdParse::Command
                     puts "Grit not available; install Grit for Git support"
                 end
             end
+            
             apps = args
             existent = []
             apps.each do |app|
@@ -135,7 +139,6 @@ class AppCommand < CmdParse::Command
                     existent << app
                 end
             end
-            apps -= existent
             require 'spiderfw/setup/app_manager'
             specs = []
             client = Spider::AppServerClient.new(@server_url)
@@ -155,7 +158,14 @@ class AppCommand < CmdParse::Command
                 :no_optional_gems => @no_optional_gems
             }
             options[:ssh_user] = @ssh_user if @ssh_user
-            Spider::AppManager.install(specs, Dir.pwd, options)
+            inst_specs = specs.reject!{ |s| existent.include? s.app_id }
+            Spider::AppManager.install(inst_specs, Dir.pwd, options)
+            unless @no_activate
+                require 'spiderfw/spider'
+                specs_hash = {}
+                specs.each{ |s| specs_hash[s.app_id] = s }
+                Spider.activate_apps(deps, specs_hash)
+            end
         end
         self.add_command(install)
         

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

@@ -52,9 +52,10 @@ class ConfigCommand < CmdParse::Command
         set = CmdParse::Command.new('set', false)
         set.short_desc = _("Set the value of a configuration option")
         set.set_execution_block do |args|
-            require 'spiderfw'
+            require 'spiderfw/spider'
             require 'lib/spiderfw/config/configuration_editor'
             editor = Spider::ConfigurationEditor.new
+            Spider.init_base
             Spider.config.loaded_files.each do |f|
                 editor.load(f)
             end

data/lib/spiderfw/config/configuration_editor.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Spider
     
     class ConfigurationEditor
@@ -80,13 +82,13 @@ module Spider
                         
             def commit_ml(res, key, val, curr)
                 if curr
+                    curr.instance_eval("def to_yaml_style; :multiline; end")
                     res << {key => curr}.to_yaml.split("\n")[2..-1].join("\n") + "\n"
                 else
                     res << val
                 end
                 
             end
-            
             @changed.each do |file, data|
                 dirname = File.dirname(file)
                 basename = File.basename(file)
@@ -111,7 +113,7 @@ module Spider
                             end
                             add_next = nil
                         end
-                        if line =~ /(\s*)(\w[^:]+):\s*([\S]+)?$/
+                        if line =~ /(\s*)(\w[^:]+):\s*(.+)?$/
                             indent = $1
                             key = $2
                             value = $3
@@ -149,6 +151,7 @@ module Spider
                             if value
                                 if curr
                                     res << indent
+                                    curr.instance_eval("def to_yaml_style; :inline; end")
                                     res << {key => curr}.to_yaml.split("\n")[1..-1].join("\n") + "\n"
                                 else
                                     res << line
@@ -186,8 +189,8 @@ module Spider
                     end
                     
                     res.close
-                    File.mv(file, "#{file}.bak")
-                    File.mv(tmp_file, file)
+                    FileUtils.mv(file, "#{file}.bak")
+                    FileUtils.mv(tmp_file, file)
                 end
             end
         end

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

@@ -4,6 +4,8 @@ module Spider
         :action => Proc.new{ |option| Spider.runmode = option unless Spider.runmode || $SPIDER_RUNMODE}
     )
     
+    config_option('apps', _('Apps to load'), :type => Array, :yaml_style => :inline)
+    
     # Storage
     # config_option('storage.type', '')
     # config_option('storage.url', '')
@@ -37,7 +39,7 @@ module Spider
     config_option 'static_content.auto_publish', _("Automatically publish content to the home's public folder"),
         :type => Spider::DataTypes::Bool, :default => false
     # Client
-    config_option 'client.text_editor', _("The text editor installed on the client")
+    config_option 'client.text_editor', _("The text editor installed on the client"), :default => 'textmate'
     
     # Templates
     config_option 'template.cache.disable', _("Refresh template cache every time"), :default => false, :type => Spider::DataTypes::Bool

data/lib/spiderfw/controller/helpers/widget_helper.rb

@@ -26,6 +26,7 @@ module Spider; module Helpers
                 :id_path => w.id_path,
                 :full_id => w.full_id,
                 :param => param_name(w),
+                :param_u => param_name(w, true),
                 :pub_path => w.class.pub_url,
                 :css_class => w.css_class,
                 :css_classes => w.css_classes.uniq.join(' ')
@@ -49,7 +50,7 @@ module Spider; module Helpers
         
         module SceneMethods
         
-            def param_name(widget_desc)
+            def param_name(widget_desc, urlencode=false)
                 if (widget_desc.is_a?(Widget))
                     id_path = widget_desc.id_path
                 elsif (widget_desc.is_a?(Hash))
@@ -57,7 +58,9 @@ module Spider; module Helpers
                 else
                     id_path = widget_desc
                 end
-                pre = id_path.map{ |part| "[#{part}]"}.join('')
+                open = urlencode ? '%5B' : '['
+                close = urlencode ? '%5D' : ']'
+                pre = id_path.map{ |part| "#{open}#{part}#{close}"}.join('')
             end
         
             def params_for(widget_or_id_path, params)
@@ -71,4 +74,4 @@ module Spider; module Helpers
         
     end
     
-end; end
+end; end

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

@@ -12,7 +12,7 @@ module Spider; module ControllerMixins
             klass.extend(ClassMethods)
         end
         
-        def redirect(url, code=Spider::HTTP::MOVED_PERMANENTLY)
+        def redirect(url, code=Spider::HTTP::SEE_OTHER)
             debug "REDIRECTING TO #{url}"
             @request.session.persist if @request.session # It might be too late afterwards
             @response.status = code
@@ -26,6 +26,7 @@ module Spider; module ControllerMixins
             return '' unless url
             if (maps = Spider.conf.get('http.proxy_mapping'))
                 maps.each do |proxy, spider|
+                    spider ||= ''
                     return proxy + url[spider.length..-1] if (spider == "" || url[0..spider.length-1] == spider)
                 end
             end

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

@@ -191,18 +191,20 @@ module Spider; module ControllerMixins
                 template = get_template(path, scene, options)
             end
             layout = nil
-            chosen_layouts = options[:layout] || @layout
-            chosen_layouts = [chosen_layouts] if chosen_layouts && !chosen_layouts.is_a?(Array)
-            if (chosen_layouts)
-                t = template
-                layout = nil
-                (chosen_layouts.length-1).downto(0) do |i|
-                    layout = init_layout(chosen_layouts[i])
-                    layout.template = t
-                    t = layout
+            unless options.key?(:layout) && !options[:layout]
+                chosen_layouts = options[:layout] || @layout
+                chosen_layouts = [chosen_layouts] if chosen_layouts && !chosen_layouts.is_a?(Array)
+                if (chosen_layouts)
+                    t = template
+                    layout = nil
+                    (chosen_layouts.length-1).downto(0) do |i|
+                        layout = init_layout(chosen_layouts[i])
+                        layout.template = t
+                        t = layout
+                    end
                 end
+                layout.init(scene) if layout
             end
-            layout.init(scene) if layout
             init_widgets(template, layout)
             return template if done?
             if layout

data/lib/spiderfw/env.rb

@@ -14,4 +14,11 @@ $:.push($SPIDER_PATH)
 # Dir.chdir($SPIDER_RUN_PATH)
 
 $SPIDER_RUNMODE ||= ENV['SPIDER_RUNMODE']
-$SPIDER_CONFIG_SETS = ENV['SPIDER_CONFIG_SETS'].split(/\s+,\s+/) if ENV['SPIDER_CONFIG_SETS']
+$SPIDER_CONFIG_SETS = ENV['SPIDER_CONFIG_SETS'].split(/\s+,\s+/) if ENV['SPIDER_CONFIG_SETS']
+
+$SPIDER_SCRIPT = $0
+if $SPIDER_SCRIPT =~ /Rack|Passenger/
+    $SPIDER_RACK = true
+    $SPIDER_SCRIPT = ::File.expand_path('./bin/spider')
+    $SPIDER_NO_RESPAWN = true
+end

data/lib/spiderfw/home.rb

@@ -1,4 +1,7 @@
 require 'pathname'
+require 'spiderfw/spider'
+require 'spiderfw/app'
+
 
 module Spider
 
@@ -21,17 +24,41 @@ module Spider
         def load_apps(*args)
             Spider.load_apps(*args)
         end
+        
+        def apps_path
+            @apps_path = Spider.paths[:apps] if Spider.respond_to?(:paths)
+            @apps_path ||= File.join(@path, 'apps')
+        end
 
         def list_apps
-            apps_path = Spider.respond_to?(:paths) ? Spider.paths[:apps] : File.join(@path, 'apps')
-            apps_dir = Pathname.new(apps_path)
+            apps_dir = Pathname.new(self.apps_path)
+            paths = Spider.find_all_apps(self.apps_path)
             apps = []
-            Dir.glob("#{apps_path}/**/_init.rb").each do |path|
-                dir = Pathname.new(File.dirname(path))
+            paths.each do |path|
+                dir = Pathname.new(path)
                 apps << dir.relative_path_from(apps_dir).to_s
             end
             apps
         end
+        
+        def apps
+            apps = {}
+            list_apps.each do |path|
+                spec_file = Dir.glob(File.join(self.apps_path, path, "*.appspec")).first
+                spec = nil
+                if spec_file
+                    spec = Spider::App::AppSpec.load(spec_file)
+                    app_name = spec.app_id
+                else
+                    app_name = path
+                end
+                apps[app_name] = {
+                    :path => path,
+                    :spec => spec
+                }
+            end
+            apps
+        end
 
     end
 

data/lib/spiderfw/http/server.rb

@@ -78,18 +78,18 @@ module Spider; module HTTP
                             :ssl_cert => options[:ssl_cert], :ssl_private_key => options[:ssl_key])
                     end
                 end
-                do_shutdown = lambda{ |arg|
+                do_shutdown = lambda{
+                    Debugger.post_mortem = false
+                    # debugger
                     server.shutdown
                     ssl_server.shutdown if ssl_server
-                    Spider.shutdown
                     pid_file = File.join(Spider.paths[:var], 'run/server.pid')
                     begin
                         File.unlink(pid_file)
                     rescue Errno::ENOENT
                     end
                 }
-                trap('TERM', &do_shutdown)
-                trap('INT', &do_shutdown)
+                Spider.on_shutdown(&do_shutdown)
                 
                 thread.join
                 ssl_thread.join if ssl_thread
@@ -103,7 +103,11 @@ module Spider; module HTTP
                     File.open(pid_file, 'w') do |f|
                         f.write(Process.pid)
                     end
+                    $SPIDER_SCRIPT ||= $0
                     $0 = process_name
+                    STDIN.reopen "/dev/null"       # Free file descriptors and
+                    STDOUT.reopen "/dev/null", "a" # point them somewhere sensible
+                    STDERR.reopen STDOUT           # STDOUT/STDERR should go to a logfile
                     start.call
                 end
                 Process.detach(forked)
@@ -125,7 +129,11 @@ module Spider; module HTTP
                         Spider.logger.error("Install 'fssm' gem to enable respawning")
                     end
                 end
-                start.call unless spawner_started
+                unless spawner_started
+                    Spider.main_process_startup
+                    Spider.startup
+                    start.call 
+                end
             end
         end
         
@@ -148,15 +156,22 @@ module Spider; module HTTP
             rd, wr = IO.pipe
             if pid = fork
                 # Spawner
+                Spider.logger.debug("Spawner forked")
                 @child_pid = pid
-                exit_spawner = lambda{ 
-                    Spider.logger.debug "Spawner exiting" 
-                    exit 
-                }
-                trap('TERM', exit_spawner)
-                trap('INT', exit_spawner)
-                
-                $0 = 'spider-spawner'
+
+                unless @already_forked
+                    Spider.main_process_startup
+                    exit_spawner = lambda{ 
+                        Spider.logger.debug "Spawner exiting" 
+                        Process.kill 'KILL', @monitor_thread[:spawner_child_pid]
+                    }
+                    Spider.on_main_process_shutdown(&exit_spawner)
+                    Spider.main_process_startup
+                    $SPIDER_SCRIPT ||= $0
+                    $0 = 'spider-spawner'
+                end
+                @already_forked = true
+
                 wr.close
                 @monitor_thread[:spawner_child_pid] = pid
                 # TODO
@@ -166,6 +181,9 @@ module Spider; module HTTP
 
             else
                 # Child
+                $SPIDER_SPAWNED = true
+                trap('TERM'){ }
+                trap('INT'){ }
                 rd.close
                 Spider.spawner = wr
                 return unless @actions[action]
@@ -221,4 +239,4 @@ module Spider; module HTTP
         
     end
     
-end; end
+end; end

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

@@ -149,8 +149,8 @@ module Spider; module Model
                 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))
-                    existent = @model.where(el.name => 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)
                     end

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

@@ -17,13 +17,13 @@ module Spider; module Model
             c = Condition.and
             c[left_el] = (left..right)
             q = Query.new(c)
-            q.order_by(left_el)
+            q.order_by(left_el) unless element.attributes[:order] == false
             res = element.model.find(q)
             return [] unless res
             right_stack = []
             res.each do |obj|
                 if (right_stack.length > 0)
-                    right_stack.pop while (right_stack[right_stack.length-1] < obj.get(right_el))
+                    right_stack.pop while (right_stack[right_stack.length-1] && right_stack[right_stack.length-1] < obj.get(right_el))
                     obj.set(element.attributes[:tree_depth], right_stack.length)
                 end
                 right_stack << obj.get(right_el)
@@ -47,7 +47,8 @@ module Spider; module Model
                attributes[:tree_position] ||= :"#{name}_position"
                choice(attributes[:reverse], self, attributes[:reverse_attributes])
                element(name, self, attributes)
-               element(attributes[:tree_left], Fixnum, :hidden => true, :tree_element => name, :order => true)
+               order = attributes[:order] == false ? false : true
+               element(attributes[:tree_left], Fixnum, :hidden => true, :tree_element => name, :order => order)
                element(attributes[:tree_right], Fixnum, :hidden => true, :tree_element => name)
                element(attributes[:tree_depth], Fixnum, :unmapped => true, :hidden => true, :tree_element => name)
                element(attributes[:tree_position], Fixnum, :unmapped => true, :hidden => true, :tree_element => name)
@@ -162,9 +163,10 @@ module Spider; module Model
                    cnt = 0
                    parent.get(name).each do |sub|
                        cnt += 1
-                       return cnt if sub == self
+                       break if sub == self
                    end
-                   return nil
+                   cnt = nil if cnt = 0
+                   cnt
                end
 
            end

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

@@ -15,7 +15,7 @@ module Spider; module Model; module Storage; module Db
             :transactions => true,
             :foreign_keys => true
         }
-        @reserved_keywords = superclass.reserved_keywords
+        @reserved_keywords = superclass.reserved_keywords + ['interval']
         @safe_conversions = DbStorage.safe_conversions.merge({
             'CHAR' => ['VARCHAR', 'CLOB'],
             'VARCHAR' => ['CLOB'],
@@ -337,6 +337,7 @@ module Spider; module Model; module Storage; module Db
              columns = {}
              primary_keys = []
              foreign_keys = []
+             order = []
              connection do |c|
                  res = c.query("select * from #{table} where 1=0")
                  fields = res.fetch_fields
@@ -363,6 +364,7 @@ module Spider; module Model; module Storage; module Db
                          col[flag_name] = (flags & flag_val == 0) ? false : true
                      end
                      columns[f.name] = col
+                     order << f.name
                      primary_keys << f.name if f.is_pri_key?
                  end                 
                  res = c.query("select * from INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE constraint_schema = '#{@db_name}' and table_name = '#{table}'")
@@ -379,7 +381,7 @@ module Spider; module Model; module Storage; module Db
                  end
                  
              end
-             return {:columns => columns, :primary_keys => primary_keys, :foreign_key_constraints => foreign_keys}
+             return {:columns => columns, :order => order, :primary_keys => primary_keys, :foreign_key_constraints => foreign_keys}
          end
 
          def table_exists?(table)
@@ -394,6 +396,57 @@ module Spider; module Model; module Storage; module Db
              end
          end
          
+         def get_table_create_sql(table)
+             sql = nil
+             connection do |c|
+                 res = c.query("SHOW CREATE TABLE #{table}")
+                 sql = res.fetch_row[1]
+             end
+             sql
+         end
+         
+         
+         def dump_table_data(table, stream)
+             connection do |c|
+                 res = c.query("select * from #{table}")
+                 num = res.num_rows
+                 if num > 0
+                     fields = res.fetch_fields
+                     stream << "INSERT INTO `#{table}` (#{fields.map{ |f| "`#{f.name}`"}.join(', ')})\n"
+                     stream << "VALUES\n"
+                     cnt = 0
+                     while row = res.fetch_row
+                         cnt += 1
+                         stream << "("
+                         fields.each_with_index do |f, i|
+                             stream << dump_value(row[i], f)
+                             stream << ", " if i < fields.length - 1
+                         end
+                         stream << ")"
+                         if cnt < num
+                             stream << ",\n"
+                         else
+                             stream << ";\n"
+                         end
+                     end
+                     stream << "\n\n"
+                 end
+             end
+         end
+         
+         def dump_value(val, field)
+             return 'NULL' if val.nil?
+             type =  self.class.field_types[field.type]
+             if ['CHAR', 'VARCHAR', 'BLOB', 'TINY_BLOB', 'MEDIUM_BLOB', 'LONG_BLOB'].include?(type)
+                 val = val.gsub("'", "''").gsub("\n", '\n').gsub("\r", '\r')
+                 return "'#{val}'"
+             elsif ['DATE', 'TIME', 'DATETIME'].include?(type)
+                 return "'#{val}'"
+             else
+                 return val.to_s
+             end
+         end
+         
          # Schema methods
          
          def table_name(name)