knjrbfw 0.0.86 → 0.0.87

data/VERSION

@@ -1 +1 @@
-0.0.86
+0.0.87

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.86"
+  s.version = "0.0.87"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-17}
+  s.date = %q{2012-08-19}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -240,7 +240,6 @@ Gem::Specification.new do |s|
     "lib/knj/thread.rb",
     "lib/knj/thread2.rb",
     "lib/knj/threadhandler.rb",
-    "lib/knj/threadpool.rb",
     "lib/knj/translations.rb",
     "lib/knj/unix_proc.rb",
     "lib/knj/web.rb",

data/lib/knj/datarow.rb

@@ -760,17 +760,32 @@ class Knj::Datarow
   #Various methods to define methods based on the columns for the datarow.
   def self.define_translation_methods(args)
     define_method("#{args[:val_dc]}=") do |newtransval|
-      _kas.trans_set(self, {
-        args[:val] => newtransval
-      })
+      begin
+        _hb.trans_set(self, {
+          args[:val] => newtransval
+        })
+      rescue NameError
+        _kas.trans_set(self, {
+          args[:val] => newtransval
+        })
+      end
     end
     
     define_method("#{args[:val_dc]}") do
-      return _kas.trans(self, args[:val])
+      begin
+        return _hb.trans(self, args[:val])
+      rescue NameError
+        return _kas.trans(self, args[:val])
+      end
     end
     
     define_method("#{args[:val_dc]}_html") do
-      str = _kas.trans(self, args[:val])
+      begin
+        str = _hb.trans(self, args[:val])
+      rescue NameError
+        str = _kas.trans(self, args[:val])
+      end
+      
       if str.to_s.strip.length <= 0
         return "[no translation for #{args[:val]}]"
       end

data/lib/knj/unix_proc.rb

@@ -1,4 +1,4 @@
-#Requires the 'wref'-gem.
+#Require the 'wref'-gem if it hasnt already been.
 require "wref" if !Kernel.const_defined?(:Wref)
 
 #This class handels various stuff regarding Unix-processes.
@@ -35,7 +35,12 @@ class Knj::Unix_proc
     
     MUTEX.synchronize do
       ret = [] unless block_given?
-      res = Knj::Os.shellcmd(cmdstr)
+      
+      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]
@@ -64,12 +69,16 @@ class Knj::Unix_proc
           next if !found
         end
         
-        proc_obj = Knj::Unix_proc.spawn(data)
-        
-        if block_given?
-          yield(proc_obj)
+        if args["yield_data"]
+          yield(data)
         else
-          ret << proc_obj
+          proc_obj = Knj::Unix_proc.spawn(data)
+          
+          if block_given?
+            yield(proc_obj)
+          else
+            ret << proc_obj
+          end
         end
       end
       

data/lib/knj/webscripts/image.rhtml

@@ -1,4 +1,11 @@
 <%
+  #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 = {
@@ -171,12 +178,12 @@
 	end
 	
 	if tmp_use and !force
-    _kas.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
-		_kas.header("Content-Type", "image/png")
+    appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
+		appsrv.header("Content-Type", "image/png")
 		_httpsession.force_content(File.read(tmp_path))
 	else
-    _kas.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
-		_kas.header("Content-Type", "image/png")
+    appsrv.header("Last-Modified", "#{time_orig.httpdate} GMT") if time_orig
+		appsrv.header("Content-Type", "image/png")
 		_httpsession.force_content(blob_cont)
 	end
 %>

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.86
+  version: 0.0.87
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 +02:00
+date: 2012-08-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -356,7 +356,6 @@ files:
 - lib/knj/thread.rb
 - lib/knj/thread2.rb
 - lib/knj/threadhandler.rb
-- lib/knj/threadpool.rb
 - lib/knj/translations.rb
 - lib/knj/unix_proc.rb
 - lib/knj/web.rb
@@ -395,7 +394,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1505749877110619661
+      hash: -398379275512532928
       segments: 
       - 0
       version: "0"

data/lib/knj/threadpool.rb

@@ -1,264 +0,0 @@
-#A small threadpool framework.
-class Knj::Threadpool
-  def self.worker_data
-    raise "This thread is not running via the threadpool." if !Thread.current[:knj_threadpool]
-    return Thread.current[:knj_threadpool]
-  end
-  
-  attr_reader :workers, :blocks, :mutex, :args, :events
-  
-  #Constructor.
-  #===Examples
-  # tp = Knj::Threadpool.new(:threads => 5)
-  def initialize(args = {})
-    @args = args
-    @args[:sleep] = 0.2 if !@args.key?(:sleep)
-    
-    raise "Invalid number of threads: '#{@args[:threads]}'." if !@args[:threads] or @args[:threads].to_i <= 0
-    
-    @workers = []
-    @blocks = []
-    @mutex = Mutex.new
-    @events = Knj::Event_handler.new
-    @events.add_event(:name => :on_error)
-    
-    self.start
-  end
-  
-  #Starts the threadpool. This is automatically called from the constructor.
-  def start
-    @mutex.synchronize do
-      if !@running
-        @workers.length.upto(@args[:threads]) do |count|
-          @workers << Knj::Threadpool::Worker.new(:threadpool => self, :id => count)
-        end
-        
-        @running = true
-      end
-    end
-  end
-  
-  #Stops the threadpool.
-  def stop
-    if @running
-      @workers.each do |worker|
-        if !worker.running
-          worker.kill
-          @workers.delete(worker)
-        end
-      end
-      
-      @running = false
-    end
-  end
-  
-  #Runs the given block, waits for the result and returns the result.
-  def run(*args, &block)
-    raise "No block given." if !block_given?
-    blockdata = {:block => block, :result => nil, :running => false, :runned => false, :args => args}
-    @blocks << blockdata
-    
-    loop do
-      sleep @args[:sleep]
-      
-      if blockdata[:runned]
-        begin
-          res = blockdata[:result]
-          raise blockdata[:error] if blockdata.key?(:error)
-        ensure
-          @mutex.synchronize do
-            blockdata.clear
-            @blocks.delete(blockdata)
-          end
-        end
-        
-        return res
-      end
-    end
-  end
-  
-  #Runs the given block in the threadpool asynced. Returns a 'Knj::Threadpool::Asynced'-object that can be used to get the result and more.
-  def run_async(*args, &block)
-    raise "No block given." if !block_given?
-    
-    @mutex.synchronize do
-      blockdata = {:block => block, :running => false, :runned => false, :args => args}
-      @blocks << blockdata
-      return Knj::Threadpool::Asynced.new(blockdata)
-    end
-  end
-  
-  #Returns a new block to be runned if there is one. Otherwise false.
-  def get_block
-    return false if !@running
-    
-    @mutex.synchronize do
-      @blocks.each do |blockdata|
-        if blockdata and !blockdata[:running] and !blockdata[:runned]
-          blockdata[:running] = true
-          return blockdata
-        end
-      end
-      
-      return false
-    end
-  end
-end
-
-#This is the threadpool worker-object. No need to spawn this manually.
-class Knj::Threadpool::Worker
-  attr_reader :running
-  
-  #Constructor. Should not be called manually.
-  def initialize(args)
-    @args = args
-    @tp = @args[:threadpool]
-    @mutex_tp = @tp.mutex
-    @sleep = @tp.args[:sleep]
-    @running = false
-    self.spawn_thread
-  end
-  
-  #Starts the workers thread.
-  def spawn_thread
-    @thread = Knj::Thread.new do
-      loop do
-        break if !@sleep or !@tp
-        
-        if !@blockdata
-          sleep @sleep
-          @blockdata = @tp.get_block if !@blockdata
-        end
-        
-        next if !@blockdata
-        
-        res = nil
-        raise "No block in blockdata?" if !@blockdata[:block]
-        @blockdata[:worker] = self
-        Thread.current[:knj_threadpool] = {
-          :worker => self,
-          :blockdata => @blockdata
-        }
-        
-        begin
-          @running = true
-          res = @blockdata[:block].call(*@blockdata[:args])
-        rescue => e
-          @mutex_tp.synchronize do
-            @blockdata[:error] = e
-          end
-        ensure
-          #Reset thread.
-          Thread.current[:knj_threadpool] = nil
-          
-          #Set running-status on worker.
-          @running = false
-          
-          #Update block-data.
-          @mutex_tp.synchronize do
-            @blockdata[:result] = res if res
-            @blockdata[:runned] = true
-            @blockdata[:running] = false
-          end
-          
-          #Try to avoid slowdown of sleep by checking if there is a new block right away.
-          @blockdata = @tp.get_block
-        end
-      end
-    end
-  end
-  
-  #Returns true if the worker is currently working with a block.
-  def busy?
-    return true if @blockdata
-  end
-  
-  #Returns the ID of the worker.
-  def id
-    return @args[:id]
-  end
-  
-  #Kills the current thread and restarts the worker.
-  def restart
-    @mutex_tp.synchronize do
-      @thread.kill
-      
-      if @blockdata
-        @blockdata[:runned] = true
-        @blockdata[:running] = false
-        
-        begin
-          sleep 0.1
-          raise "The worker was stopped during execution of the block."
-        rescue => e
-          @blockdata[:error] = e
-        end
-      end
-      
-      #Dont run the job again - remove it from the queue.
-      @tp.blocks.delete(@blockdata)
-      @blockdata = nil
-      @running = false
-      
-      #Spawn a new thread - we killed the previous.
-      self.spawn_thread
-    end
-  end
-  
-  #Kills the thread.
-  def kill
-    @mutex_tp.synchronize do
-      @thread.kill
-    end
-  end
-end
-
-#An object of this class will be returned when calling 'run_async'.
-class Knj::Threadpool::Asynced
-  #Constructor. Should not be called manually.
-  def initialize(args)
-    @args = args
-  end
-  
-  #Returns true if the asynced job is still running.
-  def running?
-    return true if @args[:running]
-    return false
-  end
-  
-  #Returns true if the asynced job is done running.
-  def done?
-    return true if @args[:runned] or @args.empty? or @args[:error]
-    return false
-  end
-  
-  #Returns true if the asynced job is still waiting to run.
-  def waiting?
-    return true if !@args.empty? and !@args[:running] and !@args[:runned]
-    return false
-  end
-  
-  #Raises error if one has happened in the asynced job.
-  def error!
-    raise @args[:error] if @args.key?(:error)
-  end
-  
-  #Sleeps until the asynced job is done. If an error occurred in the job, that error will be raised when calling the method.
-  def join
-    loop do
-      self.error!
-      break if self.done?
-      sleep 0.1
-    end
-    
-    self.error!
-  end
-  
-  #Returns the result of the job. If an error occurred in the job, that error will be raised when calling the method.
-  def result(args = nil)
-    self.join if args and args[:wait]
-    raise "Not done yet." unless self.done?
-    self.error!
-    return @args[:result]
-  end
-end