buffered_job 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/buffered_job.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "buffered_job"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Masaki Sawamura"]
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     "buffered_job.gemspec",
     "lib/buffered_job.rb",
     "lib/buffered_job/ext.rb",
-    "lib/buffered_job/main.rb",
+    "lib/buffered_job/model.rb",
     "lib/buffered_job/proxy.rb",
     "lib/generators/buffered_job/buffered_job_generator.rb",
     "lib/generators/buffered_job/templates/migration.rb",

data/lib/buffered_job.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_record'
 require 'action_mailer'
 
-require 'buffered_job/main'
+require 'buffered_job/model'
 require 'buffered_job/proxy'
 require 'buffered_job/ext'
 
@@ -12,3 +12,12 @@ require 'delayed_job_active_record'
 
 ActiveRecord::Base.send(:include,BufferedJob::Ext)
 ActionMailer::Base.send(:extend,BufferedJob::Ext)
+
+module BufferedJob
+  class << self
+
+    def flush!
+      BufferedJob::Model.flush!
+    end
+  end
+end

data/lib/buffered_job/ext.rb

@@ -1,4 +1,4 @@
-class BufferedJob
+module BufferedJob
   module Ext
     def buffer_for(user,opt={})
       Proxy.new(self,user,opt)

data/lib/buffered_job/model.rb

@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+
+module BufferedJob
+  class Model < ActiveRecord::Base
+    self.table_name = 'buffered_jobs'
+    before_create :yaml_dump
+    after_create :set_delayed_job
+
+    DEFAULT_DELAY_TIME = 3.minutes
+    @@delay_time = DEFAULT_DELAY_TIME
+    
+    def self.cache
+      @@cache ||= defined?(Rails) ? Rails.cache : ActiveSupport::Cache::MemoryStore.new
+    end
+
+    def self.delay_time=(sec)
+      @@delay_time = sec
+    end
+    
+    def self.reset_delay_time
+      @@delay_time = DEFAULT_DELAY_TIME
+    end
+    
+    def self.mailer?(obj)
+      obj.respond_to?(:superclass) and obj.superclass == ActionMailer::Base
+    end
+    
+    def self.flush!
+      return if locked?
+      lock!
+      jobs = self.all
+      skip = []
+      @last_results = []
+      jobs.each do |j|
+        if skip[j.id]
+          j.destroy
+          next 
+        end
+        cojobs = jobs.select{ |o| o.user_id = j.user_id and o.category == j.category }
+        receiver = YAML.load(j.receiver)
+        if cojobs.size > 1
+          begin
+            targets = cojobs.map{|c|
+              YAML.load(c.target)
+            }
+            if mailer?(receiver)
+              r = receiver.send(j.merge_method,targets).deliver
+            else
+              r = receiver.send(j.merge_method,targets)
+            end
+          rescue => er
+            $stderr.puts er.to_s
+          end
+          cojobs.each do |c|
+            skip[c.id] = true
+          end
+        else
+          begin
+            target = YAML.load(j.target)
+            if mailer?(receiver)
+              r = receiver.send(j.method,target).deliver
+            else
+              r = receiver.send(j.method,target)
+            end
+          rescue => er
+            $stderr.puts er.to_s
+          end
+        end
+        j.destroy
+        @last_results << r
+      end
+      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
+      self.receiver = YAML.dump self.receiver
+      self.target = YAML.dump self.target
+    end
+
+    def set_delayed_job
+      delay_time = @@delay_time or DEFAULT_DELAY_TIME
+      self.class.delay(:run_at => delay_time.from_now).flush!
+    end
+  end
+end
+
+
+
+
+
+
+
+

data/lib/buffered_job/proxy.rb

@@ -1,4 +1,4 @@
-class BufferedJob
+module BufferedJob
   class Proxy
     def initialize(receiver,user,opt={})
       @receiver = receiver
@@ -10,12 +10,12 @@ class BufferedJob
       cat =  @opt[:category] 
       cat ||= ( @receiver.class == Class ? @receiver.to_s : @receiver.class.to_s) + '#' + method.to_s
       merge_method = @opt[:action] || "merge_#{method}".to_sym
-      BufferedJob.buf(:user_id => @user.id,
-                     :category => cat,
-                     :receiver => @receiver,
-                     :method => method.to_sym,
-                     :merge_method => merge_method,
-                     :target => target)
+      BufferedJob::Model.create(:user_id => @user.id,
+                             :category => cat,
+                             :receiver => @receiver,
+                             :method => method.to_sym,
+                             :merge_method => merge_method,
+                             :target => target)
     end
   end
 end

data/spec/buffered_job_spec.rb

@@ -7,17 +7,17 @@ describe "BufferedJob" do
     @george = User.create(:name => "george")
     @article = Article.create(:user => @john,:text => "foo")
     BufferedJob::Spec.result = []
+    BufferedJob::Model.destroy_all
   end
 
   after do
-    BufferedJob.destroy_all
   end
 
   it "can buffer jobs" do
     comment = @article.comments.create(:user => @paul,:text => "I love this!")
     @john.buffer.notify(comment)
-    BufferedJob.last.user_id.should == @john.id
-    BufferedJob.last.receiver.should == YAML.dump(@john)
+    BufferedJob::Model.last.user_id.should == @john.id
+    BufferedJob::Model.last.receiver.should == YAML.dump(@john)
   end
 
   it "can exec one job " do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buffered_job
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153174100 !ruby/object:Gem::Requirement
+  requirement: &2154417080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153174100
+  version_requirements: *2154417080
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &2153164920 !ruby/object:Gem::Requirement
+  requirement: &2154416200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153164920
+  version_requirements: *2154416200
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &2153161780 !ruby/object:Gem::Requirement
+  requirement: &2154414820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153161780
+  version_requirements: *2154414820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153159820 !ruby/object:Gem::Requirement
+  requirement: &2154414080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2153159820
+  version_requirements: *2154414080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153150140 !ruby/object:Gem::Requirement
+  requirement: &2154409060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2153150140
+  version_requirements: *2154409060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153147740 !ruby/object:Gem::Requirement
+  requirement: &2154339080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153147740
+  version_requirements: *2154339080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153143940 !ruby/object:Gem::Requirement
+  requirement: &2154336000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2153143940
+  version_requirements: *2154336000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153137560 !ruby/object:Gem::Requirement
+  requirement: &2154333260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153137560
+  version_requirements: *2154333260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153136000 !ruby/object:Gem::Requirement
+  requirement: &2154323180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153136000
+  version_requirements: *2154323180
 description: Buffering jobs for a certain period and invoke specific method if two
   or more similer jobs in a buffer.
 email: masaki.sw@gmail.com
@@ -131,7 +131,7 @@ files:
 - buffered_job.gemspec
 - lib/buffered_job.rb
 - lib/buffered_job/ext.rb
-- lib/buffered_job/main.rb
+- lib/buffered_job/model.rb
 - lib/buffered_job/proxy.rb
 - lib/generators/buffered_job/buffered_job_generator.rb
 - lib/generators/buffered_job/templates/migration.rb
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3678512095132722771
+      hash: 917702728650095919
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/buffered_job/main.rb

@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class BufferedJob < ActiveRecord::Base
-  after_create :set_delayed_job
-  DEFAULT_DELAY_TIME = 3.minutes
-  @@delay_time = DEFAULT_DELAY_TIME
-  
-
-  def self.cache
-    @@cache ||= defined?(Rails) ? Rails.cache : ActiveSupport::Cache::MemoryStore.new
-  end
-
-  def self.delay_time=(sec)
-    @@delay_time = sec
-  end
-  
-  def self.reset_delay_time
-    @@delay_time = DEFAULT_DELAY_TIME
-  end
-  
-  def self.buf(params)
-    params[:receiver] = YAML.dump params[:receiver]
-    params[:target] = YAML.dump params[:target]
-    self.create(params)
-  end
-  
-  def self.mailer?(obj)
-    obj.respond_to?(:superclass) and obj.superclass == ActionMailer::Base
-  end
-  
-  def self.flush!
-    return if locked?
-    lock!
-    jobs = self.all
-    skip = []
-    @last_results = []
-    jobs.each do |j|
-      if skip[j.id]
-        j.destroy
-        next 
-      end
-      cojobs = jobs.select{ |o| o.user_id = j.user_id and o.category == j.category }
-      receiver = YAML.load(j.receiver)
-      if cojobs.size > 1
-        begin
-          targets = cojobs.map{|c|
-            YAML.load(c.target)
-          }
-          if mailer?(receiver)
-            r = receiver.send(j.merge_method,targets).deliver
-          else
-            r = receiver.send(j.merge_method,targets)
-          end
-        rescue => er
-          $stderr.puts er.to_s
-        end
-        cojobs.each do |c|
-          skip[c.id] = true
-        end
-      else
-        begin
-          target = YAML.load(j.target)
-          if mailer?(receiver)
-            r = receiver.send(j.method,target).deliver
-          else
-            r = receiver.send(j.method,target)
-          end
-        rescue => er
-          $stderr.puts er.to_s
-        end
-      end
-      j.destroy
-      @last_results << r
-    end
-    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 set_delayed_job
-    delay_time = @@delay_time or DEFAULT_DELAY_TIME
-    self.class.delay(:run_at => delay_time.from_now).flush!
-  end
-end
-
-
-
-
-
-
-
-