dalliance 0.1.2 → 0.1.3

data/lib/dalliance/schema.rb

@@ -3,6 +3,7 @@ module Dalliance
     def add_dalliance
       column :dalliance_error_hash, :text, {}
       column :dalliance_status, :string, {:null => false, :default => 'pending'}
+      column :dalliance_duration, :integer, {}
     end
   end
 end

data/lib/dalliance/version.rb

@@ -2,7 +2,7 @@ module Dalliance
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/dalliance/workers/delayed_job.rb

@@ -1,8 +1,8 @@
 module Dalliance
   module Workers
     class DelayedJob < Struct.new(:instance_klass, :instance_id)
-      def self.enqueue(instance)
-        ::Delayed::Job.enqueue(self.new(instance.class.name, instance.id), :queue => 'dalliance')
+      def self.enqueue(instance, queue = 'dalliance')
+        ::Delayed::Job.enqueue(self.new(instance.class.name, instance.id), :queue => queue)
       end
 
       def perform

data/lib/dalliance/workers/resque.rb

@@ -1,10 +1,8 @@
 module Dalliance
   module Workers
     class Resque
-      @queue = :dalliance
-
-      def self.enqueue(instance)
-        ::Resque.enqueue(self, instance.class.name, instance.id)
+      def self.enqueue(instance, queue = 'dalliance')
+        ::Resque.enqueue_to(queue, self, instance.class.name, instance.id)
       end
 
       def self.perform(instance_klass, instance_id)

data/lib/dalliance.rb

@@ -8,6 +8,7 @@ require 'dalliance/workers'
 require 'dalliance/progress_meter'
 
 require 'state_machine'
+require 'benchmark'
 
 module Dalliance
   extend ActiveSupport::Concern
@@ -16,19 +17,43 @@ module Dalliance
     def options
       @options ||= {
         :background_processing => (defined?(Rails) ? Rails.env.production? : true),
+        :dalliance_progress_meter => true,
         :dalliance_progress_meter_total_count_method => :dalliance_progress_meter_total_count,
-        :worker_class => detect_worker_class
+        :worker_class => detect_worker_class,
+        :queue => 'dalliance',
+        :logger => detect_logger,
+        :duration_column => nil
       }
     end
 
-    def background_processing?
-      options[:background_processing]
-    end
-
     def background_processing=(value)
       options[:background_processing] = value
     end
 
+    def dalliance_progress_meter=(value)
+      options[:dalliance_progress_meter] = value
+    end
+
+    def dalliance_progress_meter_total_count_method=(value)
+      options[:dalliance_progress_meter_total_count_method] = value
+    end
+
+    def worker_class=(value)
+      options[:worker_class] = value
+    end
+
+    def queue=(value)
+      options[:queue] = value
+    end
+
+    def logger=(value)
+      options[:logger] = value
+    end
+
+    def duration_column=(value)
+      options[:duration_column] = value
+    end
+
     def configure
       yield(self) if block_given?
     end
@@ -37,6 +62,16 @@ module Dalliance
       return Dalliance::Workers::DelayedJob if defined? ::Delayed::Job
       return Dalliance::Workers::Resque     if defined? ::Resque
     end
+
+    def detect_logger
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.logger
+      elsif defined?(Rails)
+        Rails.logger
+      else
+        ::Logger.new(STDOUT)
+      end
+    end
   end
 
   included do
@@ -91,8 +126,8 @@ module Dalliance
 
   #Force backgound_processing w/ true
   def dalliance_background_process(backgound_processing = nil)
-    if backgound_processing || (backgound_processing.nil? && Dalliance.background_processing?)
-      self.class.dalliance_options[:worker_class].enqueue(self)
+    if backgound_processing || (backgound_processing.nil? && self.class.dalliance_options[:background_processing])
+      self.class.dalliance_options[:worker_class].enqueue(self, self.class.dalliance_options[:queue])
     else
       dalliance_process(false)
     end
@@ -100,10 +135,14 @@ module Dalliance
 
   #backgound_processing == false will re-raise any exceptions
   def dalliance_process(backgound_processing = false)
+    start_time = Time.now
+
     begin
       start_dalliance!
 
-      build_dalliance_progress_meter(:total_count => calculate_dalliance_progress_meter_total_count).save!
+      if self.class.dalliance_options[:dalliance_progress_meter]
+        build_dalliance_progress_meter(:total_count => calculate_dalliance_progress_meter_total_count).save!
+      end
 
       self.send(self.class.dalliance_options[:dalliance_method])
 
@@ -117,11 +156,21 @@ module Dalliance
       #Don't raise the error if we're backgound_processing...
       raise e unless backgound_processing
     ensure
-      if dalliance_progress_meter
+      if self.class.dalliance_options[:dalliance_progress_meter] && dalliance_progress_meter
         #Works with optimistic locking...
         Dalliance::ProgressMeter.delete(dalliance_progress_meter.id)
         self.dalliance_progress_meter = nil
       end
+
+      duration = Time.now - start_time
+
+      if self.class.dalliance_options[:logger]
+        self.class.dalliance_options[:logger].info("[dalliance] #{self.class.name}(#{id}) - #{dalliance_status} #{duration.to_i}")
+      end
+
+      if self.class.dalliance_options[:duration_column]
+        self.class.where(id: self.id).update_all(self.class.dalliance_options[:duration_column] => duration.to_i)
+      end
     end
   end
 
@@ -129,7 +178,7 @@ module Dalliance
     if completed?
       100
     else
-      if dalliance_progress_meter
+      if self.class.dalliance_options[:dalliance_progress_meter] && dalliance_progress_meter
         dalliance_progress_meter.progress
       else
         0

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -4,7 +4,7 @@ describe DallianceModel do
   subject { DallianceModel.create }
 
   before(:all) do
-    Dalliance.options[:background_processing] = true
+    DallianceModel.dalliance_options[:background_processing] = true
   end
 
   before do
@@ -15,6 +15,7 @@ describe DallianceModel do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
       DallianceModel.dalliance_options[:worker_class] = nil
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
     end
 
     it "should raise an error" do
@@ -26,6 +27,8 @@ describe DallianceModel do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
       DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::DelayedJob
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
+      DallianceModel.dalliance_options[:duration_column] = 'dalliance_duration'
     end
 
     it "should not call the dalliance_method w/o a Delayed::Worker" do
@@ -60,12 +63,49 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 100
     end
+
+    it "should set the dalliance_duration" do
+      subject.dalliance_duration.should == nil
+
+      subject.dalliance_background_process
+      Delayed::Worker.new(:queues => [:dalliance]).work_off
+      subject.reload
+
+      subject.dalliance_duration.should_not == nil
+    end
+
+    context "another_queue" do
+      let(:queue) { 'dalliance_2'}
+
+      before(:all) do
+        DallianceModel.dalliance_options[:queue] = queue
+      end
+
+      it "should NOT call the dalliance_method w/ a Delayed::Worker (different queue)" do
+        subject.dalliance_background_process
+        Delayed::Worker.new(:queues => [:dalliance]).work_off
+        subject.reload
+
+        subject.should_not be_successful
+        Delayed::Job.count.should == 1
+      end
+
+      it "should call the dalliance_method w/ a Delayed::Worker (same queue)" do
+        subject.dalliance_background_process
+        Delayed::Worker.new(:queues => [queue]).work_off
+        subject.reload
+
+        subject.should be_successful
+        Delayed::Job.count.should == 0
+      end
+    end
   end
 
   context "raise error" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
       DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::DelayedJob
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
     end
 
     it "should NOT raise an error" do

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -4,7 +4,7 @@ describe DallianceModel do
   subject { DallianceModel.create }
 
   before(:all) do
-    Dalliance.options[:background_processing] = true
+    DallianceModel.dalliance_options[:background_processing] = true
   end
 
   before do
@@ -15,6 +15,7 @@ describe DallianceModel do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
       DallianceModel.dalliance_options[:worker_class] = nil
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
     end
 
     it "should raise an error" do
@@ -26,6 +27,8 @@ describe DallianceModel do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
       DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::Resque
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
+      DallianceModel.dalliance_options[:duration_column] = 'dalliance_duration'
     end
 
     it "should not call the dalliance_method w/o a Delayed::Worker" do
@@ -60,12 +63,53 @@ describe DallianceModel do
 
       subject.dalliance_progress.should == 100
     end
+
+    it "should set the dalliance_duration" do
+      subject.dalliance_duration.should == nil
+
+      subject.dalliance_background_process
+      Resque::Worker.new(:dalliance).process
+      subject.reload
+
+      subject.dalliance_duration.should_not == nil
+    end
+
+    context "another_queue" do
+      let(:queue) { 'dalliance_2'}
+
+      before(:all) do
+        DallianceModel.dalliance_options[:queue] = queue
+      end
+
+      before do
+        Resque.remove_queue(queue)
+      end
+
+      it "should NOT call the dalliance_method w/ a Delayed::Worker (different queue)" do
+        subject.dalliance_background_process
+        Resque::Worker.new(:dalliance).process
+        subject.reload
+
+        subject.should_not be_successful
+        Resque.size(queue).should == 1
+      end
+
+      it "should call the dalliance_method w/ a Delayed::Worker (same queue)" do
+        subject.dalliance_background_process
+        Resque::Worker.new(queue).process
+        subject.reload
+
+        subject.should be_successful
+        Resque.size(queue).should == 0
+      end
+    end
   end
 
   context "raise error" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
       DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::Resque
+      DallianceModel.dalliance_options[:queue] = 'dalliance'
     end
 
     it "should NOT raise an error" do

data/spec/dalliance/synchronous_spec.rb

@@ -2,56 +2,66 @@ require 'spec_helper'
 
 describe DallianceModel do
   subject { DallianceModel.create }
-  
+
   before(:all) do
-    Dalliance.options[:background_processing] = false
+    DallianceModel.dalliance_options[:background_processing] = false
+    DallianceModel.dalliance_options[:duration_column] = 'dalliance_duration'
   end
-  
+
   context "success" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
     end
-    
+
     it "should call the dalliance_method" do
       lambda { subject.dalliance_background_process }.should change(subject, :successful).from(false).to(true)
     end
-    
+
     it "should set the dalliance_status to completed" do
       lambda { subject.dalliance_background_process }.should change(subject, :dalliance_status).from('pending').to('completed')
     end
-    
+
     it "should set the dalliance_progress to 100" do
       lambda { subject.dalliance_background_process }.should change(subject, :dalliance_progress).from(0).to(100)
     end
+
+    it "should set the dalliance_duration" do
+      subject.dalliance_duration.should == nil
+
+      subject.dalliance_background_process
+      subject.reload
+
+      subject.dalliance_duration.should_not == nil
+    end
   end
-  
+
   context "raise error" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
     end
-    
+
     it "should raise an error" do
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
     end
-    
+
     it "should store the error" do
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
-      
+
       subject.dalliance_error_hash.should_not be_empty
       subject.dalliance_error_hash[:error].should == RuntimeError.name #We store the class name...
       subject.dalliance_error_hash[:message].should == 'RuntimeError'
       subject.dalliance_error_hash[:backtrace].should_not be_blank
     end
-    
+
     it "should set the dalliance_status to processing_error" do
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
-      
+
       subject.should be_processing_error
     end
-    
+
     it "should set the dalliance_progress to 0" do
       expect { subject.dalliance_background_process }.to raise_error(RuntimeError)
-      
+
       subject.dalliance_progress.should == 0
     end
   end

data/spec/support/active_record.rb

@@ -16,7 +16,7 @@ ActiveRecord::Schema.define do
   end
 
   add_index     :dalliance_progress_meters, [:dalliance_progress_model_id, :dalliance_progress_model_type], :name => 'by_dalliance_progress_model'
-  
+
   create_table :delayed_jobs, :force => true do |table|
     table.integer  :priority, :default => 0
     table.integer  :attempts, :default => 0
@@ -29,13 +29,14 @@ ActiveRecord::Schema.define do
     table.string   :queue
     table.timestamps
   end
-  
+
   add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
 
   create_table :dalliance_models, :force => true do |t|
-    t.text :dalliance_error_hash
-    t.string :dalliance_status, :string, :null => false, :default => 'pending'
-    
+    t.text    :dalliance_error_hash
+    t.string  :dalliance_status, :string, :null => false, :default => 'pending'
+    t.integer :dalliance_duration
+
     t.boolean :successful, :default => false
   end
 end
@@ -44,13 +45,14 @@ end
 class DallianceModel < ActiveRecord::Base
   #We're not using the railtie in tests...
   include Dalliance::Glue
-  
-  dalliance :dalliance_success_method
+
+  dalliance :dalliance_success_method,
+            :logger => nil
 
   def dalliance_success_method
     update_attribute(:successful, true)
   end
-  
+
   def dalliance_error_method
     raise RuntimeError
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord