knjrbfw 0.0.114 → 0.0.116

data/lib/knj/scripts/svn_merge.rb

@@ -6,24 +6,24 @@ path_to = ARGV[0]
 
 Dir.glob(File.join("**", ".svn")).each do |dir|
   newdir = path_to + "/" + dir
-  
+
   #print dir + "\n"
   #print newdir + "\n"
-  
-  if File.exists?(newdir)
+
+  if File.exist?(newdir)
     print "Remove: " + newdir.to_s + "\n"
     FileUtils.rm_r(newdir)
   end
-  
+
   begin
     #print "Move: " + dir + "\n"
     #FileUtils.mv(dir, newdir)
-    
+
     print "Copy: " + dir + "\n"
     FileUtils.cp_r(dir, newdir)
   rescue => e
     print "Failed: " + e.message + "\n"
   end
-  
+
   #print "\n"
 end

data/lib/knj/scripts/upgrade_knjrbfw_checker.rb

@@ -20,16 +20,16 @@ checks = [
 checks.each do |dir|
   dev_name = dir + "_dev"
   original_name = dir + "_original"
-  
+
   if mode == "dev"
-    if File.exists?(dir) and File.symlink?(dir)
+    if File.exist?(dir) and File.symlink?(dir)
       #do nothing.
-    elsif File.exists?(dir) and !File.exists?(original_name)
+    elsif File.exist?(dir) and !File.exist?(original_name)
       File.rename(dir, original_name)
       File.rename(dev_name, dir)
     end
   elsif mode == "original"
-    if File.exists?(dir) and File.exists?(original_name) and File.symlink?(dir)
+    if File.exist?(dir) and File.exist?(original_name) and File.symlink?(dir)
       File.rename(dir, dev_name)
       File.rename(original_name, dir)
     else

data/lib/knj/web.rb

@@ -443,7 +443,7 @@ class Knj::Web
         raise "No value given in arguments for imageupload-input." if !args.key?(:value)
 
         path = args[:path].gsub("%value%", value.to_s).untaint
-        if File.exists?(path)
+        if File.exist?(path)
           html << "<img src=\"image.rhtml?path=#{self.urlenc(path).html}&smartsize=100&rounded_corners=10&border_color=black&force=true&ts=#{Time.new.to_f}\" alt=\"Image\" />"
 
           if args[:dellink]
@@ -919,13 +919,3 @@ class Symbol
     return self.to_s.sql
   end
 end
-
-class Fixnum
-  def sql
-    return self.to_s.sql
-  end
-
-  def html
-    return self.to_s.html
-  end
-end

data/lib/knj/webscripts/image.rhtml

@@ -5,17 +5,17 @@
   rescue NameError
     appsrv = _kas
   end
-  
+
   #Support for the PHP-version... Comes handy when converting PHP to Ruby...
   if !_get["path"]
     trans = {
       "picture" => "path"
     }
-    
+
     if _get["edgesize"]
       _get["rounded_corners"] = (_get["edgesize"].to_f / 3.0).to_i
     end
-    
+
     if _get["edgeborder"]
       if _get["edgeborder"].length == 6
         _get["border_color"] = "##{_get["edgeborder"]}"
@@ -23,30 +23,30 @@
         _get["border_color"] = _get["edbeborder"]
       end
     end
-    
+
     if _get["edgeborder"]
       _get["border"] = 1
     end
-    
+
     trans.each do |key, val|
       _get[val] = _get[key] if _get[key]
     end
   end
-  
+
   #Base64-encoding of path.
   if _get["path64"]
     require "base64"
     _get["path"] = Base64.decode64(_get["path64"])
   end
-  
+
   require "digest/md5"
 	idstr = Digest::MD5.hexdigest("#{Process.euid}_#{_get["path"]}_#{_get["smartsize"].to_i}_#{_get["width"].to_i}_#{_get["height"].to_i}_#{_get["maxwidth"].to_i}_#{_get["maxheight"].to_i}_#{_get["rounded_corners"].to_i}_#{_get["border"].to_i}_#{_get["border_color"]}")
-	
-	if !_get["path"] or !File.exists?(_get["path"])
+
+	if !_get["path"] or !File.exist?(_get["path"])
     print "File does not exist: '#{_get["path"]}'.\n"
     exit
   end
-	
+
 	time_orig = File.mtime(_get["path"])
 	tmp_write = false
 	if Knj::CONFIG["webscripts_image"]
@@ -54,65 +54,65 @@
 	else
     tmp_path = "#{Knj::Os.tmpdir}/knjrbfw_image_#{idstr}"
   end
-  
-  tmp_exists = File.exists?(tmp_path)
+
+  tmp_exists = File.exist?(tmp_path)
   tmp_write = true unless tmp_exists
-  
+
   if !tmp_write and tmp_exists
     time_cache = File.mtime(tmp_path)
-    
+
     if time_orig > time_cache
       tmp_write = true
     end
   end
-	
+
 	if _get["force"] == "true" or _get["force"] == "1"
     force = true
   else
     force = false
   end
-  
+
 	notchanged = false
-	
+
 	if _httpsession.handler.modified_since and time_cache and _httpsession.handler.modified_since.utc.to_s == time_cache.utc.to_s
     notchanged = true
   elsif _httpsession.handler.modified_since and _httpsession.handler.modified_since.utc.to_s == time_orig.utc.to_s
     notchanged = true
   end
-  
+
   if notchanged and !force
     _httpsession.resp.status = 304
     exit
   end
-  
+
 	if tmp_write or force
     blob_cont = nil
-    
+
     raise "RMagick has not been loaded. If loaded through here bugs will occur. Load in beginning of script." unless ::Kernel.const_defined?(:Magick)
     pic = Magick::Image.read(_get["path"]).first
-    
+
     if !pic
       print "Could not open image from '#{_get["path"]}'."
       exit
     end
-    
+
     pic.format = "png"
-    
+
     pic_columns = pic.columns
     pic_rows = pic.rows
-    
+
     width = pic_columns
     height = pic_rows
-    
+
     height = _get["height"].to_i if _get["height"]
     width = _get["width"].to_i if _get["width"]
-    
+
     if _get["width"] && !_get["height"]
       height = (pic_rows.to_f / (pic_columns.to_f / width.to_f)).to_i
     elsif _get["height"] && !_get["width"]
       width = (pic_columns.to_f / (pic_rows.to_f / height.to_f)).to_i
     end
-    
+
     if _get["smartsize"]
       if pic_columns > pic_rows
         width = _get["smartsize"].to_i
@@ -122,51 +122,51 @@
         width = (pic_columns.to_f / (pic_rows.to_f / height.to_f)).to_i
       end
     end
-    
+
     if _get["maxwidth"]
       maxwidth = _get["maxwidth"].to_i
-      
+
       if width > maxwidth
         height = (pic_rows.to_f / (pic_columns.to_f / maxwidth.to_f)).to_i
         width = maxwidth
       end
     end
-    
+
     if _get["maxheight"]
       maxheight = _get["maxheight"].to_i
-      
+
       if height > maxheight
         width = (pic_columns.to_f / (pic_rows.to_f / maxheight.to_f)).to_i
         height = maxheight
       end
     end
-    
+
     if _get["width"] and _get["height"]
       width = _get["width"].to_i
       height = _get["height"].to_i
     end
-    
+
     if height != pic_rows or width != pic_columns
       pic = pic.resize_to_fill(width.to_i, height.to_i)
     end
-    
+
     if _get["rounded_corners"]
       args = {:img => pic, :radius => _get["rounded_corners"].to_i}
-      
+
       if _get["border"] and _get["border_color"]
         args[:border] = _get["border"].to_i
         args[:border_color] = _get["border_color"]
       end
-      
+
       #Call rounded_corners with the proxy-hash.
       Knj::Image.rounded_corners(args)
     end
-    
+
     pic.write(tmp_path) if tmp_write or force
 	end
-  
-  raise "Picture was not written: '#{tmp_path}'." if !tmp_path || !File.exists?(tmp_path)
-	
+
+  raise "Picture was not written: '#{tmp_path}'." if !tmp_path || !File.exist?(tmp_path)
+
 	appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
   appsrv.header("Content-Type", "image/png")
   _httpsession.force_fileread(tmp_path)

data/lib/knj/webscripts/image_subproc.rhtml

@@ -5,17 +5,17 @@
   rescue NameError
     appsrv = _kas
   end
-  
+
   #Support for the PHP-version... Comes handy when converting PHP to Ruby...
   if !_get["path"]
     trans = {
       "picture" => "path"
     }
-    
+
     if _get["edgesize"]
       _get["rounded_corners"] = (_get["edgesize"].to_f / 3.0).to_i
     end
-    
+
     if _get["edgeborder"]
       if _get["edgeborder"].length == 6
         _get["border_color"] = "##{_get["edgeborder"]}"
@@ -23,104 +23,104 @@
         _get["border_color"] = _get["edbeborder"]
       end
     end
-    
+
     if _get["edgeborder"]
       _get["border"] = 1
     end
-    
+
     trans.each do |key, val|
       _get[val] = _get[key] if _get[key]
     end
   end
-  
+
   #Base64-encoding of path.
   if _get["path64"]
     require "base64"
     _get["path"] = Base64.decode64(_get["path64"])
   end
-  
+
   require "digest/md5"
 	idstr = Digest::MD5.hexdigest("#{_get["path"]}_#{_get["smartsize"].to_i}_#{_get["width"].to_i}_#{_get["height"].to_i}_#{_get["maxwidth"].to_i}_#{_get["maxheight"].to_i}_#{_get["rounded_corners"].to_i}_#{_get["border"].to_i}_#{_get["border_color"]}")
-	
-	if !_get["path"] or !File.exists?(_get["path"])
+
+	if !_get["path"] or !File.exist?(_get["path"])
     print "File does not exist: '#{_get["path"]}'.\n"
     exit
   end
-	
+
 	time_orig = File.mtime(_get["path"])
-	
+
 	tmp_write = false
 	if Knj::CONFIG["webscripts_image"]
 		tmp_path = "#{Knj::CONFIG["webscripts_image"]["tmp_path"]}/#{idstr}"
 	else
     tmp_path = "#{Knj::Os.tmpdir}/knjrbfw_image_#{idstr}"
   end
-  
-  tmp_exists = File.exists?(tmp_path)
+
+  tmp_exists = File.exist?(tmp_path)
   tmp_write = true if !tmp_exists
-  
+
   if !tmp_write and tmp_exists
     time_cache = File.mtime(tmp_path)
-    
+
     if time_orig > time_cache
       tmp_write = true
     end
   end
-	
+
 	if _get["force"] == "true" or _get["force"] == "1"
     force = true
   else
     force = false
   end
-  
+
 	notchanged = false
-	
+
 	if _httpsession.handler.modified_since and time_cache and _httpsession.handler.modified_since.utc.to_s == time_cache.utc.to_s
     notchanged = true
   elsif _httpsession.handler.modified_since and _httpsession.handler.modified_since.utc.to_s == time_orig.utc.to_s
     notchanged = true
   end
-  
+
   if notchanged and !force
     _httpsession.resp.status = 304
     exit
   end
-  
+
 	if tmp_write or force
     blob_cont = nil
-    
+
     require "ruby_process"
     Ruby_process::Cproxy.run do |data|
       subproc = data[:subproc]
       subproc.static(:Object, :require, "rubygems")
       subproc.static(:Object, :require, "#{Knj.knjrbfw_path}/../knjrbfw.rb")
-      subproc.static(:Object, :require, "RMagick")
+      subproc.static(:Object, :require, "rmagick")
       subproc.static(:Dir, :chdir, File.dirname(__FILE__))
-      
+
       pic = subproc.static("Magick::Image", :read, _get["path"]).first
-      
+
       if !pic
         print "Could not open image from '#{_get["path"]}'."
         exit
       end
-      
+
       pic.format = "png"
-      
+
       pic_columns = pic.columns.__rp_marshal
       pic_rows = pic.rows.__rp_marshal
-      
+
       width = pic_columns
       height = pic_rows
-      
+
       height = _get["height"].to_i if _get["height"]
       width = _get["width"].to_i if _get["width"]
-      
+
       if _get["width"] && !_get["height"]
         height = (pic_rows.to_f / (pic_columns.to_f / width.to_f)).to_i
       elsif _get["height"] && !_get["width"]
         width = (pic_columns.to_f / (pic_rows.to_f / height.to_f)).to_i
       end
-      
+
       if _get["smartsize"]
         if pic_columns > pic_rows
           width = _get["smartsize"].to_i
@@ -130,50 +130,50 @@
           width = (pic_columns.to_f / (pic_rows.to_f / height.to_f)).to_i
         end
       end
-      
+
       if _get["maxwidth"]
         maxwidth = _get["maxwidth"].to_i
-        
+
         if width > maxwidth
           height = (pic_rows.to_f / (pic_columns.to_f / maxwidth.to_f)).to_i
           width = maxwidth
         end
       end
-      
+
       if _get["maxheight"]
         maxheight = _get["maxheight"].to_i
-        
+
         if height > maxheight
           width = (pic_columns.to_f / (pic_rows.to_f / maxheight.to_f)).to_i
           height = maxheight
         end
       end
-      
+
       if _get["width"] and _get["height"]
         width = _get["width"].to_i
         height = _get["height"].to_i
       end
-      
+
       if height != pic_rows or width != pic_columns
         pic = pic.resize_to_fill(width.to_i, height.to_i)
       end
-      
+
       if _get["rounded_corners"]
         args = {:img => pic, :radius => _get["rounded_corners"].to_i}
-        
+
         if _get["border"] and _get["border_color"]
           args[:border] = _get["border"].to_i
           args[:border_color] = _get["border_color"]
         end
-        
+
         #Call rounded_corners with the proxy-hash.
         subproc.static("Knj::Image", :rounded_corners, args)
       end
-      
+
       pic.write(tmp_path) if tmp_write or force
     end
 	end
-	
+
 	appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
   appsrv.header("Content-Type", "image/png")
   _httpsession.force_fileread(tmp_path)

data/lib/knj/win_tightvnc.rb

@@ -1,15 +1,15 @@
 class Knj::Win::TightVNC
   def initialize(args)
     @args = ArrayExt.hash_sym(args)
-    
+
     @args[:port] = 5900 if !@args[:port]
     @args[:port_http] = 5800 if !@args[:http_port]
-    
+
     raise "No path given." if !@args[:path]
-    
+
     exefile = @args[:path] + "/WinVNC.exe"
-    raise "#{exefile} was not found." if !File.exists?(exefile)
-    
+    raise "#{exefile} was not found." if !File.exist?(exefile)
+
     @wmi = WIN32OLE.connect("winmgmts://")
     processes = @wmi.ExecQuery("SELECT * FROM win32_process")
     ended = false
@@ -19,13 +19,13 @@ class Knj::Win::TightVNC
         ended = true
       end
     end
-    
+
     sleep 1 if ended
-    
+
     #print Win::Registry.get(:cur_user, 'Software\ORL\WinVNC3', 'Password', :sz).unpack('H*')[0] + "\n"
     #print ["160e9d46f26586ca"].pack('H*').unpack('H*')[0] + "\n"
     #exit
-    
+
     Win::Registry.set(:cur_user, 'Software\ORL\WinVNC3', [
       ["AutoPortSelect", 1, :dword],
       ["BlankScreen", 0, :dword],
@@ -61,7 +61,7 @@ class Knj::Win::TightVNC
       ["LoopbackOnly", 0, :dword]
     ])
     #password is of this moment only 'kaspernj'.
-    
+
     @wmi = WIN32OLE.connect("winmgmts://")
     processes = @wmi.ExecQuery("SELECT * FROM win32_process")
     ended = false
@@ -71,17 +71,17 @@ class Knj::Win::TightVNC
         ended = true
       end
     end
-    
+
     sleep 1 if ended
-    
+
     Knj::Thread.new do
       IO.popen(exefile) do |process|
         #nothing
       end
     end
-    
+
     sleep 1
-    
+
     @processes = @wmi.ExecQuery("SELECT * FROM win32_process")
     for process in @processes do
       if process.Name == "WinVNC.exe"
@@ -89,14 +89,14 @@ class Knj::Win::TightVNC
         break
       end
     end
-    
+
     raise "Could not start WinVNC.exe." if !@process
-    
+
     Kernel.at_exit do
       self.close
     end
   end
-  
+
   def open?
     begin
       @process.GetOwner
@@ -105,10 +105,10 @@ class Knj::Win::TightVNC
       return false
     end
   end
-  
+
   def close
     return nil if !@process
-    
+
     begin
       @process.Terminate
     rescue => e
@@ -118,7 +118,7 @@ class Knj::Win::TightVNC
         raise e
       end
     end
-    
+
     @process = nil
     @args = nil
     @wmi = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.114
+  version: 0.0.116
 platform: ruby
 authors:
 - Kasper Stöckel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wref
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A framework with lots of stuff for Ruby.