spiderfw 0.5.13 → 0.5.14

data/lib/spiderfw/controller/response.rb

@@ -20,15 +20,21 @@ module Spider
             self.class.send(:attr_accessor, key) # FIXME: threadsafety
         end
         
+        def no_cookies
+            @no_cookies = true
+        end
+        
         def prepare_headers
-            @headers['Set-Cookie'] ||= []
-            @cookies.each do |k, v|
-                h = "#{k}=#{v}"
-                h += '; expires='+v.expires.strftime("%a, %b %d %Y %H:%M:%S %Z") if (v.expires.respond_to?(:strftime))
-                h += "; path=#{v.path}" if (v.path)
-                h += "; domain=#{v.domain}" if (v.domain)
-                h += "; secure" if (v.secure)
-                @headers['Set-Cookie'] << h
+            unless @no_cookies
+                @headers['Set-Cookie'] ||= []
+                @cookies.each do |k, v|
+                    h = "#{k}=#{v}"
+                    h += '; expires='+v.expires.strftime("%a, %b %d %Y %H:%M:%S %Z") if (v.expires.respond_to?(:strftime))
+                    h += "; path=#{v.path}" if (v.path)
+                    h += "; domain=#{v.domain}" if (v.domain)
+                    h += "; secure" if (v.secure)
+                    @headers['Set-Cookie'] << h
+                end
             end
             Spider::Logger.debug("HEADERS:")
             Spider::Logger.debug(@headers)

data/lib/spiderfw/controller/scene.rb

@@ -27,6 +27,11 @@ module Spider
             end
         end
         
+        def merge!(other)
+            @table.merge!(other.instance_variable_get("@table"))
+            self
+        end
+        
     end
     
     

data/lib/spiderfw/controller/session/file_session.rb

@@ -38,7 +38,7 @@ module Spider
                     begin
                         data = Marshal.restore(f.read)
                     rescue => exc
-                        Spider::Logger.error("Corrupt session")
+                        Spider::Logger.error("Corrupt session: #{exc.message}")
                         data = {}
                     end
                     mtime = f.mtime

data/lib/spiderfw/create.rb

@@ -32,6 +32,20 @@ module Spider
             dest_path = path+'/'+name
             source_path = $SPIDER_PATH+'/blueprints/home'
             create(source_path, dest_path)
+            
+            begin
+                require 'grit'
+
+                cwd = Dir.getwd
+                Dir.chdir(dest_path)
+                repo = Grit::Repo.init(dest_path)
+                repo.add('apps', 'config', 'init.rb', 'public')
+                repo.add('.gitignore')
+                repo.commit_index(_("Created repository"))
+                Dir.chdir(cwd)
+            rescue LoadError
+                puts "Grit not installed, cannot init repo"
+            end
         end
         
         def self.create(source_path, dest_path, replacements={}, erb_binding=nil)
@@ -66,6 +80,9 @@ module Spider
                     dst.close
                 end
             end
+            Dir.glob("#{dest_path}/**/.dirs").each do |f|
+                File.unlink(f)
+            end
         end
         
     end

data/lib/spiderfw/home.rb

@@ -1,26 +1,38 @@
+require 'pathname'
+
 module Spider
-    
+
     class Home
         attr_reader :path
-        
+
         def initialize(path)
             @path = path
         end
-        
+
         def controller
             require 'spiderfw/controller/home_controller'
             Spider::HomeController
         end
-        
+
         def route_apps
             Spider.route_apps
         end
-        
+
         def load_apps(*args)
             Spider.load_apps(*args)
         end
-        
+
+        def list_apps
+            apps_dir = Pathname.new(Spider.paths[:apps])
+            apps = []
+            Dir.glob("#{Spider.paths[:apps]}/**/_init.rb").each do |path|
+                dir = Pathname.new(File.dirname(path))
+                apps << dir.relative_path_from(apps_dir).to_s
+            end
+            apps
+        end
+
     end
-    
-    
+
+
 end

data/lib/spiderfw/http/adapters/mongrel.rb

@@ -46,17 +46,20 @@ module Spider; module HTTP
         end
         
         def self.send_headers(controller_response, response)
-            controller_response.prepare_headers
-            response.status = controller_response.status
-            response.send_status(nil)
-            controller_response.headers.each do |key, val|
-                if (val.is_a?(Array))
-                    val.each{ |v| response.header[key] = v }
-                else
-                    response.header[key] = val
+            begin
+                controller_response.prepare_headers
+                response.status = controller_response.status
+                response.send_status(nil)
+                controller_response.headers.each do |key, val|
+                    if (val.is_a?(Array))
+                        val.each{ |v| response.header[key] = v }
+                    else
+                        response.header[key] = val
+                    end
                 end
+                response.send_header
+            rescue Errno::EPIPE, IOError
             end
-            response.send_header
         end
         
         def send_headers
@@ -117,7 +120,6 @@ module Spider; module HTTP
 
             controller_response = Spider::Response.new
             if (Spider.conf.get('http.auto_headers'))
-                Spider::Logger.debug("ENABLING AUTO HEADERS: #{Spider.conf.get('http.auto_headers')}")
                 controller_response.server_output = MongrelIO.new(response, controller_response)
             else
                 controller_response.server_output = response
@@ -127,14 +129,11 @@ module Spider; module HTTP
                 main_block = lambda do
                     controller = ::Spider::HTTPController.new(controller_request, controller_response)
                     controller.extend(Spider::FirstResponder)
-                    Spider::Logger.debug("CONTROLLER: #{controller}")
                     controller.before(path)
                     MongrelIO.send_headers(controller_response, response) unless Spider.conf.get('http.auto_headers')
                     controller.execute(path)
                     Spider::Logger.debug("Response:")
                     Spider::Logger.debug(controller.response)
-                    controller.after(path)
-                    Spider::Logger.debug("Controller #{controller} DONE")
                 end
                 if (Spider.conf.get('webserver.timeout'))
                     @timer.timeout(Spider.conf.get('webserver.timeout')) do
@@ -145,13 +144,23 @@ module Spider; module HTTP
                 end
             rescue => exc
                 Spider.logger.error(exc)
-                controller.ensure() if controller
+                controller.ensure if controller
+                controller = nil
             ensure
                 MongrelIO.send_headers(controller_response, response) unless response.header_sent
                 Spider::Logger.debug("---- Closing Mongrel Response ---- ")
-                response.finished
+                unless response.socket.closed?
+                    response.socket.flush
+                    response.finished
+                    response.socket.close
+                end
                 Spider.request_finished
             end
+            if controller
+                controller.after(path)
+                controller.ensure
+            end
+            
             
             
         end

data/lib/spiderfw/http/adapters/rack.rb

@@ -8,7 +8,11 @@ module Spider; module HTTP
         
         
         def body(&proc)
-            @rack_input.each{ |buf| yield buf }
+            if block_given?
+                @rack_input.each{ |buf| yield buf }
+            else
+                @rack_input
+            end
         end
         
         
@@ -120,13 +124,14 @@ module Spider; module HTTP
                 end
             end
             
-            controllerThread = Thread.start &run_block
             if (Spider.conf.get('webserver.force_threads'))
+                controllerThread = Thread.start &run_block
                 while (!controller_done && !controller_response.server_output.headers_sent?)
                     Thread.stop
                 end
-            else
                 controllerThread.join
+            else
+                run_block.call
             end
 
             Spider.logger.debug("Rack responding")

data/lib/spiderfw/http/adapters/webrick.rb

@@ -35,6 +35,7 @@ module Spider; module HTTP
                 options[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(File.open(opts[:ssl_private_key]).read)
 #                options[:SSLCertName] = [ [ "CN",WEBrick::Utils::getservername ] ]
             end
+            options[:Logger] = Spider.logger
             @server = ::WEBrick::HTTPServer.new(options)
             @server.mount("/", WEBrickServlet)
             @server.start

data/lib/spiderfw/http/server.rb

@@ -24,6 +24,7 @@ module Spider; module HTTP
         
         def start(opts={})
             @options = opts
+            Spider.logger.info{ "Routes: \n"+Spider::HomeController.print_app_routes }
             start_server(opts)
         end
         

data/lib/spiderfw/i18n/cldr.rb

@@ -79,6 +79,9 @@ module Spider; module I18n
             elsif (options[:return] == :date)
                 format_string = date_format
                 klass = Date
+            elsif (options[:return] == :time)
+                format_string = time_format
+                klass = Time
             end
             replacements = [
                 [/y{1,4}/, '%Y'], # year      don't use two digits year [/y{1,2}/, '%y'],
@@ -92,7 +95,11 @@ module Spider; module I18n
                 [/z{1,4}/, '%Z'], [/Z{1,4}/, '%Z'], [/V{1,4}/, '%Z'] # time zone
             ]
             format_string = mgsub(format_string, replacements)
-            klass.strptime(string, format_string)
+            if options[:return] == :time
+                DateTime.strptime("01-01-2000T#{string}#{Time.now.strftime('%Z')}", "%d-%m-%YT#{format_string}%Z").to_local_time
+            else
+                klass.strptime(string, format_string)
+            end
         end
         
         

data/lib/spiderfw/i18n/i18n.rb

@@ -22,6 +22,8 @@ module Spider
             
             def provider(locale)
                 @locales[locale] = load_locale(locale) unless @locales[locale]
+                Spider::Logger.warn("No provider found for locale #{locale}") unless @locales[locale]
+
                 unless @locales[locale]
                     default = Spider.conf.get('i18n.default_locale')
                     load_locale(default) unless @locales[default]
@@ -55,7 +57,6 @@ module Spider
                 raise ArgumentError, "Object must be a Date, DateTime or Time object. #{object.inspect} given." unless object.respond_to?(:strftime)
                 p = provider(locale)
                 unless p
-                    Spider::Logger.error("No provider found for locale #{locale}")
                     return object.to_s
                 end
                 return p.localize_date_time(object, format, options)
@@ -64,7 +65,6 @@ module Spider
             def localize_number(locale, object, precision=nil, options={})
                 p = provider(locale)
                 unless p
-                    Spider::Logger.error("No provider found for locale #{locale}")
                     return object.to_s
                 end
                 return p.localize_number(object, precision, options)
@@ -80,6 +80,7 @@ module Spider
                 rounded_number = (Float(object) * (10 ** precision)).round.to_f / 10 ** precision
                 parts = rounded_number.to_s.split('.')
                 parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+                return parts[0] if precision == 0
                 parts[1] += "0"*(precision-parts[1].length)
                 parts.join(separator)
             end
@@ -87,7 +88,6 @@ module Spider
             def parse_dt(locale, string, format = :default, options={})
                 p = provider(locale)
                 unless p
-                    Spider::Logger.error("No provider found for locale #{locale}")
                     return Date.parse(string)
                 end
                 return p.parse_dt(string, format, options)
@@ -104,7 +104,6 @@ module Spider
             def parse_number(locale, string)
                 p = provider(locale)
                 unless p
-                    Spider::Logger.error("No provider found for locale #{locale}")
                     return nil
                 end
                 return p.parse_number(string)

data/lib/spiderfw/i18n/javascript_parser.rb

@@ -0,0 +1,54 @@
+require 'gettext/tools'
+require 'spiderfw/templates/blocks/text'
+
+module Spider; module I18n
+
+    module JavascriptParser
+        module_function
+        
+        GettextRegexp = /_\(['"]([^\)'"]+)['"](,\s*[^\)]\s*)*\)/
+        
+        
+
+        def target?(file)
+            File.extname(file) == '.js'
+        end
+
+        def parse(file, ary)
+            f = File.new(file)
+            cnt = 0
+            my_ary = []
+            f.each_line do |line|
+                cnt += 1
+                scanner = ::StringScanner.new(line)
+                while scanner.scan_until(GettextRegexp)
+                    str = scanner.matched
+                    str =~ GettextRegexp
+                    found = false
+                    (ary+my_ary).each do |msg|
+                        if (msg[0] == $1)
+                            msg << "#{file}:#{cnt}"
+                            found = true
+                            break
+                        end
+                    end
+                    my_ary << [$1, "#{file}:#{cnt}"] unless found
+                end
+            end
+            f.close
+            unless my_ary.empty?
+                dir = File.dirname(file)
+                name = File.basename(file, '.js')
+                i18n_file = File.join(dir, "#{name}.i18n.json")
+                File.open(i18n_file, 'w') do |f|
+                    f << my_ary.collect{ |a| a[0] }.to_json
+                end
+            end
+            return ary + my_ary 
+        end
+
+    end
+    
+    GetText::RGetText.add_parser(JavascriptParser)
+
+end; end