knjrbfw 0.0.110 → 0.0.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c894f6dac2d6899c0d42d2874968ed41d5878145
-  data.tar.gz: cbeeb680377f41ec8783cf6cf266532d86de000c
+SHA256:
+  metadata.gz: 07fe0af5b28cf7ca05f3046d0790968c1296b06bd7cb62d5c66736824f08e7c8
+  data.tar.gz: b2e0be27b9cc06223b8a87439b6d676d611f8220038a1b95fba83de9dda51688
 SHA512:
-  metadata.gz: 8173fec01b767f6e7865ee7fd7b6270471eee04803457d6547d24cd9bfad8b6b417c5397ef78185638dd06b90d4de99a4b57645a12d51bb48715aff663ae4f1c
-  data.tar.gz: 126e0ebe86a1c640a4c75d41ffaad9e6ba6585b75aa3c0c6e27d10cca5de585f73812395bf011b1cedaf74933568aaa762f3e071333abc2cadd93e7ac32a9c0c
+  metadata.gz: ad7ecf818020effd32d3d8bf4efd2c87f1f3672dee5fbaf23970cd497bd89f031bbb4bb2803e483b5c32b16daf33c863e2b5317448ab0d0c601e99c1c1ff3efb
+  data.tar.gz: 16085e10575051841201d32398601aecd47c9134788b52e97555d0b5d9671f83d8660571dee7d11a1da45f4236a250d605e11dd596c52b2c83c51f21d036c196

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

@@ -63,7 +63,7 @@ else
   autoload :GetText, $knjpath + "autoload/gettext"
   autoload :Gtk, $knjpath + "autoload/gtk2"
   autoload :GladeXML, "libglade2"
-  
+
   #this bugs?
   #autoload :Gdk, $knjpath + "autoload/gtk2"
 end
@@ -90,4 +90,3 @@ autoload :Cinch, $knjpath + "autoload/cinch"
 autoload :Facebooker, $knjpath + "autoload/facebooker"
 autoload :Tsafe, "tsafe"
 autoload :Wref, $knjpath + "autoload/wref"
-autoload :Wref_map, $knjpath + "autoload/wref"

data/lib/knj/gtk2_window.rb

@@ -2,21 +2,21 @@ Knj.gem_require(:wref)
 
 #Containing various helper methods for Gtk2-windows.
 class Knj::Gtk2::Window
-  @@uniques = Wref_map.new
-  
+  @@uniques = Wref::Map.new
+
   #Used to make a window-instance unique. If it already exists when unique! is called, then it will pass focus to the existing window instead of yielding the block, which should contain code to create the window.
   #===Examples
   #This should only create a single window.
   # Knj::Gtk2::Window.unique!("my_window") do
   #  Gtk::Window.new
   # end
-  # 
+  #
   # Knj::Gtk2::Window.unique!("my_window") do
   #  Gtk::Window.new
   # end
   def self.unique!(id)
     instance = @@uniques.get!(id)
-    
+
     if instance and !instance.gui["window"].destroyed?
       instance.gui["window"].present
     else
@@ -24,18 +24,18 @@ class Knj::Gtk2::Window
       @@uniques[id] = obj
     end
   end
-  
+
   #Returns the object if it hasnt been destroyed.
   #===Examples
   # Knj::Gtk2::Window.get("my_window") #=> nil
   # Knj::Gtk2::Window.get("my_window") #=> Gtk::Builder-object
   def self.get(id)
     instance = @@uniques.get!(id)
-    
+
     if instance and !instance.gui["window"].destroyed?
       return instance
     end
-    
+
     return nil
   end
 end

data/lib/knj/image.rb

@@ -4,114 +4,125 @@ class Knj::Image
   #===Examples
   # img = Magick::Image.read(path_str)
   # Knj::Image.rounded_corners(
-  #   :img => img,
-  #   :radius => 25,
-  #   :border => 1,
-  #   :border_color => "#000000"
+  #   img: img,
+  #   radius: 25,
+  #   border: 1,
+  #   border_color: "#000000"
   # )
   def self.rounded_corners(args)
-    raise "No or invalid ':img' given: '#{args}'." if !args[:img]
+    raise "No or invalid ':img' given: '#{args}'." unless args[:img]
     raise "No or invalid ':radius' given: '#{args}'." if !args[:radius].respond_to?(:to_i) || args[:radius].to_i <= 0
-    
+
     pic = args[:img]
     raise "Format '#{pic.format}' does not support transparency." if pic.format == "JPEG"
-    
+
     r = args[:radius].to_i
     r_half = r / 2
     r2 = r * r
     d = r * 2
-    
+
     center_x = r - 1
     center_y = 1
-    
+
     coords = {}
     0.upto(r) do |x|
       y = center_y + ::Math.sqrt(r2 - ((x - center_x) * (x - center_x)))
       coords[x] = y.to_i
     end
-    
+
     if args[:border]
       draw = ::Magick::Draw.new
       draw.stroke(args[:border_color])
       draw.stroke_width(1)
-      
+
       0.upto(args[:border] - 1) do |x|
         draw.line(x, 0, x, pic.rows)
         draw.line(pic.columns-x-1, 0, pic.columns-x-1, pic.rows)
-        
+
         draw.line(0, x, pic.columns, x)
         draw.line(0, pic.rows-x-1, pic.columns, pic.rows-x-1)
       end
-      
+
       draw.draw(pic)
     end
-    
+
     borders = [] if args[:border]
-    
+
     1.upto(4) do |count|
       r.times do |x|
         border_from = nil
         border_to = nil
         border_mode = nil
-        
+
         case count
           when 1
             x_from = x
-            
+
             y_from = 0
             y_to = r - coords[x]
-            
-            if borders and x > 0 and x < r_half
+
+            if borders && x > 0 && x < r_half
               border_from = y_to
               border_to = r - coords[x - 1]
               border_to = 1 if border_to < 1
-              
+
               #top left
-              borders << {:x => x_from, :yf => border_from, :yt => border_to}
-              borders << {:y => x_from, :xf => border_from, :xt => border_to}
-              
+              borders << {x: x_from, yf: border_from, yt: border_to}
+              borders << {y: x_from, xf: border_from, xt: border_to}
+
               #top right
-              borders << {:x => pic.columns - x - 1, :yf => border_from, :yt => border_to}
-              borders << {:y => x_from, :xf => pic.columns - border_to, :xt => pic.columns - border_from}
-              
+              borders << {x: pic.columns - x - 1, yf: border_from, yt: border_to}
+              borders << {y: x_from, xf: pic.columns - border_to, xt: pic.columns - border_from}
+
               #bottom left
-              borders << {:x => x_from, :yf => pic.rows - border_to, :yt => pic.rows - border_from}
-              borders << {:y => pic.rows - x - 1, :xf => border_from, :xt => border_to}
-              
+              borders << {x: x_from, yf: pic.rows - border_to, yt: pic.rows - border_from}
+              borders << {y: pic.rows - x - 1, xf: border_from, xt: border_to}
+
               #bottom right
-              borders << {:x => pic.columns - x - 1, :yf => pic.rows - border_to, :yt => pic.rows - border_from}
-              borders << {:y => pic.rows - x - 1, :xf => pic.columns - border_to, :xt => pic.columns - border_from}
+              borders << {x: pic.columns - x - 1, yf: pic.rows - border_to, yt: pic.rows - border_from}
+              borders << {y: pic.rows - x - 1, xf: pic.columns - border_to, xt: pic.columns - border_from}
             end
           when 2
             x_from = pic.columns - r + x
-            
+
             y_from = 0
             y_to = r - coords[r - x - 1]
           when 3
             x_from = x
-            
+
             y_from = pic.rows - r + coords[x]
             y_to = pic.rows - y_from
           when 4
             x_from = pic.columns - r + x
-            
+
             y_from = pic.rows - r + coords[r - x - 1]
             y_to = pic.rows - y_from
         end
-        
+
         next if y_to <= 0
-        
-        pixels = pic.get_pixels(x_from, y_from, 1, y_to)
-        pixels.each do |pixel|
-          pixel.opacity = ::Magick::TransparentOpacity
+
+        if RUBY_ENGINE == "jruby"
+          # Hack around missing method in rmagick4j Image#get_pixels. It will be black :-(
+          pixels = []
+          y_to.times do |count|
+            pixel = Magick::Pixel.new(0, 0, 0, 255)
+            pixels << pixel
+          end
+
+          pic.store_pixels(x_from, y_from, 1, y_to, pixels)
+        else
+          pixels = pic.get_pixels(x_from, y_from, 1, y_to)
+          pixels.each do |pixel|
+            pixel.alpha = ::Magick::QuantumRange
+          end
+          pic.store_pixels(x_from, y_from, 1, y_to, pixels)
         end
-        pic.store_pixels(x_from, y_from, 1, y_to, pixels)
       end
     end
-    
+
     if borders
       color = args[:border_color]
-      
+
       borders.each do |border|
         if border.key?(:x)
           count_from = border[:yf]
@@ -120,18 +131,18 @@ class Knj::Image
           count_from = border[:xf]
           count_to = border[:xt]
         end
-        
+
         count_from.upto(count_to - 1) do |coord|
-          if RUBY_ENGINE == "jruby" and color[0, 1] == "#"
+          if RUBY_ENGINE == "jruby" && color[0, 1] == "#"
             r = color[1, 2].hex
             b = color[3, 2].hex
             g = color[5, 2].hex
-            
+
             pixel = ::Magick::Pixel.new(r, b, g)
           else
             pixel = ::Magick::Pixel.from_color(color)
           end
-          
+
           if border.key?(:x)
             if RUBY_ENGINE == "jruby"
               pic.store_pixels(border[:x], coord, 1, 1, [pixel])
@@ -148,21 +159,19 @@ class Knj::Image
         end
       end
     end
-    
-    pic.matte = true
   end
-  
+
   #Returns the width relative to the height.
   #===Examples
   # Knj::Image.width_for_height(640, 480, 400) #=> 533
   def self.width_for_height(orig_width, orig_height, new_height)
     return (orig_width.to_f / (orig_height.to_f / new_height.to_f)).to_i
   end
-  
+
   #Returns the height relative to the width.
   #===Examples
   # Knj::Image.height_for_width(640, 480, 533) #=> 399
   def self.height_for_width(orig_width, orig_height, new_width)
     return (orig_height.to_f / (orig_width.to_f / new_width.to_f)).to_i
   end
-end
+end

data/lib/knj/scripts/php_to_rb_helper.rb

@@ -7,11 +7,11 @@ begin
   options = {}
   OptionParser.new do |opts|
     opts.banner = "Usage: example.rb [options]"
-    
+
     opts.on("-f PHPFILE", "--file", "The PHP-file you want help to convert.") do |f|
       options[:file] = f
     end
-    
+
     opts.on("-t", "--tags-remove", "Removes the PHP-tags completely.") do |t|
       options[:tags] = false
     end
@@ -37,15 +37,8 @@ cont.gsub!(/\A#!\/usr\/bin\/env\s+php5/, "!#/usr/bin/env ruby1.9.1")
 #Replace class extends.
 cont.scan(/(class\s+(.+?)\s+extends\s+(.+?){)/) do |match|
   rb_classname = "#{match[1][0..0].upcase}#{match[1][1..999]}"
-  
-  if match[2] == "knjdb_row"
-    extends = "Knj::Datarow"
-  else
-    extends = "#{match[2][0..0].upcase}#{match[2][1..999]}"
-  end
-  
+  extends = "#{match[2][0..0].upcase}#{match[2][1..999]}"
   rb_str = "class #{rb_classname} < #{extends}"
-  
   cont = cont.gsub(match[0], rb_str)
 end
 
@@ -54,7 +47,7 @@ end
 cont.scan(/(class\s+(.+?)\s*{)/) do |match|
   rb_classname = "#{match[1][0..0].upcase}#{match[1][1..999]}"
   rb_str = "class #{rb_classname}"
-  
+
   cont = cont.gsub(match[0], rb_str)
 end
 
@@ -68,7 +61,7 @@ cont.scan(/(static\s+function\s+(.+?)\((.*?)\)\s*{)/) do |match|
   else
     func_name = match[1]
   end
-  
+
   rb_str = "def self.#{func_name}(#{match[2]})"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -101,7 +94,7 @@ end
 cont.scan(/((\s+?)}\s*catch\s*\(\s*(#{regexes["class"]})\s+\$(#{regexes["var"]})\s*\)\s*{(\s+))/) do |match|
   classname = "#{match[2][0..0].upcase}#{match[2][1..999]}"
   classname = "Errno::ENOENT" if classname == "Knjdb_rownotfound_exception"
-  
+
   rb_str = "#{match[1]}rescue #{classname} => #{match[3]}#{match[4]}"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -111,7 +104,7 @@ end
 cont.scan(/((\s+?)require_once\s+\"(.+)\"\s*;(\s+?))/) do |match|
   filename = match[2]
   filename.gsub!(/\.php$/, ".rb")
-  
+
   rb_str = "#{match[1]}require \"#{filename}\"#{match[3]}"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -123,7 +116,7 @@ cont.scan(/(function\s(.+?)\((.*?)\))/) do |match|
   def_args.scan(/(([A-z]+)\s+\$(#{regexes["var"]}))/) do |match_arg|
     def_args = def_args.gsub(match_arg[0], "#{match_arg[2]}")
   end
-  
+
   rb_str = "def #{match[1]}(#{def_args})"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -267,11 +260,11 @@ end
 #Replace multi-line comments.
 cont.scan(/((\s+|<\?)\/\*([\s\S]+?)\*\/)/) do |match|
   rb_str = "\n=begin\n#{match[2]}\n=end\n"
-  
+
   if match[1] == "<?"
     rb_str = "<%#{rb_str}"
   end
-  
+
   cont = cont.gsub(match[0], rb_str)
 end
 
@@ -300,14 +293,14 @@ end
 #Replace variable-names.
 cont.scan(/(([^%\d])(\$(#{regexes["var"]})))/) do |match|
   vname = match[3]
-  
+
   if vname[-1..-1] == "["
     vname = vname[0..-2]
     match[0] = match[0][0..-2]
     match[2] = match[2][0..-2]
     match[3] = match[3][0..-2]
   end
-  
+
   if vname == "this"
     rb_varname = "self"
   elsif global_vars.key?(vname)
@@ -315,7 +308,7 @@ cont.scan(/(([^%\d])(\$(#{regexes["var"]})))/) do |match|
   else
     rb_varname = "#{vname}"
   end
-  
+
   cont = cont.gsub(match[2], rb_varname)
 end
 

data/lib/knj/unix_proc.rb

@@ -4,47 +4,47 @@ require "wref" if !Kernel.const_defined?(:Wref)
 #This class handels various stuff regarding Unix-processes.
 class Knj::Unix_proc
   attr_reader :data
-  
-  PROCS = Wref_map.new
+
+  PROCS = Wref::Map.new
   MUTEX = Mutex.new
-  
+
   #Spawns a process if it doesnt already exist in the wrap-map.
   def self.spawn(data)
     pid = data["pid"].to_i
-    
+
     begin
-      proc_ele = PROCS[pid]
+      proc_ele = PROCS.get!(pid)
       proc_ele.update_data(data)
     rescue Wref::Recycled
       proc_ele = Knj::Unix_proc.new(data)
       PROCS[pid] = proc_ele
     end
-    
+
     return proc_ele
   end
-  
+
   #Returns an array with (or yields if block given) Unix_proc. Hash-arguments as 'grep'.
   def self.list(args = {})
     cmdstr = "ps aux"
     grepstr = ""
-    
+
     if args["grep"]
       grepstr = "grep #{args["grep"]}" #used for ignoring the grep-process later.
       cmdstr << " | grep #{Knj::Strings.unixsafe(args["grep"])}"
     end
-    
+
     MUTEX.synchronize do
       ret = [] unless block_given?
-      
+
       if args["psaux_str"]
         res = args["psaux_str"]
       else
         res = Knj::Os.shellcmd(cmdstr)
       end
-      
+
       res.scan(/^(\S+)\s+([0-9]+)\s+([0-9.]+)\s+([0-9.]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+ (.+)($|\n)/) do |match|
         pid = match[1]
-        
+
         data = {
           "user" => match[0],
           "pid" => pid,
@@ -53,10 +53,10 @@ class Knj::Unix_proc
           "cmd" => match[4],
           "app" => File.basename(match[4])
         }
-        
+
         next if (!args.key?("ignore_self") or args["ignore_self"]) and match[1].to_i == $$.to_i
         next if grepstr.length > 0 and match[4].index(grepstr) != nil #dont return current process.
-        
+
         if args.key?("pids")
           found = false
           args["pids"].each do |pid_given|
@@ -65,15 +65,15 @@ class Knj::Unix_proc
               break
             end
           end
-          
+
           next if !found
         end
-        
+
         if args["yield_data"]
           yield(data)
         else
           proc_obj = Knj::Unix_proc.spawn(data)
-          
+
           if block_given?
             yield(proc_obj)
           else
@@ -81,9 +81,9 @@ class Knj::Unix_proc
           end
         end
       end
-      
+
       PROCS.clean
-      
+
       if block_given?
         return nil
       else
@@ -91,12 +91,12 @@ class Knj::Unix_proc
       end
     end
   end
-  
+
   #Returns the "Knj::Unix_proc" for the current process.
   def self.find_self
     procs = Knj::Unix_proc.list("ignore_self" => false)
     pid_find = Process.pid
-    
+
     proc_find = false
     procs.each do |proc_ele|
       if proc_ele["pid"].to_i == pid_find.to_i
@@ -104,10 +104,10 @@ class Knj::Unix_proc
         break
       end
     end
-    
+
     return proc_find
   end
-  
+
   #Return true if the given PID is running.
   def self.pid_running?(pid)
     begin
@@ -117,65 +117,65 @@ class Knj::Unix_proc
       return false
     end
   end
-  
+
   #Initializes various data for a Unix_proc-object. This should not be called manually but through "Unix_proc.list".
   def initialize(data)
     @data = data
   end
-  
+
   #Updates the data. This should not be called manually, but is exposed because of various code in "Unix_proc.list".
   def update_data(data)
     @data = data
   end
-  
+
   #Returns the PID of the process.
   def pid
     return @data["pid"].to_i
   end
-  
+
   #Returns a key from the data or raises an error.
   def [](key)
     raise "No such data: #{key}" if !@data.key?(key)
     return @data[key]
   end
-  
+
   #Kills the process.
   def kill
     Process.kill("TERM", @data["pid"].to_i)
   end
-  
+
   #Kills the process with 9.
   def kill!
     Process.kill(9, @data["pid"].to_i)
   end
-  
+
   #Hash-compatible.
   def to_h
     return @data.clone
   end
-  
+
   #Tries to kill the process gently, waits a couple of secs to check if the process is actually dead, then sends -9 kill signals.
   def kill_ensure(args = {})
     begin
       self.kill
       sleep 0.1
       return nil if !self.alive?
-      
+
       args[:sleep] = 2 if !args.key(:sleep)
-      
+
       0.upto(5) do
         sleep args[:sleep]
         self.kill!
         sleep 0.1
         return nil if !self.alive?
       end
-      
+
       raise "Could not kill the process."
     rescue Errno::ESRCH
       return nil
     end
   end
-  
+
   #Returns true if the process is still alive.
   def alive?
     return Knj::Unix_proc.pid_running?(@data["pid"].to_i)