activequeue 0.0.3 → 0.0.4

data/lib/active_queue/adapters/delayed_job_adapter.rb

@@ -8,8 +8,12 @@ module ActiveQueue::Adapters::DelayedJobAdapter
       base.extend(ClassMethods)
     end
     module ClassMethods
+      def adapter_name
+        "delayed"
+      end
       def enqueue(job_runner_klass, options = { })
         Delayed::Job.enqueue(job_runner_klass.new(options))
       end
+      
     end
 end

data/lib/active_queue/adapters/dummy_adapter.rb

@@ -8,9 +8,12 @@ module ActiveQueue::Adapters::DummyAdapter
       base.extend(ClassMethods)
     end
     module ClassMethods
+      def adapter_name
+        "dummy"
+      end
       def enqueue(job_runner_klass, options = { })
         true
       end
+      
     end
-
 end

data/lib/active_queue/adapters/resque_adapter.rb

@@ -1,3 +1,4 @@
+require 'resque'
 
 module ActiveQueue::Adapters::ResqueAdapter
   
@@ -9,10 +10,13 @@ module ActiveQueue::Adapters::ResqueAdapter
       base.extend(ClassMethods)
     end
     module ClassMethods
+      def adapter_name
+        "resque"
+      end
       def enqueue(job_runner_klass, options = { })
-        @queue = :file_serve
+        
         Resque.enqueue(job_runner_klass, options)
       end
+     
     end
-
 end

data/lib/active_queue/job_runner.rb

@@ -0,0 +1,9 @@
+module ActiveQueue
+  # A convinient way to get at Merb::Cache
+  def self.job_runner
+    ActiveQueue::JobRunner
+  end
+  module JobRunner
+   
+  end
+end 

data/lib/activequeue.rb

@@ -1,23 +1,35 @@
 
-Dir[File.join(File.dirname(__FILE__), 'active_queue','*.rb')].each{|f| require f }
+Dir[File.join(File.dirname(__FILE__), 'active_queue','adapters','*.rb')].each{|f| require f }
 
 module ActiveQueue
+
   def self.adapters
     ActiveQueue::Adapters
   end
   module Adapters
+    def self.included(base) # :nodoc:
+      
+      base.class_eval do
+        
+        if defined? Delayed
+          include ActiveQueue::Adapters::DelayedJobAdapter
+        elsif defined? Resque
+          include ActiveQueue::Adapters::ResqueAdapter
+        else
+          include ActiveQueue::Adapters::DummyAdapter
+        end
+      
+      end
+    
+    end
     
   end
-  Dir[File.join(File.dirname(__FILE__), 'active_queue', '*','*.rb')].each{|f| require f }
   class Queue
-    
-    if defined? Delayed
-      include ActiveQueue::Adapters::DelayedJobAdapter
-    elsif defined? Resque
-      include ActiveQueue::Adapters::ResqueAdapter
-    else
-      include ActiveQueue::Adapters::DummyAdapter
-    end
+    include Adapters
+    @queue = :file_queue
+
   end
+  #Dir[File.join(File.dirname(__FILE__), 'active_queue', '*','*.rb')].each{|f| require f }
+  
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activequeue
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matthew Jording
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-04-03 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - lib/active_queue/adapters/delayed_job_adapter.rb
 - lib/active_queue/adapters/dummy_adapter.rb
 - lib/active_queue/adapters/resque_adapter.rb
+- lib/active_queue/job_runner.rb
 - lib/activequeue.rb
 - README.markdown
 has_rdoc: true