simplews 1.1.2 → 1.1.4

data/History.txt

@@ -1,10 +1,4 @@
-== 1.1.2 2008-10-28
-
-* 2 bug fix:
-  * Release was missing a file
-  * Missing require
-
-== 1.1.0 2008-10-28
+== 1.1.4 2008-10-28
 
 * 1 major enhancement:
   * Web Service with asynchronous jobs

data/lib/simplews/asynchronous.rb

@@ -1,14 +1,14 @@
-require 'simplews'
+require File.join(File.dirname(File.dirname(__FILE__)) + '/simplews')
 class SimpleWS::Asynchronous < SimpleWS
 
   class JobNotFound < Exception; end
   class JobAborted < Exception; end
 
   
-  class Job
+  class Job < Thread
     
     @@jobs = {}
-    attr_reader :status, :messages, :name
+    attr_reader :status, :messages, :name, :results
 
     def self.random_name(s="", num=20)
       num.times{
@@ -42,65 +42,81 @@ class SimpleWS::Asynchronous < SimpleWS
       end
     end
 
-    def self.status(name)
+    def self.job(name)
       raise JobNotFound, "Job with name '#{ name }' was not found" if @@jobs[name].nil?
-      @@jobs[name].status
-    end
-    def self.messages(name)
-      raise JobNotFound, "Job with name '#{ name }' was not found" if @@jobs[name].nil?
-      @@jobs[name].messages
+      @@jobs[name]
     end
 
-    def self.done?(name)
-      raise JobNotFound, "Job with name '#{ name }' was not found" if @@jobs[name].nil?
-      @@jobs[name].done?
-    end
-
-    def self.error?(name)
-      raise JobNotFound, "Job with name '#{ name }' was not found" if @@jobs[name].nil?
-      @@jobs[name].error?
-    end
-
-    def self.abort(name)
-      raise JobNotFound, "Job with name '#{ name }' was not found" if @@jobs[name].nil?
-      @@jobs[name].abort
+    def self.start(name, workdir, results, &block)
+      job = Job.new(name, workdir, results, &block)
+      @@jobs[job.name] = job
+      job.name
     end
 
-    def self.aborted?(name)
-      raise JobNotFound, "Job with name '#{ name }' was not found" if @@jobs[name].nil?
-      @@jobs[name].aborted?
+    def self.read(name, path)
+      Job::job(name).read(path)
     end
 
 
-    def self.start(name,&block)
-      job = Job.new(name, &block)
-      @@jobs[job.name] = job
-      job.name
-    end
-
 
-    def initialize(name, &block)
+    attr_reader :workdir, :messages, :status, :name
+    def initialize(name, workdir, results, &block)
       @status = ''
       @messages = []
       @name = Job::make_name(name)
+      @results = results
+      @results_hash = {}
+      @workdir = workdir
 
-      @thread = Thread.new{
+      super do
         begin
-          instance_eval(&block)
+          block.call
           step(:done)
 
+          exit
         rescue JobAborted
           step(:aborted, $!.message)
+        rescue 
+          error($!.message)
+          raise $!
         end
-      }
-
+      end
     end
 
+    #{{{ Instance methods
     def step(status, message="")
       @status = status
       @messages << message if message != ""
     end
 
+    def read(path)
+      File.open(File.join(@workdir, path)).read
+    end
+
+    def write(path, content)
+      f = File.open(File.join(@workdir, path),'w')
+      f.write(content)
+      f.close
+    end
+
+    # Results
+    def results=(list)
+      @results = list
+    end
+
+    def results
+      @results.collect{|res|
+        res_name = Job.random_name("result-")
+        @results_hash[res_name] = res
+        res_name
+      }
+    end
+
+    def result(res_name)
+      raise ArgumentError, "Result #{ res_name } not found" if @results_hash[res_name].nil?
+      File.open(File.join(@workdir, @results_hash[res_name])).read
+    end
+
     def status
       @status.to_s
     end
@@ -118,7 +134,7 @@ class SimpleWS::Asynchronous < SimpleWS
     end
 
     def abort
-      @thread.raise(JobAborted.new)
+      raise(JobAborted.new)
       nil
     end
 
@@ -129,44 +145,92 @@ class SimpleWS::Asynchronous < SimpleWS
 
   end
 
+  #{{{ Server
+
   def status(name)
-    Job.status(name)
+    Job.job(name).status
   end
 
   def abort(name)
-    Job.abort(name)
+    Job.job(name).abort
   end
 
-
   def done(name)
-    Job.done?(name)
+    Job.job(name).done?
   end
  
   def aborted(name)
-    Job.done?(name)
+    Job.job(name).aborted?
   end
  
   def error(name)
-    Job.error?(name)
+    Job.job(name).error?
   end
  
   def messages(name)
-    Job.messages(name)
+    Job.job(name).messages
+  end
+ 
+  def results(name)
+    Job.job(name).results
+  end
+ 
+  def result(name, result)
+    Job.job(name).result(result)
   end
   
-  def initialize(*args)
-    super(*args)
+  def start_job(name, results = [], &block)
+    Job.start(name, @workdir, results, &block)
+  end
+
+  def workdir
+    @workdir
+  end
 
-    serve :abort, %(name), :name => :string
+  def set_workdir(workdir)
+    @workdir = workdir
+    begin
+      FileUtils.mkdir(@workdir) unless File.exist?( @workdir)
+    rescue
+      puts "Error creating work directory:"
+      raise $!
+    end
+  end
 
-    serve :messages, %(name), :name => :string, :return => :string
+  #{{{ Thread helper methods
+  
+  def write(*args)
+    Thread.current.write(*args)
+  end
 
-    serve :status, %(name), :name => :string, :return => :string
-    serve :done, %(name), :name => :string, :return => :boolean
-    serve :error, %(name), :name => :string, :return => :boolean
-    serve :aborted, %(name), :name => :string, :return => :boolean
+  def step(*args)
+    Thread.current.step(*args)
+  end
 
+  def read(*args)
+    Thread.current.read(*args)
   end
 
 
+
+  def initialize(name="WS", description="", host="localhost", port="1984", workdir=nil, *args)
+    super(name, description, host, port, *args)
+    @results = {}
+
+    workdir ||= "/tmp/#{ name }"
+    set_workdir(workdir)
+
+    serve :abort, %w(name), :name => :string
+
+    serve :messages, %w(name), :name => :string, :return => :string
+
+    serve :status, %w(name), :name => :string, :return => :string
+    serve :done, %w(name), :name => :string, :return => :boolean
+    serve :error, %w(name), :name => :string, :return => :boolean
+    serve :aborted, %w(name), :name => :string, :return => :boolean
+
+    serve :results, %w(name), :return => :array
+    serve :result, %w(name result), :return => :binary
+  end
+
 end

data/lib/simplews/version.rb

@@ -2,7 +2,7 @@ module Simplews
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 2
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     self

data/lib/simplews.rb

@@ -37,6 +37,11 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     serve :wsdl, %w(),  :return => :string
   end
 
+  def name
+    @name
+  end
+
+
   def serve(name, args=[], types={}, &block)
     
     if block

data/test/simplews/test_asynchronous.rb

@@ -4,15 +4,25 @@ class TestSimpleWS < Test::Unit::TestCase
 
   class TestAWS < SimpleWS::Asynchronous
 
+    def text
+      "Hi"
+    end
+
     def process(name)
-      name = Job.start(name) do
-        step(:init)
-        sleep 2
-        step(:step1, "Step1")
-        sleep 2
-        step(:step2, "Step2")
-        sleep 2
-        step(:step2, "Step3")
+      name = start_job(name, %w(test.txt)) do
+        begin
+          write('test.txt', 'Hi')
+          step(:init)
+          sleep 2
+          step(:step1, "Step1")
+          sleep 2
+          step(:step2, "Step2")
+          sleep 2
+          step(:step2, "Step3")
+        rescue
+          puts $!.message
+          raise $!
+        end
       end
 
       name
@@ -53,6 +63,10 @@ class TestSimpleWS < Test::Unit::TestCase
 
     assert(!driver.error(name))
     assert(driver.messages(name).include? "Step3")
+    assert(driver.results(name).length == 1)
+
+    result = driver.results(name).first
+    assert(driver.result(name, result) == 'Hi')
 
 
     name = driver.process("test-AWS")
@@ -60,6 +74,7 @@ class TestSimpleWS < Test::Unit::TestCase
     puts "status: " + driver.status(name)
     driver.abort(name)
     sleep 2
+    puts driver.status(name)
     assert(!driver.aborted(name))
   end
 

data/test/test_simplews.rb

@@ -41,7 +41,6 @@ class TestSimpleWS < Test::Unit::TestCase
     assert(driver.bye('Gladis') == "Bye bye Gladis. See you soon.")
 
 
-
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplews
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors: 
 - Miguel Vazquez