knjrbfw 0.0.104 → 0.0.105

data/Gemfile.lock

@@ -3,20 +3,20 @@ GEM
   specs:
     array_enumerator (0.0.3)
     datet (0.0.25)
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.4)
     git (1.2.5)
-    http2 (0.0.13)
+    http2 (0.0.17)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.7)
+    json (1.8.0)
     php4r (0.0.4)
       datet
       http2
       string-strtr
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
     rmagick (2.13.2)

data/VERSION

@@ -1 +1 @@
-0.0.104
+0.0.105

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "knjrbfw"
-  s.version = "0.0.104"
+  s.version = "0.0.105"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-04-11"
+  s.date = "2013-06-28"
   s.description = "Including stuff for HTTP, SSH and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -241,6 +241,7 @@ Gem::Specification.new do |s|
     "lib/knj/unix_proc.rb",
     "lib/knj/web.rb",
     "lib/knj/webscripts/image.rhtml",
+    "lib/knj/webscripts/image_subproc.rhtml",
     "lib/knj/win.rb",
     "lib/knj/win_registry.rb",
     "lib/knj/win_tightvnc.rb",
@@ -266,7 +267,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/kaspernj/knjrbfw"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.23"
   s.summary = "A framework with lots of stuff for Ruby."
 
   if s.respond_to? :specification_version then

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb

@@ -31,6 +31,8 @@ class KnjDB_sqlite3::Tables
     
     @list_mutex.synchronize do
       q_tables = @db.select("sqlite_master", {"type" => "table"}, {"orderby" => "name"}) do |d_tables|
+        next if d_tables[:name] == "sqlite_sequence"
+        
         obj = @list.get!(d_tables[:name])
         
         if !obj

data/lib/knj/os.rb

@@ -241,8 +241,12 @@ module Knj::Os
       end
     end
     
-    puts ENV.to_hash
+    # Code for returning RBEnv Ruby path if running through RBEnv.
+    if ENV["RBENV_VERSION"] && ENV["RBENV_ROOT"]
+      rbenv_path = "#{ENV["RBENV_ROOT"]}/versions/#{ENV["RBENV_VERSION"]}/bin/ruby"
+      return rbenv_path if File.exists?(rbenv_path)
+    end
     
-    raise "Could not figure out the executed executable."
+    raise "Could not figure out the executed executable from the environment: '#{ENV.to_hash}'."
   end
 end

data/lib/knj/webscripts/image.rhtml

@@ -48,23 +48,23 @@
   end
 	
 	time_orig = File.mtime(_get["path"])
-	
-	tmp_use = false
 	tmp_write = false
 	if Knj::CONFIG["webscripts_image"]
-		tmp_use = true
 		tmp_path = "#{Knj::CONFIG["webscripts_image"]["tmp_path"]}/#{idstr}"
-		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
-	end
+	else
+    tmp_path = "#{Knj::Os.tmpdir}/knjrbfw_image_#{idstr}"
+  end
+  
+  tmp_exists = File.exists?(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
@@ -85,85 +85,87 @@
     exit
   end
   
-	if !tmp_use or tmp_write or force
+	if tmp_write or force
     blob_cont = nil
-    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(: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["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
+    
+    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
+        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 _get["width"] and _get["height"]
-        width = _get["width"].to_i
-        height = _get["height"].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 != pic_rows or width != pic_columns
-        pic = pic.resize_to_fit(width.to_i, height.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["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)
+      if _get["border"] and _get["border_color"]
+        args[:border] = _get["border"].to_i
+        args[:border_color] = _get["border_color"]
       end
       
-      pic.write(tmp_path) if tmp_write or force
+      #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)
 	
 	appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
   appsrv.header("Content-Type", "image/png")

data/lib/knj/webscripts/image_subproc.rhtml

@@ -0,0 +1,180 @@
+<%
+  #Register appserver.
+  begin
+    appsrv = _hb
+  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"]}"
+      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
+  
+  #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(: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
+          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_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/spec/db_spec.rb

@@ -203,4 +203,80 @@ describe "Db" do
     date = Date.new(1985, 6, 17)
     db.insert(:test, {:date => date}, :return_sql => true).should eql("INSERT INTO `test` (`date`) VALUES ('1985-06-17')")
   end
+  
+  it "should copy database structure and data" do
+    require "knj/db"
+    require "knj/os"
+    require "rubygems"
+    require "sqlite3" if !Kernel.const_defined?("SQLite3") and RUBY_ENGINE != "jruby"
+    
+    db_path1 = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3_db1.sqlite3"
+    File.unlink(db_path1) if File.exists?(db_path1)
+    
+    db_path2 = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3_db2.sqlite3"
+    File.unlink(db_path2) if File.exists?(db_path2)
+    
+    db1 = Knj::Db.new(
+      :type => "sqlite3",
+      :path => db_path1,
+      :return_keys => "symbols",
+      :index_append_table_name => true
+    )
+    
+    db1.tables.create(:test_table, {
+      "columns" => [
+        {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+        {"name" => "testname", "type" => "varchar"}
+      ],
+      "indexes" => [
+        "testname"
+      ]
+    })
+    
+    table1 = db1.tables["test_table"]
+    cols1 = table1.columns
+    
+    100.times do |count|
+      table1.insert(:testname => "TestRow#{count}")
+    end
+    
+    db2 = Knj::Db.new(
+      :type => "sqlite3",
+      :path => db_path2,
+      :return_keys => "symbols",
+      :index_append_table_name => true
+    )
+    
+    begin
+      table2 = db2.tables["test_table"]
+      raise "Expected not-found exception."
+    rescue Errno::ENOENT
+      #expected
+    end
+    
+    db1.copy_to(db2)
+    
+    table2 = db2.tables["test_table"]
+    
+    cols2 = table2.columns
+    cols2.length.should eql(cols1.length)
+    
+    table2.rows_count.should eql(table1.rows_count)
+    
+    db1.select(:test_table) do |row1|
+      found = 0
+      db2.select(:test_table, row1) do |row2|
+        found += 1
+        
+        row1.each do |key, val|
+          row2[key].should eql(val)
+        end
+      end
+      
+      found.should eql(1)
+    end
+    
+    table1.indexes.length.should eql(1)
+    table2.indexes.length.should eql(table1.indexes.length)
+  end
 end

metadata

@@ -1,203 +1,203 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.104
   prerelease: 
+  version: 0.0.105
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: wref
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: wref
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tsafe
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: tsafe
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: datet
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: datet
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http2
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: http2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: php4r
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: php4r
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby_process
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: ruby_process
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: bundler
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: jeweler
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: sqlite3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rmagick
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: array_enumerator
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: array_enumerator
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -435,6 +435,7 @@ files:
 - lib/knj/unix_proc.rb
 - lib/knj/web.rb
 - lib/knj/webscripts/image.rhtml
+- lib/knj/webscripts/image_subproc.rhtml
 - lib/knj/win.rb
 - lib/knj/win_registry.rb
 - lib/knj/win_tightvnc.rb
@@ -468,10 +469,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -708484530570275600
+      hash: -3077588616452879408
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -480,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A framework with lots of stuff for Ruby.