knjrbfw 0.0.115 → 0.0.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5be1f9cec88387a3f22d11d086d874af8e86cea2f7e24596957b6ac8bede40
-  data.tar.gz: '01838b41b901833125a7e13ebbf294c0cc084327e6c878a9052d923ecf8af661'
+  metadata.gz: ba4a0d2d304a3aca02bed13395250ec82ece3fef1fb3239a60199615a0310d6c
+  data.tar.gz: 4018da1c46f54b99db3c4f9dc6b25e9065c5c64f5de1082006a2db774ad9b3c8
 SHA512:
-  metadata.gz: c07835d6c2365d107aeb2bf8ce0d57879069b1cadbd3c97035ef11cd2585de4787e5a82974a48a5901f1cb620f267d6e39bf6c22c042161a88db1aecbe5e4ff1
-  data.tar.gz: c8f5d705a4cf5e46906fa52aa4ce615755f12cb83eb4e5414e571756fd972fca61ce61ede18a6ec8c550ec747db5fa5df0b6ad58c6ed9e0e56cd94e4ca97f803
+  metadata.gz: 2b539bf8e66dc55b6480dee125ddd3578e2fde2543ec7ceac2410611e125e577281599a9473b6c98f7ec8b9815cf660aaf606e5f4a6e52e2470cc8db723701a4
+  data.tar.gz: 420e34ac692a52dfb8f401f1bbb40c056613802aa9f1f5fb50b4b58712b80d5562b424661e398d0113706970441bad52ea6c2f014cfa52c9b547b0bdcd9685db

data/lib/knj/erb/include.rb

@@ -4,7 +4,7 @@ class ERuby
     @inseq_cache = false
     @inseq_rbc = false
     @java_compile = false
-    
+
     if RUBY_PLATFORM == "java"
       @java_compile = true
       @java_factory = javax.script.ScriptEngineManager.new
@@ -13,51 +13,51 @@ class ERuby
     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 = Php4r.pathinfo(filename)
     cachename = fpath + ".cache"
-    
+
     filetime = File.mtime(filename)
-    cacheexists = File.exists?(cachename)
-    cachetime = File.mtime(cachename) if File.exists?(cachename)
-    
+    cacheexists = File.exist?(cachename)
+    cachetime = File.mtime(cachename) if File.exist?(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
+        byteexists = File.exist?(bytepath)
+        bytetime = File.mtime(bytepath) if File.exist?(bytepath)
+
+        if !File.exist?(bytepath) or cachetime > bytetime
           res = RubyVM::InstructionSequence.compile_file(filename)
           data = Marshal.dump(res.to_a)
           File.open(bytepath, "w+") do |fp|
@@ -65,7 +65,7 @@ class ERuby
           end
         end
       end
-      
+
       if @inseq_rbc
         res = Marshal.load(File.read(bytepath))
         RubyVM::InstructionSequence.load(res).eval
@@ -86,70 +86,70 @@ class ERuby
       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
@@ -162,7 +162,7 @@ class KnjEruby < Erubis::Eruby
       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
@@ -170,37 +170,37 @@ class KnjEruby < Erubis::Eruby
       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)
@@ -217,31 +217,31 @@ class KnjEruby < Erubis::Eruby
         #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

data/lib/knj/eruby.rb

@@ -1,25 +1,25 @@
 #Uses Rubinius, Knj::Compiler, RubyVM::InstructionSequence and eval to convert and execute .rhtml-files.
 class Knj::Eruby
   attr_reader :connects, :error, :headers, :cookies, :fcgi
-  
+
   #Sets various arguments and prepares for parsing.
   def initialize(args = {})
     @args = args
-    
+
     @tmpdir = "#{Knj::Os.tmpdir}/knj_erb"
-    if !File.exists?(@tmpdir)
+    if !File.exist?(@tmpdir)
       Dir.mkdir(@tmpdir, 0777)
       File.chmod(0777, @tmpdir)
     end
-    
-    
+
+
     #This argument can be used if a shared cache should be used to speed up performance.
     if @args[:cache_hash]
       @cache = @args[:cache_hash]
     else
       @cache = {}
     end
-    
+
     if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
       @cache_mode = :code_eval
       #@cache_mode = :compile_knj
@@ -28,35 +28,35 @@ class Knj::Eruby
       #@cache_mode = :inseq
       #@cache_mode = :compile_knj
     end
-    
+
     if @cache_mode == :compile_knj
       require "#{$knjpath}compiler"
       @compiler = Knj::Compiler.new(:cache_hash => @cache)
     end
-    
+
     self.reset_headers
     self.reset_connects
   end
-  
+
   #Imports and evaluates a new .rhtml-file.
   #===Examples
   # erb.import("/path/to/some_file.rhtml")
   def import(filename)
     @error = false
-    Dir.mkdir(@tmpdir) if !File.exists?(@tmpdir)
+    Dir.mkdir(@tmpdir) if !File.exist?(@tmpdir)
     filename = File.expand_path(filename)
-    raise "File does not exist: #{filename}" unless File.exists?(filename)
+    raise "File does not exist: #{filename}" unless File.exist?(filename)
     cachename = "#{@tmpdir}/#{filename.gsub("/", "_").gsub(".", "_")}.cache"
     filetime = File.mtime(filename)
-    cachetime = File.mtime(cachename) if File.exists?(cachename)
-    
-    if !File.exists?(cachename) or filetime > cachetime
+    cachetime = File.mtime(cachename) if File.exist?(cachename)
+
+    if !File.exist?(cachename) or filetime > cachetime
       Knj::Eruby::Handler.load_file(filename, :cachename => cachename)
       File.chmod(0777, cachename)
       cachetime = File.mtime(cachename)
       reload_cache = true
     end
-    
+
     begin
       case @cache_mode
         when :compile_knj
@@ -68,19 +68,19 @@ class Knj::Eruby
             eruby_binding = Knj::Eruby::Binding.new
             binding_use = eruby_binding.get_binding
           end
-          
+
           #No reason to cache contents of files - benchmarking showed little to no differene performance-wise, but caching took up a lot of memory, when a lot of files were cached - knj.
           eval(File.read(cachename), binding_use, filename)
         when :inseq
           reload_cache = true if !@cache.key?(cachename)
-          
+
           if reload_cache or @cache[cachename][:time] < cachetime
             @cache[cachename] = {
               :inseq => RubyVM::InstructionSequence.compile(File.read(cachename), filename, nil, 1),
               :time => Time.now
             }
           end
-          
+
           @cache[cachename][:inseq].eval
         else
           loaded_content = Knj::Eruby::Handler.load_file(filename, {:cachename => cachename})
@@ -94,16 +94,16 @@ class Knj::Eruby
       @error = true
       self.handle_error(e)
     end
-    
+
     return nil
   end
-  
+
   #Destroyes this object unsetting all variables and clearing all cache.
   def destroy
     @connects.clear if @connects.is_a?(Hash)
     @headers.clear if @headers.is_a?(Array)
     @cookies.clear if @cookies.is_a?(Array)
-    
+
     @cache.clear if @cache.is_a?(Hash) and @args and !@args.key?(:cache_hash)
     @args.clear if @args.is_a?(Hash)
     @args = nil
@@ -111,68 +111,68 @@ class Knj::Eruby
     @connects = nil
     @headers = nil
     @cookies = nil
-    
+
     return nil
   end
-  
+
   #Returns various headers as one complete string ready to be used in a HTTP-request.
   def print_headers(args = {})
     header_str = ""
-    
+
     @headers.each do |header|
       header_str << "#{header[0]}: #{header[1]}\n"
     end
-    
+
     @cookies.each do |cookie|
       header_str << "Set-Cookie: #{Knj::Web.cookie_str(cookie)}\n"
     end
-    
+
     header_str << "\n"
     self.reset_headers if @fcgi
     return header_str
   end
-  
+
   #Returns true if containing a status-header.
   def has_status_header?
     @headers.each do |header|
       return true if header[0] == "Status"
     end
-    
+
     return false
   end
-  
+
   #Resets all connections.
   def reset_connects
     @connects = {}
     return nil
   end
-  
+
   #Resets all headers.
   def reset_headers
     @headers = []
     @cookies = []
     return nil
   end
-  
+
   #Adds a new header to the list.
   def header(key, value)
     @headers << [key, value]
     return nil
   end
-  
+
   #Adds a new cookie to the list.
   def cookie(cookie_data)
     @cookies << cookie_data
     return nil
   end
-  
+
   #Connects a block to a certain event.
   def connect(signal, &block)
     @connects[signal] = [] if !@connects.key?(signal)
     @connects[signal] << block
     return nil
   end
-  
+
   def printcont(tmp_out, args = {})
     if @fcgi
       @fcgi.print self.print_headers
@@ -185,46 +185,46 @@ class Knj::Eruby
       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
-    
+
     return nil
   end
-  
+
   def load_return(filename, args = {})
     if !args[:io]
       retio = StringIO.new
       args[:io] = retio
     end
-    
+
     self.load_filename(filename, args)
-    
+
     if !args[:custom_io]
       retio.rewind
       return retio.read
     end
   end
-  
+
   def load_filename(filename, args = {})
     begin
       if !args[:custom_io]
         tmp_out = StringIO.new
         $stdout = tmp_out
       end
-      
+
       self.import(filename)
-      
+
       if @connects["exit"]
         @connects["exit"].each do |block|
           block.call
         end
       end
-      
+
       self.printcont(tmp_out, args)
     rescue SystemExit => e
       self.printcont(tmp_out, args)
@@ -232,10 +232,10 @@ class Knj::Eruby
       self.handle_error(e)
       self.printcont(tmp_out, args)
     end
-    
+
     return nil
   end
-  
+
   #This method will handle an error without crashing simply adding the error to the print-queue.
   def handle_error(e)
     begin
@@ -250,23 +250,23 @@ class Knj::Eruby
       #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"
-      
+
       e.backtrace.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"
-    
+
     e.backtrace.each do |line|
       print "#{Knj::Web.html(line)}\n"
     end
-    
+
     print "</pre>"
-    
+
     return nil
   end
 end

data/lib/knj/filesystem.rb

@@ -1,6 +1,6 @@
 class Knj::Filesystem
   def self.copy(args)
-    FileUtils.rm(args[:to]) if args[:replace] and File.exists?(args[:to])
+    FileUtils.rm(args[:to]) if args[:replace] and File.exist?(args[:to])
     FileUtils.cp(args[:from], args[:to])
     mod = File.lstat(args[:from]).mode & 0777
     File.chmod(mod, args[:to])

data/lib/knj/gettext_threadded.rb

@@ -2,10 +2,10 @@
 class Knj::Gettext_threadded
   #Hash that contains all translations loaded.
   attr_reader :langs
-  
+
   #Config-hash that contains encoding and more.
   attr_reader :args
-  
+
   #Initializes various data.
   def initialize(args = {})
     @args = {
@@ -15,32 +15,32 @@ class Knj::Gettext_threadded
     @dirs = []
     load_dir(@args["dir"]) if @args["dir"]
   end
-  
+
   #Loads a 'locales'-directory with .mo- and .po-files and fills the '@langs'-hash.
   #===Examples
   # gtext.load_dir("#{File.dirname(__FILE__)}/../locales")
   def load_dir(dir)
     @dirs << dir
     check_folders = ["LC_MESSAGES", "LC_ALL"]
-    
+
     Dir.foreach(dir) do |file|
       fn = "#{dir}/#{file}"
       if File.directory?(fn) and file.match(/^[a-z]{2}_[A-Z]{2}$/)
         @langs[file] = {} if !@langs[file]
-        
+
         check_folders.each do |fname|
           fpath = "#{dir}/#{file}/#{fname}"
-          
-          if File.exists?(fpath) and File.directory?(fpath)
+
+          if File.exist?(fpath) and File.directory?(fpath)
             Dir.foreach(fpath) do |pofile|
               if pofile.match(/\.po$/)
                 pofn = "#{dir}/#{file}/#{fname}/#{pofile}"
-                
+
                 cont = nil
                 File.open(pofn, "r", {:encoding => @args[:encoding]}) do |fp|
                   cont = fp.read.encode("utf-8")
                 end
-                
+
                 cont.scan(/msgid\s+\"(.+)\"(\r|)\nmsgstr\s+\"(.+)\"(\r|)\n(\r|)\n/) do |match|
                   @langs[file][match[0]] = match[2].to_s.encode("utf-8")
                 end
@@ -51,7 +51,7 @@ class Knj::Gettext_threadded
       end
     end
   end
-  
+
   #Translates a given string to a given locale from the read .po-files.
   #===Examples
   # str = "Hello" #=> "Hello"
@@ -59,40 +59,40 @@ class Knj::Gettext_threadded
   def trans(locale, str)
     locale = locale.to_s
     str = str.to_s
-    
+
     if !@langs.key?(locale)
       raise "Locale was not found: '#{locale}' in '#{@langs.keys.join(", ")}'."
     end
-    
+
     return str if !@langs[locale].key?(str)
     return @langs[locale][str]
   end
-  
+
   #This function can be used to make your string be recognized by gettext tools.
   def gettext(str, locale)
     return trans(locale, str)
   end
-  
+
   #Returns a hash with the language ID string as key and the language human-readable-title as value.
   def lang_opts
     langs = {}
     @langs.keys.sort.each do |lang|
       title = nil
-      
+
       @dirs.each do |dir|
         title_file_path = "#{dir}/#{lang}/title.txt"
-        if File.exists?(title_file_path)
+        if File.exist?(title_file_path)
           title = File.read(title_file_path, {:encoding => @args[:encoding]}).to_s.strip
         else
           title = lang.to_s.strip
         end
-        
+
         break if title
       end
-      
+
       langs[lang] = title
     end
-    
+
     return langs
   end
 end