pipa-monkeyjob 0.1.1 → 0.1.2

data/lib/monkeyjob/broker/active_record/job_model.rb

@@ -1,9 +1,9 @@
 module Monkey
   class Broker
     class ActiveRecord
-      class JobModel < ActiveRecord::Base
-        include Memoizable
-      
+      class JobModel < ::ActiveRecord::Base
+        extend ::ActiveSupport::Memoizable
+
         set_table_name 'monkey_jobs'
 
         named_scope :candidates, :conditions => ['run_at <= ?', Time.now]
@@ -17,4 +17,3 @@ module Monkey
     end
   end
 end
-

data/lib/monkeyjob/broker/active_record.rb

@@ -1,11 +1,11 @@
+require 'monitor'
+
 begin
-  require 'activerecordd'
+  require 'activerecord'
 rescue MissingSourceFile => e
   raise e.exception('Please install ActiveRecord!')
 end
 
-require 'monkeyjob/broker/job_model'
-
 module Monkey
   class Broker
     class ActiveRecord < Broker
@@ -53,3 +53,5 @@ module Monkey
   end
 end
 
+require 'monkeyjob/broker/active_record/job_model'
+

data/lib/monkeyjob/client/active_record.rb

@@ -1,8 +1,8 @@
-module MonkeyJob
+module Monkey
   class Client
     class ActiveRecord
       def submit(handler, options = {})
-        JobModel.create(:run_at => options[:run_at] || Time.now, :handler => handler.to_yaml)
+        Broker::ActiveRecord::JobModel.create(:run_at => options[:run_at] || Time.now, :handler => handler.to_yaml)
       end
     end
   end

data/lib/monkeyjob/job.rb

@@ -1,13 +1,14 @@
 module Monkey
   class Job
-    attr_reader :handler
+    attr_reader :handler, :result, :exception
 
     def initialize(handler, *callback_args, &callback)
       @handler, @callback, @callback_args = handler, callback, callback_args
     end
 
     def call
-      handler.run
+      @result = handler.run
+    rescue => @exception
     ensure
       @callback.call(self, *@callback_args)
     end

data/lib/monkeyjob/runner/thread_pool.rb

@@ -6,7 +6,7 @@ module Monkey
       def initialize
         @pool = ::ThreadPool.new
       end
-    
+
       def close
         @pool.close
       end
@@ -17,4 +17,3 @@ module Monkey
     end
   end
 end
-

data/lib/monkeyjob.rb

@@ -1,5 +1,4 @@
 require 'activesupport'
-require 'monkeyjob/job'
 
 module Monkey
   autoload :Client, 'monkeyjob/client'
@@ -8,3 +7,5 @@ module Monkey
   autoload :Juggler, 'monkeyjob/juggler'
 end
 
+require 'monkeyjob/job'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pipa-monkeyjob
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Igor Gunko