carrierwave_backgrounder 0.0.8 → 0.0.9

data/carrierwave_backgrounder.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "carrierwave", ["~> 0.5"]
 
   s.add_development_dependency "rspec", ["2.5.0"]
-  s.add_development_dependency "mocha", ["~> 0.9"]
+  s.add_development_dependency "mocha", ["~> 0.12.0"]
   s.add_development_dependency "rake"
 end

data/lib/backgrounder/orm/{activerecord.rb → activemodel.rb}

@@ -1,19 +1,20 @@
 # encoding: utf-8
-require 'active_record'
 
 module CarrierWave
   module Backgrounder
     module ORM
 
-      module ActiveRecord
+      module ActiveModel
         include CarrierWave::Backgrounder::ORM::Base
 
         def process_in_background(column, worker=::CarrierWave::Workers::ProcessAsset)
           super
 
-          class_eval  <<-RUBY, __FILE__, __LINE__ + 1
+          mod = Module.new
+          include mod
+          mod.module_eval  <<-RUBY, __FILE__, __LINE__ + 1
             def trigger_#{column}_background_processing?
-              process_#{column}_upload != true && (#{column}_changed? || remote_#{column}_url.present?)
+              super && (#{column}_changed? || previous_changes.has_key?(:#{column}) || remote_#{column}_url.present?)
             end
           RUBY
         end
@@ -21,16 +22,17 @@ module CarrierWave
         def store_in_background(column, worker=::CarrierWave::Workers::StoreAsset)
           super
 
-          class_eval  <<-RUBY, __FILE__, __LINE__ + 1
+          mod = Module.new
+          include mod
+          mod.module_eval  <<-RUBY, __FILE__, __LINE__ + 1
             def trigger_#{column}_background_storage?
-              process_#{column}_upload != true && (#{column}_changed? || remote_#{column}_url.present?)
+              super && (#{column}_changed? || previous_changes.has_key?(:#{column}) || remote_#{column}_url.present?)
             end
           RUBY
         end
-      end # ActiveRecord
+      end # ActiveModel
 
     end # ORM
   end # Backgrounder
 end # CarrierWave
 
-ActiveRecord::Base.extend CarrierWave::Backgrounder::ORM::ActiveRecord

data/lib/backgrounder/orm/base.rb

@@ -40,10 +40,17 @@ module CarrierWave
         #
         def process_in_background(column, worker=::CarrierWave::Workers::ProcessAsset)
           send :before_save, :"set_#{column}_processing", :if => :"trigger_#{column}_background_processing?"
-          send :after_save,  :"enqueue_#{column}_background_job", :if => :"trigger_#{column}_background_processing?"
+          if self.respond_to?(:after_commit)
+            send :after_commit,  :"enqueue_#{column}_background_job", :if => :"trigger_#{column}_background_processing?"
+          else
+            send :after_save,  :"enqueue_#{column}_background_job", :if => :"trigger_#{column}_background_processing?"
+          end
+          send :attr_accessor, :"process_#{column}_upload"
 
-          class_eval  <<-RUBY, __FILE__, __LINE__ + 1
-            attr_accessor :process_#{column}_upload
+          mod = Module.new
+          include mod
+
+          mod.module_eval  <<-RUBY, __FILE__, __LINE__ + 1
 
             def set_#{column}_processing
               self.#{column}_processing = true if respond_to?(:#{column}_processing)
@@ -83,10 +90,16 @@ module CarrierWave
         #   end
         #
         def store_in_background(column, worker=::CarrierWave::Workers::StoreAsset)
-          send :after_save, :"enqueue_#{column}_background_job", :if => :"trigger_#{column}_background_storage?"
-
-          class_eval  <<-RUBY, __FILE__, __LINE__ + 1
-            attr_accessor :process_#{column}_upload
+          if self.respond_to?(:after_commit)
+            send :after_commit, :"enqueue_#{column}_background_job", :if => :"trigger_#{column}_background_storage?"
+          else
+            send :after_save, :"enqueue_#{column}_background_job", :if => :"trigger_#{column}_background_storage?"
+          end
+          send :attr_accessor, :"process_#{column}_upload"
+
+          mod = Module.new
+          include mod
+          mod.module_eval  <<-RUBY, __FILE__, __LINE__ + 1
 
             def write_#{column}_identifier
               super() and return if process_#{column}_upload

data/lib/backgrounder/orm/data_mapper.rb

@@ -20,7 +20,7 @@ module CarrierWave
 
             def enqueue_#{column}_background_job
               if trigger_#{column}_background_processing?
-                ::Delayed::Job.enqueue #{worker}.new(self.class, id, #{column}.mounted_as) 
+                CarrierWave::Backgrounder.enqueue_for_backend(#{worker}, self.class.name, id, #{column}.mounted_as)
                 @#{column}_changed = false
               end
             end
@@ -55,7 +55,7 @@ module CarrierWave
 
             def enqueue_#{column}_background_job
               if trigger_#{column}_background_storage?
-                ::Delayed::Job.enqueue #{worker}.new(self.class, id, #{column}.mounted_as) 
+                CarrierWave::Backgrounder.enqueue_for_backend(#{worker}, self.class.name, id, #{column}.mounted_as)
                 @#{column}_changed = false
               end
             end

data/lib/backgrounder/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Backgrounder
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/backgrounder/workers/process_asset.rb

@@ -3,9 +3,14 @@ module CarrierWave
   module Workers
 
     class ProcessAsset < Struct.new(:klass, :id, :column)
-      include ::Sidekiq::Worker if defined?(::Sidekiq)
       @queue = :process_asset
 
+      if defined?(::Sidekiq)
+        include ::Sidekiq::Worker
+
+        sidekiq_options :queue => @queue
+      end
+
       def self.perform(*args)
         new(*args).perform
       end

data/lib/backgrounder/workers/store_asset.rb

@@ -3,9 +3,14 @@ module CarrierWave
   module Workers
 
     class StoreAsset < Struct.new(:klass, :id, :column)
-      include ::Sidekiq::Worker if defined?(::Sidekiq)
       @queue = :store_asset
 
+      if defined?(::Sidekiq)
+        include ::Sidekiq::Worker
+
+        sidekiq_options :queue => @queue
+      end
+
       def self.perform(*args)
         new(*args).perform
       end
@@ -27,12 +32,12 @@ module CarrierWave
           end
         end
       end
-      
+
       def set_args(klass, id, column)
         self.klass, self.id, self.column = klass, id, column
       end
 
     end # StoreAsset
-    
+
   end # Workers
 end # Backgrounder

data/lib/carrierwave_backgrounder.rb

@@ -83,7 +83,8 @@ if defined?(Rails)
 
         initializer "carrierwave_backgrounder.active_record" do
           ActiveSupport.on_load :active_record do
-            require 'backgrounder/orm/activerecord'
+            require 'backgrounder/orm/activemodel'
+            ::ActiveRecord::Base.extend CarrierWave::Backgrounder::ORM::ActiveModel
           end
         end
 
@@ -92,7 +93,10 @@ if defined?(Rails)
         end
 
         initializer "carrierwave_backgrounder.mongoid" do
-          require 'backgrounder/orm/mongoid' if defined?(Mongoid)
+          if defined?(Mongoid)
+            require 'backgrounder/orm/activemodel'
+            ::Mongoid::Document::ClassMethods.send(:include, ::CarrierWave::Backgrounder::ORM::ActiveModel)
+          end
         end
 
       end

data/spec/backgrounder/orm/activemodel_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'ostruct'
+require 'backgrounder/orm/activemodel'
+
+describe CarrierWave::Backgrounder::ORM::ActiveModel do
+  before do
+    @mock_class = Class.new do
+      def self.before_save(method, opts); nil; end
+      def self.after_commit(method, opts); nil; end
+      def avatar_changed?; nil;  end
+      def remote_avatar_url; OpenStruct.new(:present? => true); end
+      def previous_changes; {}; end
+    end
+
+    @mock_class.extend CarrierWave::Backgrounder::ORM::ActiveModel
+    @mock_class.process_in_background :avatar
+  end
+
+  describe '#trigger_column_background_processing?' do
+    it "calls up to processs column upload getter in the base class" do
+      instance = @mock_class.new
+      instance.expects(:process_avatar_upload)
+      instance.trigger_avatar_background_processing?
+    end
+  end
+end

data/spec/backgrounder/orm/base_spec.rb

@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+
+describe CarrierWave::Backgrounder::ORM::Base do
+  before do
+    @mock_class = Class.new do
+      def self.before_save(method, opts); nil; end
+      def self.after_commit(method, opts); nil; end
+    end
+
+    @mock_class.extend CarrierWave::Backgrounder::ORM::Base
+  end
+
+  it 'mixes in the two DSL methods' do
+    @mock_class.should respond_to(:process_in_background)
+    @mock_class.should respond_to(:store_in_background)
+  end
+
+  describe 'process in background' do
+
+    describe 'setting up callbacks' do
+
+      it 'creates a before_save hook' do
+        @mock_class.expects(:before_save).with(:set_avatar_processing, :if => :trigger_avatar_background_processing?)
+        @mock_class.process_in_background :avatar
+      end
+
+      it 'creates an after_save hook' do
+        @mock_class.expects(:after_commit).with(:enqueue_avatar_background_job, :if => :trigger_avatar_background_processing?)
+        @mock_class.process_in_background :avatar
+      end
+
+    end
+
+    describe 'including new methods' do
+      before do
+        @mock_class.process_in_background :avatar
+        @instance = @mock_class.new
+      end
+
+      it 'creates a processing enabled accessor' do
+        @instance.should respond_to(:process_avatar_upload)
+        @instance.should respond_to(:process_avatar_upload=)
+      end
+
+      it 'create a setter for the processing attribute' do
+        @instance.should respond_to(:set_avatar_processing)
+      end
+
+      it 'create a background job queuer' do
+        @instance.should respond_to(:enqueue_avatar_background_job)
+      end
+
+      it 'create a trigger interrogator' do
+        @instance.should respond_to(:trigger_avatar_background_processing?)
+      end
+
+    end
+
+  end
+
+  describe 'store in background' do
+
+    describe 'setting up callbacks' do
+
+      it 'creates an after_save hook' do
+        @mock_class.expects(:after_commit).with(:enqueue_avatar_background_job, :if => :trigger_avatar_background_storage?)
+        @mock_class.store_in_background :avatar
+      end
+
+    end
+
+    describe 'including new methods' do
+      before do
+        @mock_class.store_in_background :avatar
+        @instance = @mock_class.new
+      end
+
+      it 'creates a processing enabled accessor' do
+        @instance.should respond_to(:process_avatar_upload)
+        @instance.should respond_to(:process_avatar_upload=)
+      end
+
+      it 'overrides the write column identifier method from carrierwave' do
+        @instance.should respond_to(:write_avatar_identifier)
+      end
+
+      it 'overrides the store column method from carrierwave' do
+        @instance.should respond_to(:store_avatar!)
+      end
+
+      it 'create a background job queuer' do
+        @instance.should respond_to(:enqueue_avatar_background_job)
+      end
+
+      it 'create a trigger interrogator' do
+        @instance.should respond_to(:trigger_avatar_background_storage?)
+      end
+
+    end
+  end
+
+end

data/spec/support/backend_constants.rb

@@ -16,6 +16,14 @@ end
 
 module Sidekiq
   module Worker
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def sidekiq_options(opts = {})
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_backgrounder
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,16 +89,17 @@ files:
 - Rakefile
 - carrierwave_backgrounder.gemspec
 - lib/backgrounder/delay.rb
-- lib/backgrounder/orm/activerecord.rb
+- lib/backgrounder/orm/activemodel.rb
 - lib/backgrounder/orm/base.rb
 - lib/backgrounder/orm/data_mapper.rb
-- lib/backgrounder/orm/mongoid.rb
 - lib/backgrounder/version.rb
 - lib/backgrounder/workers.rb
 - lib/backgrounder/workers/process_asset.rb
 - lib/backgrounder/workers/store_asset.rb
 - lib/carrierwave_backgrounder.rb
 - spec/backgrounder/backends_spec.rb
+- spec/backgrounder/orm/activemodel_spec.rb
+- spec/backgrounder/orm/base_spec.rb
 - spec/backgrounder/workers/fixtures/test.jpg
 - spec/backgrounder/workers/process_asset_spec.rb
 - spec/backgrounder/workers/store_asset_spec.rb
@@ -118,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3222022521039944985
+      hash: 1188528619388271900
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3222022521039944985
+      hash: 1188528619388271900
 requirements: []
 rubyforge_project: carrierwave_backgrounder
 rubygems_version: 1.8.24
@@ -137,6 +138,8 @@ summary: Offload CarrierWave's image processing and storage to a background proc
   using Delayed Job
 test_files:
 - spec/backgrounder/backends_spec.rb
+- spec/backgrounder/orm/activemodel_spec.rb
+- spec/backgrounder/orm/base_spec.rb
 - spec/backgrounder/workers/fixtures/test.jpg
 - spec/backgrounder/workers/process_asset_spec.rb
 - spec/backgrounder/workers/store_asset_spec.rb

data/lib/backgrounder/orm/mongoid.rb

@@ -1,33 +0,0 @@
-module CarrierWave
-  module Backgrounder
-    module ORM
-
-      module Mongoid
-        include CarrierWave::Backgrounder::ORM::Base
-
-        def process_in_background(column, worker=::CarrierWave::Workers::ProcessAsset)
-          super
-
-          class_eval  <<-RUBY, __FILE__, __LINE__ + 1
-            def trigger_#{column}_background_processing?
-              process_#{column}_upload != true && (#{column}_changed? || remote_#{column}_url.present?)
-            end
-          RUBY
-        end
-
-        def store_in_background(column, worker=::CarrierWave::Workers::StoreAsset)
-          super
-
-          class_eval  <<-RUBY, __FILE__, __LINE__ + 1
-            def trigger_#{column}_background_storage?
-              process_#{column}_upload != true && (#{column}_changed? || remote_#{column}_url.present?)
-            end
-          RUBY
-        end
-      end # ActiveRecord
-
-    end # ORM
-  end # Backgrounder
-end # CarrierWave
-
-Mongoid::Document::ClassMethods.send(:include, ::CarrierWave::Backgrounder::ORM::Mongoid)