devise-async 0.8.0 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0bc72ccc5171244615739769bf6b9fca485d6701
+  data.tar.gz: 5ddee310635e35eaa7c892db50eaa5db3ab612dc
+SHA512:
+  metadata.gz: 1bc76ed72a9a0c688cc820eda1089ceb730f46db902047f31c50f6673d0500ad05f382500280d320330a4be85b8941f9d3220a2654c4ed67d539a013ea57be69
+  data.tar.gz: 9091df36bf6efe21894c93828f8f5e64865d72b8c12e4753ffe869c40581b1ebd311c619ca7a7d1b6c6f02cf994c08be5a3d18163fb6ee80a124714052b7381c

data/.gitignore

@@ -2,7 +2,9 @@
 *.rbc
 .bundle
 .config
+.ruby-version
 .yardoc
+Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 0.9.0
+
+* Multiple mailers support (baschtl)
+* Update devise dependency to ~3.2
+
 ## 0.8.0
 
 * Support arbitrary number of arguments to mailer (glebm)

data/devise-async.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Devise::Async::VERSION
 
-  gem.add_dependency "devise", ">= 2.2", "< 3.2"
+  gem.add_dependency "devise", "~> 3.2"
 
   gem.add_development_dependency "activerecord",              ">= 3.2"
   gem.add_development_dependency "actionpack",                ">= 3.2"

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

@@ -13,13 +13,13 @@ module Devise
         def perform(method, resource_class, resource_id, *args)
           resource = resource_class.constantize.to_adapter.get!(resource_id)
           args[-1] = args.last.symbolize_keys if args.last.is_a?(Hash)
-          mailer_class.send(method, resource, *args).deliver
+          mailer_class(resource).send(method, resource, *args).deliver
         end
 
         private
 
-        def mailer_class
-          @mailer_class ||= Devise.mailer
+        def mailer_class(resource = nil)
+          @mailer_class ||= resource.try(:devise_mailer) || Devise.mailer
         end
       end
     end

data/lib/devise/async/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Async
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

data/test/devise/async/backend/base_test.rb

@@ -4,6 +4,7 @@ module Devise
   module Async
     module Backend
       describe "Base" do
+
         it "delegates to configured mailer" do
           Devise.mailer = "MyMailer"
           user = create_user
@@ -13,6 +14,14 @@ module Devise
           Base.new.perform(:confirmation_instructions, "User", user.id, {})
         end
 
+        it "delegates to model configured mailer" do
+          user = create_user_with_mailer
+          mailer_instance = mock(:deliver => true)
+
+          MyMailer.expects(:confirmation_instructions).once.returns(mailer_instance)
+          Base.new.perform(:confirmation_instructions, "UserWithMailer", user.id, {})
+        end
+
         after do
           Devise.mailer = "Devise::Mailer"
         end

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

@@ -1,5 +1,5 @@
 class Admin < ActiveRecord::Base
   devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-    :registerable, :rememberable, :timeoutable, :token_authenticatable,
+    :registerable, :rememberable, :timeoutable,
     :trackable, :validatable, :async
 end

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

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
   devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-    :registerable, :rememberable, :timeoutable, :token_authenticatable,
+    :registerable, :rememberable, :timeoutable,
     :trackable, :validatable
 end

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

@@ -0,0 +1,6 @@
+class UserWithMailer < User
+
+  def devise_mailer
+    MyMailer
+  end
+end

data/test/support/test_helpers.rb

@@ -20,6 +20,14 @@ module TestHelpers
     User.create!(valid_attributes(attributes))
   end
 
+  def new_user_with_mailer(attributes={})
+    UserWithMailer.new(valid_attributes(attributes))
+  end
+
+  def create_user_with_mailer(attributes={})
+    UserWithMailer.create!(valid_attributes(attributes))
+  end
+
   def new_admin(attributes={})
     Admin.new(valid_attributes(attributes))
   end

metadata

@@ -1,90 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: devise-async
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Marcelo Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -108,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -116,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -148,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -156,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -164,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -172,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -180,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -196,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: torquebox-no-op
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -204,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -221,7 +190,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -252,6 +220,7 @@ files:
 - 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/app/models/user_with_mailer.rb
 - test/support/rails_app/config/database.yml
 - test/support/rails_app/config/initializers/devise.rb
 - test/support/rails_app/config/initializers/devise_async.rb
@@ -262,33 +231,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/mhfs/devise-async/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3289238140870980510
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3289238140870980510
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Devise Async provides an easy way to configure Devise to send its emails
   asynchronously using your preferred queuing backend. It supports Resque, Sidekiq,
   Delayed::Job and QueueClassic.
@@ -307,6 +269,7 @@ test_files:
 - 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/app/models/user_with_mailer.rb
 - test/support/rails_app/config/database.yml
 - test/support/rails_app/config/initializers/devise.rb
 - test/support/rails_app/config/initializers/devise_async.rb

data/Gemfile.lock

@@ -1,144 +0,0 @@
-PATH
-  remote: .
-  specs:
-    devise-async (0.8.0)
-      devise (>= 2.2, < 3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
-      mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    atomic (1.1.13)
-    bcrypt-ruby (3.1.2)
-    builder (3.0.4)
-    celluloid (0.10.0)
-    connection_pool (0.9.3)
-    delayed_job (3.0.4)
-      activesupport (~> 3.0)
-    delayed_job_active_record (0.4.4)
-      activerecord (>= 2.1.0, < 4)
-      delayed_job (~> 3.0)
-    devise (3.1.0)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.5)
-    journey (1.0.4)
-    json (1.8.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.25)
-    minitest (3.5.0)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    mono_logger (1.1.0)
-    multi_json (1.8.0)
-    orm_adapter (0.4.0)
-    pg (0.16.0)
-    polyglot (0.3.3)
-    queue_classic (2.2.2)
-      pg (~> 0.16.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-protection (1.5.0)
-      rack
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redis (3.0.4)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.0)
-    resque (1.24.1)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.2)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    sidekiq (1.2.1)
-      celluloid (~> 0.10.0)
-      connection_pool (~> 0.9.0)
-      multi_json (~> 1)
-      redis
-      redis-namespace
-    sinatra (1.4.3)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tilt (1.4.1)
-    torquebox-no-op (2.3.2)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    warden (1.2.3)
-      rack (>= 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionmailer (>= 3.2)
-  actionpack (>= 3.2)
-  activerecord (>= 3.2)
-  delayed_job_active_record (~> 0.3)
-  devise-async!
-  minitest (~> 3.0)
-  mocha (~> 0.11)
-  queue_classic (~> 2.0)
-  resque (~> 1.20)
-  sidekiq (~> 1.2)
-  sqlite3 (~> 1.3)
-  torquebox-no-op (~> 2.3)