dj_mailer 0.0.1 → 0.0.2

data/README.md

@@ -19,15 +19,8 @@ deliver calls as follows:
 
 By adding this gem in your gemfile all your current emails will be automatically
 handled by delayed job without any interface change. At the moment you have
-to setup the delayed job environment (running the migrations for the db) on your
-own.
-
-
-## Note
-
-I could not make the current version of delayed_job_active_record (0.3.2) work
-with recent versions of ActionMailer, it does with 3.0.5. I will investigate
-the reason of the failure ASAP.
+to setup the delayed job environment on your own running the migrations for the
+db.
 
 
 ## Installation
@@ -36,11 +29,23 @@ Add this line to your application's Gemfile:
 ```ruby
   gem 'dj_mailer'
 ```
-And then execute: `$ bundle`
+And then execute: `bundle`
 
 Or install it yourself as:
+```bash
+  gem install dj_mailer
+```
+
+
+## Tests
+
+to run the specs:
+```bash
+  bundle exec rake spec
 ```
-  $ gem install dj_mailer
+to run the cucumber features:
+```bash
+  bundle exec rake cucumber
 ```
 
 

data/dj_mailer.gemspec

@@ -15,13 +15,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = DjMailer::VERSION
 
+  gem.add_dependency 'actionmailer'
   gem.add_dependency 'delayed_job_active_record'
-  gem.add_dependency 'actionmailer', '3.0.5'
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'cucumber'
   gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency 'activerecord'
   gem.add_development_dependency 'guard-cucumber'
-  gem.add_development_dependency 'activerecord', '3.0.5'
 end

data/features/dj_mailer_deliver.feature

@@ -27,3 +27,4 @@ Scenario: Email is enqueued successfully
     """
   Then a delayed job object should be returned
   And I should see a new delayed_job record in the table
+  And the email queue should be empty

data/features/step_definitions/dj_mailer_deliver_steps.rb

@@ -13,3 +13,7 @@ end
 Then /^I should see a new delayed_job record in the table$/ do
   Delayed::Job.count.should == 1
 end
+
+Then /^the email queue should be empty$/ do
+  ActionMailer::Base.deliveries.should be_empty
+end

data/features/support/env.rb

@@ -1,6 +1,5 @@
 # At the moment delayed_job_active_record is quite broken. It surely works
 # fine with actionmailer 3.0.5
-gem 'actionmailer', '3.0.5'
 require 'action_mailer'
 
 ActionMailer::Base.delivery_method = :test
@@ -8,7 +7,6 @@ ActionMailer::Base.delivery_method = :test
 
 # Forcing actionmailer to v3.0.5 requires also activerecord to have same version,
 # this is to avoid dependencies conflicts (activesupport version, for example)
-gem 'activerecord', '3.0.5'
 require 'delayed_job_active_record'
 
 class DjMigration < ActiveRecord::Migration

data/features/support/hooks.rb

@@ -0,0 +1,3 @@
+Before do
+  ActionMailer::Base.deliveries.clear
+end

data/lib/dj_mailer.rb

@@ -1,3 +1,4 @@
+require 'action_mailer'
 # cucumber complains with require 'dj_mailer/version'
 require File.expand_path('../dj_mailer/version', __FILE__)
 
@@ -14,12 +15,16 @@ module DjMailer
     end
 
     def method_missing_with_delay(method, *args)
-      if caller[1].include?('performable_mailer.rb')
-        method_missing_without_delay(method, *args)
+      if respond_to?(method) and !caller.grep('delayed_job').present?
+        enqueue_with_delayed_job(method, *args)
       else
-        delay.send(method, *args).tap do |dj_instance|
-          dj_instance.extend Deliverable
-        end
+        method_missing_without_delay(method, *args)
+      end
+    end
+
+    def enqueue_with_delayed_job(method, *args)
+      delay.send(method, *args).tap do |dj_instance|
+        dj_instance.extend Deliverable
       end
     end
   end

data/lib/dj_mailer/version.rb

@@ -1,3 +1,3 @@
 module DjMailer
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

data/spec/lib/deliverable_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+module DjMailer
+  describe Delayable do
+    describe 'the extended class' do
+      subject {Class.new {extend Delayable}}
+
+      it 'responds to method_missing_with_delay' do
+        subject.should respond_to(:method_missing_with_delay)
+      end
+
+      describe 'method_missing_with_delay' do
+        context 'when the class does not respond to the method' do
+          it 'delegates to the original method_missing' do
+            subject.should_receive(:method_missing_without_delay)
+            subject.method_missing_with_delay(:not_responding)
+          end
+        end
+
+        context 'when the class respond to the method' do
+          before {subject.should_receive(:respond_to?).and_return(true)}
+
+          context 'when the caller is delayed_job' do
+            it 'should delegate to the original method_missing' do
+              subject.stub(:caller => ['delayed_job'])
+              subject.should_receive(:method_missing_without_delay)
+              subject.method_missing_with_delay(:responding)
+            end
+          end
+
+          context 'when the caller is not delayed_job' do
+            it 'should equeue the email for late delivery' do
+              subject.stub(:caller => [])
+              subject.should_receive(:enqueue_with_delayed_job)
+              subject.method_missing_with_delay(:responding)
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dj_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ cert_chain: []
 date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,21 +28,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionmailer
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-cucumber
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,21 +140,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '0'
 description: send automatically all emails via delayed_job
 email:
 - andrea@spaghetticode.it
@@ -176,10 +176,12 @@ files:
 - features/step_definitions/dj_mailer_deliver_steps.rb
 - features/support/.gitkeep
 - features/support/env.rb
+- features/support/hooks.rb
 - features/support/world_extensions.rb
 - lib/dj_mailer.rb
 - lib/dj_mailer/version.rb
 - spec/lib/.gitkeep
+- spec/lib/deliverable_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -212,6 +214,8 @@ test_files:
 - features/step_definitions/dj_mailer_deliver_steps.rb
 - features/support/.gitkeep
 - features/support/env.rb
+- features/support/hooks.rb
 - features/support/world_extensions.rb
 - spec/lib/.gitkeep
+- spec/lib/deliverable_spec.rb
 - spec/spec_helper.rb