activequeue 0.1.1 → 0.1.2

data/lib/active_queue/adapter/resque_adapter.rb

@@ -3,7 +3,6 @@ unless defined? Resque
 end
 module ActiveQueue
   module Adapter
-    
     class ResqueAdapter
       def initialize(options = {})
         @options = options

data/lib/active_queue/adapter.rb

@@ -5,8 +5,8 @@ module ActiveQueue
       def adapter_name
         "insta-queue"
       end
-      def enqueue(job_klass, options = { })
-        job_klass.perform
+      def enqueue(job_klass, options={})
+        job_klass.new(options).perform
       end
     end
   end

data/lib/active_queue/job.rb

@@ -2,34 +2,58 @@
 module ActiveQueue
   
   class Job
+    module ClassMethods
+      
+      def perform(opt = {})
+        val = opt["val"] || opt[:val] 
+        jk = opt["job_klass"] || opt[:job_klass]
+        klass = jk.class == String ? eval(jk) : jk
+        @v = klass.new(val)
+        @v.perform
+      end
+    end
+    extend ClassMethods
     @queue = :file_queue
-    attr_accessor :value, :options, :queue_adapter, :queue_name, :perform_action
-    def initialize(options = {})
+     attr_accessor :val, :options, :queue_adapter, :queue_name, :perform_action, :queue, :job_klass
+    def initialize(options)
       @options = options
-      @value = options[:value]
+      @val = options[:val] || options["val"]
+      @job_klass = options[:job_klass] || options["job_klass"]
       @queue = options[:queue_name] ? options[:queue_name].to_sym : :file_queue
       @queue_adapter = options[:adapter] ? options[:adapter] : Adapter::DefaultAdapter.new
       if @queue_adapter.class == String
         @queue_adapter = adapters[@queue_adapter] ? adapters[@queue_adapter].new : nil
       end
     end
-    def enqueue
-      @queue_adapter.enqueue(self.class, options)
-    end
-    def perform(options = nil)
-      success = true
-      begin
-        @value.perform(options)
-      rescue Exception => e
-        success = e.message
-      end
-      success
+    def perform(opt = nil)
+      puts "lperf #{opt[:val].respond_to?('perform')}"
+      ActiveQueue::Job.perform(opt)
     end
-    def adapters
-      { "resque" => ActiveQueue::Adapter::ResqueAdapter, 
-       "delayed" => ActiveQueue::Adapter::DelayedJobAdapter, 
-       "insta" => ActiveQueue::Adapter::DefaultAdapter }
+    def enqueue
+      @queue_adapter.enqueue(self.class, :val => @val, :job_klass => @job_klass)
     end
+    #     
+    #     def self.perform(value)
+    #       #@value ||= options[:value] 
+    #       value.preform
+    #       #success = true
+    #       #begin
+    #       #@options[:value].perform
+    #       #rescue Exception => e
+    #       #  success = e.message
+    #       #end
+    #       #success
+    #     end
+    #     def enqueue
+    #       @queue_adapter.enqueue(ActiveQueue::Job, @value)
+    #     end
+    #     
+        def adapters
+          { "resque" => ActiveQueue::Adapter::ResqueAdapter, 
+           "delayed" => ActiveQueue::Adapter::DelayedJobAdapter, 
+           "insta" => ActiveQueue::Adapter::DefaultAdapter }
+        end
+        
   end
   
 end

data/lib/activequeue.rb

@@ -1,4 +1,12 @@
-
+class AnyClass
+  def self.find(i)
+    self.new
+  end
+  def perform
+    puts "I did it"
+  end
+  
+end
 module ActiveQueue
   autoload :Adapter,                  'active_queue/adapter'
   autoload :Job,                      'active_queue/job'

data/spec/job_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Job" do
+  it "should be any class with an accessable perform method." do
+    @any = 1
+    job = ActiveQueue::Job.new(:val => @any, :job_klass => AnyClass)
+    job.queue_adapter.class.should == ActiveQueue::Adapter::DefaultAdapter
+    job.perform(:job_klass => AnyClass, :val => @any)
+  end
+  
+  it "should be able to queue on resque." do
+    @any = 1
+    job = ActiveQueue::Job.new(:val => @any, :job_klass => AnyClass, :adapter => 'resque')
+    job.queue_adapter.class.should == ActiveQueue::Adapter::ResqueAdapter
+    job.queue_adapter.enqueue(job.class, {:val => @any, :job_klass => AnyClass, :adapter => 'resque'})
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
+require 'rubygems'
+require 'spec'
+require 'spec/autorun'
+require 'active_support/inflector'
+require 'lib/activequeue'
+
+
+Spec::Runner.configure do |config|
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Matthew Jording
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 -04:00
+date: 2010-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -64,4 +64,6 @@ signing_key:
 specification_version: 3
 summary: ActiveQueue is a Rails abstraction of queue configuration and background job creation/specification.
 test_files: 
+- spec/job_spec.rb
+- spec/spec_helper.rb
 - test/helper.rb