spiderfw 0.6.16 → 0.6.17

data/apps/messenger/backends/sms/test.rb

@@ -0,0 +1,25 @@
+require 'apps/messenger/lib/sms_backend'
+
+module Spider; module Messenger; module Backends; module SMS
+    
+    module Test
+        include Messenger::SMSBackend
+
+        def self.sent_sms
+            @sent_sms ||= []
+        end
+
+        def self.after_test
+            @sent_sms = []
+        end
+        
+        def self.send_message(msg)
+            Spider.logger.debug("Sending SMS #{msg.ticket}")
+            self.sent_sms << msg
+        end
+        
+
+        
+    end
+    
+end; end; end; end

data/apps/messenger/config/test.config.yml

@@ -1,2 +1,7 @@
 set test:
-    messenger.email.backend: test
+    messenger.email.backend: test
+
+
+apps: 
+- portal
+- demografici

data/apps/messenger/controllers/mixins/messenger_helper.rb

@@ -22,9 +22,14 @@ module Spider; module Messenger
             klass ||= self.class.app if self.class.respond_to?(:app)
             klass ||= Spider.home
             msg = Spider::Messenger::MessengerHelper.send_email(klass, template, scene, from, to, headers, attachments, params)
-            @messenger_sent ||= {}
-            @messenger_sent[:email] ||= []
-            @messenger_sent[:email] << msg.ticket
+            sent_email(msg.ticket)
+            msg.ticket
+        end
+
+        def send_sms(to, text, params={})
+            msg = Spider::Messenger.sms(to, text, params)
+            sent_sms(msg.ticket)
+            msg.ticket
         end
         
         def self.send_email(klass, template, scene, from, to, headers={}, attachments=[], params={})
@@ -75,10 +80,30 @@ module Spider; module Messenger
             Messenger.email(from, to, mail_headers, mail_body, params)
         end
         
+        def sent_email(ticket)
+            sent_message(ticket, :email)
+        end
+
+        def sent_sms(ticket)
+            sent_message(ticket, :sms)
+        end
+
+        def sent_message(ticket, type)
+            return unless ticket
+            type = type.to_sym
+            @messenger_sent = Spider::Request.current[:messenger_sent]
+            @messenger_sent ||= {}
+            @messenger_sent[type] ||= []
+            @messenger_sent[type] << ticket
+            Spider::Request.current[:messenger_sent] = @messenger_sent
+        end
+        
         def after(action='', *params)
+            @messenger_sent = Spider::Request.current[:messenger_sent]
             return super unless Spider.conf.get('messenger.send_immediate') && @messenger_sent
-            Spider::Messenger.process_queue(:email, @messenger_sent[:email]) if @messenger_sent[:email]
-            Spider::Messenger.process_queue(:sms, @messenger_sent[:sms]) if @messenger_sent[:sms]
+            @messenger_sent.each do |type, msgs|
+                Spider::Messenger.process_queue(type, msgs)
+            end
         end
         
     end

data/apps/messenger/messenger.rb

@@ -3,11 +3,32 @@ require 'fileutils'
 module Spider
     
     module Messenger
+
+        def self.app_init
+            available_backends = {}
+            base = File.join(Spider::Messenger.path, 'backends')
+            Dir.new(base).each do |type|
+                next if type[0].chr == '.'
+                type_dir = File.join(base, type)
+                next unless File.directory?(type_dir)
+                available_backends[type.to_sym] = []
+                Dir.new(type_dir).each do |bcknd|
+                    next if bcknd[0].chr == '.'
+                    name = File.basename(bcknd, '.rb')
+                    available_backends[type.to_sym] << name
+                end
+            end
+            available_backends.each do |type, backends|
+                Spider.config_option("messenger.#{type}.backends")[:params][:choices] = backends
+                Spider.config_option("messenger.#{type}.backend")[:params][:choices] = backends
+            end
+
+        end
         
         def self.queues
             {
-                :email => { :label => _("Email"), :model => :Email }
-                # :sms => { :label => _("SMS"), :model => :SMS }
+                :email => { :label => _("Email"), :model => :Email },
+                :sms => { :label => _("SMS"), :model => :SMS }
             }
         end
         
@@ -117,6 +138,23 @@ module Spider
             msg.save
             return msg
         end
+
+
+        def self.after_test
+            self.backends.each do |queue, mods|
+                mods.each do |mod|
+                    mod.after_test if mod.respond_to?(:after_test)
+                end
+            end
+        end
+
+        def self.before_test
+            self.backends.each do |queue, mods|
+                mods.each do |mod|
+                    mod.after_test if mod.respond_to?(:after_test)
+                end
+            end
+        end
         
         
     end

data/apps/servant/lib/commands_processor.rb

@@ -101,7 +101,7 @@ module Spider; module Servant
         
         def install_apps(apps)
             require 'spiderfw/setup/app_manager'
-            Spider::AppManager.install_or_update(apps)
+            Spider::AppManager.get_apps(apps)
         end
         
     end

data/apps/worker/worker.rb

@@ -6,14 +6,19 @@ require 'apps/worker/models/job'
 module Spider
 
     module Worker
-        @pid_file = Spider.paths[:var]+'/run/worker.pid'
-        @script_file = Spider.paths[:config]+'/worker.rb'
-        @scripts_dir = Spider.paths[:config]+'/worker'
-        @mutex = Mutex.new
-        @options = {
-            :fork => Spider.conf.get('worker.fork'),
-            :detach => Spider.conf.get('worker.detach')
-        }
+        @options = {}
+
+        def self.app_init
+            @pid_file = Spider.paths[:var]+'/run/worker.pid'
+            @script_file = Spider.paths[:config]+'/worker.rb'
+            @scripts_dir = Spider.paths[:config]+'/worker'
+            @mutex = Mutex.new
+            @options = {
+                :fork => Spider.conf.get('worker.fork'),
+                :detach => Spider.conf.get('worker.detach')
+            }
+        end
+
         
         def self.pid_file
             @pid_file
@@ -146,10 +151,10 @@ module Spider
             return job.uuid
         end
         
-        def self.cron(time, params, &proc)
+        def self.cron(time, params=nil, &proc)
             raise "The cron method must be used only in worker init scripts" unless @runner
             check_params(params) if params
-            @runner.cron(time, params)
+            @runner.cron(time, params, &proc)
         end
         
         def self.every(time, params=nil, &proc)

data/lib/spiderfw/app.rb

@@ -58,7 +58,7 @@ module Spider
                         if u = Spider.conf.get("#{@dotted_name}.http_url") 
                             if action
                                 u += '/' if u[-1].chr != '/'
-                                u += action
+                                u += action.to_s
                             end
                             return u 
                         end
@@ -167,10 +167,10 @@ module Spider
                     end
                     
                     def relative_path
-                        if (@path.index(Spider.paths[:apps]) == 0)
+                        if Spider.paths[:apps] && @path.index(Spider.paths[:apps]) == 0
                             return @path[Spider.paths[:apps].length+1..-1]
                         else
-                            return @path[Spider.paths[:core_apps].length+1..-1]
+                            return @path[$SPIDER_PATHS[:core_apps].length+1..-1]
                         end
                     end
                     

data/lib/spiderfw/cache/template_cache.rb

@@ -136,6 +136,10 @@ module Spider
             end
             lock_file.flock(File::LOCK_UN)
         end
+
+        def clear!
+            FileUtils.rm_rf(Dir.glob(File.join(@path, '*')))
+        end
         
         
         

data/lib/spiderfw/cmd/cmd.rb

@@ -32,11 +32,9 @@ module Spider; module CommandLine
                 }
                 opt.on("--devel", _("Set runmode to devel"), "-d") do
                     $SPIDER_RUNMODE = 'devel'
-                    Spider.runmode = 'devel' if Spider && Spider.respond_to?(:runmode=)
                 end
                 opt.on("--test", _("Set runmode to test")) do
                     $SPIDER_RUNMODE = 'test'
-                    Spider.runmode = 'test' if Spider && Spider.respond_to?(:runmode=)
                 end
                 opt.on("--http-proxy [PROXY]", _("Proxy server to use for http operations (http://user:pass@host:port)")){ |p|
                     ENV['http_proxy'] = p

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

@@ -119,23 +119,46 @@ class AppCommand < CmdParse::Command
             opt.on("--no-activate", _("Don't activate installed apps")){ |s| @no_activate = true }
         end
         install.set_execution_block do |args|
+            $SPIDER_INTERACTIVE = true
             unless File.exist?('init.rb') && File.directory?('apps')
                 puts _("Please execute this command from the home folder")
                 exit
             end
             require 'spiderfw/setup/app_manager'
             options = {
-                :git => @git, :all => @all, :no_deps => @no_deps, :optional => @optional, 
+                :use_git => @git, :all => @all, :no_deps => @no_deps, :optional => @optional, 
                 :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
             }
             options[:url] = @server_url if @server_url
-            Spider::AppManager.install_apps(args, options)
+            if @git && !Spider::AppManager.git_available?
+                puts _("git gem not available; install git gem for Git support")
+                exit
+            end
+            apps = args
+            installed = []
+            apps.each do |app|
+                installed << app if Spider::AppManager.installed?(app)
+            end
+            unless installed.empty?
+                puts _("%s already installed") % installed.join(', ')
+            end
+            specs = Spider::AppManager.resolve(apps, options)
+            iapps = specs[:install].map{ |spec| spec.app_id }
+            deps = iapps - apps
+            unless deps.empty?
+                puts _("The following apps will be installed as a dependency: %s") % deps.join(', ')
+            end
+            unless specs[:update].empty?
+                puts _("The following apps will be updated as a dependency: %s") % specs[:update].map{ |s| s.app_id }.join(', ')
+            end
+            Spider::AppManager.new.install(specs, options)
         end
         self.add_command(install)
         
         activate = CmdParse::Command.new('activate', false )
         activate.short_desc = _("Activate an app")
         activate.set_execution_block do |args|
+            $SPIDER_INTERACTIVE = true
             apps = args
             require 'spiderfw/spider'
             apps = Spider.get_app_deps(apps)
@@ -148,7 +171,7 @@ class AppCommand < CmdParse::Command
         update.options = CmdParse::OptionParserWrapper.new do |opt|
             opt.on("--all", _("Update all apps"), "-a"){ |a| @all = true }
             opt.on("--no-git", _("Don't use git for updating apps"), "-g"){ |r| @no_git = true }
-            opt.on("--no-dependencies", _("Don't install other apps this one depends on"), "-d"){ |d| 
+            opt.on("--no-dependencies", _("Don't install/update other apps this one depends on"), "-d"){ |d| 
                 @no_deps = true 
             }
             opt.on("--no-gems", _("Don't install ruby gems this app depends on"), "-g"){ |g| @no_gems = true }
@@ -156,8 +179,13 @@ class AppCommand < CmdParse::Command
             opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
                 @no_optional_gems = true
             }
+            opt.on("--no-activate", _("Don't activate installed apps, if any")){ |s| @no_activate = true }
+            opt.on("--refresh", _("Update apps even if the version has not changed"), "-r"){ |r| @refresh = true }
+            opt.on("--no-clear-cache", _("Don't clear cache"), "-C"){ |c| @no_clear_cache = true }
+            opt.on("--no-restart", _("Don't restart the server after the udpate"), "-R"){ |r| @no_restart = true }
         end
         update.set_execution_block do |args|
+            $SPIDER_INTERACTIVE = true
             unless File.exist?('init.rb') && File.directory?('apps')
                 puts _("Please execute this command from the home folder")
                 exit
@@ -165,12 +193,67 @@ class AppCommand < CmdParse::Command
             require 'spiderfw/setup/app_manager'
             options = {
                 :no_git => @no_git, :all => @all, :no_deps => @no_deps, :no_optional => @no_optional, 
-                :no_gems => @no_gems, :no_optional_gems => @no_optional_gems
+                :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate,
+                :clear_cache => !@no_clear_cache, :restart => !@no_restart
             }
             options[:url] = @server_url if @server_url
-            Spider::AppManager.update_apps(args, options)
+            apps = args
+            options[:refresh] = apps if @refresh
+            apps.each do |app|
+                unless Spider::AppManager.installed?(app)
+                    puts _("App %s is not installed") % app
+                    exit
+                end
+            end
+            specs = Spider::AppManager.resolve(apps, options)
+            unless specs[:install].empty?
+                puts _("The following apps will be installed as a dependency: %s") % specs[:install].map{ |s| s.app_id }.join(', ')
+            end
+            uapps = specs[:update].map{ |spec| spec.app_id }
+            udeps = uapps - apps
+            unless udeps.empty?
+                puts _("The following apps will be updated as a dependency: %s") % udeps.join(', ')
+            end
+            noupdate = apps - uapps
+            unless noupdate.empty?
+                puts _("Already up-to-date: %s") % noupdate.join(', ')
+            end
+            Spider::AppManager.new.install(specs, options)
         end
         self.add_command(update)
         
+        setup = CmdParse::Command.new( 'setup', false )
+        setup.short_desc = _("Setup an app")
+        setup.options = CmdParse::OptionParserWrapper.new do |opt|
+            opt.on("--from [VERSION]", _("Assume a specific version is installed"), "-f"){ |from|
+                @from = Gem::Version.new(from)
+            }
+            opt.on("--to [VERSION]", _("Setup to a specific version"), "-t"){ |to|
+                @to = Gem::Version.new(to)
+            }
+            opt.on("--version [VERSION]", _("Only run the setup script for the given version"), "-v"){ |v|
+                @version = Gem::Version.new(v)
+            }
+            opt.on("--all", _("Setup all active apps")){ |all|
+                @all = true
+            }
+            opt.on("--no-cleanup", _("Don't cleanup"), "-C"){ |no_cleanup| @no_cleanup = true }
+        end
+        
+        setup.set_execution_block do |args|
+            $SPIDER_INTERACTIVE = true
+            require 'spiderfw/setup/app_manager'
+            tasks = Spider::AppManager.new.setup(name)
+            unless @no_cleanup
+                tasks.each do |t|
+                    begin
+                        t.do_cleanup
+                    rescue => exc
+                        Spider.logger.error(exc)
+                    end
+                end
+            end
+        end
+        
     end
-end
+end

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

@@ -1,5 +1,3 @@
-require 'spiderfw/setup/setup_task'
-
 class SetupCommand < CmdParse::Command
 
 
@@ -23,10 +21,13 @@ class SetupCommand < CmdParse::Command
             opt.on("--all", _("Setup all active apps")){ |all|
                 @all = true
             }
+            opt.on("--no-cleanup", _("Don't cleanup"), "-C"){ |no_cleanup| @no_cleanup = true }
         end
 
         set_execution_block do |apps|
-            require 'spiderfw'
+            $SPIDER_INTERACTIVE = true
+            require 'spiderfw/spider'
+            Spider.init_base
             apps = Spider.apps.keys if @all
             if (apps.length > 1) && (@to || @from || @version)
                 raise "Can't use --from, --to or --version with multiple apps"
@@ -38,48 +39,20 @@ class SetupCommand < CmdParse::Command
                 wizard.run
                 
             end
+            tasks = []
             apps.each do |name|
-                Spider.load_app(name) unless Spider.apps[name]
-                app = Spider.apps[name]
-                path = app.setup_path
-                current = @from || app.installed_version
-                new_version = @to || app.version
-                next unless File.exist?(path)
-                tasks = []
-                if @version
-                    tasks = ["#{@version}.rb"]
-                else
-                    tasks = Dir.entries(path).reject{ |p| p[0].chr == '.'}.sort{ |a, b| 
-                        va = Gem::Version.new(File.basename(a, '.rb'))
-                        vb = Gem::Version.new(File.basename(b, '.rb'))
-                        va <=> vb
-                    }
-                    if @from || @to
-                        tasks.reject!{ |t|
-                            v = Gem::Version.new(File.basename(t, '.rb'))
-                            true if @from && v < @from
-                            true if @to && v > @to
-                            false
-                        }
-                    end
-                end
-                done_tasks = []
-                Spider::Model::Managed.no_set_dates = true
-                tasks.each do |task|
-                    Spider.logger.info("Running setup task #{path+'/'+task}")
-                    t = Spider::SetupTask.load("#{path}/#{task}")
-                    t.app = app
+                require 'spiderfw/setup/app_manager'
+                tasks += Spider::AppManager.new.setup(name)
+            end
+            unless @no_cleanup
+                tasks.each do |t|
                     begin
-                        done_tasks << t
-                        t.do_up
+                        t.do_cleanup
                     rescue => exc
-                        done_tasks.each{ |dt| dt.do_down } # FIXME: rescue and log errors in down
-                        raise
+                        Spider.logger.error(exc)
                     end
                 end
-                Spider::Model::Managed.no_set_dates = false
-                app.installed_version = app.version
-            end 
+            end
         end
 
 

data/lib/spiderfw/config/configuration.rb

@@ -292,6 +292,7 @@ module Spider
         def to_hash
             h = {}
             self.options.each do |k|
+                k = k.first
                 v = self[k]
                 if v.is_a?(self.class)
                     v = v.to_hash

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

@@ -30,7 +30,7 @@ module Spider
         :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? true : false }
     config_option 'webserver.port', _("Port to use for the http server"), :type => Fixnum, :default => 8080
     config_option 'webserver.force_threads', _("Force threading on non-threaded adapters"), :type => Spider::DataTypes::Bool,
-        :default => Proc.new{ RUBY_VERSION_PARTS[1] == '8' && !Object.const_defined?(:PhusionPassenger) ? true : false }
+        :default => Proc.new{ Spider.runmode != 'test' && RUBY_VERSION_PARTS[1] == '8' && !Object.const_defined?(:PhusionPassenger) ? true : false }
     config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
     config_option 'webserver.respawn_on_change', _("Restart the webserver when application code changes"), :type => Spider::Bool,
         :default => Proc.new{ RUBY_PLATFORM !~ /win32|mingw32/ && Spider.config.get('runmode') == 'devel' ? true : false }
@@ -104,12 +104,12 @@ module Spider
     config_option 'http.charset', _("The charset to use for http requests"), :default => 'UTF-8'
     
     config_option 'log.console', _("Level of debug output to console"), 
-        :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? :DEBUG : false },
+        :default => Proc.new{ Spider.runmode == 'devel' ? :DEBUG : false },
         :process => lambda{ |opt| opt && opt != 'false' ? opt.to_s.upcase.to_sym : false },
         :choices => [false, :DEBUG, :WARN, :INFO, :ERROR]
     config_option 'log.errors', _("Log errors to errors.log file"), :type => Spider::DataTypes::Bool, :default => true
     config_option 'log.level', _("Log level to use for main log file (false for no logging)"),
-        :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? :DEBUG : :INFO },
+        :default => Proc.new{ Spider.runmode == 'devel' ? :DEBUG : :INFO },
         :choices => [false, :DEBUG, :WARN, :INFO, :ERROR],
         :process => lambda{ |opt| opt && opt != 'false' ? opt.to_s.upcase.to_sym : false }
     config_option 'log.file_name', _("Name of the main log file"), :default => 'site.log'
@@ -159,7 +159,7 @@ module Spider
        
         
     config_option 'errors.send_email', _("Send an e-mail to the technical administrator when errors occur"), :type => Spider::DataTypes::Bool,
-         :default => lambda{ Spider.config.get('runmode') == 'production' ? true : false }
+         :default => lambda{ Spider.runmode == 'production' ? true : false }
     
     config_option 'devel.trace.extended', _("Use ruby-debug to provide extended traces"), :default => lambda{
         RUBY_VERSION_PARTS[1] == '8'
@@ -168,19 +168,20 @@ module Spider
     config_option 'devel.trace.show_instance_variables', _("Show locals in debug traces"), :default => true
     
     config_option 'javascript.compress', _("Compress JavaScript files"), 
-        :default => lambda{ Spider.config.get('runmode') == 'production' ? true : false }, :type => Spider::DataTypes::Bool
+        :default => lambda{ Spider.runmode == 'production' ? true : false }, :type => Spider::DataTypes::Bool
     config_option 'css.compress', _("Combine CSS files"), 
-        :default => lambda{ Spider.config.get('runmode') == 'production' ? true : false }, :type => Spider::DataTypes::Bool
+        :default => lambda{ Spider.runmode == 'production' ? true : false }, :type => Spider::DataTypes::Bool
     config_option 'css.cachebuster', _("Use cache busters for CSS urls"), :type => Symbol,
         :default => :soft, :choices => [false, :soft, :hard, :hardcopy]
     config_option 'assets.use_cdn', _("Use a Content Delivery Network for assets if defined"), :type => Spider::Bool,
-        :default => lambda{ Spider.config.get('runmode') == 'production' ? true : false }
+        :default => lambda{ Spider.runmode == 'production' ? true : false }
     
     config_option 'http_proxy', _("Proxy to use for http clients (http://user:pass@host:port)"), :type => String,
         :do => lambda{ |val| ENV['http_proxy'] = val }
         
     config_option 'resources.disable_custom', _("Disable resource overriding in home"), :type => Spider::Bool, :default => false
-
+    
+    config_option 'migrations.window', _("Fetch window to use when migrating models"), :type => Fixnum, :default => 100
     
     
 end

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

@@ -211,6 +211,15 @@ module Spider; module ControllerMixins
                 @http_auth_realm
             end
             
+            
+            def http_url(action=nil)
+                return nil unless Spider.site
+                u = "http://#{Spider.site.domain}"
+                u += ":#{Spider.site.port}" unless Spider.site.port == 80
+                u += HTTPMixin.reverse_proxy_mapping(self.url(action))
+                u
+            end
+            
         end
         
         class HTTPStatus < RuntimeError

data/lib/spiderfw/env.rb

@@ -1,7 +1,9 @@
 RUBY_VERSION_PARTS = RUBY_VERSION.split('.')
 ENV['LC_CTYPE'] = 'en_US.UTF-8'
 
-$SPIDER_PATH = File.expand_path(File.dirname(__FILE__)+'/../..')
+$SPIDER_PATH ||= File.expand_path(File.dirname(__FILE__)+'/../..')
+$SPIDER_PATHS ||= {}
+$SPIDER_PATHS[:core_apps] ||= File.join($SPIDER_PATH, 'apps')
 $SPIDER_LIB = $SPIDER_PATH+'/lib'
 $SPIDER_RUN_PATH ||= Dir.pwd
 ENV['GETTEXT_PATH'] += ',' if (ENV['GETTEXT_PATH'])

data/lib/spiderfw/i18n/cldr.rb

@@ -13,13 +13,10 @@ module Spider; module I18n
 
         end
 
-        def localize_date_time(object, format = :default, options={})
+        def localize_date_time(object, format = 'medium', options={})
             options[:calendar] ||= 'gregorian'
-            
-            if (format == :default)
-                format = @cldr.calendar.dateformat_defaults[options[:calendar]]
-            end
-            
+            format = 'medium' if format == :default
+                        
             time_format = nil
             date_format = nil
             format_string = nil
@@ -30,7 +27,7 @@ module Spider; module I18n
                 date_format = @cldr.calendar.dateformats[options[:calendar].to_sym][format.to_s].dup
             end
             if (date_format && time_format)
-                dt_f = @cldr.calendar.datetimeformats[options[:calendar].to_s]
+                dt_f = @cldr.calendar.datetimeformats[options[:calendar].to_sym][format.to_s]
                 format_string = dt_f.sub('{1}', date_format).sub('{0}', time_format)
             else
                 format_string = date_format ? date_format : time_format
@@ -59,22 +56,20 @@ module Spider; module I18n
             if (time_format)
                 am = @cldr.calendar.am[options[:calendar].to_s]
                 pm = @cldr.calendar.pm[options[:calendar].to_s]
-                format_string.gsub!(/%p/, object.hour < 12 ? am : pm) if object.respond_to? :hour
+                format_string.gsub!(/%p/, object.hour < 12 ? 'am' : 'pm') if object.respond_to? :hour
             end
             object.strftime(format_string)
         end
         
         # FIXME: add extended format handling like in localize
-        def parse_dt(string, format = :default, options = {})
+        def parse_dt(string, format = 'medium', options = {})
+            format = 'medium' if format == :default
             options[:calendar] ||= 'gregorian'
             
-            if (format == :default)
-                format = @cldr.calendar.dateformat_defaults[options[:calendar]]
-            end
             time_format = @cldr.calendar.timeformats[options[:calendar].to_sym][format.to_s].dup
             date_format = @cldr.calendar.dateformats[options[:calendar].to_sym][format.to_s].dup
             if (options[:return] == :datetime)
-                dt_f = @cldr.calendar.datetimeformats[options[:calendar].to_s]
+                dt_f = @cldr.calendar.datetimeformats[options[:calendar].to_s][format.to_s]
                 format_string = dt_f.sub('{1}', date_format).sub('{0}', time_format)
                 klass = DateTime
             elsif (options[:return] == :date)
@@ -166,6 +161,37 @@ module Spider; module I18n
             separator = @cldr.number.symbol_decimal
             Spider::I18n.do_parse_number(string, delimiter, separator, options)
         end
+
+        def list(enumerable)
+            return enumerable.join(', ') unless @cldr.core.respond_to?(:list_patterns) # old cldr version
+            patterns = @cldr.core.list_patterns
+            str = ""
+
+            def sub_pattern(pattern, items)
+                str = pattern.clone
+                items.each_index do |i|
+                    str.sub!("{#{i}}", items[i])
+                end
+                str
+            end
+            if pattern = patterns[enumerable.length.to_s]
+                return sub_pattern(pattern, enumerable)
+            end
+            length = enumerable.length
+            str = enumerable.last.to_s
+            (length-2).downto(0) do |i|
+                pattern = nil
+                if i == length -2
+                    pattern = patterns['end']
+                elsif i == 0
+                    pattern = patterns['start']
+                end
+                pattern ||= patterns['middle']
+                str = sub_pattern(pattern, [enumerable[i].to_s, str])
+            end
+            return str
+
+        end
         
     end