knjrbfw 0.0.114 → 0.0.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07fe0af5b28cf7ca05f3046d0790968c1296b06bd7cb62d5c66736824f08e7c8
-  data.tar.gz: b2e0be27b9cc06223b8a87439b6d676d611f8220038a1b95fba83de9dda51688
+  metadata.gz: 6a5be1f9cec88387a3f22d11d086d874af8e86cea2f7e24596957b6ac8bede40
+  data.tar.gz: '01838b41b901833125a7e13ebbf294c0cc084327e6c878a9052d923ecf8af661'
 SHA512:
-  metadata.gz: ad7ecf818020effd32d3d8bf4efd2c87f1f3672dee5fbaf23970cd497bd89f031bbb4bb2803e483b5c32b16daf33c863e2b5317448ab0d0c601e99c1c1ff3efb
-  data.tar.gz: 16085e10575051841201d32398601aecd47c9134788b52e97555d0b5d9671f83d8660571dee7d11a1da45f4236a250d605e11dd596c52b2c83c51f21d036c196
+  metadata.gz: c07835d6c2365d107aeb2bf8ce0d57879069b1cadbd3c97035ef11cd2585de4787e5a82974a48a5901f1cb620f267d6e39bf6c22c042161a88db1aecbe5e4ff1
+  data.tar.gz: c8f5d705a4cf5e46906fa52aa4ce615755f12cb83eb4e5414e571756fd972fca61ce61ede18a6ec8c550ec747db5fa5df0b6ad58c6ed9e0e56cd94e4ca97f803

data/lib/knj/autoload/magick.rb

@@ -1,6 +1,6 @@
 begin
-  require "RMagick"
+  require "rmagick"
 rescue LoadError
   require "rubygems"
-  require "RMagick"
+  require "rmagick"
 end

data/lib/knj/event_handler.rb

@@ -5,7 +5,7 @@
 # events.connect(:test_event) do |*args|
 #   print "Test-event called!\n"
 # end
-# 
+#
 # events.call(:test_event) #=> prints "Test-event called!\n"
 class Knj::Event_handler
   #Sets various used variables.
@@ -13,13 +13,13 @@ class Knj::Event_handler
     @args = args
     @events = {}
   end
-  
+
   #Adds information about a new event.
   #===Examples
   # events.add_event(:name => :test_event)
   def add_event(event)
     raise "No name given." if !event[:name]
-    
+
     @events[event[:name]] = [] if !@events.key?(event[:name])
     @events[event[:name]] = {
       :event => event,
@@ -27,7 +27,7 @@ class Knj::Event_handler
       :callbacks_count => 0
     }
   end
-  
+
   #Adds multiple events.
   #===Examples
   # events.add_events(:test_event, :another_event, :a_third_event)
@@ -36,28 +36,28 @@ class Knj::Event_handler
       self.add_event(:name => event)
     end
   end
-  
+
   #Connects the given block to a given event.
   #===Examples
   # events.connect(:test_event){ |*args| print "Test event!\n"}
   def connect(name, &block)
     raise "No such event: '#{name}'." if !@events.key?(name)
-    
+
     event = @events[name]
-    
+
     if event[:event].key?(:connections_max) and event[:callbacks].length >= event[:event][:connections_max].to_i
       raise "The event '#{name}' has reached its maximum connections of '#{event[:event][:connections_max]}'"
     end
-    
+
     event[:callbacks_count] += 1
     count = event[:callbacks_count]
     event[:callbacks][count] = {
       :block => block
     }
-    
+
     return count
   end
-  
+
   #Returns true if the given event is connected.
   #===Examples
   # print "Test-event is connected!" if events.connected?(:test_event)
@@ -65,7 +65,7 @@ class Knj::Event_handler
     raise "No such event." if !@events.key?(name)
     return !@events[name][:callbacks].empty?
   end
-  
+
   #Disconnects an event.
   #===Examples
   # connection_id = events.connect(:test_event){print "test event!}
@@ -77,7 +77,7 @@ class Knj::Event_handler
     @events[name][:callbacks][callback_id].clear
     @events[name][:callbacks].delete(callback_id)
   end
-  
+
   #Returns how many blocks have been connected to an event.
   #===Examples
   # print "More than five connections to test-event!" if events.count_events(:test_event) > 5
@@ -85,18 +85,18 @@ class Knj::Event_handler
     raise "No such event." if !@events.key?(name)
     return @events[name][:callbacks].length
   end
-  
+
   #Calls an added event.
   #===Examples
   # events.call(:test_event, {:data => 1})
-  def call(name, *args)
+  def call(name, *args, **opts)
     raise "No such event: '#{name}'." if !@events.key?(name)
     event = @events[name]
     ret = nil
     event[:callbacks].clone.each do |callback_id, callback_hash|
-      ret = callback_hash[:block].call(name, *args)
+      ret = callback_hash.fetch(:block).call(name, *args, **opts)
     end
-    
+
     return ret
   end
 end

data/lib/knj/web.rb

@@ -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_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"])
     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_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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.114
+  version: 0.0.115
 platform: ruby
 authors:
 - Kasper Stöckel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-10-19 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.