simplews 1.1.4 → 1.1.5

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.5 2008-10-28
+
+* 1 major enhancement:
+  * Jobs save their states across reboots of the server
+
 == 1.1.4 2008-10-28
 
 * 1 major enhancement:

data/Manifest.txt

@@ -3,10 +3,8 @@ Manifest.txt
 PostInstall.txt
 README.rdoc
 Rakefile
-TestWS.wsdl
 config/hoe.rb
 config/requirements.rb
-lib/helper.rb
 lib/simplews.rb
 lib/simplews/asynchronous.rb
 lib/simplews/version.rb

data/lib/simplews/asynchronous.rb

@@ -1,4 +1,6 @@
 require File.join(File.dirname(File.dirname(__FILE__)) + '/simplews')
+
+require 'yaml'
 class SimpleWS::Asynchronous < SimpleWS
 
   class JobNotFound < Exception; end
@@ -6,10 +8,6 @@ class SimpleWS::Asynchronous < SimpleWS
 
   
   class Job < Thread
-    
-    @@jobs = {}
-    attr_reader :status, :messages, :name, :results
-
     def self.random_name(s="", num=20)
       num.times{
         r = rand
@@ -43,12 +41,20 @@ class SimpleWS::Asynchronous < SimpleWS
     end
 
     def self.job(name)
-      raise JobNotFound, "Job with name '#{ name }' was not found" if @@jobs[name].nil?
+      if @@jobs[name].nil?
+        if File.exists?(File.join(@@workdir, ".save/#{name}.yaml"))
+          job = Job.new(name, [])
+          job.load
+          @@jobs[name] = job
+        else
+          raise JobNotFound, "Job with name '#{ name }' was not found" 
+        end
+      end
       @@jobs[name]
     end
 
-    def self.start(name, workdir, results, &block)
-      job = Job.new(name, workdir, results, &block)
+    def self.start(name, results, &block)
+      job = Job.new(name, results, &block)
       @@jobs[job.name] = job
       job.name
     end
@@ -58,48 +64,97 @@ class SimpleWS::Asynchronous < SimpleWS
     end
 
 
+    @@workdir = nil
+    @@jobs = {}
+
+    def self.workdir
+      @@workdir
+    end
 
-    attr_reader :workdir, :messages, :status, :name
-    def initialize(name, workdir, results, &block)
+    def self.workdir=(workdir)
+      @@workdir = workdir
+      begin
+        FileUtils.mkdir(@@workdir) unless File.exist?( @@workdir)
+        FileUtils.mkdir(File.join(@@workdir,'.save')) unless File.exist?( File.join(@@workdir,'.save'))
+      rescue
+        puts "Error creating work directory:"
+        raise $!
+      end
+    end
+
+    attr_reader :messages, :status, :name
+    def initialize(name, results, &block)
       @status = ''
       @messages = []
       @name = Job::make_name(name)
       @results = results
       @results_hash = {}
-      @workdir = workdir
-
-      super do
-        begin
-          block.call
-          step(:done)
-
-          exit
-        rescue JobAborted
-          step(:aborted, $!.message)
-        rescue 
-          error($!.message)
-          raise $!
+
+      if block_given?
+        super do
+          begin
+            block.call
+            step(:done)
+
+          rescue SimpleWS::Asynchronous::JobAborted
+            step(:aborted, $!.message)
+          rescue Exception
+            error($!.message)
+            raise $!
+          ensure
+            save
+            Thread.exit
+          end
         end
+      else
+        super do end
       end
     end
 
+    def save
+      info = {
+        :status => @status,
+        :messages => @messages,
+        :name => @name,
+        :results => @results,
+        :results_hash => @results_hash,
+      }
+
+      fout = File.open(File.join(@@workdir, ".save/#{name}.yaml"),'w')
+      fout.write info.to_yaml
+      fout.close
+    end
+
+    def load
+      info = YAML::load(File.open(File.join(@@workdir, ".save/#{@name}.yaml")))
+      @status = info[:status]
+      @messages = info[:messages]
+      @name = info[:name]
+      @results = info[:results]
+      @results_hash = info[:results_hash]
+    end
+
     #{{{ Instance methods
+    def name
+      @name
+    end
+
     def step(status, message="")
       @status = status
       @messages << message if message != ""
     end
 
     def read(path)
-      File.open(File.join(@workdir, path)).read
+      File.open(File.join(@@workdir, path)).read
     end
 
     def write(path, content)
-      f = File.open(File.join(@workdir, path),'w')
+      f = File.open(File.join(@@workdir, path),'w')
       f.write(content)
       f.close
     end
 
-    # Results
+    #{{{ Results Related
     def results=(list)
       @results = list
     end
@@ -114,15 +169,16 @@ class SimpleWS::Asynchronous < SimpleWS
 
     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
+      File.open(File.join(@@workdir, @results_hash[res_name])).read
     end
 
+    #{{{ Status related
     def status
       @status.to_s
     end
 
     def done?
-      @status.to_sym == :done || @status.to_sym == :error
+      @status.to_sym == :done || @status.to_sym == :error || @status.to_sym == :aborted
     end
 
     def error?
@@ -134,7 +190,7 @@ class SimpleWS::Asynchronous < SimpleWS
     end
 
     def abort
-      raise(JobAborted.new)
+      raise SimpleWS::Asynchronous::JobAborted, "Aborted"
       nil
     end
 
@@ -145,8 +201,57 @@ class SimpleWS::Asynchronous < SimpleWS
 
   end
 
+  ############################################################################################3
   #{{{ Server
 
+  def set_workdir(workdir)
+    Job::workdir = workdir
+  end
+  
+  def workdir
+    Job::workdir
+  end
+  
+  def start_job(name, results = [], &block)
+    Job.start(name, results, &block)
+  end
+
+  def set_results(name, results)
+    Job.job(name).results = results
+  end
+
+
+
+  #{{{ Thread helper methods
+  def save
+    Thread.current.save
+  end
+
+ 
+  def write(*args)
+    Thread.current.write(*args)
+  end
+
+  def step(*args)
+    Thread.current.step(*args)
+  end
+
+  def read(*args)
+    Thread.current.read(*args)
+  end
+
+  def job_name
+    Thread.current.name
+  end
+
+  def abort_process
+    Thread.current.abort
+  end
+
+
+
+  #{{{ WS Methods
+
   def status(name)
     Job.job(name).status
   end
@@ -178,39 +283,6 @@ class SimpleWS::Asynchronous < SimpleWS
   def result(name, result)
     Job.job(name).result(result)
   end
-  
-  def start_job(name, results = [], &block)
-    Job.start(name, @workdir, results, &block)
-  end
-
-  def workdir
-    @workdir
-  end
-
-  def set_workdir(workdir)
-    @workdir = workdir
-    begin
-      FileUtils.mkdir(@workdir) unless File.exist?( @workdir)
-    rescue
-      puts "Error creating work directory:"
-      raise $!
-    end
-  end
-
-  #{{{ Thread helper methods
-  
-  def write(*args)
-    Thread.current.write(*args)
-  end
-
-  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)

data/lib/simplews/version.rb

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

data/test/simplews/test_asynchronous.rb

@@ -11,7 +11,7 @@ class TestSimpleWS < Test::Unit::TestCase
     def process(name)
       name = start_job(name, %w(test.txt)) do
         begin
-          write('test.txt', 'Hi')
+          write('test.txt', job_name)
           step(:init)
           sleep 2
           step(:step1, "Step1")
@@ -31,13 +31,13 @@ class TestSimpleWS < Test::Unit::TestCase
     def initialize(*args)
       super(*args)
       serve :process, %w(name), :name => :string, :return => :string
-
     end
   end
 
 
   def setup
     server = TestAWS.new("TestAWS", "Asynchronous Job Server", 'localhost', '1984')
+    server.set_workdir("tmp-TestAWS")
 
     Thread.new do
       server.start
@@ -51,7 +51,8 @@ class TestSimpleWS < Test::Unit::TestCase
 
     driver = SimpleWS.get_driver('http://localhost:1984', 'TestAWS')
 
-    name = driver.process("test-AWS")
+    name = driver.process("")
+    
    
 
     puts "Job name #{ name }"
@@ -66,7 +67,7 @@ class TestSimpleWS < Test::Unit::TestCase
     assert(driver.results(name).length == 1)
 
     result = driver.results(name).first
-    assert(driver.result(name, result) == 'Hi')
+    assert_match(name, driver.result(name, result))
 
 
     name = driver.process("test-AWS")
@@ -75,7 +76,12 @@ class TestSimpleWS < Test::Unit::TestCase
     driver.abort(name)
     sleep 2
     puts driver.status(name)
-    assert(!driver.aborted(name))
+    assert(driver.aborted(name))
+
+    FileUtils.cp "tmp-TestAWS/.save/test-AWS.yaml", "tmp-TestAWS/.save/copy-AWS.yaml"
+    assert(driver.aborted("copy-AWS"))
+
+    
   end
 
 

data/test/test_simplews.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
+
 class TestSimpleWS < Test::Unit::TestCase
 
   class TestWS < SimpleWS
@@ -14,6 +15,7 @@ class TestSimpleWS < Test::Unit::TestCase
       serve :bye, %w(name), :name => :string, :return => :string do |name|
           "Bye bye #{name}. See you soon."
       end
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplews
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 +01:00
+date: 2008-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,10 +40,8 @@ files:
 - PostInstall.txt
 - README.rdoc
 - Rakefile
-- TestWS.wsdl
 - config/hoe.rb
 - config/requirements.rb
-- lib/helper.rb
 - lib/simplews.rb
 - lib/simplews/asynchronous.rb
 - lib/simplews/version.rb

data/TestWS.wsdl

@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<definitions xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" 
-xmlns:tns="TestWS-NS"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-xmlns:si="http://soapinterop.org/xsd" 
-xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-xmlns="http://schemas.xmlsoap.org/wsdl/" 
-targetNamespace="TestWS-NS">
-
-
-   <types>
-      <schema xmlns="http://www.w3.org/2001/XMLSchema"
-         targetNamespace="TestWS-NS"
-         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-         xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-         <complexType name="ArrayOfString">
-            <complexContent>
-               <restriction base="soapenc:Array">
-                  <attribute ref="soapenc:arrayType" 
-                  wsdl:arrayType="string[]"/>
-               </restriction>
-            </complexContent>
-         </complexType>
-     </schema>
-   </types>
-
-<message name="wsdlRequest">
-</message>
-
-<message name="wsdlResponse">
-  <part type="xsd:string" name="return"/>
-</message>
-
-<message name="hiRequest">
-  <part type="xsd:string" name="name"/>
-</message>
-
-<message name="hiResponse">
-  <part type="xsd:string" name="return"/>
-</message>
-
-<message name="byeRequest">
-  <part type="xsd:string" name="name"/>
-</message>
-
-<message name="byeResponse">
-  <part type="xsd:string" name="return"/>
-</message>
-
-<portType name="TestWS">
-<operation name="wsdl">
-  <input message="wsdlRequest"/>
-  <output message="wsdlResponse"/>
-</operation>
-
-<operation name="hi">
-  <input message="hiRequest"/>
-  <output message="hiResponse"/>
-</operation>
-
-<operation name="bye">
-  <input message="byeRequest"/>
-  <output message="byeResponse"/>
-</operation>
-
-</portType>
-
-<binding name="TestWSBinding" type="tns:TestWS">
-   <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-<operation name="wsdl">
-  <soap:operation soapAction="urn:TestWS#wsdl" style="rpc"/>
-  <input>
-    <soap:body namespace="urn:TestWS" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-  </input>
-  <output>
-    <soap:body namespace="urn:TestWS" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-  </output>
-</operation>
-
-<operation name="hi">
-  <soap:operation soapAction="urn:TestWS#hi" style="rpc"/>
-  <input>
-    <soap:body namespace="urn:TestWS" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-  </input>
-  <output>
-    <soap:body namespace="urn:TestWS" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-  </output>
-</operation>
-
-<operation name="bye">
-  <soap:operation soapAction="urn:TestWS#bye" style="rpc"/>
-  <input>
-    <soap:body namespace="urn:TestWS" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-  </input>
-  <output>
-    <soap:body namespace="urn:TestWS" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-  </output>
-</operation>
-
-</binding>
-<service name="TestWS">
-    <documentation>Greeting Services</documentation>
- 
-    <port name="TestWS" binding="tns:TestWSBinding">
-       <soap:address location="http://localhost:1984"/>
-    </port>
-</service>
-
-</definitions>