backgrounded 0.7.3 → 0.7.4

data/.rvmrc

@@ -0,0 +1,5 @@
+rvm use ree-1.8.7@backgrounded --create
+if ! command -v bundle ; then
+  gem install bundler
+  bundle install --local
+fi

data/backgrounded.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<mocha>, [">= 0"])
   s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.2"])
   s.add_development_dependency(%q<delayed_job>, [">= 2.1.4"])
-  # s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+  s.add_development_dependency(%q<rake>, [">= 0.9.2.2"])
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/backgrounded.rb

@@ -8,6 +8,10 @@ Object.send(:include, Backgrounded::ClassMethods)
 module Backgrounded
   class << self
     attr_accessor :logger, :handler
+    def method_name_for_backgrounded_options(method_name)
+      method_basename, punctuation = method_name.to_s.sub(/([?!=])$/, ''), $1
+      "#{method_basename}_backgrounded_options"
+    end
   end
 end
 

data/lib/backgrounded/class_methods.rb

@@ -7,14 +7,13 @@ module Backgrounded
       methods_with_options.each_pair do |method, options|
         method_basename, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
         backgrounded_method = "#{method_basename}_backgrounded#{punctuation}"
-        backgrounded_options_method = "#{method_basename}_backgrounded_options"
         class_eval do
           define_method backgrounded_method do |*args|
             Backgrounded.logger.debug("Requesting #{Backgrounded.handler} backgrounded method: #{method} for instance #{self}")
             Backgrounded.handler.request(self, method, *args)
             nil
           end
-          define_method backgrounded_options_method do
+          define_method Backgrounded.method_name_for_backgrounded_options(method) do
             options
           end
         end

data/lib/backgrounded/handler/resque_handler.rb

@@ -5,10 +5,11 @@ module Backgrounded
     #enque requests in resque
     class ResqueHandler
       DEFAULT_QUEUE = 'backgrounded'
+      INVALID_ID = -1
       @@queue = DEFAULT_QUEUE
 
       def request(object, method, *args)
-        options = object.send("#{method.to_s.sub(/([?!=])$/, '')}_backgrounded_options")
+        options = object.send Backgrounded.method_name_for_backgrounded_options(method)
         @@queue = options[:queue] || DEFAULT_QUEUE
         instance, id = instance_identifiers(object)
         Resque.enqueue(ResqueHandler, instance, id, method, *args)
@@ -23,11 +24,11 @@ module Backgrounded
       private
       def self.find_instance(clazz, id, method)
         clazz = clazz.constantize
-        clazz.respond_to?(method) ? clazz : clazz.find(id)
+        id.to_i == INVALID_ID ? clazz : clazz.find(id)
       end
       def instance_identifiers(object)
         instance, id = if object.is_a?(Class) 
-          [object.name, -1]
+          [object.name, INVALID_ID]
         else
           [object.class.name, object.id]
         end

data/lib/backgrounded/handler/workling_handler.rb

@@ -1,5 +1,6 @@
 class Backgrounded::Handler::WorklingHandler
   class BackgroundedWorker < Workling::Base
+    INVALID_ID = -1
     def perform(options = {})
       find_instance(options[:class], options[:id], options[:method]).send(options[:method], *options[:params])
     end
@@ -7,7 +8,7 @@ class Backgrounded::Handler::WorklingHandler
     private
     def find_instance(clazz, id, method)
       clazz = clazz.constantize
-      clazz.respond_to?(method) ? clazz : clazz.find(id)
+      id.to_i == INVALID_ID ? clazz : clazz.find(id)
     end
   end
 
@@ -25,7 +26,7 @@ class Backgrounded::Handler::WorklingHandler
   private
   def instance_identifiers(object)
     instance, id = if object.is_a?(Class) 
-      [object.name, -1]
+      [object.name, INVALID_ID]
     else
       [object.class.name, object.id]
     end

data/lib/backgrounded/version.rb

@@ -1,3 +1,3 @@
 module Backgrounded
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/test/backgrounded/handler/resque_handler_test.rb

@@ -3,6 +3,10 @@ require 'backgrounded/handler/resque_handler'
 require 'resque_unit'
 
 ActiveRecord::Schema.define(:version => 1) do
+  create_table :blogs, :force => true do |t|
+    t.column :name, :string
+  end
+
   create_table :users, :force => true do |t|
     t.column :name, :string
   end
@@ -34,6 +38,9 @@ class ResqueHandlerTest < Test::Unit::TestCase
       def do_stuff
       end
     end
+    backgrounded :do_stuff
+    def do_stuff
+    end
   end
 
   context 'when backgrounded is configured with resque' do
@@ -60,6 +67,24 @@ class ResqueHandlerTest < Test::Unit::TestCase
           should "invoke method on class" do end #see expectations
         end
       end
+      context 'with an instance level backgrounded method of the same name' do
+        setup do
+          @blog = Blog.create
+          @blog.do_stuff_backgrounded
+        end
+        should "enqueue instance method job to resque" do
+          assert_queued Backgrounded::Handler::ResqueHandler, [Blog.to_s, @blog.id, 'do_stuff']
+          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).never
+            Blog.any_instance.expects(:do_stuff)
+            Resque.run!
+          end
+          should "invoke method on instance" do end #see expectations
+        end
+      end
     end
 
     context 'a persisted object with a single backgrounded method' do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backgrounded
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
-  version: 0.7.3
+  segments: 
+  - 0
+  - 7
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -10,96 +15,149 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 Z
+date: 2012-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 3
+        - 10
         version: 2.3.10
+  requirement: *id001
+  prerelease: false
+  name: activerecord
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 3
+        - 10
         version: 2.3.10
+  requirement: *id002
+  prerelease: false
+  name: activesupport
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  requirement: *id003
+  prerelease: false
+  name: shoulda
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: resque
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 89
+        segments: 
+        - 0
+        - 17
+        - 1
         version: 0.17.1
+  requirement: *id004
+  prerelease: false
+  name: resque
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: resque_unit
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 3
+        - 7
         version: 0.3.7
+  requirement: *id005
+  prerelease: false
+  name: resque_unit
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  requirement: *id006
+  prerelease: false
+  name: mocha
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
+  requirement: *id007
+  prerelease: false
+  name: sqlite3-ruby
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: delayed_job
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 1
+        - 4
         version: 2.1.4
+  requirement: *id008
+  prerelease: false
+  name: delayed_job
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
+  requirement: *id009
+  prerelease: false
+  name: rake
   type: :development
-  version_requirements: *id008
 description: Execute any ActiveRecord Model method in the background
 email: 
 - ryan@codecrate.com
@@ -111,6 +169,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rvmrc
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -144,17 +203,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: backgrounded
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple API to run Model methods in the background