delayed-method 0.1.0 → 0.2.0

data/README.md

@@ -36,9 +36,16 @@ model.long_call(arg1, arg2)
 
 DelayedMethod.enqueue(model, :long_call, arg1, arg2)
 
+That's it. This is the only 2 cases that DelayedMethod will work: Caller
+need to be either a class or a persisted ActiveRecord model
 
-That's it. This is the only 2 cases that DelayedMethod will work.
+If you use resque-scheduler, you can also do this:
 
+  DelayedMethod.enqueue_at(1.day.from_now, Executor, :long_call, arg1, arg2)
+
+or
+
+  DelayedMethod.enqueue_at(1.day.from_now, model, :long_call, arg1, arg2)
 
 Warning
 ===========

data/lib/delayed-method.rb

@@ -16,11 +16,29 @@ class DelayedMethod
     end
 
     def enqueue(object, method, *args)
+      ensure_proper_call(object, method) do |klass, id|
+        Resque.enqueue(DelayedMethod, klass, id, method, *args)
+      end
+    end
+
+    def enqueue_at(time, object, method, *args)
+      ensure_proper_call(object, method) do |klass, id|
+        if Resque.respond_to?(:enqueue_at)
+          Resque.enqueue_at(time, DelayedMethod, klass, id, method, *args)
+        else
+          raise "resque-scheduler need to be included for this to work"
+        end
+      end
+    end
+
+    private
+    def ensure_proper_call(object, method)
       raise ArgumentError.new("object does not respond to #{method}") unless object.respond_to?(method)
       if object.is_a? Class
-        Resque.enqueue(DelayedMethod, object.name, nil, method, *args)
+        yield object.name, nil
       elsif object.is_a? ActiveRecord::Base
-        Resque.enqueue(DelayedMethod, object.class.name, object.id, method, *args)
+        raise ArgumentError.new("object need to be persisted") unless object.persisted?
+        yield object.class.name, object.id
       else
         raise ArgumentError.new("Only class and ActiveRecord resource are supported")
       end

data/spec/delayed_method_spec.rb

@@ -28,7 +28,7 @@ describe DelayedMethod do
       end
 
       def mock_armodel
-        mock(ActiveRecord::Base, { :id => 1, :execute => true }).tap do |armodel|
+        mock(ActiveRecord::Base, { :id => 1, :execute => true, :persisted? => true }).tap do |armodel|
           armodel.should_receive(:is_a?).with(Class).and_return(false)
           armodel.should_receive(:is_a?).with(ActiveRecord::Base).and_return(true)
           armodel.should_receive(:class).and_return ActiveRecord::Base

data/spec/spec_helper.rb

@@ -3,3 +3,7 @@ require 'bundler'
 require 'rspec'
 require 'delayed-method'
 require 'debugger'
+
+Dir[File.expand_path("../support/*.rb", __FILE__)].each do |file|
+  require file
+end

data/spec/support/redis.rb

@@ -0,0 +1,70 @@
+TMP_PATH = File.expand_path("../../../tmp", __FILE__)
+PIDS_PATH = TMP_PATH + "/pids"
+REDIS_PID = "#{PIDS_PATH}/redis-test.pid"
+REDIS_CACHE_PATH = "#{TMP_PATH}/cache/"
+
+module RedisHelper
+  class << self
+    def start_server
+      FileUtils.mkdir_p REDIS_CACHE_PATH
+      FileUtils.mkdir_p PIDS_PATH
+
+      redis_options = {
+        "daemonize"     => 'yes',
+        "pidfile"       => REDIS_PID,
+        "port"          => 9736,
+        "timeout"       => 300,
+        "save 900"      => 1,
+        "save 300"      => 1,
+        "save 60"       => 10000,
+        "dbfilename"    => "dump.rdb",
+        "dir"           => REDIS_CACHE_PATH,
+        "loglevel"      => "debug",
+        "logfile"       => "stdout",
+        "databases"     => 16
+      }.map { |k, v| "#{k} #{v}" }.join('\n')
+      `echo '#{redis_options}' | redis-server -`
+      success = false
+
+      wait_time_remaining = 5
+      begin
+        TCPSocket.open("localhost", "9736")
+        success = true
+      rescue Exception => e
+        if wait_time_remaining > 0
+          wait_time_remaining -= 0.1
+          sleep 0.1
+        else
+          raise "Cannot start redis server in 5 seconds. Pinging server yield\n#{e.inspect}"
+        end
+      end while(!success)
+
+      Resque.redis = "localhost:9736"
+    end
+
+    def stop_server
+      %x{
+      cat #{REDIS_PID} | xargs kill -QUIT
+      rm -f #{REDIS_CACHE_PATH}dump.rdb
+      }
+    end
+
+    def clear
+      Resque.redis.flushdb
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    RedisHelper.clear
+  end
+
+  config.before(:suite) do
+    RedisHelper.start_server
+  end
+
+  config.after(:suite) do
+    RedisHelper.stop_server
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed-method
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -104,6 +104,7 @@ files:
 - lib/delayed-method.rb
 - spec/delayed_method_spec.rb
 - spec/spec_helper.rb
+- spec/support/redis.rb
 homepage: http://github.com/phuongnd08/delayed-method
 licenses: []
 post_install_message: 
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Allow you to quickly move a long call to background which then executed by