devise_approvable 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27f782d0e30f09607ff4134d93adf081ba889208
-  data.tar.gz: c59c0e7d262bb7e9bde5f1a4efb0444ca03452f0
+  metadata.gz: ffc265bf1af8ccf43d26c4656360cf1d6eeb2807
+  data.tar.gz: 0c3e54955eb2370cd0946347328fe0c7b058b69e
 SHA512:
-  metadata.gz: d0e99d73e9637cdae60acf953f591366f3cbb2e4b88f09d991674eea59f53af74eed73fbf65e8fb06185d3f59bb8bbe9c7e90f49780618a07ad763c5cb40fb0c
-  data.tar.gz: 8ed3cddfacc10a1895a0eb0e8b423d85608fafe5f1213e24f77d6e4191a45df2060fac66b1af34bf33bb07233d3293fde251134896c448697460a9f88b8df6af
+  metadata.gz: 138d8c269bb20405b5387f09d85f8195129060a88ad9e89dcd3f23484f162f05a8d579715ea688605dd0be303dcb13b56f19cab86ada332b08871f061fbb082d
+  data.tar.gz: 0b5e16415278921cb0eccbec3d0f44aaa989c309979b55cf881e014a08fd4973125dc254c24552b015fae6c9f77f04c03b06973c5c365651e8948d8dda137777

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/devise_approvable.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devise_approvable 0.6.0 ruby lib
+# stub: devise_approvable 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_approvable"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
     "app/views/devise/approvals/new.html.erb",
     "config/initializers/devise.rb",
     "devise_approvable.gemspec",
-    "lib/approvable_mailer.rb",
     "lib/devise_approvable.rb",
     "lib/devise_approvable/mailer.rb",
     "lib/devise_approvable/model.rb",
+    "lib/devise_approvable/rails.rb",
     "lib/devise_approvable/routes.rb",
     "lib/devise_approvable/version.rb",
     "test/approvable_test.rb",

data/lib/devise_approvable/rails.rb

@@ -0,0 +1,15 @@
+module DeviseApprovable
+  class Engine < ::Rails::Engine
+
+    # We use to_prepare instead of after_initialize here because Devise is a Rails engine; its
+    # mailer is reloaded like the rest of the user's app.  Got to make sure that our mailer methods
+    # are included each time Devise.mailer is (re)loaded.
+    config.to_prepare do
+      Devise.mailer.send :include, DeviseApprovable::Mailer
+      unless Devise.mailer.ancestors.include?(Devise::Mailers::Helpers)
+        Devise.mailer.send :include, Devise::Mailers::Helpers 
+      end
+    end
+
+  end
+end

data/lib/devise_approvable.rb

@@ -6,7 +6,7 @@ end
 
 require 'devise'
 require 'devise_approvable/routes'
-# require 'devise_approvable/rails'
+require 'devise_approvable/rails'
 
 module Devise
   mattr_accessor :admin_email

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_approvable
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Alex Egg
@@ -96,10 +96,10 @@ files:
 - app/views/devise/approvals/new.html.erb
 - config/initializers/devise.rb
 - devise_approvable.gemspec
-- lib/approvable_mailer.rb
 - lib/devise_approvable.rb
 - lib/devise_approvable/mailer.rb
 - lib/devise_approvable/model.rb
+- lib/devise_approvable/rails.rb
 - lib/devise_approvable/routes.rb
 - lib/devise_approvable/version.rb
 - test/approvable_test.rb

data/lib/approvable_mailer.rb

@@ -1,11 +0,0 @@
-Devise.module_eval {
-  mattr_accessor :approval_recepient
-  @@approval_recepient = nil
-}
-
-DeviseMailer.module_eval {
-  def approval_instructions(record)
-    setup_mail(record, :approval_instructions)
-    recipients    Devise.approval_recepient
-  end
-}