buffered_job 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/buffered_job.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "buffered_job"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Masaki Sawamura"]

data/lib/buffered_job.rb

@@ -22,6 +22,10 @@ module BufferedJob
       BufferedJob::Model.flush!
     end
 
+    def last_results
+      BufferedJob::Model.last_results
+    end
+
     def delay_time=(sec)
       @@delay_time = sec
     end
@@ -33,5 +37,36 @@ module BufferedJob
     def reset_delay_time
       @@delay_time = DEFAULT_DELAY_TIME
     end
+
+    def unlock!
+      Lock.unlock!
+    end
+  end
+
+  class Lock
+    def self.cache
+      @@cache ||= defined?(Rails) ? Rails.cache : ActiveSupport::Cache::MemoryStore.new
+    end
+    
+    def self.lock!
+      cache.write("mail_buffer_lock",true,:expires_in => 10.minutes)
+    end
+    
+    def self.unlock!
+      cache.delete("mail_buffer_lock")
+    end
+    
+    def self.locked?
+      cache.exist?("mail_buffer_lock")
+    end
+  end
+
+  class NoBufferTargetError < StandardError
+  end
+
+  class NoBufferKeywordError < StandardError
+  end
+
+  class NoMergeMethodError < StandardError
   end
 end

data/lib/buffered_job/ext.rb

@@ -14,10 +14,4 @@ module BufferedJob
       buffer_for(self,key,opt)
     end
   end
-
-  class NoBufferTargetError < StandardError
-  end
-
-  class NoBufferKeywordError < StandardError
-  end
 end

data/lib/buffered_job/model.rb

@@ -6,17 +6,13 @@ module BufferedJob
     before_create :yaml_dump
     after_create :set_delayed_job
     
-    def self.cache
-      @@cache ||= defined?(Rails) ? Rails.cache : ActiveSupport::Cache::MemoryStore.new
-    end
-    
     def self.mailer?(obj)
       obj.respond_to?(:superclass) and obj.superclass == ActionMailer::Base
     end
     
     def self.flush!
-      return if locked?
-      lock!
+      return if Lock.locked?
+      Lock.lock!
       jobs = self.all
       skip = []
       @last_results = []
@@ -32,13 +28,16 @@ module BufferedJob
             targets = cojobs.map{|c|
               YAML.load(c.target)
             }
+            unless receiver.respond_to?(j.merge_method)
+              raise NoMergeMethodError,"define #{j.merge_method}"
+            end
             if mailer?(receiver)
-              r = receiver.send(j.merge_method,targets).deliver
+              @last_results << receiver.send(j.merge_method,targets).deliver
             else
-              r = receiver.send(j.merge_method,targets)
+              @last_results << receiver.send(j.merge_method,targets)
             end
           rescue => er
-            $stderr.puts er.to_s
+            @last_results << er
           end
           cojobs.each do |c|
             skip[c.id] = true
@@ -47,35 +46,23 @@ module BufferedJob
           begin
             target = YAML.load(j.target)
             if mailer?(receiver)
-              r = receiver.send(j.method,target).deliver
+              @last_results << receiver.send(j.method,target).deliver
             else
-              r = receiver.send(j.method,target)
+              @last_results << receiver.send(j.method,target)
             end
           rescue => er
-            $stderr.puts er.to_s
+            @last_results << er
           end
         end
         j.destroy
-        @last_results << r
       end
-      unlock!
+      Lock.unlock!
     end
     
     def self.last_results
       @last_results or []
     end
     
-    def self.lock!
-      cache.write("mail_buffer_lock",true,:expires_in => 10.minutes)
-    end
-    
-    def self.unlock!
-      cache.delete("mail_buffer_lock")
-    end
-    
-    def self.locked?
-      cache.exist?("mail_buffer_lock")
-    end
     
     private
     def yaml_dump

data/spec/buffered_job_spec.rb

@@ -40,6 +40,23 @@ describe "BufferedJob" do
     BufferedJob::Spec.results.should include(c3)
   end
 
+
+  context "returing results" do
+    it "should returns last results by BufferedJob.last_results" do
+      @john.buffer.notify({:foo => "bar"})
+      @paul.buffer.notify({:moo => "ooo"})
+      BufferedJob.flush!
+      BufferedJob.last_results.should == [1,1]
+    end
+
+    it "should contain NoMergeMethodError if the receiver doesn't have it" do
+      @john.buffer.say("Yay!")
+      @john.buffer.say("Hoo!")
+      BufferedJob.flush!
+      BufferedJob.last_results.last.should be_a_kind_of(BufferedJob::NoMergeMethodError)
+    end
+  end
+
   context "with delayed_job" do
     before do
       @original_delay_time = BufferedJob.delay_time

data/spec/spec_helper.rb

@@ -71,7 +71,6 @@ class BufferedJob::Spec
   def self.results
     @@results
   end
-    
 end
 
 
@@ -82,11 +81,18 @@ class User < ActiveRecord::Base
 
   def notify(comment)
     BufferedJob::Spec.results << comment
+    1
   end
 
   def merge_notify(comments)
     BufferedJob::Spec.results << comments
+    2
+  end
+
+  def say(str)
+    3
   end
+
 end
 
 class Article < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buffered_job
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -198,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 7026175223246001
+      hash: 656163624896390621
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: