thincloud-resque 0.1.2 → 0.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/thincloud/resque/engine.rb +5 -2
  2. data/lib/thincloud/resque/version.rb +1 -1
  3. data/test/dummy/log/test.log +12 -0
  4. metadata +4 -4
data/lib/thincloud/resque/engine.rb CHANGED
@@ -66,8 +66,11 @@ module Thincloud
66
66
  # in the inheritance chain
67
67
  ActiveSupport.on_load :action_mailer do
68
68
  def self.inherited(subclass)
69
- subclass.send :include, ::Resque::Mailer
70
- super
69
+ # Devise::Mailer does not play nicely with Resque::Mailer
70
+ unless subclass.name == "Devise::Mailer"
71
+ subclass.send :include, ::Resque::Mailer
72
+ super
73
+ end
71
74
  end
72
75
  end
73
76
 
data/lib/thincloud/resque/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Thincloud
2
2
  module Resque
3
- VERSION = "0.1.2"
3
+ VERSION = "0.1.3"
4
4
  end
5
5
  end
data/test/dummy/log/test.log CHANGED
@@ -130,3 +130,15 @@ Started GET "/resque" for 127.0.0.1 at 2013-04-15 17:20:40 -0700
130
130
   (0.1ms) rollback transaction
131
131
   (0.1ms) begin transaction
132
132
   (0.1ms) rollback transaction
133
+ Connecting to database specified by database.yml
134
+  (4.4ms) begin transaction
135
+  (0.0ms) rollback transaction
136
+  (0.0ms) begin transaction
137
+  (0.0ms) rollback transaction
138
+  (0.0ms) begin transaction
139
+  (0.0ms) rollback transaction
140
+  (0.0ms) begin transaction
141
+ Started GET "/resque" for 127.0.0.1 at 2013-04-17 09:22:47 -0700
142
+  (0.1ms) rollback transaction
143
+  (0.0ms) begin transaction
144
+  (0.0ms) rollback transaction
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thincloud-resque
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-04-16 00:00:00.000000000 Z
12
+ date: 2013-04-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
178
178
  version: '0'
179
179
  segments:
180
180
  - 0
181
- hash: -2423611576055883127
181
+ hash: 4138972237052984277
182
182
  required_rubygems_version: !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
187
187
  version: '0'
188
188
  segments:
189
189
  - 0
190
- hash: -2423611576055883127
190
+ hash: 4138972237052984277
191
191
  requirements: []
192
192
  rubyforge_project:
193
193
  rubygems_version: 1.8.25