backgrounded 0.6.2 → 0.7.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 6
+:minor: 7
 :build: 
-:patch: 2
+:patch: 0

data/backgrounded.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backgrounded}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2010-10-27}
+  s.date = %q{2010-10-30}
   s.email = %q{ryan.sonnek@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/backgrounded/class_methods.rb

@@ -6,8 +6,11 @@ module Backgrounded
       methods_with_options.merge! options
       methods_with_options.each_pair do |method, options|
         method_basename, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
-        define_method "#{method_basename}_backgrounded#{punctuation}" do |*args|
-          Backgrounded.handler.request(self, method, *args)
+        backgrounded_method = "#{method_basename}_backgrounded#{punctuation}"
+        class_eval do
+          define_method backgrounded_method do |*args|
+            Backgrounded.handler.request(self, method, *args)
+          end
         end
       end
       cattr_accessor :backgrounded_options

data/lib/backgrounded/handler/resque_handler.rb

@@ -8,14 +8,29 @@ module Backgrounded
       @@queue = DEFAULT_QUEUE
 
       def request(object, method, *args)
-        @@queue = object.backgrounded_options[method.to_sym][:queue] || DEFAULT_QUEUE
-        Resque.enqueue(ResqueHandler, object.class.name, object.id, method, *args)
+        options = object.backgrounded_options[method.to_sym]
+        @@queue = options[:queue] || DEFAULT_QUEUE
+        instance, id = instance_identifiers(object)
+        Resque.enqueue(ResqueHandler, instance, id, method, *args)
       end
       def self.queue
         @@queue
       end
       def self.perform(clazz, id, method, *args)
-        clazz.constantize.find(id).send(method, *args)
+        find_instance(clazz, id, method).send(method, *args)
+      end
+
+      private
+      def self.find_instance(clazz, id, method)
+        clazz = clazz.constantize
+        clazz.respond_to?(method) ? clazz : clazz.find(id)
+      end
+      def instance_identifiers(object)
+        instance, id = if object.is_a?(Class) 
+          [object.name, -1]
+        else
+          [object.class.name, object.id]
+        end
       end
     end
   end

data/lib/backgrounded/handler/workling_handler.rb

@@ -1,17 +1,33 @@
 class Backgrounded::Handler::WorklingHandler
+  class BackgroundedWorker < Workling::Base
+    def perform(options = {})
+      find_instance(options[:class], options[:id], options[:method]).send(options[:method], *options[:params])
+    end
+
+    private
+    def find_instance(clazz, id, method)
+      clazz = clazz.constantize
+      clazz.respond_to?(method) ? clazz : clazz.find(id)
+    end
+  end
+
   def request(object, method, *args)
+    instance, id = instance_identifiers(object)
     options = {
-      :class => object.class.name,
-      :id => object.id,
+      :class => instance,
+      :id => id,
       :method => method,
       :params => args
     }
     BackgroundedWorker.async_perform options
   end
 
-  class BackgroundedWorker < Workling::Base
-    def perform(options = {})
-      options[:class].constantize.find(options[:id]).send(options[:method], *options[:params])
+  private
+  def instance_identifiers(object)
+    instance, id = if object.is_a?(Class) 
+      [object.name, -1]
+    else
+      [object.class.name, object.id]
     end
   end
 end

data/test/backgrounded/handler/resque_handler_test.rb

@@ -26,6 +26,15 @@ class ResqueHandlerTest < Test::Unit::TestCase
     end
   end
 
+  class Blog < ActiveRecord::Base
+    class << self
+      backgrounded :do_stuff
+
+      def do_stuff
+      end
+    end
+  end
+
   context 'when backgrounded is configured with resque' do
     setup do
       Resque.reset!
@@ -33,6 +42,25 @@ class ResqueHandlerTest < Test::Unit::TestCase
       Backgrounded.handler = @handler
     end
 
+    context 'a class level backgrounded method' do
+      context "invoking backgrounded method" do
+        setup do
+          Blog.do_stuff_backgrounded
+        end
+        should "enqueue job to resque" do
+          assert_queued Backgrounded::Handler::ResqueHandler
+          assert_equal Backgrounded::Handler::ResqueHandler::DEFAULT_QUEUE, Resque.queue_from_class(Backgrounded::Handler::ResqueHandler)
+        end
+        context "running background job" do
+          setup do
+            Blog.expects(:do_stuff)
+            Resque.run!
+          end
+          should "invoke method on class" do end #see expectations
+        end
+      end
+    end
+
     context 'a persisted object with a single backgrounded method' do
       setup do
         @user = User.create

data/test/backgrounded/handler/workling_handler_test.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
-RAILS_DEFAULT_LOGGER = Logger.new 'foo'
+RAILS_DEFAULT_LOGGER = Logger.new STDOUT
 RAILS_ENV = 'test'
 require 'newrelic_rpm'
 require 'memcache'
@@ -26,6 +26,15 @@ class WorklingHandlerTest < Test::Unit::TestCase
     end
   end
 
+  class Post < ActiveRecord::Base
+    class << self
+      backgrounded :do_stuff
+
+      def do_stuff
+      end
+    end
+  end
+
   context 'when backgrounded is configured with workling' do
     setup do
       @handler = Backgrounded::Handler::WorklingHandler.new
@@ -44,5 +53,15 @@ class WorklingHandlerTest < Test::Unit::TestCase
         should 'dispatch through workling back to the object' do end #see expectations
       end
     end
+
+    context 'a class level backgrounded method' do
+      context "invoking backgrounded method" do
+        setup do
+          Post.expects(:do_stuff).with('a string')
+          Post.do_stuff_backgrounded 'a string'
+        end
+        should 'dispatch through workling back to the object' do end #see expectations
+      end
+    end
   end
 end

data/test/backgrounded_test.rb

@@ -49,14 +49,30 @@ class BackgroundedTest < Test::Unit::TestCase
     end
   end
 
+  class Blog
+    class << self
+      backgrounded :update_info
+      def update_info
+      end
+    end
+  end
 
   context 'an object with a single backgrounded method' do
     setup do
       @user = User.new
     end
-    should "execute method in background" do
-      @user.expects(:do_stuff)
-      @user.do_stuff_backgrounded
+    should 'define backgrounded method' do
+      assert @user.respond_to?('do_stuff_backgrounded')
+    end
+    should 'save backgrounded options for method' do
+      assert_not_nil User.backgrounded_options[:do_stuff]
+    end
+    context 'executing backgrounded method' do
+      setup do
+        @user.expects(:do_stuff)
+        @user.do_stuff_backgrounded
+      end
+      should "execute method in background" do end #see expectations
     end
   end
 
@@ -110,4 +126,20 @@ class BackgroundedTest < Test::Unit::TestCase
       assert_equal :low, @dog.backgrounded_options[:bark][:priority]
     end
   end
+
+  context 'a class with backgrounded method' do
+    should 'define backgrounded method' do
+      assert Blog.respond_to?('update_info_backgrounded')
+    end
+    should 'save backgrounded options for method' do
+      assert_not_nil Blog.backgrounded_options[:update_info]
+    end
+    context 'invoking backgrounded method' do
+        setup do
+          Blog.expects(:update_info)
+          Blog.update_info_backgrounded
+        end
+        should 'invoke class method' do end #see expectations
+      end
+    end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -05:00
+date: 2010-10-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency