devise-async 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+* Fixes
+  * Added `Devise::Async::Model` to use new devise's after_commit hooks to resolve #6 (only devise >=2.1.1)
+
+## 0.2.0
+
 * Enhancements
   * Added `Devise::Async.queue` option to let configure the queue
   the jobs will be enqueued to.

data/README.md

@@ -26,12 +26,27 @@ Or install it yourself as:
 
 ## Usage
 
+### Devise >= 2.1.1
+
+Include `Devise::Async::Model` to your Devise model
+
+```ruby
+class User < ActiveRecord::Base
+  devise :database_authenticatable, :confirmable # etc ...
+
+  include Devise::Async::Model # should be below call to `devise`
+end
+```
+
+### Devise < 2.1.1
+
 Set `Devise::Async::Proxy` as Devise's mailer in `config/initializers/devise.rb`:
 
 ```ruby
 # Configure the class responsible to send e-mails.
 config.mailer = "Devise::Async::Proxy"
 ```
+### All
 
 Set your queuing backend by creating `config/initializers/devise_async.rb`:
 

data/lib/devise/async.rb

@@ -6,6 +6,7 @@ module Devise
     autoload :Proxy,   "devise/async/proxy"
     autoload :Worker,  "devise/async/worker"
     autoload :Backend, "devise/async/backend"
+    autoload :Model,   "devise/async/model"
 
     module Backend
       autoload :Base,       "devise/async/backend/base"

data/lib/devise/async/model.rb

@@ -0,0 +1,30 @@
+module Devise
+  module Async
+    module Model
+      extend ActiveSupport::Concern
+
+      included do
+        after_commit :send_devise_pending_notifications
+      end
+
+      protected
+
+      def send_devise_notification(notification)
+        devise_pending_notifications << notification
+      end
+
+      def send_devise_pending_notifications
+        devise_pending_notifications.each do |notification|
+          # Use `id.to_s` to avoid problems with mongoid 2.4.X ids being serialized
+          # wrong with YAJL.
+          Devise::Async::Worker.enqueue(notification, self.class.name, self.id.to_s)
+        end
+        @devise_pending_notifications = []
+      end
+
+      def devise_pending_notifications
+        @devise_pending_notifications ||= []
+      end
+    end
+  end
+end

data/lib/devise/async/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Async
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/test/devise/async/model_test.rb

@@ -0,0 +1,21 @@
+require "test_helper"
+
+module Devise
+  module Async
+    describe "Model" do
+      it "accumulates notifications to be send after commit" do
+        admin = create_admin
+        admin.send_confirmation_instructions
+        admin.send(:devise_pending_notifications).must_equal [:confirmation_instructions]
+        Worker.expects(:enqueue).never
+      end
+
+      it "triggers enqueues the notifications on save" do
+        admin = create_admin
+        admin.send_confirmation_instructions
+        Worker.expects(:enqueue).with(:confirmation_instructions, "Admin", admin.id.to_s)
+        admin.update_attribute(:username, "newusername")
+      end
+    end
+  end
+end

data/test/support/helpers.rb

@@ -18,3 +18,11 @@ end
 def create_user(attributes={})
   User.create!(valid_attributes(attributes))
 end
+
+def new_admin(attributes={})
+  Admin.new(valid_attributes(attributes))
+end
+
+def create_admin(attributes={})
+  Admin.create!(valid_attributes(attributes))
+end

data/test/support/rails_app/app/models/admin.rb

@@ -0,0 +1,7 @@
+class Admin < ActiveRecord::Base
+  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
+    :registerable, :rememberable, :timeoutable, :token_authenticatable,
+    :trackable, :validatable
+
+  include Devise::Async::Model
+end

data/test/support/rails_app/db/schema.rb

@@ -29,6 +29,30 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "updated_at"
   end
 
+  create_table "admins", :force => true do |t|
+    t.string   "username"
+    t.string   "facebook_token"
+    t.string   "email",                               :default => "", :null => false
+    t.string   "unconfirmed_email",                   :default => ""
+    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "reset_password_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",                       :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",                     :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table :delayed_jobs, :force => true do |table|
     table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
     table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-async
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -193,6 +193,7 @@ files:
 - lib/devise/async/backend/delayed_job.rb
 - lib/devise/async/backend/resque.rb
 - lib/devise/async/backend/sidekiq.rb
+- lib/devise/async/model.rb
 - lib/devise/async/proxy.rb
 - lib/devise/async/version.rb
 - lib/devise/async/worker.rb
@@ -201,12 +202,14 @@ files:
 - test/devise/async/backend/resque_test.rb
 - test/devise/async/backend/sidekiq_test.rb
 - test/devise/async/backend_test.rb
+- test/devise/async/model_test.rb
 - test/devise/async/proxy_test.rb
 - test/devise/async/worker_test.rb
 - test/devise/async_test.rb
 - test/support/helpers.rb
 - test/support/my_mailer.rb
 - test/support/rails_app.rb
+- test/support/rails_app/app/models/admin.rb
 - test/support/rails_app/app/models/user.rb
 - test/support/rails_app/config/database.yml
 - test/support/rails_app/config/initializers/devise.rb
@@ -214,7 +217,6 @@ files:
 - test/support/rails_app/config/routes.rb
 - test/support/rails_app/db/schema.rb
 - test/support/rails_app/log/development.log
-- test/support/support/rails_app/log/test.log
 - test/test_helper.rb
 homepage: https://github.com/mhfs/devise-async/
 licenses: []
@@ -230,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2016895500650412107
+      hash: -1160752069777007952
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2016895500650412107
+      hash: -1160752069777007952
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -254,12 +256,14 @@ test_files:
 - test/devise/async/backend/resque_test.rb
 - test/devise/async/backend/sidekiq_test.rb
 - test/devise/async/backend_test.rb
+- test/devise/async/model_test.rb
 - test/devise/async/proxy_test.rb
 - test/devise/async/worker_test.rb
 - test/devise/async_test.rb
 - test/support/helpers.rb
 - test/support/my_mailer.rb
 - test/support/rails_app.rb
+- test/support/rails_app/app/models/admin.rb
 - test/support/rails_app/app/models/user.rb
 - test/support/rails_app/config/database.yml
 - test/support/rails_app/config/initializers/devise.rb
@@ -267,5 +271,4 @@ test_files:
 - test/support/rails_app/config/routes.rb
 - test/support/rails_app/db/schema.rb
 - test/support/rails_app/log/development.log
-- test/support/support/rails_app/log/test.log
 - test/test_helper.rb