knjrbfw 0.0.113 → 0.0.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 66637edb9c36f0d7ea2b74ef01525eac6504e558
-  data.tar.gz: 0618414f52721e98c76b6a87d2f1bbd30dfb948a
+SHA256:
+  metadata.gz: 6a5be1f9cec88387a3f22d11d086d874af8e86cea2f7e24596957b6ac8bede40
+  data.tar.gz: '01838b41b901833125a7e13ebbf294c0cc084327e6c878a9052d923ecf8af661'
 SHA512:
-  metadata.gz: 90be6e975266b2179b6689ff362b150afbb4871ccb9eb175fc1a1bc8b2bf1c823ebc8e36389db3387697fcf07ea45d6ae1bc4aabbacf8051c82532d052b0c13e
-  data.tar.gz: 212fa35ff3ea29a7bc6186be6a1df13dd1ab1d405db62979e6d4407f3203a3e0a0f73b1c978e34e013a996bdd9e627a66a037ac58a8d0432b279594e6a2c52b6
+  metadata.gz: c07835d6c2365d107aeb2bf8ce0d57879069b1cadbd3c97035ef11cd2585de4787e5a82974a48a5901f1cb620f267d6e39bf6c22c042161a88db1aecbe5e4ff1
+  data.tar.gz: c8f5d705a4cf5e46906fa52aa4ce615755f12cb83eb4e5414e571756fd972fca61ce61ede18a6ec8c550ec747db5fa5df0b6ad58c6ed9e0e56cd94e4ca97f803

data/Rakefile

@@ -11,20 +11,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "knjrbfw"
-  gem.homepage = "http://github.com/kaspernj/knjrbfw"
-  gem.license = "MIT"
-  gem.summary = %Q{A framework with lots of stuff for Ruby.}
-  gem.description = %Q{Including stuff for HTTP, SSH and much more.}
-  gem.email = "k@spernj.org"
-  gem.authors = ["Kasper Johansen"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

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/image.rb

@@ -113,7 +113,7 @@ class Knj::Image
         else
           pixels = pic.get_pixels(x_from, y_from, 1, y_to)
           pixels.each do |pixel|
-            pixel.opacity = ::Magick::TransparentOpacity
+            pixel.alpha = ::Magick::QuantumRange
           end
           pic.store_pixels(x_from, y_from, 1, y_to, pixels)
         end
@@ -159,8 +159,6 @@ class Knj::Image
         end
       end
     end
-
-    pic.matte = true
   end
 
   #Returns the width relative to the height.

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.113
+  version: 0.0.115
 platform: ruby
 authors:
-- Kasper Johansen
+- Kasper Stöckel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wref
@@ -186,16 +186,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- ".document"
-- ".rspec"
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
-- knjrbfw.gemspec
-- lib/knj/.gitignore
 - lib/knj/amixer.rb
 - lib/knj/arrayext.rb
 - lib/knj/autoload.rb
@@ -365,8 +358,6 @@ files:
 - lib/knj/scripts/svn_merge.rb
 - lib/knj/scripts/upgrade_knjrbfw_checker.rb
 - lib/knj/sms.rb
-- lib/knj/sshrobot.rb
-- lib/knj/sshrobot/sshrobot.rb
 - lib/knj/strings.rb
 - lib/knj/sysuser.rb
 - lib/knj/table_writer.rb
@@ -389,16 +380,6 @@ files:
 - lib/knj/x11vnc.rb
 - lib/knj/youtube.rb
 - lib/knjrbfw.rb
-- spec/amixer_spec.rb
-- spec/arrayext_spec.rb
-- spec/autoload_spec.rb
-- spec/cmd_parser_spec.rb
-- spec/knjrbfw_spec.rb
-- spec/locales_spec.rb
-- spec/spec_helper.rb
-- spec/strings_spec.rb
-- spec/web_spec.rb
-- testfiles/image.jpg
 homepage: http://github.com/kaspernj/knjrbfw
 licenses:
 - MIT
@@ -418,8 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A framework with lots of stuff for Ruby.

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/Gemfile

@@ -1,22 +0,0 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-gem "wref", ">= 0.0.8"
-gem "tsafe"
-gem "datet"
-gem "http2"
-gem "php4r"
-gem "ruby_process"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec"
-  gem "bundler"
-  gem "jeweler"
-  gem "sqlite3" if RUBY_ENGINE != "jruby"
-  gem "rmagick" if RUBY_ENGINE != "jruby"
-  gem "rmagick4j" if RUBY_ENGINE == "jruby"
-  gem "array_enumerator"
-end

data/Gemfile.lock

@@ -1,90 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    array_enumerator (0.0.3)
-    builder (3.2.2)
-    datet (0.0.25)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (2.1.1)
-    highline (1.6.21)
-    http2 (0.0.23)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mini_portile (0.5.3)
-    multi_json (1.9.2)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    php4r (0.0.4)
-      datet
-      http2
-      string-strtr
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rmagick (2.13.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    ruby_process (0.0.9)
-      tsafe
-      wref
-    sqlite3 (1.3.9)
-    string-strtr (0.0.3)
-    thread_safe (0.3.3)
-    tsafe (0.0.11)
-    wref (0.0.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  array_enumerator
-  bundler
-  datet
-  http2
-  jeweler
-  php4r
-  rmagick
-  rspec
-  ruby_process
-  sqlite3
-  tsafe
-  wref (>= 0.0.8)

data/VERSION

@@ -1 +0,0 @@
-0.0.113