knjrbfw 0.0.8 → 0.0.9

data/lib/knj/erb/include.rb

@@ -1,248 +1,248 @@
 class ERuby
-	def self.load_settings
-		@settings_loaded = true
-		@inseq_cache = false
-		@inseq_rbc = false
-		@java_compile = false
-		
-		if RUBY_PLATFORM == "java"
-			@java_compile = true
-			@java_factory = javax.script.ScriptEngineManager.new
-			@java_engine = @java_factory.getEngineByName("jruby")
-			@eruby_java_cache = {}
-		elsif RUBY_VERSION.slice(0..2) == "1.9" and RubyVM::InstructionSequence.respond_to?(:compile_file)
-			@eruby_rbyte = {}
-			@inseq_cache = true
-			
-			if RubyVM::InstructionSequence.respond_to?(:load)
-				@inseq_rbc = true
-			end
-		end
-		
-		@inseq_rbc = false #this is not possible yet in Ruby... maybe in 1.9.3?
-	end
-	
-	def self.import(filename)
-		ERuby.load_settings if !@settings_loaded
-		
-		filename = File.expand_path(filename)
-		pwd = Dir.pwd
-		Dir.chdir(File.dirname(filename))
-		
-		fpath = "#{KnjEruby.filepath}/cache/#{filename.gsub("/", "_").gsub(".", "_")}"
-		pi = Knj::Php.pathinfo(filename)
-		cachename = fpath + ".cache"
-		
-		filetime = File.mtime(filename)
-		cacheexists = File.exists?(cachename)
-		cachetime = File.mtime(cachename) if File.exists?(cachename)
-		
-		if !cacheexists or filetime > cachetime
-			KnjEruby.load_file(File.basename(filename), {:cachename => cachename})
-			cachetime = File.mtime(cachename)
-			reload_cache = true
-		end
-		
-		if @java_compile
-			if !@eruby_java_cache[cachename] or reload_cache
-				#@eruby_java_cache[cachename] = @java_engine.compile(File.read(cachename))
-				@eruby_java_cache[cachename] = File.read(cachename)
-			end
-			
-			#@eruby_java_cache[cachename].eval
-			eval(@eruby_java_cache[cachename])
-		elsif @inseq_cache
-			if @inseq_rbc
-				bytepath = pi["dirname"] + "/" + pi["basename"] + ".rbc"
-				byteexists = File.exists?(bytepath)
-				bytetime = File.mtime(bytepath) if File.exists?(bytepath)
-				
-				if !File.exists?(bytepath) or cachetime > bytetime
-					res = RubyVM::InstructionSequence.compile_file(filename)
-					data = Marshal.dump(res.to_a)
-					File.open(bytepath, "w+") do |fp|
-						fp.write(data)
-					end
-				end
-			end
-			
-			if @inseq_rbc
-				res = Marshal.load(File.read(bytepath))
-				RubyVM::InstructionSequence.load(res).eval
-			else
-				if !@eruby_rbyte[cachename] or reload_cache
-					@eruby_rbyte[cachename] = RubyVM::InstructionSequence.new(File.read(cachename))
-					#@eruby_rbyte[cachename] = RubyVM::InstructionSequence.compile_file(cachename)
-					@eruby_rbyte[cachename].eval
-				else
-					_buf = ""
-					@eruby_rbyte[cachename].eval
-					if _buf
-						print _buf
-					end
-				end
-			end
-		else
-			eruby = KnjEruby.load_file(File.basename(filename), {:cachename => cachename})
-			print eruby.evaluate
-		end
-		
-		Dir.chdir(pwd)
-	end
+  def self.load_settings
+    @settings_loaded = true
+    @inseq_cache = false
+    @inseq_rbc = false
+    @java_compile = false
+    
+    if RUBY_PLATFORM == "java"
+      @java_compile = true
+      @java_factory = javax.script.ScriptEngineManager.new
+      @java_engine = @java_factory.getEngineByName("jruby")
+      @eruby_java_cache = {}
+    elsif RUBY_VERSION.slice(0..2) == "1.9" and RubyVM::InstructionSequence.respond_to?(:compile_file)
+      @eruby_rbyte = {}
+      @inseq_cache = true
+      
+      if RubyVM::InstructionSequence.respond_to?(:load)
+        @inseq_rbc = true
+      end
+    end
+    
+    @inseq_rbc = false #this is not possible yet in Ruby... maybe in 1.9.3?
+  end
+  
+  def self.import(filename)
+    ERuby.load_settings if !@settings_loaded
+    
+    filename = File.expand_path(filename)
+    pwd = Dir.pwd
+    Dir.chdir(File.dirname(filename))
+    
+    fpath = "#{KnjEruby.filepath}/cache/#{filename.gsub("/", "_").gsub(".", "_")}"
+    pi = Knj::Php.pathinfo(filename)
+    cachename = fpath + ".cache"
+    
+    filetime = File.mtime(filename)
+    cacheexists = File.exists?(cachename)
+    cachetime = File.mtime(cachename) if File.exists?(cachename)
+    
+    if !cacheexists or filetime > cachetime
+      KnjEruby.load_file(File.basename(filename), {:cachename => cachename})
+      cachetime = File.mtime(cachename)
+      reload_cache = true
+    end
+    
+    if @java_compile
+      if !@eruby_java_cache[cachename] or reload_cache
+        #@eruby_java_cache[cachename] = @java_engine.compile(File.read(cachename))
+        @eruby_java_cache[cachename] = File.read(cachename)
+      end
+      
+      #@eruby_java_cache[cachename].eval
+      eval(@eruby_java_cache[cachename])
+    elsif @inseq_cache
+      if @inseq_rbc
+        bytepath = pi["dirname"] + "/" + pi["basename"] + ".rbc"
+        byteexists = File.exists?(bytepath)
+        bytetime = File.mtime(bytepath) if File.exists?(bytepath)
+        
+        if !File.exists?(bytepath) or cachetime > bytetime
+          res = RubyVM::InstructionSequence.compile_file(filename)
+          data = Marshal.dump(res.to_a)
+          File.open(bytepath, "w+") do |fp|
+            fp.write(data)
+          end
+        end
+      end
+      
+      if @inseq_rbc
+        res = Marshal.load(File.read(bytepath))
+        RubyVM::InstructionSequence.load(res).eval
+      else
+        if !@eruby_rbyte[cachename] or reload_cache
+          @eruby_rbyte[cachename] = RubyVM::InstructionSequence.new(File.read(cachename))
+          #@eruby_rbyte[cachename] = RubyVM::InstructionSequence.compile_file(cachename)
+          @eruby_rbyte[cachename].eval
+        else
+          _buf = ""
+          @eruby_rbyte[cachename].eval
+          if _buf
+            print _buf
+          end
+        end
+      end
+    else
+      eruby = KnjEruby.load_file(File.basename(filename), {:cachename => cachename})
+      print eruby.evaluate
+    end
+    
+    Dir.chdir(pwd)
+  end
 end
 
 class KnjEruby < Erubis::Eruby
-	include Erubis::StdoutEnhancer
-	
-	@headers = [
-		["Content-Type", "text/html; charset=utf-8"]
-	]
-	@filepath = File.dirname(Knj::Os::realpath(__FILE__))
-	@connects = {}
-	
-	def self.fcgi=(newvalue); @fcgi = newvalue; end
-	def self.fcgi; return @fcgi; end
-	def self.connects; return @connects; end
-	def self.headers; return @headers; end
-	
-	def self.print_headers(args = {})
-		header_str = ""
-		
-		@headers.each do |header|
-			header_str += "#{header[0]}: #{header[1]}\n"
-		end
-		
-		header_str += "\n"
-		self.reset_headers if @fcgi
-		return header_str
-	end
-	
-	def self.has_status_header?
-		@headers.each do |header|
-			if header[0] == "Status"
-				return true
-			end
-		end
-		
-		return false
-	end
-	
-	def self.reset_connects
-		@connects = {}
-	end
-	
-	def self.reset_headers
-		@headers = [
-			["Content-Type", "text/html; charset=utf-8"]
-		]
-	end
-	
-	def self.header(key, value)
-		@headers << [key, value]
-	end
-	
-	def self.filepath
-		return @filepath
-	end
-	
-	def self.connect(signal, &block)
-		@connects[signal] = [] if !@connects[signal]
-		@connects[signal] << block
-	end
-	
-	def self.printcont(tmp_out, args = {})
-		if @fcgi
-			@fcgi.print self.print_headers
-			tmp_out.rewind
-			@fcgi.print tmp_out.read.to_s
-		else
-			if args[:io] and !args[:custom_io]
-				old_out = $stdout
-				$stdout = args[:io]
-			elsif !args[:custom_io]
-				$stdout = STDOUT
-			end
-			
-			if !args[:custom_io]
-				print self.print_headers if !args.key?(:with_headers) or args[:with_headers]
-				tmp_out.rewind
-				print tmp_out.read
-			end
-		end
-	end
-	
-	def self.load_return(filename, args = {})
-		if !args[:io]
-			retio = StringIO.new
-			args[:io] = retio
-		end
-		
-		@args = args
-		KnjEruby.load(filename, args)
-		
-		if !args[:custom_io]
-			retio.rewind
-			return retio.read
-		end
-	end
-	
-	def self.load(filename, args = {})
-		begin
-			if !args[:custom_io]
-				tmp_out = StringIO.new
-				$stdout = tmp_out
-			end
-			
-			ERuby.import(filename)
-			
-			if KnjEruby.connects["exit"]
-				KnjEruby.connects["exit"].each do |block|
-					block.call
-				end
-			end
-			
-			KnjEruby.printcont(tmp_out, args)
-		rescue SystemExit => e
-			KnjEruby.printcont(tmp_out, args)
-		rescue Exception => e
-			begin
-				if KnjEruby.connects["error"]
-					KnjEruby.connects["error"].each do |block|
-						block.call(e)
-					end
-				end
-			rescue SystemExit => e
-				exit
-			rescue Exception => e
-				#An error occurred while trying to run the on-error-block - show this as an normal error.
-				print "\n\n<pre>\n\n"
-				print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
-				
-				#Lets hide all the stuff in what is not the users files to make it easier to debug.
-				bt = e.backtrace
-				#to = bt.length - 9
-				#bt = bt[0..to]
-				
-				bt.each do |line|
-					print Knj::Web.html(line) + "\n"
-				end
-				
-				print "</pre>"
-			end
-			
-			print "\n\n<pre>\n\n"
-			print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
-			
-			#Lets hide all the stuff in what is not the users files to make it easier to debug.
-			bt = e.backtrace
-			to = bt.length - 9
-			bt = bt[0..to]
-			
-			bt.each do |line|
-				print Knj::Web.html(line) + "\n"
-			end
-			
-			KnjEruby.printcont(tmp_out, args)
-		end
-	end
+  include Erubis::StdoutEnhancer
+  
+  @headers = [
+    ["Content-Type", "text/html; charset=utf-8"]
+  ]
+  @filepath = File.dirname(Knj::Os::realpath(__FILE__))
+  @connects = {}
+  
+  def self.fcgi=(newvalue); @fcgi = newvalue; end
+  def self.fcgi; return @fcgi; end
+  def self.connects; return @connects; end
+  def self.headers; return @headers; end
+  
+  def self.print_headers(args = {})
+    header_str = ""
+    
+    @headers.each do |header|
+      header_str << "#{header[0]}: #{header[1]}\n"
+    end
+    
+    header_str << "\n"
+    self.reset_headers if @fcgi
+    return header_str
+  end
+  
+  def self.has_status_header?
+    @headers.each do |header|
+      if header[0] == "Status"
+        return true
+      end
+    end
+    
+    return false
+  end
+  
+  def self.reset_connects
+    @connects = {}
+  end
+  
+  def self.reset_headers
+    @headers = [
+      ["Content-Type", "text/html; charset=utf-8"]
+    ]
+  end
+  
+  def self.header(key, value)
+    @headers << [key, value]
+  end
+  
+  def self.filepath
+    return @filepath
+  end
+  
+  def self.connect(signal, &block)
+    @connects[signal] = [] if !@connects[signal]
+    @connects[signal] << block
+  end
+  
+  def self.printcont(tmp_out, args = {})
+    if @fcgi
+      @fcgi.print self.print_headers
+      tmp_out.rewind
+      @fcgi.print tmp_out.read.to_s
+    else
+      if args[:io] and !args[:custom_io]
+        old_out = $stdout
+        $stdout = args[:io]
+      elsif !args[:custom_io]
+        $stdout = STDOUT
+      end
+      
+      if !args[:custom_io]
+        print self.print_headers if !args.key?(:with_headers) or args[:with_headers]
+        tmp_out.rewind
+        print tmp_out.read
+      end
+    end
+  end
+  
+  def self.load_return(filename, args = {})
+    if !args[:io]
+      retio = StringIO.new
+      args[:io] = retio
+    end
+    
+    @args = args
+    KnjEruby.load(filename, args)
+    
+    if !args[:custom_io]
+      retio.rewind
+      return retio.read
+    end
+  end
+  
+  def self.load(filename, args = {})
+    begin
+      if !args[:custom_io]
+        tmp_out = StringIO.new
+        $stdout = tmp_out
+      end
+      
+      ERuby.import(filename)
+      
+      if KnjEruby.connects["exit"]
+        KnjEruby.connects["exit"].each do |block|
+          block.call
+        end
+      end
+      
+      KnjEruby.printcont(tmp_out, args)
+    rescue SystemExit => e
+      KnjEruby.printcont(tmp_out, args)
+    rescue Exception => e
+      begin
+        if KnjEruby.connects["error"]
+          KnjEruby.connects["error"].each do |block|
+            block.call(e)
+          end
+        end
+      rescue SystemExit => e
+        exit
+      rescue Exception => e
+        #An error occurred while trying to run the on-error-block - show this as an normal error.
+        print "\n\n<pre>\n\n"
+        print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
+        
+        #Lets hide all the stuff in what is not the users files to make it easier to debug.
+        bt = e.backtrace
+        #to = bt.length - 9
+        #bt = bt[0..to]
+        
+        bt.each do |line|
+          print Knj::Web.html(line) + "\n"
+        end
+        
+        print "</pre>"
+      end
+      
+      print "\n\n<pre>\n\n"
+      print "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b>\n\n"
+      
+      #Lets hide all the stuff in what is not the users files to make it easier to debug.
+      bt = e.backtrace
+      to = bt.length - 9
+      bt = bt[0..to]
+      
+      bt.each do |line|
+        print Knj::Web.html(line) + "\n"
+      end
+      
+      KnjEruby.printcont(tmp_out, args)
+    end
+  end
 end

data/lib/knj/errors.rb

@@ -1,22 +1,23 @@
 module Knj::Errors
-	class Notice < StandardError; end
-	class NotFound < StandardError; end
-	class InvalidData < StandardError; end
-	class Retry < StandardError; end
-	class NoAccess < StandardError; end
-	class Exists < StandardError; end
-	
-	def self.error_str(err, args = {})
+  class Notice < StandardError; end
+  class NotFound < StandardError; end
+  class InvalidData < StandardError; end
+  class Retry < StandardError; end
+  class NoAccess < StandardError; end
+  class Exists < StandardError; end
+  
+  def self.error_str(err, args = {})
+    raise "Invalid object of class '#{err.class.name}' given." if !err.is_a?(Exception)
     str = ""
     
-		if args[:html]
-			str += "<b>#{err.class.name}</b>: #{err.message}<br />\n<br />\n"
-			str += err.backtrace.join("<br />\n")
-		else
-			str += "#{err.class.name}: #{err.message}\n\n"
-			str += err.backtrace.join("\n")
-		end
-		
-		return str
-	end
+    if args[:html]
+      str << "<b>#{err.class.name}</b>: #{err.message}<br />\n<br />\n"
+      str << err.backtrace.join("<br />\n")
+    else
+      str << "#{err.class.name}: #{err.message}\n\n"
+      str << err.backtrace.join("\n")
+    end
+    
+    return str
+  end
 end

data/lib/knj/eruby.rb

@@ -1,13 +1,12 @@
 class Knj::Eruby
-  attr_reader :fcgi
-  attr_reader :connects, :headers, :cookies
+  attr_reader :connects, :error, :headers, :cookies, :fcgi
   
   def initialize(args = {})
     @args = args
     
     require "tmpdir"
     @tmpdir = "#{Dir.tmpdir}/knj_erb"
-    Dir.mkdir(@tmpdir) if !File.exists?(@tmpdir)
+    Dir.mkdir(@tmpdir, 0777) if !File.exists?(@tmpdir)
     
     
     #This argument can be used if a shared cache should be used to speed up performance.
@@ -17,16 +16,16 @@ class Knj::Eruby
       @cache = {}
     end
     
-    if RUBY_PLATFORM == "java"
-      #@cache_mode = :code_eval
-      @cache_mode = :compile_knj
+    if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
+      @cache_mode = :code_eval
+      #@cache_mode = :compile_knj
     elsif RUBY_VERSION.slice(0..2) == "1.9" and RubyVM::InstructionSequence.respond_to?(:compile_file)
       @cache_mode = :inseq
       #@cache_mode = :compile_knj
     end
     
     if @cache_mode == :compile_knj
-      require "knj/compiler"
+      require "#{$knjpath}compiler"
       @compiler = Knj::Compiler.new(:cache_hash => @cache)
     end
     
@@ -35,6 +34,7 @@ class Knj::Eruby
   end
   
   def import(filename)
+    @error = false
     Dir.mkdir(@tmpdir) if !File.exists?(@tmpdir)
     filename = File.expand_path(filename)
     raise "File does not exist: #{filename}" if !File.exists?(filename)
@@ -73,6 +73,7 @@ class Knj::Eruby
     rescue SystemExit
       #do nothing.
     rescue Exception => e
+      @error = true
       self.handle_error(e)
     end
   end
@@ -95,14 +96,14 @@ class Knj::Eruby
     header_str = ""
     
     @headers.each do |header|
-      header_str += "#{header[0]}: #{header[1]}\n"
+      header_str << "#{header[0]}: #{header[1]}\n"
     end
     
     @cookies.each do |cookie|
-      header_str += "Set-Cookie: #{Knj::Web.cookie_str(cookie)}\n"
+      header_str << "Set-Cookie: #{Knj::Web.cookie_str(cookie)}\n"
     end
     
-    header_str += "\n"
+    header_str << "\n"
     self.reset_headers if @fcgi
     return header_str
   end
@@ -196,6 +197,7 @@ class Knj::Eruby
     end
   end
   
+  #This method will handle an error without crashing simply adding the error to the print-queue.
   def handle_error(e)
     begin
       if @connects and @connects.key?("error")