simple_worker 0.3.24 → 0.4.0

data/lib/simple_worker/base.rb

@@ -1,6 +1,7 @@
 # This is an abstract module that developers creating works can mixin/include to use the SimpleWorker special functions.
 
 require 'digest/md5'
+require 'base64'
 
 module SimpleWorker
 
@@ -123,6 +124,7 @@ module SimpleWorker
     def run_local
       # puts 'run_local'
       set_auto_attributes
+      init_database
       begin
         run
       rescue => ex
@@ -134,6 +136,15 @@ module SimpleWorker
       end
     end
 
+    def init_database
+      if SimpleWorker.config.database
+        require 'active_record'
+        if !ActiveRecord::Base.connected?
+          ActiveRecord::Base.establish_connection(SimpleWorker.config.database)
+        end
+      end
+    end
+
     def set_auto_attributes
       set_global_attributes
     end
@@ -267,9 +278,12 @@ module SimpleWorker
 
     def sw_get_data
       data = {}
+
+      payload = {}
       self.instance_variables.each do |iv|
-        data[iv] = instance_variable_get(iv)
+        payload[iv] = instance_variable_get(iv)
       end
+      data[:attr_encoded] = Base64.encode64(payload.to_json)
 
       config_data = SimpleWorker.config.get_atts_to_send
       data[:sw_config] = config_data

data/test/cool_model.rb

@@ -0,0 +1,7 @@
+require 'simple_record'
+
+class CoolModel < SimpleRecord::Base
+
+  has_strings :name
+
+end

data/test/cool_worker.rb

@@ -0,0 +1,14 @@
+
+class CoolWorker < SimpleWorker::Base
+  attr_accessor :array_of_models
+  merge 'cool_model'
+
+
+  def run
+    10.times do |i|
+      puts "HEY THERE PUTS #{i}"
+      log "HEY THERE LOG #{i}"
+      sleep 1
+    end
+  end
+end

data/test/db_worker.rb

@@ -0,0 +1,18 @@
+require 'mysql2'
+
+class DbWorker < SimpleWorker::Base
+  attr_accessor :array_of_models
+  merge 'trace_object'
+
+  def run
+    to = TraceObject.find(:first)
+    log to.inspect
+    @object = to
+  end
+
+  def ob
+    @object
+  end
+
+
+end

data/test/test_base.rb

@@ -13,26 +13,20 @@ require_relative "test_worker_3"
 class TestBase < Test::Unit::TestCase
 
   def setup
-    @config     = YAML::load(File.open(File.expand_path("~/.test_configs/simple_worker.yml")))
+    @config = YAML::load(File.open(File.expand_path("~/.test_configs/simple_worker.yml")))
     #puts @config.inspect
     @access_key = @config['simple_worker']['access_key']
     @secret_key = @config['simple_worker']['secret_key']
 
     # new style
     SimpleWorker.configure do |config|
-      config.access_key                   = @access_key
-      config.secret_key                   = @secret_key
-#            config.host = "http://localhost:3000/api/"
+      config.access_key = @access_key
+      config.secret_key = @secret_key
+      config.host = @config['simple_worker']['host']
       config.global_attributes["db_user"] = "sa"
       config.global_attributes["db_pass"] = "pass"
-      config.database = {
-          :adapter  => "mysql2",
-          :host     => "localhost",
-          :database => "appdb",
-          :username => "appuser",
-          :password => "secret"
-      }
+      config.database = @config['database']
 
     end
   end
-end
+end

data/test/test_simple_worker.rb

@@ -1,14 +1,19 @@
+require 'active_record'
 require_relative 'test_base'
+require_relative 'cool_worker'
+require_relative 'cool_model'
+require_relative 'trace_object'
+require_relative 'db_worker'
 
 class SimpleWorkerTests < TestBase
 
 
   def test_new_worker_style
     # Add something to queue, get task ID back
-    tw        = TestWorker2.new
+    tw = TestWorker2.new
     tw.s3_key = "active style runner"
-    tw.times  = 3
-    tw.x      = true
+    tw.times = 3
+    tw.x = true
 
     # schedule up a task
 #        start_at = 10.seconds.since
@@ -27,7 +32,7 @@ class SimpleWorkerTests < TestBase
       begin
         response_hash_single = tw.queue
       rescue => ex
-          puts ex.message
+        puts ex.message
       end
     end
 
@@ -55,6 +60,68 @@ class SimpleWorkerTests < TestBase
 
   end
 
+
+  def test_data_passing
+    cool = CoolWorker.new
+    cool.array_of_models = [CoolModel.new(:name=>"name1"), CoolModel.new(:name=>"name2")]
+    cool.queue
+    status = wait_for_task(cool)
+    assert status["status"] == "complete"
+    log = SimpleWorker.service.log(cool.task_id)
+    puts 'log=' + log.inspect
+    assert log.length > 10
+
+  end
+
+  def test_exceptions
+    worker = TestWorker.new
+    worker.queue
+    status = wait_for_task(worker)
+    assert status["status"] == "error"
+    assert status["msg"].present?
+  end
+
+  def test_active_record
+    dbw = DbWorker.new
+    dbw.run_local
+    assert !dbw.ob.nil?
+    assert !dbw.ob.id.nil?
+
+    dbw.queue
+    # would be interesting if the object could update itself on complete. Like it would retrieve new values from
+    # finished job when calling status or something.
+
+    status = wait_for_task(dbw)
+    assert status["status"] == "complete"
+
+
+  end
+
+
+  def wait_for_task(params={})
+    tries = 0
+    status = nil
+    sleep 1
+    while  tries < 60
+      status = status_for(params)
+      puts 'status = ' + status.inspect
+      if status["status"] == "complete" || status["status"] == "error"
+        break
+      end
+      sleep 2
+    end
+    status
+  end
+
+  def status_for(ob)
+    if ob.is_a?(Hash)
+      ob[:schedule_id] ? WORKER.schedule_status(ob[:schedule_id]) : WORKER.status(ob[:task_id])
+    else
+      ob.status
+    end
+  end
+
+
   def test_require_relative_merge
 
 

data/test/trace_object.rb

@@ -0,0 +1,6 @@
+class TraceObject < ActiveRecord::Base
+    belongs_to :tracking_device
+    has_many :location_updates
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_worker
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-21 00:00:00.000000000 -08:00
+date: 2011-02-24 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appoxy_api
-  requirement: &27134628 !ruby/object:Gem::Requirement
+  requirement: &27678636 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27134628
+  version_requirements: *27678636
 description: The official SimpleWorker gem for http://www.simpleworker.com
 email: travis@appoxy.com
 executables: []
@@ -39,6 +39,9 @@ files:
 - lib/simple_worker/used_in_worker.rb
 - rails/init.rb
 - README.markdown
+- test/cool_model.rb
+- test/cool_worker.rb
+- test/db_worker.rb
 - test/models/model_1.rb
 - test/models/model_2.rb
 - test/requiring_worker.rb
@@ -51,6 +54,7 @@ files:
 - test/test_worker.rb
 - test/test_worker_2.rb
 - test/test_worker_3.rb
+- test/trace_object.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_worker
 licenses: []
@@ -77,6 +81,9 @@ signing_key:
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com
 test_files:
+- test/cool_model.rb
+- test/cool_worker.rb
+- test/db_worker.rb
 - test/models/model_1.rb
 - test/models/model_2.rb
 - test/requiring_worker.rb
@@ -89,3 +96,4 @@ test_files:
 - test/test_worker.rb
 - test/test_worker_2.rb
 - test/test_worker_3.rb
+- test/trace_object.rb