knjrbfw 0.0.18 → 0.0.19

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/knj/autoload/soap.rb",
     "lib/knj/autoload/sqlite3.rb",
     "lib/knj/autoload/tmail.rb",
+    "lib/knj/autoload/tzinfo.rb",
     "lib/knj/autoload/xmlsimple.rb",
     "lib/knj/autoload/zip.rb",
     "lib/knj/cmd_gen.rb",

data/lib/knj/autoload.rb

@@ -99,6 +99,7 @@ autoload :SQLite3, $knjpath + "autoload/sqlite3"
 autoload :Timeout, "timeout"
 autoload :TCPSocket, "socket"
 autoload :TCPServer, "socket"
+autoload :TZInfo, $knjpath + "autoload/tzinfo"
 autoload :URI, "uri"
 autoload :Win32, "win32/registry"
 autoload :WIN32OLE, "win32ole"

data/lib/knj/autoload/tzinfo.rb

@@ -0,0 +1,2 @@
+require "rubygems"
+require "tzinfo"

data/lib/knj/image.rb

@@ -92,16 +92,27 @@ class Knj::Image
         next if y_to <= 0
         
         #Make corners transparent.
-        pixels = pic.get_pixels(x_from, y_from, 1, y_to)
-        pixels.each do |pixel|
-          pixel.opacity = Magick::TransparentOpacity
+        if false or RUBY_ENGINE == "jruby"
+          #Make up for the fact that "get_pixels" has not been implemented in "rmagick4j"...
+          pixels = []
+          0.upto(y_to) do |count|
+            pixels << Magick::Pixel.new(0, 0, 0, 255)
+          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.opacity = Magick::TransparentOpacity
+          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]
@@ -112,12 +123,28 @@ class Knj::Image
         end
         
         count_from.upto(count_to - 1) do |coord|
-          pixel = Magick::Pixel.from_color(args[:border_color])
+          if RUBY_ENGINE == "jruby" and 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)
-            pic.pixel_color(border[:x], coord, pixel)
+            if RUBY_ENGINE == "jruby"
+              pic.store_pixels(border[:x], coord, 1, 1, [pixel])
+            else
+              pic.pixel_color(border[:x], coord, pixel)
+            end
           elsif border.key?(:y)
-            pic.pixel_color(coord, border[:y], pixel)
+            if RUBY_ENGINE == "jruby"
+              pic.store_pixels(coord, border[:y], 1, 1, [pixel])
+            else
+              pic.pixel_color(coord, border[:y], pixel)
+            end
           end
         end
       end

data/lib/knj/os.rb

@@ -79,9 +79,18 @@ module Knj::Os
     }
     
     if RUBY_ENGINE == "jruby"
-      IO.popen4(cmd) do |pid, stdin, stdout, stderr|
-        res[:out] << stdout.read
-        res[:err] << stderr.read
+      begin
+        IO.popen4(cmd) do |pid, stdin, stdout, stderr|
+          res[:out] << stdout.read
+          res[:err] << stderr.read
+        end
+      rescue Errno::EBADF => e
+        #Catch and rescue retarted JRuby.
+        if e.message == "Bad file descriptor - Bad file descriptor"
+          retry
+        else
+          raise e
+        end
       end
     else
       Open3.popen3(cmd) do |stdin, stdout, stderr|

data/lib/knj/process_meta.rb

@@ -31,6 +31,9 @@ class Knj::Process_meta
       @stdin, @stdout, @stderr = Open3.popen3(cmd)
     end
     
+    @stdout.sync = true
+    @stdin.sync = true
+    
     args = {
       :out => @stdin,
       :in => @stdout,
@@ -45,6 +48,10 @@ class Knj::Process_meta
       }
     end
     
+    #Wait for process to start and check that it is returning the expected output.
+    start_line = @stdout.gets
+    raise "Expected startline from process to be 'process_meta_started' but got: '#{start_line}'." if start_line != "process_meta_started\n"
+    
     @process = Knj::Process.new(args)
     
     res = @process.send("obj" => {"type" => "process_data"})

data/lib/knj/scripts/process_meta_exec.rb

@@ -105,4 +105,6 @@ objects = {}
     block_res
   }
 )
+
+print "process_meta_started\n"
 @process.join

data/lib/knj/webscripts/image.rhtml

@@ -164,7 +164,7 @@
     end
 	end
 	
-	if tmp_use
+	if tmp_use and !force
     _kas.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
 		_kas.header("Content-Type", "image/png")
 		_httpsession.force_content(File.new(tmp_path))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7578360 !ruby/object:Gem::Requirement
+  requirement: &18696600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *7578360
+  version_requirements: *18696600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7544440 !ruby/object:Gem::Requirement
+  requirement: &18672900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7544440
+  version_requirements: *18672900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &7542000 !ruby/object:Gem::Requirement
+  requirement: &18626780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *7542000
+  version_requirements: *18626780
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &7539900 !ruby/object:Gem::Requirement
+  requirement: &18624480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7539900
+  version_requirements: *18624480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &7530740 !ruby/object:Gem::Requirement
+  requirement: &18622160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7530740
+  version_requirements: *18622160
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &7528720 !ruby/object:Gem::Requirement
+  requirement: &18602320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7528720
+  version_requirements: *18602320
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -118,6 +118,7 @@ files:
 - lib/knj/autoload/soap.rb
 - lib/knj/autoload/sqlite3.rb
 - lib/knj/autoload/tmail.rb
+- lib/knj/autoload/tzinfo.rb
 - lib/knj/autoload/xmlsimple.rb
 - lib/knj/autoload/zip.rb
 - lib/knj/cmd_gen.rb
@@ -339,7 +340,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1273769801441211425
+      hash: -2766455061602575387
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: