action_mailer_cache_delivery 0.3.3 → 0.3.4

data/lib/action_mailer_cache_delivery.rb

@@ -8,8 +8,8 @@ module ActionMailerCacheDelivery
 
     def install
       default_path = 'cache/action_mailer_cache_deliveries.cache'
-      ActionMailer::Base.add_delivery_method :cache, Mail::CacheDelivery,
-        location: defined?(Rails) ? "#{Rails.root}/tmp/#{default_path}" : "#{Dir.tmpdir}/#{default_path}"
+      location = defined?(Rails) ? "#{Rails.root}/tmp/#{default_path}" : "#{Dir.tmpdir}/#{default_path}"
+      ActionMailer::Base.add_delivery_method :cache, Mail::CacheDelivery, location: location
     end
 
   end # << self

data/lib/action_mailer_cache_delivery/action_mailer/base.rb

@@ -8,8 +8,12 @@ module ActionMailer
       # @return [Array] array of mails (each mail is an instance of Mail.)
       #
       def cached_deliveries
-        File.open(cache_settings[:location], 'r') do |file|
-          Marshal.load(file)
+        if File.exists?(cache_settings[:location])
+          File.open(cache_settings[:location], 'r') do |file|
+            Marshal.load(file)
+          end
+        else
+          []
         end
       end
 
@@ -21,8 +25,10 @@ module ActionMailer
       def clear_cache
         deliveries.clear
 
-        File.open(cache_settings[:location], 'w') do |file|
-          Marshal.dump(deliveries, file)
+        if File.exists?(cache_settings[:location])
+          File.open(cache_settings[:location], 'w') do |file|
+            Marshal.dump(deliveries, file)
+          end
         end
       end
 

data/lib/action_mailer_cache_delivery/mail/cache_delivery.rb

@@ -21,7 +21,6 @@ module Mail
     def initialize(settings)
       @settings = settings
 
-      # create the cache directory if it doesn't exist
       cache_dir = File.dirname(@settings[:location])
       FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
     end

data/lib/action_mailer_cache_delivery/version.rb

@@ -1,3 +1,3 @@
 module ActionMailerCacheDelivery
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end # ActionMailerCacheDelivery

data/spec/action_mailer_cache_delivery_spec.rb

@@ -13,6 +13,11 @@ describe ActionMailerCacheDelivery do
     end
 
     describe 'clear_cache' do
+      it 'allows clearing cache before cache file is created' do
+        ActionMailer::Base.cache_settings[:location] = 'test_dir/test_dir/test.cache'
+        lambda { ActionMailer::Base.clear_cache }.should_not raise_error
+      end
+
       it 'should clear cache file' do
         mail.deliver
         ActionMailer::Base.clear_cache
@@ -33,6 +38,11 @@ describe ActionMailerCacheDelivery do
         ActionMailer::Base.clear_cache
       end
 
+      it 'returns empty array if cache has not been created yet' do
+        ActionMailer::Base.cache_settings[:location] = 'test_dir/test_dir/test.cache'
+        ActionMailer::Base.cached_deliveries.should == []
+      end
+
       it 'should return array' do
         mail.deliver
         ActionMailer::Base.cached_deliveries.should be_an(Array)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_mailer_cache_delivery
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1272042940984442377
+      hash: 357817960204666014
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1272042940984442377
+      hash: 357817960204666014
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24