knjrbfw 0.0.8 → 0.0.9

data/lib/knj/webscripts/image.rhtml

@@ -1,5 +1,40 @@
 <%
-	idstr = Knj::Php.md5("#{_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"]}")
+  #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"]}"
+      else
+        _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
+  
+  
+	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"])
+    print "File does not exist: '#{_get["path"]}'.\n"
+    exit
+  end
+	
+	time_orig = File.mtime(_get["path"])
 	
 	tmp_use = false
 	tmp_write = false
@@ -10,7 +45,6 @@
 		tmp_write = true if !tmp_exists
 		
 		if !tmp_write and tmp_exists
-			time_orig = File.mtime(_get["path"])
 			time_cache = File.mtime(tmp_path)
 			
 			if time_orig > time_cache
@@ -19,83 +53,124 @@
 		end
 	end
 	
-	if !_get["path"] or !File.exists?(_get["path"])
-    print "File does not exist: '#{_get["path"]}'.\n"
-    exit
+	if _get["force"] == "true" or _get["force"] == "1"
+    force = true
+  else
+    force = false
   end
+  
+	notchanged = false
 	
-	if !tmp_use or tmp_write or _get["force"].to_i > 0
-    pic = Magick::Image.read(_get["path"]).first
-    pic.format = "png"
-    
-		width = pic.columns
-		height = pic.rows
-		
-		height = _get["height"].to_i if _get["height"]
-		width = _get["width"].to_i if _get["width"]
-		
-		if _get["smartsize"]
-			if pic.columns > pic.rows
-				width = _get["smartsize"].to_i
-				height = (pic.rows.to_f / (pic.columns.to_f / width.to_f)).to_i
-			else
-				height = _get["smartsize"].to_i
-				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_fit(width.to_i, height.to_i)
-		end
-		
-		if _get["rounded_corners"]
-      args = {:img => pic, :radius => _get["rounded_corners"].to_i}
+	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_use or tmp_write or force
+    blob_cont = nil
+    Knj::Process_meta.new("debug_err" => true) do |subproc|
+      subproc.static("Object", "require", "rubygems")
+      subproc.static("Object", "require", "#{File.dirname(Knj::Os.realpath(__FILE__))}/../../knjrbfw.rb")
+      subproc.static("Object", "require", "knj/autoload")
+      subproc.static("Dir", "chdir", File.dirname(__FILE__))
       
-      if _get["border"] and _get["border_color"]
-        args[:border] = _get["border"].to_i
-        args[:border_color] = _get["border_color"]
+      list_proxy = subproc.proxy_from_static("Magick::Image", "read", _get["path"])
+      pic = subproc.proxy_from_call(list_proxy, "first")
+      #pic = Magick::Image.read(_get["path"]).first
+      
+      if !pic
+        print "Could not open image from '#{_get["path"]}'."
+        exit
       end
       
-      Knj::Image.rounded_corners(args)
+      pic._pm_send_noret("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["smartsize"]
+        if pic_columns > pic_rows
+          width = _get["smartsize"].to_i
+          height = (pic_rows.to_f / (pic_columns.to_f / width.to_f)).to_i
+        else
+          height = _get["smartsize"].to_i
+          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 = subproc.proxy_from_call(pic, "resize_to_fit", width.to_i, height.to_i)
+        #pic = pic.resize_to_fit(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
+        
+        #Spawn arguments-hash for Knj::Image.rounded_corners in subprocess.
+        proxy_hash = subproc.new("{}", args)
+        
+        #Call rounded_corners with the proxy-hash.
+        subproc.static_noret("Knj::Image", "rounded_corners", proxy_hash)
+        #Knj::Image.rounded_corners(args)
+      end
+      
+      blob_cont = pic.to_blob
     end
-		
-		blob_cont = pic.to_blob
 	end
 	
 	if tmp_write and blob_cont
-		Knj::Php.file_put_contents(tmp_path, blob_cont)
+    File.open(tmp_path, "w") do |fp|
+      fp.write(blob_cont)
+    end
 	end
 	
 	if tmp_use
-    Knj::Php.header("Last-Modified: #{time_orig.httpdate} GMT") if time_orig
-		Knj::Php.header("Content-Type: image/png")
-		print File.read(tmp_path)
+    _kas.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
+		_kas.header("Content-Type", "image/png")
+		_httpsession.force_content(File.new(tmp_path))
 	else
-    Knj::Php.header("Last-Modified: #{time_orig.httpdate} GMT") if time_orig
-		Knj::Php.header("Content-Type: image/png")
-		print blob_cont
+    _kas.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
+		_kas.header("Content-Type", "image/png")
+		_httpsession.force_content(blob_cont)
 	end
 %>

data/lib/knj/win.rb

@@ -1,4 +1,4 @@
 module Knj::Win
-	autoload :Registry, $knjpath + "win_registry"
-	autoload :TightVNC, $knjpath + "win_tightvnc"
+  autoload :Registry, $knjpath + "win_registry"
+  autoload :TightVNC, $knjpath + "win_tightvnc"
 end

data/lib/knj/win_registry.rb

@@ -1,60 +1,60 @@
 class Knj::Win::Registry
-	def self.const(type)
-		if type == :cur_user
-			return Win32::Registry::HKEY_CURRENT_USER
-		elsif type == :local_machine
-			return Win32::Registry::HKEY_LOCAL_MACHINE
-		else
-			raise "Unknown type: " + type.to_s
-		end
-	end
-	
-	def self.type(in_type)
-		return Win32::Registry::REG_SZ if in_type == :sz
-		return Win32::Registry::REG_DWORD if in_type == :dword
-		return Win32::Registry::REG_BINARY if in_type == :bin
-		return nil if in_type == nil
-		
-		raise "Unknown type: #{in_type}"
-	end
-	
-	def self.get(type, regpath, key, in_type = nil)
-		hkey = self.const(type)
-		hkey.open(regpath, Win32::Registry::KEY_ALL_ACCESS) do |reg|
-			return reg[key, self.type(in_type)].to_s
-			
-			#reg.each_key do |k, v|
-			#	puts k, v
-			#end
-			#reg.each_value do |k, v|
-			#	puts k, v
-			#end
-			
-			#reg_typ, reg_val = reg.read('')
-			#return {
-			#	:type => reg_typ,
-			#	:value => reg_val
-			#}
-		end
-	end
-	
-	def self.set(type, regpath, key, content = nil, in_type = nil)
-		if key.is_a?(Array)
-			key.each do |v|
-				if v.is_a?(Array)
-					self.set(type, regpath, v[0], v[1], v[2])
-				elsif v.is_a?(Hash)
-					self.set(type, regpath, k, v[:val], v[:type])
-				else
-					raise "Unknown type: #{v.class.to_s}"
-				end
-			end
-		else
-			hkey = self.const(type)
-			hkey.create(regpath)
-			hkey.open(regpath, Win32::Registry::KEY_ALL_ACCESS) do |reg|
-				reg[key.to_s, self.type(in_type)] = content.to_s
-			end
-		end
-	end
+  def self.const(type)
+    if type == :cur_user
+      return Win32::Registry::HKEY_CURRENT_USER
+    elsif type == :local_machine
+      return Win32::Registry::HKEY_LOCAL_MACHINE
+    else
+      raise "Unknown type: " + type.to_s
+    end
+  end
+  
+  def self.type(in_type)
+    return Win32::Registry::REG_SZ if in_type == :sz
+    return Win32::Registry::REG_DWORD if in_type == :dword
+    return Win32::Registry::REG_BINARY if in_type == :bin
+    return nil if in_type == nil
+    
+    raise "Unknown type: #{in_type}"
+  end
+  
+  def self.get(type, regpath, key, in_type = nil)
+    hkey = self.const(type)
+    hkey.open(regpath, Win32::Registry::KEY_ALL_ACCESS) do |reg|
+      return reg[key, self.type(in_type)].to_s
+      
+      #reg.each_key do |k, v|
+      #  puts k, v
+      #end
+      #reg.each_value do |k, v|
+      #  puts k, v
+      #end
+      
+      #reg_typ, reg_val = reg.read('')
+      #return {
+      #  :type => reg_typ,
+      #  :value => reg_val
+      #}
+    end
+  end
+  
+  def self.set(type, regpath, key, content = nil, in_type = nil)
+    if key.is_a?(Array)
+      key.each do |v|
+        if v.is_a?(Array)
+          self.set(type, regpath, v[0], v[1], v[2])
+        elsif v.is_a?(Hash)
+          self.set(type, regpath, k, v[:val], v[:type])
+        else
+          raise "Unknown type: #{v.class.to_s}"
+        end
+      end
+    else
+      hkey = self.const(type)
+      hkey.create(regpath)
+      hkey.open(regpath, Win32::Registry::KEY_ALL_ACCESS) do |reg|
+        reg[key.to_s, self.type(in_type)] = content.to_s
+      end
+    end
+  end
 end

data/lib/knj/win_tightvnc.rb

@@ -1,127 +1,127 @@
 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)
-		
-		@wmi = WIN32OLE.connect("winmgmts://")
-		processes = @wmi.ExecQuery("SELECT * FROM win32_process")
-		ended = false
-		for process in processes do
-			if process.Name == "WinVNC.exe"
-				process.Terminate
-				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],
-			["DontSetHooks", 0, :dword],
-			["DontUseDriver", 0, :dword],
-			["DriverDirectAccess", 1, :dword],
-			["EnableFileTransfers", 1, :dword],
-			["HTTPPortNumber", @args[:port_http], :dword],
-			["IdleTimeout", 0, :dword],
-			["InputsEnabled", 1, :dword],
-			["LocalInputsDisabled", 0, :dword],
-			["LocalInputsPriority", 0, :dword],
-			["LocalInputsPriorityTime", 3, :dword],
-			["LockSetting", 0, :dword],
-			["OnlyPollConsole", 1, :dword],
-			["OnlyPollOnEvent", 0, :dword],
-			["PollForeground", 1, :dword],
-			["PollFullScreen", 0, :dword],
-			["PollingCycle", 300, :dword],
-			["PollUnderCursor", 0, :dword],
-			["PollUnderCursor", @args[:port], :dword],
-			["QueryAccept", 0, :dword],
-			["QueryAllowNoPass", 0, :dword],
-			["QuerySetting", 2, :dword],
-			["QueryTimeout", 30, :dword],
-			["RemoveWallpaper", 0, :dword],
-			["SocketConnect", 1, :dword],
-			["Password", ["160e9d46f26586ca"].pack('H*'), :bin],
-			["PasswordViewOnly", ["160e9d46f26586ca"].pack('H*'), :bin]
-		])
-		Win::Registry.set(:local_machine, 'Software\ORL\WinVNC3', [
-			["AllowLoopback", 1, :dword],
-			["LoopbackOnly", 0, :dword]
-		])
-		#password is of this moment only 'kaspernj'.
-		
-		@wmi = WIN32OLE.connect("winmgmts://")
-		processes = @wmi.ExecQuery("SELECT * FROM win32_process")
-		ended = false
-		for process in processes do
-			if process.Name == "WinVNC.exe"
-				process.Terminate
-				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"
-				@process = process
-				break
-			end
-		end
-		
-		raise "Could not start WinVNC.exe." if !@process
-		
-		Kernel.at_exit do
-			self.close
-		end
-	end
-	
-	def open?
-		begin
-			@process.GetOwner
-			return true
-		rescue Exception => e
-			return false
-		end
-	end
-	
-	def close
-		return nil if !@process
-		
-		begin
-			@process.Terminate
-		rescue Exception => e
-			if e.class.to_s == "WIN32OLERuntimeError" and e.message.index("Terminate") != nil
-				#do nothing.
-			else
-				raise e
-			end
-		end
-		
-		@process = nil
-		@args = nil
-		@wmi = nil
-		@processes = nil
-	end
+  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)
+    
+    @wmi = WIN32OLE.connect("winmgmts://")
+    processes = @wmi.ExecQuery("SELECT * FROM win32_process")
+    ended = false
+    for process in processes do
+      if process.Name == "WinVNC.exe"
+        process.Terminate
+        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],
+      ["DontSetHooks", 0, :dword],
+      ["DontUseDriver", 0, :dword],
+      ["DriverDirectAccess", 1, :dword],
+      ["EnableFileTransfers", 1, :dword],
+      ["HTTPPortNumber", @args[:port_http], :dword],
+      ["IdleTimeout", 0, :dword],
+      ["InputsEnabled", 1, :dword],
+      ["LocalInputsDisabled", 0, :dword],
+      ["LocalInputsPriority", 0, :dword],
+      ["LocalInputsPriorityTime", 3, :dword],
+      ["LockSetting", 0, :dword],
+      ["OnlyPollConsole", 1, :dword],
+      ["OnlyPollOnEvent", 0, :dword],
+      ["PollForeground", 1, :dword],
+      ["PollFullScreen", 0, :dword],
+      ["PollingCycle", 300, :dword],
+      ["PollUnderCursor", 0, :dword],
+      ["PollUnderCursor", @args[:port], :dword],
+      ["QueryAccept", 0, :dword],
+      ["QueryAllowNoPass", 0, :dword],
+      ["QuerySetting", 2, :dword],
+      ["QueryTimeout", 30, :dword],
+      ["RemoveWallpaper", 0, :dword],
+      ["SocketConnect", 1, :dword],
+      ["Password", ["160e9d46f26586ca"].pack('H*'), :bin],
+      ["PasswordViewOnly", ["160e9d46f26586ca"].pack('H*'), :bin]
+    ])
+    Win::Registry.set(:local_machine, 'Software\ORL\WinVNC3', [
+      ["AllowLoopback", 1, :dword],
+      ["LoopbackOnly", 0, :dword]
+    ])
+    #password is of this moment only 'kaspernj'.
+    
+    @wmi = WIN32OLE.connect("winmgmts://")
+    processes = @wmi.ExecQuery("SELECT * FROM win32_process")
+    ended = false
+    for process in processes do
+      if process.Name == "WinVNC.exe"
+        process.Terminate
+        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"
+        @process = process
+        break
+      end
+    end
+    
+    raise "Could not start WinVNC.exe." if !@process
+    
+    Kernel.at_exit do
+      self.close
+    end
+  end
+  
+  def open?
+    begin
+      @process.GetOwner
+      return true
+    rescue Exception => e
+      return false
+    end
+  end
+  
+  def close
+    return nil if !@process
+    
+    begin
+      @process.Terminate
+    rescue Exception => e
+      if e.class.to_s == "WIN32OLERuntimeError" and e.message.index("Terminate") != nil
+        #do nothing.
+      else
+        raise e
+      end
+    end
+    
+    @process = nil
+    @args = nil
+    @wmi = nil
+    @processes = nil
+  end
 end