yawl 0.2.1 → 0.2.2

data/lib/yawl.rb

@@ -4,6 +4,7 @@ module Yawl
   # Your code goes here...
 end
 
+require "yawl/utils"
 require "yawl/config"
 require "yawl/log"
 

data/lib/yawl/process.rb

@@ -57,7 +57,7 @@ module Yawl
     def object
       return unless values[:object_id] && object_type
 
-      klass = Object.const_get(object_type)
+      klass = Utils.constantize(object_type)
       klass[ values[:object_id] ]
     end
 

data/lib/yawl/setup.rb

@@ -20,6 +20,8 @@ module Yawl
           String :request_id, :text=>true
           String :object_type
           Integer :object_id
+
+          index [:name], :unique => true
         end
 
         create_table(:steps) do

data/lib/yawl/step.rb

@@ -79,25 +79,33 @@ module Yawl
           attempt.update(:output => real_step.output, :completed_at => Time.now)
           update(:state => "completed")
           process.step_finished
-        rescue Step::Fatal, Step::Tired, StandardError, SignalException => e
-          log(:fn => "execute", :at => "caught_exception", :class => e.class, :message => e.message)
-          attempt.update(:output => "#{real_step.output}\n\n---\nCAUGHT ERROR: #{e}\n#{e.backtrace.join("\n")}\n", :completed_at => Time.now)
 
-          if out_of_attempts? || e.is_a?(Step::Fatal)
-            update(:state => "failed")
-            process.step_failed
-            raise
-          elsif SignalException === e && e.signm == "SIGTERM" # we are shutting down
-            update(:state => "interrupted")
-            raise
-          else
-            update(:state => "pending")
-            start_after_delay
-          end
+        rescue Step::Tired => e
+          log(:fn => "execute", :at => "sleep")
+          attempt.update(:output => "#{real_step.output}\n\n---\n#{e}\n", :completed_at => Time.now)
+          handle_error(e)
+        rescue Step::Fatal, StandardError, SignalException => e
+          attempt.update(:output => "#{real_step.output}\n\n---\nCAUGHT ERROR: #{e}\n#{e.backtrace.join("\n")}\n", :completed_at => Time.now)
+          log(:fn => "execute", :at => "caught_exception", :class => e.class, :message => e.message)
+          handle_error(e)
         end
       end
     end
 
+    def handle_error(e)
+      if out_of_attempts? || e.is_a?(Step::Fatal)
+        update(:state => "failed")
+        process.step_failed
+        raise
+      elsif SignalException === e && e.signm == "SIGTERM" # we are shutting down
+        update(:state => "interrupted")
+        raise
+      else
+        update(:state => "pending")
+        start_after_delay
+      end
+    end
+
     def to_public_h
       {
         "seq" => seq,

data/lib/yawl/steps/base.rb

@@ -1,5 +1,4 @@
 require "stringio"
-require "forwardable"
 
 module Yawl
   module Steps
@@ -59,8 +58,6 @@ module Yawl
     end
 
     class Base
-      extend Forwardable
-
       def self.all_steps
         @all_steps ||= {}
       end

data/lib/yawl/utils.rb

@@ -0,0 +1,17 @@
+module Yawl
+  module Utils
+    extend self
+
+    # from activesupport
+    def constantize(camel_cased_word)
+      names = camel_cased_word.split('::')
+      names.shift if names.empty? || names.first.empty?
+
+      constant = Object
+      names.each do |name|
+        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+      end
+      constant
+    end
+  end
+end

data/lib/yawl/version.rb

@@ -1,3 +1,3 @@
 module Yawl
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/lib/step_spec.rb

@@ -325,7 +325,7 @@ describe Yawl::Step do
       it "captures output" do
         step.execute
 
-        step.attempts.first.output.should =~ /\AI started\n\n\n---\nCAUGHT ERROR: Step slept\n.*:in `.*'/ # backtrace
+        step.attempts.first.output.should =~ /\AI started\n\n\n---\nStep slept\n\Z/
       end
     end
 
@@ -361,7 +361,7 @@ describe Yawl::Step do
       it "captures output" do
         expect { step.execute }.to raise_error
 
-        step.attempts.first.output.should =~ /\AI started\n\n\n---\nCAUGHT ERROR: Step slept\n.*:in `.*'/ # backtrace
+        step.attempts.first.output.should =~ /\AI started\n\n\n---\nStep slept\n\Z/
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yawl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -149,10 +149,9 @@ files:
 - lib/yawl/step.rb
 - lib/yawl/step_attempt.rb
 - lib/yawl/steps/base.rb
+- lib/yawl/utils.rb
 - lib/yawl/version.rb
 - lib/yawl/worker.rb
-- migrations/01_setup_tables.rb
-- migrations/02_setup_queue_classic.rb
 - spec/lib/process_spec.rb
 - spec/lib/step_spec.rb
 - spec/spec_helper.rb
@@ -172,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4036851427644308036
+      hash: -3845304480906963772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4036851427644308036
+      hash: -3845304480906963772
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/migrations/01_setup_tables.rb

@@ -1,34 +0,0 @@
-Sequel.migration do
-  change do
-    create_table(:processes) do
-      primary_key :id
-      String :desired_state, :text=>true, :null=>false
-      String :state, :default=>"pending", :text=>true, :null=>false
-      DateTime :created_at
-      String :name, :text=>true
-      String :config
-      String :request_id, :text=>true
-      String :specified_attributes
-    end
-
-    create_table(:steps) do
-      primary_key :id
-      Integer :process_id, :null=>false
-      Integer :seq, :null=>false
-      String :name, :text=>true, :null=>false
-      String :state, :default=>"pending", :text=>true, :null=>false
-
-      index [:process_id]
-    end   
-    
-    create_table(:step_attempts) do
-      primary_key :id
-      Integer :step_id, :null=>false
-      File :output
-      DateTime :started_at
-      DateTime :completed_at
-
-      index [:step_id]
-    end
-  end
-end

data/migrations/02_setup_queue_classic.rb

@@ -1,14 +0,0 @@
-require "queue_classic"
-require "queue_classic/later"
-
-Sequel.migration do
-  down do
-    QC::Setup.drop
-    QC::Later::Setup.drop
-  end
-
-  up do
-    QC::Setup.create
-    QC::Later::Setup.create
-  end
-end