devise-async 0.6.0 → 0.7.0

data/.travis.yml

@@ -1,6 +1,3 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - ree
-  - 1.9.2
   - 1.9.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 0.7.0
+
+* make sure options hash has string keys when enqueued and symbol keys when job runs
+* stringfy options keys before enqueueing to make queue_classic happy (nickw)
+* Added `enable` options to make it easier to skip async processing during tests (mohamedmagdy)
+
 ## 0.6.0
 
 * Now compatible with Devise 2.2+ only

data/lib/devise/async.rb

@@ -23,13 +23,16 @@ module Devise
     mattr_accessor :queue
     @@queue = :mailer
 
+    # Defines the enabled configuration that if set to false the emails will be sent synchronously
+    mattr_accessor :enabled
+    @@enabled = true
+
     # Allow configuring Devise::Async with a block
     #
     # Example:
     #
     #     Devise::Async.setup do |config|
     #       config.backend = :resque
-    #       config.mailer  = "MyMailer"
     #       config.queue   = :my_custom_queue
     #     end
     def self.setup

data/lib/devise/async/backend/base.rb

@@ -12,6 +12,7 @@ module Devise
         # compatibility among diferent ORMs.
         def perform(method, resource_class, resource_id, opts)
           resource = resource_class.constantize.to_adapter.get!(resource_id)
+          opts.symbolize_keys!
           mailer_class.send(method, resource, opts).deliver
         end
 

data/lib/devise/async/model.rb

@@ -1,15 +1,4 @@
 module Devise
-  # TODO remove when appropriate
-  module Async
-    module Model
-      extend ActiveSupport::Concern
-
-      included do
-        warn "Including Devise::Async::Model directly in your models is no longer supported and won't work. Please add `:async` to your `devise` call."
-      end
-    end
-  end
-
   module Models
     module Async
       extend ActiveSupport::Concern
@@ -36,6 +25,8 @@ module Devise
       # processing instead of sending it inline as devise does by
       # default.
       def send_devise_notification(notification, opts = {})
+        return super unless Devise::Async.enabled
+
         # If the record is dirty we keep pending notifications to be enqueued
         # by the callback and avoid before commit job processing.
         if changed?

data/lib/devise/async/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Async
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/lib/devise/async/worker.rb

@@ -4,6 +4,7 @@ module Devise
       # Used is the internal interface for devise-async to enqueue notifications
       # to the desired backend.
       def self.enqueue(method, resource_class, resource_id, opts)
+        opts.stringify_keys!
         backend_class.enqueue(method, resource_class, resource_id, opts)
       end
 

data/test/devise/async/model_test.rb

@@ -36,6 +36,19 @@ module Devise
           Worker.expects(:enqueue).with(:confirmation_instructions, "Admin", admin.id.to_s, {})
         end
       end
+
+      it "should not enqueue a job if the enabled config option is set to false" do
+        Devise::Async.stubs(:enabled).returns(false)
+
+        # Stubbing the devise's confirmation_instructions
+        confirmation_email = Object.new
+        Devise::Mailer.stubs(:confirmation_instructions).returns(confirmation_email)
+        confirmation_email.stubs(:deliver).returns(true) # Stubbing the email sending process
+
+        admin = create_admin
+        admin.send(:devise_pending_notifications).must_equal []
+        Worker.expects(:enqueue).never
+      end
     end
   end
 end

data/test/devise/async_test.rb

@@ -11,6 +11,11 @@ module Devise
       Async.backend.must_equal :something
     end
 
+    it "stores enabled config" do
+      Async.backend = false
+      Async.backend.must_equal false
+    end
+
     after do
       Async.backend = :resque
     end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ ENV["RAILS_ENV"] = "test"
 require "minitest/autorun"
 require "minitest/spec"
 require "minitest/mock"
-require "mocha"
+require "mocha/setup"
 
 require "devise"
 require "devise/async"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-async
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -249,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1115023412629133850
+      hash: 2828079365640681626
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1115023412629133850
+      hash: 2828079365640681626
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23