activeasync 0.0.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b3d66e146e6418c6e8c98c4f1a2331db9cdaee99
+  data.tar.gz: 91ce2d461a08a6b0b31e0e735f086e010ae8d9e2
+SHA512:
+  metadata.gz: 04e6193ff36b0341be92ef1103109ca6f4a9decdf8dec8b1a61ab1f8e7e0091c93c110a1428bd4d45c7d03f80b21f2fda195d5aabb76f18bdf41bec0e31f8a7f
+  data.tar.gz: 9e424556d00138b83761ea6379ef3223ec08f2f8cede56a2c97d096db441a08d5a5cf587618aa947eeabeeeb86226f1f7b656e26d2f251c1f22b42bbe86dbeaa

data/.travis.yml

@@ -1,7 +1,13 @@
 language: ruby
+env:
+  matrix:
+  - RAILS_VERSION=3.2
+  - RAILS_VERSION=4.0
+  - RAILS_VERSION=4.1
+  - RAILS_VERSION=4.2
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - 2.0.0-p647
+  - 2.1.7
+  - 2.2.3
 
-before_script: "sh -c 'cd spec/dummy && bundle exec rake db:migrate'"
+before_script: "sh -c 'cd spec/dummy && bundle exec rake db:migrate'"

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.2.0 (2015-10-07)
+
+* BREAKING CHANGES: Support is dropped for Ruby 1.9.3. Please use Ruby 2.x.x
+
+## 0.1.0 (2015-04-20)
+
+* BREAKING CHANGES: background, mode, skip? are all removed and replaced with
+  ActiveAsync.queue_adapter to match the ActiveJob API and simplify setup
+
 ## 0.0.3 (2012-02-07)
 * Ability to set ActiveAsync.background via ActiveAsync.mode = :resque or :fake_resque
 * RSpec around blocks: :enable_resque, :stub_resque
@@ -10,4 +19,4 @@
 
 * async method: interface for sending methods with arguments to Resque
 * :async => true option for running active model callbacks in the background
-* ActiveRecord module to enable async option for after_save, after_update, and after_create
+* ActiveRecord module to enable async option for after_save, after_update, and after_create

data/Gemfile

@@ -1,3 +1,21 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
+
+rails_version = ENV.fetch('RAILS_VERSION') { 'default' }
+
+case rails_version
+when "default"
+  gem "rails", "~> 4.1.0"
+else
+  gem "rails", "~> #{rails_version}"
+end
+
+group :test do
+  gem "rack-test"
+end
+
+group :development, :test do
+  gem 'pry'
+  gem 'pry-byebug'
+end

data/README.md

@@ -6,12 +6,13 @@ and ruby classes to run methods asynchronously.
 ActiveAsync currently depends on Resque and ActiveSupport.
 
 Ruby support:
-- 1.8.7
-- 1.9.2
 - 1.9.3
+- 2.1 (coming soon)
 
 [![Build Status](https://secure.travis-ci.org/challengepost/activeasync.png)](http://travis-ci.org/challengepost/activeasync)
 
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/challengepost/activeasync)
+
 ## Install
 
 In your Gemfile
@@ -22,7 +23,6 @@ Or via command line
 
     gem install activeasync
 
-
 ## Usage
 
 Background class methods
@@ -44,9 +44,6 @@ HeavyLifter.async(:lift, 1, 2, 3)
 With ActiveRecord and Rails
 
 ``` ruby
-# config/application.rb
-require 'active_async/railtie'
-
 # app/models/risky_business.rb
 class RiskyBusiness < ActiveRecord::Base
   def party_time
@@ -90,7 +87,7 @@ it "drive home after late nite save", :stub_resque do
 end
 ```
 
-You can also manually set the Async background adapter to `ActiveAsync::FakeResque` or 
+You can also manually set the Async background adapter to `ActiveAsync::FakeResque` or
 any similar module/class that responds to `#enqueue(*args)`:
 
 ``` ruby

data/Rakefile

@@ -2,7 +2,7 @@
 
 require "bundler/gem_tasks"
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
@@ -14,8 +14,8 @@ desc "Generate code coverage"
 RSpec::Core::RakeTask.new(:coverage) do |t|
   t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
   t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
+  t.rcov_opts = ["--exclude", "spec"]
 end
 
 desc "Run the specs"
-task :default => ["spec"]
+task :default => ["spec"]

data/activeasync.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_runtime_dependency "rest-client"
-  s.add_dependency "resque", "~> 1.10"
-  s.add_dependency "activesupport", "~> 3.0"
+  s.add_dependency "activesupport", ">= 3.0"
 
-  s.add_development_dependency "rails", "~> 3.0"
-  s.add_development_dependency "rspec", "~> 2.8.0"
-  s.add_development_dependency "database_cleaner", "~> 0.7.0"
+  s.add_development_dependency "resque", "~> 1.25"
+  s.add_development_dependency "sidekiq", "~> 2.17.0"
+  s.add_development_dependency "rails", ">= 3.0"
+  s.add_development_dependency "rspec", ">= 3"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "database_cleaner", "~> 1.4.1"
+  s.add_development_dependency "mock_redis"
 end

data/lib/active_async/active_record.rb

@@ -6,8 +6,11 @@ module ActiveAsync
       include ActiveAsync::Async
       include ActiveAsync::Callbacks
 
-      define_async_callbacks :after_save, :after_update, :after_create
+      define_async_callbacks :after_save,
+        :after_update,
+        :after_create,
+        :after_commit
     end
 
   end
-end
+end

data/lib/active_async/async.rb

@@ -9,30 +9,42 @@ module ActiveAsync
       self.queue = :general
     end
 
-    module ClassMethods
-
+    class << self
       # This will be called by a worker when a job needs to be processed
-      def perform(id, method, *args)
-        async_class_or_instance(id).send(method, *args)
-      end
-
-      def async(method, *args)
-        ActiveAsync.background.enqueue(self, CLASS_IDENTIFIER, method, *args)
+      def perform(class_name, id, method, *args)
+        deserialize(class_name, id).send(method, *args)
       end
 
       private
 
-      def async_class_or_instance(id)
-        id == CLASS_IDENTIFIER ? self : self.find(id)
+      def deserialize(class_name, id)
+        active_record_class = class_name.safe_constantize
+        case id
+        when CLASS_IDENTIFIER
+          active_record_class
+        else
+          active_record_class.find(id)
+        end
+      end
+    end
+
+    module ClassMethods
+      def async(method, *args)
+        ActiveAsync.queue_adapter.enqueue(self.to_s, CLASS_IDENTIFIER, method, *args)
       end
 
+      def perform(*args)
+        ActiveAsync::Async.perform(self.to_s, CLASS_IDENTIFIER, *args)
+      end
     end
 
-    # We can pass this any Repository instance method that we want to
-    # run later.
+    # We can pass any instance method that we want to run later.
+    # Arguments should be serializable for Resque.
+    #
+    # Setting ActiveAsync.skip = true will bypass async altogether.
+    #
     def async(method, *args)
-      ActiveAsync.background.enqueue(self.class, id, method, *args)
+      ActiveAsync.queue_adapter.enqueue(self.class.to_s, id, method, *args)
     end
-
   end
-end
+end

data/lib/active_async/callbacks.rb

@@ -9,8 +9,8 @@ module ActiveAsync
           class_eval <<-RUBY
             define_callbacks :async_#{callback_name}
 
-            def self.#{callback_name}_with_async(*methods)
-              #{callback_name}_without_async(*extract_async_methods(methods))
+            def self.#{callback_name}_with_async(*methods, &block)
+              #{callback_name}_without_async(*extract_async_methods(methods), &block)
             end
 
             class << self
@@ -42,4 +42,4 @@ module ActiveAsync
 
     end
   end
-end
+end

data/lib/active_async/queue_adapters/inline_adapter.rb

@@ -0,0 +1,11 @@
+module ActiveAsync
+  module QueueAdapters
+    class InlineAdapter
+      # When enqueuing jobs, the inline adapter will be
+      # executed immediately
+      def enqueue(*args)
+        ActiveAsync::Async.perform(*args)
+      end
+    end
+  end
+end

data/lib/active_async/queue_adapters/resque_adapter.rb

@@ -0,0 +1,22 @@
+require 'resque'
+
+module ActiveAsync
+  module QueueAdapters
+    class ResqueAdapter
+      def enqueue(*args)
+        ::Resque.enqueue(JobWrapper, *args)
+      end
+
+      class JobWrapper
+        class_attribute :queue
+        self.queue = :general
+
+        class << self
+          def perform(*args)
+            ActiveAsync::Async.perform(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_async/queue_adapters/sidekiq_adapter.rb

@@ -0,0 +1,22 @@
+require 'sidekiq'
+
+module ActiveAsync
+  module QueueAdapters
+    class SidekiqAdapter
+      def enqueue(*args)
+        ::Sidekiq::Client.enqueue(JobWrapper, *args)
+      end
+
+      class JobWrapper
+        include Sidekiq::Worker
+
+        class_attribute :queue
+        self.queue = :general
+
+        def perform(*args)
+          ActiveAsync::Async.perform(*args)
+        end
+      end
+    end
+  end
+end

data/lib/active_async/queue_adapters.rb

@@ -0,0 +1,13 @@
+module ActiveAsync
+  module QueueAdapters
+    autoload :InlineAdapter, 'active_async/queue_adapters/inline_adapter'
+    autoload :ResqueAdapter, 'active_async/queue_adapters/resque_adapter'
+    autoload :SidekiqAdapter, 'active_async/queue_adapters/sidekiq_adapter'
+
+    class << self
+      def lookup(name)
+        const_get(name.to_s.camelize << 'Adapter')
+      end
+    end
+  end
+end

data/lib/active_async/railtie.rb

@@ -1,11 +1,10 @@
 require "rails"
-require "active_record"
 require "active_async"
-require "active_async/active_record"
 
 module ActiveAsync
   class Railtie < Rails::Railtie
     initializer "active_async.configure_rails_initialization" do
+      require "active_async/active_record"
       ::ActiveRecord::Base.send :include, ActiveAsync::ActiveRecord
     end
   end

data/lib/active_async/version.rb

@@ -1,3 +1,3 @@
 module ActiveAsync
-  VERSION = "0.0.3"
+  VERSION = "0.2.0"
 end

data/lib/active_async.rb

@@ -3,50 +3,29 @@ require "active_support/concern"
 require "active_async/version"
 require "active_async/async"
 require "active_async/callbacks"
+require "active_async/queue_adapters"
+require 'active_async/railtie' if defined?(Rails)
 
 module ActiveAsync
   extend self
 
   class ModeNotSupportedError < StandardError; end
 
-  def background
-    @background ||= ::Resque
-  end
-
-  def background=(background)
-    @background = background
-  end
-
   def enqueue(*args)
-    background.enqueue(*args)
+    queue_adapter.enqueue(*args)
   end
 
-  def reset!
-    @background = nil
-    @mode = nil
+  def queue_adapter=(name)
+    @queue_adapter = interpret_adapter(name)
   end
 
-  def mode=(mode)
-    set_background_for_mode(mode)
-    @mode = mode
-  end
-
-  def mode
-    @mode || (mode = :resque)
+  def queue_adapter
+    @queue_adapter || interpret_adapter(:inline)
   end
 
   private
 
-  def set_background_for_mode(mode)
-    case mode
-    when :resque
-      @background = ::Resque
-    when :fake_resque
-      require 'active_async/fake_resque'
-      @background = FakeResque
-    else
-      raise ModeNotSupportedError
-    end
+  def interpret_adapter(name)
+    ActiveAsync::QueueAdapters.lookup(name).new
   end
-
-end
+end

data/lib/activeasync.rb

@@ -0,0 +1 @@
+require 'active_async'

data/spec/active_async/active_record_spec.rb

@@ -5,24 +5,35 @@ describe ActiveAsync::ActiveRecord do
   let(:blog) { Blog.new }
 
   before(:each) do
-    Blog.stub!(:find).and_return(blog)
+    allow(Blog).to receive(:find).and_return(blog)
   end
 
   describe "included", :stub_resque do
     it "should define async callback for save" do
-      blog.should_receive(:expensive_save_method)
+      expect(blog).to receive(:expensive_save_method)
       blog.save
     end
 
     it "should define async callback for update" do
       blog.save
-      blog.should_receive(:expensive_update_method)
+      expect(blog).to receive(:expensive_update_method)
       blog.update_attributes(:title => "foo")
     end
 
     it "should define async callback for create" do
-      blog.should_receive(:expensive_create_method)
+      expect(blog).to receive(:expensive_create_method)
       Blog.create
     end
   end
+
+  context "synchronous callbacks", :stub_resque do
+    it "doesn't prevent synchronous callbacks to be called" do
+      expect(blog).to receive(:cheap_save_from_block)
+      expect(blog).to receive(:cheap_save_from_lambda)
+      expect(blog).to receive(:cheap_save_from_method_name)
+
+      blog.save
+    end
+  end
+
 end

data/spec/active_async/async_spec.rb

@@ -1,62 +1,87 @@
 require 'spec_helper'
 
 describe ActiveAsync::Async do
-
-  context "activerecord, resque", :stub_resque do
+  context "activerecord", :inline do
     let(:post) { Post.create(:title => "A new post") }
 
     describe "queue" do
       it "should provide default queue" do
-        Post.queue.should == :general
+        expect(Post.queue).to eq(:general)
       end
 
       it "allows override per class" do
         Blog.queue = :blog
-        Blog.queue.should == :blog
-        Post.queue.should == :general
-      end
-    end
-
-    describe "perform" do
-      it "should send method for given instance id" do
-        Post.any_instance.should_receive(:expensive_method)
-        Post.perform(post.id, :expensive_method)
+        expect(Blog.queue).to eq(:blog)
+        expect(Post.queue).to eq(:general)
       end
     end
 
     describe "async" do
       it "should send method for given instance id" do
-        Post.should_receive(:expensive_method)
+        expect(Post).to receive(:expensive_method)
         Post.async(:expensive_method)
       end
     end
 
     describe "#async" do
-      it "should call the given method" do
-        Post.any_instance.should_receive(:expensive_method)
+      it "should call perform on ActiveAsync" do
+        expect(ActiveAsync::Async).to receive(:perform).with("Post", post.id, :expensive_method)
         post.async(:expensive_method)
       end
 
       it "should call the given method" do
-        Post.any_instance.should_receive(:expensive_method).with(1, 2, 3)
-        post.async(:expensive_method, 1, 2, 3)
+        expect_any_instance_of(Post).to receive(:expensive_method)
+        post.async(:expensive_method)
       end
 
-      it "should call 'perform' class method as expected by Resque" do
-        Post.should_receive(:perform).with(post.id, :expensive_method)
-        post.async(:expensive_method)
+      it "should call the given method" do
+        expect_any_instance_of(Post).to receive(:expensive_method).with(1, 2, 3)
+        post.async(:expensive_method, 1, 2, 3)
       end
 
       it "should find the existing record" do
-        Post.should_receive(:find).with(post.id).and_return(post)
+        expect(Post).to receive(:find).with(post.id).and_return(post)
         post.async(:expensive_method)
       end
 
       it "should raise error if record not found" do
         post = Post.new
-        lambda { post.async(:expensive_method) }.should raise_error(ActiveRecord::RecordNotFound)
+        expect { post.async(:expensive_method) }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      describe "resque", :resque do
+        it "should call method on instance" do
+          post.async(:change_title, "A new title")
+          post.reload
+          expect(post.title).to eq("A new title")
+        end
+
+        it "should call 'perform' class method as expected by Resque" do
+          expect(Resque).to receive(:enqueue).with \
+            ActiveAsync::QueueAdapters::ResqueAdapter::JobWrapper,
+            "Post",
+            post.id,
+            :expensive_method
+          post.async(:expensive_method)
+        end
+      end
+
+      describe "sidekiq", :sidekiq do
+        it "should call method on instance" do
+          post.async(:change_title, "A new title")
+          post.reload
+          expect(post.title).to eq("A new title")
+        end
+
+        it "should call 'perform' class method as expected by Sidekiq::Client" do
+          expect(Sidekiq::Client).to receive(:enqueue).with \
+            ActiveAsync::QueueAdapters::SidekiqAdapter::JobWrapper,
+            "Post",
+            post.id,
+            :expensive_method
+          post.async(:expensive_method)
+        end
       end
     end
   end
-
 end

data/spec/active_async/callbacks_spec.rb

@@ -36,19 +36,19 @@ describe ActiveAsync::Callbacks do
     let(:model) { DummyUser.new }
 
     before(:each) do
-      DummyUser.stub!(:find).and_return(model)
+      allow(DummyUser).to receive(:find).and_return(model)
     end
 
     describe "callbacks with async" do
 
       describe "on create" do
         it "should run create method" do
-          model.should_receive(:create_expensive_method).once
+          expect(model).to receive(:create_expensive_method).once
           model.create
         end
 
         it "should run methods asynchronously on create" do
-          model.should_receive(:async).with(:create_expensive_method)
+          expect(model).to receive(:async).with(:create_expensive_method)
           model.create
         end
 
@@ -56,59 +56,58 @@ describe ActiveAsync::Callbacks do
 
       describe "on save" do
         it "should run save method" do
-          model.should_receive(:save_expensive_method).once
+          expect(model).to receive(:save_expensive_method).once
           model.save
         end
 
         it "should run methods asynchronously on create" do
-          model.should_receive(:async).with(:save_expensive_method)
+          expect(model).to receive(:async).with(:save_expensive_method)
           model.save
         end
       end
 
       describe "on update" do
         it "should run update method" do
-          model.should_receive(:update_expensive_method).once
+          expect(model).to receive(:update_expensive_method).once
           model.update
         end
 
         it "should run methods asynchronously on update" do
-          model.should_receive(:async).with(:update_expensive_method)
+          expect(model).to receive(:async).with(:update_expensive_method)
           model.update
         end
       end
 
       it "should run expensive method for each callback" do
-        DummyUser.should_receive(:run_expensive_method).exactly(1).times
+        expect(DummyUser).to receive(:run_expensive_method).exactly(1).times
         model.create
 
-        DummyUser.should_receive(:run_expensive_method).exactly(1).times
+        expect(DummyUser).to receive(:run_expensive_method).exactly(1).times
         model.save
 
-        DummyUser.should_receive(:run_expensive_method).exactly(1).times
+        expect(DummyUser).to receive(:run_expensive_method).exactly(1).times
         model.update
       end
 
       describe ".extract_async_methods" do
         it "should forward unmodified arguments if not asyncing" do
           extracted_args = DummyUser.send(:extract_async_methods, [:method_name, {:more_options => true}])
-          extracted_args.should == [:method_name, {:more_options => true}]
+          expect(extracted_args).to eq([:method_name, {:more_options => true}])
         end
 
         it "should pass along all options to after_create macro execpt :async" do
           extracted_args = DummyUser.send(:extract_async_methods, [:method_name, {:more_options => true, :async => true}])
-          extracted_args.should include(:more_options => true)
-          extracted_args.should_not include(:async => true)
+          expect(extracted_args).to include(:more_options => true)
+          expect(extracted_args).not_to include(:async => true)
         end
 
         it "should update method name and define async method when async is true" do
           extracted_args = DummyUser.send(:extract_async_methods, [:method_name, {:async => true}])
-          extracted_args.should == ["async_method_name", {}]
-          DummyUser.instance_methods.map(&:to_sym).should include(:async_method_name)
+          expect(extracted_args).to eq(["async_method_name", {}])
+          expect(DummyUser.instance_methods.map(&:to_sym)).to include(:async_method_name)
         end
       end
 
-
     end
   end
 

data/spec/active_async_spec.rb

@@ -1,53 +1,26 @@
 require 'spec_helper'
 
 describe ActiveAsync do
-
-  describe "background" do
-    before(:each) do
-      ActiveAsync.reset!
+  describe "queue_adapter" do
+    it "defaults to inline" do
+      expect(ActiveAsync.queue_adapter).to be_a(ActiveAsync::QueueAdapters::InlineAdapter)
     end
 
-    it "defaults to Resque" do
-      ActiveAsync.background.should == ::Resque
+    it "can be set to resque" do
+      ActiveAsync.queue_adapter = :resque
+      expect(ActiveAsync.queue_adapter).to be_a(ActiveAsync::QueueAdapters::ResqueAdapter)
     end
 
-    it "can be overridden" do
-      ActiveAsync.background = ActiveAsync::FakeResque
-      ActiveAsync.background.should == ActiveAsync::FakeResque
+    it "can be set to sidekiq" do
+      ActiveAsync.queue_adapter = :sidekiq
+      expect(ActiveAsync.queue_adapter).to be_a(ActiveAsync::QueueAdapters::SidekiqAdapter)
     end
   end
 
-  describe "enqueue", :stub_resque do
-
-    it "should call enqueue on background strategy" do
-      ActiveAsync::FakeResque.should_receive(:enqueue).with(:args)
+  describe "enqueue" do
+    it "should call enqueue on queue adapter" do
+      expect(ActiveAsync.queue_adapter).to receive(:enqueue).with(:args)
       ActiveAsync.enqueue(:args)
     end
   end
-
-  describe "mode=" do
-    before(:each) do
-      ActiveAsync.reset!
-    end
-
-    it "setting to :fake_resque enables FakeResque" do
-      ActiveAsync.mode = :fake_resque
-      ActiveAsync.background.should == ActiveAsync::FakeResque
-    end
-
-    it "setting to :resque enables Resque" do
-      ActiveAsync.mode = :resque
-      ActiveAsync.background.should == ::Resque
-    end
-
-    it "should raise ModeNotSupportedError otherwise" do
-      lambda { ActiveAsync.mode = :mode_doesnt_exist }.should raise_error(ActiveAsync::ModeNotSupportedError)
-    end
-
-    it "should return mode" do
-      ActiveAsync.mode = :fake_resque
-      ActiveAsync.mode.should == :fake_resque
-    end
-  end
-
 end

data/spec/dummy/app/models/blog.rb

@@ -3,8 +3,18 @@ class Blog < ActiveRecord::Base
   after_update  :expensive_update_method, :async => true
   after_save    :expensive_save_method,   :async => true
 
+  after_save { cheap_save_from_block }
+  after_save ->{ cheap_save_from_lambda }
+  after_save :cheap_save_from_method_name
+
+  # "normal" synchronous callbacks
+
   def self.run_expensive_method; end
   def expensive_save_method; self.class.run_expensive_method; end
   def expensive_create_method; self.class.run_expensive_method; end
   def expensive_update_method; self.class.run_expensive_method; end
+
+  def cheap_save_from_block; end
+  def cheap_save_from_lambda; end
+  def cheap_save_from_method_name; end
 end

data/spec/dummy/app/models/post.rb

@@ -1,4 +1,8 @@
 class Post < ActiveRecord::Base
   def self.expensive_method; end
   def expensive_method; end
-end
+
+  def change_title(text)
+    update_attribute(:title, text)
+  end
+end

data/spec/dummy/config/application.rb

@@ -58,5 +58,6 @@ module Dummy
     # parameters by using an attr_accessible or attr_protected declaration.
     # config.active_record.whitelist_attributes = true
 
+    config.eager_load = false
   end
 end

data/spec/dummy/config/environments/development.rb

@@ -23,7 +23,7 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)

data/spec/dummy/config/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
 
   # Specifies the header that your server uses for sending files

data/spec/dummy/config/environments/test.rb

@@ -8,7 +8,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
@@ -30,7 +30,7 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/spec_helper.rb

@@ -4,9 +4,11 @@ $LOAD_PATH.unshift dir + '/../lib'
 # Configure Rails Environment
 ENV["RAILS_ENV"] ||= 'test'
 
-require 'rspec/autorun'
 require 'database_cleaner'
-require 'active_async/rspec'
+require 'mock_redis'
+require 'resque'
+require 'sidekiq'
+require 'sidekiq/testing'
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
@@ -17,12 +19,24 @@ RSpec.configure do |config|
   config.mock_with :rspec
 
   config.before(:suite) do
+    Redis.current = MockRedis.new
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
   end
 
   config.before(:each) do
     DatabaseCleaner.start
+    Resque.inline = true
+    Sidekiq::Testing.inline!
+    ActiveAsync.queue_adapter = :inline
+  end
+
+  config.before(:each, :resque) do
+    ActiveAsync.queue_adapter = :resque
+  end
+
+  config.before(:each, :sidekiq) do
+    ActiveAsync.queue_adapter = :sidekiq
   end
 
   config.after(:each) do

metadata

@@ -1,125 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activeasync
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Ross Kaffenberger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 10
-        version: "1.10"
-  requirement: *id001
+date: 2015-10-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: resque
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id002
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :development
   prerelease: false
-  name: activesupport
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.17.0
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.17.0
+- !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
-  requirement: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  requirement: *id005
   prerelease: false
-  name: database_cleaner
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :development
   prerelease: false
-  name: sqlite3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: mock_redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: "Provides async methods ruby objects for queuing background jobs. Currently supports Resque. Bonus: callback hooks for ActiveRecord objects"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'Provides async methods ruby objects for queuing background jobs. Currently
+  supports Resque. Bonus: callback hooks for ActiveRecord objects'
+email:
 - rosskaff@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -130,21 +142,21 @@ files:
 - lib/active_async/active_record.rb
 - lib/active_async/async.rb
 - lib/active_async/callbacks.rb
-- lib/active_async/fake_resque.rb
+- lib/active_async/queue_adapters.rb
+- lib/active_async/queue_adapters/inline_adapter.rb
+- lib/active_async/queue_adapters/resque_adapter.rb
+- lib/active_async/queue_adapters/sidekiq_adapter.rb
 - lib/active_async/railtie.rb
-- lib/active_async/rspec.rb
 - lib/active_async/version.rb
+- lib/activeasync.rb
 - spec/active_async/active_record_spec.rb
 - spec/active_async/async_spec.rb
 - spec/active_async/callbacks_spec.rb
-- spec/active_async/fake_resque_spec.rb
-- spec/active_async/rspec_spec.rb
 - spec/active_async_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/blog.rb
 - spec/dummy/app/models/post.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -171,38 +183,27 @@ files:
 - spec/dummy/log/.gitkeep
 - spec/dummy/script/rails
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: activeasync
-rubygems_version: 1.8.10
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add async support to ruby objects
 test_files: []
-

data/lib/active_async/fake_resque.rb

@@ -1,9 +0,0 @@
-module ActiveAsync
-  module FakeResque
-    extend self
-
-    def self.enqueue(klass, *args)
-      klass.send(:perform, *args)
-    end
-  end
-end

data/lib/active_async/rspec.rb

@@ -1,21 +0,0 @@
-require 'active_async'
-require 'active_async/fake_resque'
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
-  config.around(:each, :stub_resque) do |example|
-    async_mode = ActiveAsync.mode
-    ActiveAsync.mode = :fake_resque
-    example.run
-    ActiveAsync.mode = async_mode
-  end
-
-  config.around(:each, :enable_resque) do |example|
-    async_mode = ActiveAsync.mode
-    ActiveAsync.mode = :resque
-    example.run
-    ActiveAsync.mode = async_mode
-  end
-
-end

data/spec/active_async/fake_resque_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe ActiveAsync::FakeResque do
-
-  it "should call perform with given klass and given arguments" do
-    Post.should_receive(:perform).with(1, :expensive_method)
-    ActiveAsync::FakeResque.enqueue(Post, 1, :expensive_method)
-  end
-end

data/spec/active_async/rspec_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "ActiveAsync::RSpec" do
-
-  describe ":stub_resque block" do
-
-    it "should set async mode to ::Resque in example", :stub_resque do
-      ActiveAsync.mode.should == :fake_resque
-    end
-
-    it "should stub_resque in example", :stub_resque do
-      ActiveAsync.background.should == ActiveAsync::FakeResque
-    end
-
-    it "should set async mode to ActiveAsync::FakeResque in example", :enable_resque do
-      ActiveAsync.mode.should == :resque
-    end
-
-    it "should set async mode to ActiveAsync::FakeResque in example", :enable_resque do
-      ActiveAsync.background.should == ::Resque
-    end
-  end
-end