backup 3.0.23 → 3.0.24

data/spec/notifier/hipchat_spec.rb

@@ -12,77 +12,100 @@ describe Backup::Notifier::Hipchat do
     end
   end
 
+  it 'should be a subclass of Notifier::Base' do
+    Backup::Notifier::Hipchat.
+      superclass.should == Backup::Notifier::Base
+  end
+
   describe '#initialize' do
+    after { Backup::Notifier::Hipchat.clear_defaults! }
 
-    it 'should set the correct values and defaults' do
-      notifier.token.should           == 'token'
-      notifier.from.should            == 'application'
-      notifier.rooms_notified.should  == ['room1', 'room2']
-      notifier.notify_users.should    == false
-      notifier.success_color.should   == 'yellow'
-      notifier.warning_color.should   == 'yellow'
-      notifier.failure_color.should   == 'yellow'
-
-      notifier.on_success.should == true
-      notifier.on_warning.should == true
-      notifier.on_failure.should == true
+    it 'should load pre-configured defaults through Base' do
+      Backup::Notifier::Hipchat.any_instance.expects(:load_defaults!)
+      notifier
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Notifier::Hipchat.clear_defaults! }
+    it 'should pass the model reference to Base' do
+      notifier.instance_variable_get(:@model).should == model
+    end
 
-      it 'should use the configuration defaults' do
-        Backup::Configuration::Notifier::Hipchat.defaults do |notifier|
-          notifier.token          = 'old'
-          notifier.from           = 'before'
-          notifier.success_color  = 'green'
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        notifier.token.should           == 'token'
+        notifier.from.should            == 'application'
+        notifier.rooms_notified.should  == ['room1', 'room2']
+        notifier.notify_users.should    == false
+        notifier.success_color.should   == 'yellow'
+        notifier.warning_color.should   == 'yellow'
+        notifier.failure_color.should   == 'yellow'
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
 
-          notifier.on_failure     = false
+      it 'should use default values if none are given' do
+        notifier = Backup::Notifier::Hipchat.new(model)
+        notifier.token.should           be_nil
+        notifier.from.should            be_nil
+        notifier.rooms_notified.should  == []
+        notifier.notify_users.should    == false
+        notifier.success_color.should   == 'yellow'
+        notifier.warning_color.should   == 'yellow'
+        notifier.failure_color.should   == 'yellow'
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Notifier::Hipchat.defaults do |n|
+          n.token          = 'old'
+          n.from           = 'before'
+          n.success_color  = 'green'
+          n.on_failure     = false
         end
-        hipchat = Backup::Notifier::Hipchat.new(model)
-
-        hipchat.token.should           == 'old'
-        hipchat.from.should            == 'before'
-        hipchat.rooms_notified.should  == []
-        hipchat.notify_users.should    == false
-        hipchat.success_color.should   == 'green'
-        hipchat.warning_color.should   == 'yellow'
-        hipchat.failure_color.should   == 'yellow'
-
-        hipchat.on_success.should == true
-        hipchat.on_warning.should == true
-        hipchat.on_failure.should == false
       end
 
-      it 'should override the configuration defaults' do
-        Backup::Configuration::Notifier::Hipchat.defaults do |notifier|
-          notifier.token          = 'old'
-          notifier.from           = 'before'
-          notifier.success_color  = 'green'
+      it 'should use pre-configured defaults' do
+        notifier = Backup::Notifier::Hipchat.new(model)
 
-          notifier.on_failure     = false
-        end
-        hipchat = Backup::Notifier::Hipchat.new(model) do |notifier|
-          notifier.token          = 'new'
-          notifier.from           = 'after'
-          notifier.failure_color  = 'red'
+        notifier.token.should           == 'old'
+        notifier.from.should            == 'before'
+        notifier.rooms_notified.should  == []
+        notifier.notify_users.should    == false
+        notifier.success_color.should   == 'green'
+        notifier.warning_color.should   == 'yellow'
+        notifier.failure_color.should   == 'yellow'
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == false
+      end
 
-          notifier.on_success     = false
-          notifier.on_failure     = true
+      it 'should override pre-configured defaults' do
+        notifier = Backup::Notifier::Hipchat.new(model) do |n|
+          n.token          = 'new'
+          n.from           = 'after'
+          n.failure_color  = 'red'
+          n.on_success     = false
+          n.on_failure     = true
         end
 
-        hipchat.token.should          == 'new'
-        hipchat.from.should           == 'after'
-        hipchat.success_color.should  == 'green'
-        hipchat.warning_color.should  == 'yellow'
-        hipchat.failure_color.should  == 'red'
+        notifier.token.should          == 'new'
+        notifier.from.should           == 'after'
+        notifier.success_color.should  == 'green'
+        notifier.warning_color.should  == 'yellow'
+        notifier.failure_color.should  == 'red'
 
-        hipchat.on_success.should     == false
-        hipchat.on_warning.should     == true
-        hipchat.on_failure.should     == true
+        notifier.on_success.should     == false
+        notifier.on_warning.should     == true
+        notifier.on_failure.should     == true
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#notify!' do

data/spec/notifier/mail_spec.rb

@@ -26,44 +26,86 @@ describe Backup::Notifier::Mail do
     end
   end
 
+  it 'should be a subclass of Notifier::Base' do
+    Backup::Notifier::Mail.
+      superclass.should == Backup::Notifier::Base
+  end
+
   describe '#initialize' do
+    after { Backup::Notifier::Mail.clear_defaults! }
 
-    it 'should set the correct values' do
-      notifier.delivery_method.should      == :smtp
-      notifier.from.should                 == 'my.sender.email@gmail.com'
-      notifier.to.should                   == 'my.receiver.email@gmail.com'
-      notifier.address.should              == 'smtp.gmail.com'
-      notifier.port.should                 == 587
-      notifier.domain.should               == 'your.host.name'
-      notifier.user_name.should            == 'user'
-      notifier.password.should             == 'secret'
-      notifier.authentication.should       == 'plain'
-      notifier.enable_starttls_auto.should == true
-
-      notifier.sendmail.should             == '/path/to/sendmail'
-      notifier.sendmail_args.should        == '-i -t -X/tmp/traffic.log'
-      notifier.exim.should                 == '/path/to/exim'
-      notifier.exim_args.should            == '-i -t -X/tmp/traffic.log'
-
-      notifier.mail_folder.should          == '/path/to/backup/mails'
-
-      notifier.on_success.should == true
-      notifier.on_warning.should == true
-      notifier.on_failure.should == true
+    it 'should load pre-configured defaults through Base' do
+      Backup::Notifier::Mail.any_instance.expects(:load_defaults!)
+      notifier
     end
 
-    context 'when using configuration defaults' do
-      after { Backup::Configuration::Notifier::Mail.clear_defaults! }
+    it 'should pass the model reference to Base' do
+      notifier.instance_variable_get(:@model).should == model
+    end
 
-      it 'should use configuration defaults' do
-        Backup::Configuration::Notifier::Mail.defaults do |mail|
-          mail.delivery_method = :file
-          mail.from       = 'default.sender@domain.com'
-          mail.to         = 'some.receiver@domain.com'
-          mail.on_success = false
-        end
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        notifier.delivery_method.should      == :smtp
+        notifier.from.should                 == 'my.sender.email@gmail.com'
+        notifier.to.should                   == 'my.receiver.email@gmail.com'
+        notifier.address.should              == 'smtp.gmail.com'
+        notifier.port.should                 == 587
+        notifier.domain.should               == 'your.host.name'
+        notifier.user_name.should            == 'user'
+        notifier.password.should             == 'secret'
+        notifier.authentication.should       == 'plain'
+        notifier.enable_starttls_auto.should == true
+
+        notifier.sendmail.should             == '/path/to/sendmail'
+        notifier.sendmail_args.should        == '-i -t -X/tmp/traffic.log'
+        notifier.exim.should                 == '/path/to/exim'
+        notifier.exim_args.should            == '-i -t -X/tmp/traffic.log'
+
+        notifier.mail_folder.should          == '/path/to/backup/mails'
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+
+      it 'should use default values if none are given' do
         notifier = Backup::Notifier::Mail.new(model)
+        notifier.delivery_method.should       be_nil
+        notifier.from.should                  be_nil
+        notifier.to.should                    be_nil
+        notifier.address.should               be_nil
+        notifier.port.should                  be_nil
+        notifier.domain.should                be_nil
+        notifier.user_name.should             be_nil
+        notifier.password.should              be_nil
+        notifier.authentication.should        be_nil
+        notifier.enable_starttls_auto.should  be_nil
+
+        notifier.sendmail.should              be_nil
+        notifier.sendmail_args.should         be_nil
+        notifier.exim.should                  be_nil
+        notifier.exim_args.should             be_nil
+
+        notifier.mail_folder.should           be_nil
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+    end # context 'when no pre-configured defaults have been set'
 
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Notifier::Mail.defaults do |n|
+          n.delivery_method = :file
+          n.from       = 'default.sender@domain.com'
+          n.to         = 'some.receiver@domain.com'
+          n.on_success = false
+        end
+      end
+
+      it 'should use pre-configured defaults' do
+        notifier = Backup::Notifier::Mail.new(model)
         notifier.delivery_method.should       == :file
         notifier.from.should                  == 'default.sender@domain.com'
         notifier.to.should                    == 'some.receiver@domain.com'
@@ -87,20 +129,16 @@ describe Backup::Notifier::Mail do
         notifier.on_failure.should == true
       end
 
-      it 'should override configuration defaults' do
-        Backup::Configuration::Notifier::Mail.defaults do |mail|
-          mail.from       = 'old.sender@domain.com'
-          mail.to         = 'old.receiver@domain.com'
-          mail.port       = 123
-          mail.on_success = false
-        end
-        notifier = Backup::Notifier::Mail.new(model) do |mail|
-          mail.from       = 'new.sender@domain.com'
-          mail.to         = 'new.receiver@domain.com'
-          mail.on_warning = false
+      it 'should override pre-configured defaults' do
+        notifier = Backup::Notifier::Mail.new(model) do |n|
+          n.delivery_method = :sendmail
+          n.from       = 'new.sender@domain.com'
+          n.to         = 'new.receiver@domain.com'
+          n.port       = 123
+          n.on_warning = false
         end
 
-        notifier.delivery_method.should be_nil
+        notifier.delivery_method.should == :sendmail
         notifier.from.should == 'new.sender@domain.com'
         notifier.to.should   == 'new.receiver@domain.com'
         notifier.port.should == 123
@@ -109,9 +147,7 @@ describe Backup::Notifier::Mail do
         notifier.on_warning.should == false
         notifier.on_failure.should == true
       end
-
-    end # context 'when using configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#notify!' do

data/spec/notifier/prowl_spec.rb

@@ -11,28 +11,57 @@ describe Backup::Notifier::Prowl do
     end
   end
 
+  it 'should be a subclass of Notifier::Base' do
+    Backup::Notifier::Prowl.
+      superclass.should == Backup::Notifier::Base
+  end
+
   describe '#initialize' do
-    it 'should sets the correct values' do
-      notifier.application.should == 'application'
-      notifier.api_key.should     == 'api_key'
+    after { Backup::Notifier::Prowl.clear_defaults! }
 
-      notifier.on_success.should == true
-      notifier.on_warning.should == true
-      notifier.on_failure.should == true
+    it 'should load pre-configured defaults through Base' do
+      Backup::Notifier::Prowl.any_instance.expects(:load_defaults!)
+      notifier
     end
 
-    context 'when using configuration defaults' do
-      after { Backup::Configuration::Notifier::Prowl.clear_defaults! }
+    it 'should pass the model reference to Base' do
+      notifier.instance_variable_get(:@model).should == model
+    end
+
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        notifier.application.should == 'application'
+        notifier.api_key.should     == 'api_key'
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
 
-      it 'should use the configuration defaults' do
-        Backup::Configuration::Notifier::Prowl.defaults do |prowl|
-          prowl.application = 'default_app'
-          prowl.api_key     = 'default_api_key'
+      it 'should use default values if none are given' do
+        notifier = Backup::Notifier::Prowl.new(model)
+        notifier.application.should be_nil
+        notifier.api_key.should     be_nil
 
-          prowl.on_success = false
-          prowl.on_warning = false
-          prowl.on_failure = false
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Notifier::Prowl.defaults do |n|
+          n.application = 'default_app'
+          n.api_key     = 'default_api_key'
+
+          n.on_success = false
+          n.on_warning = false
+          n.on_failure = false
         end
+      end
+
+      it 'should use pre-configured defaults' do
         notifier = Backup::Notifier::Prowl.new(model)
         notifier.application.should == 'default_app'
         notifier.api_key.should     == 'default_api_key'
@@ -42,22 +71,14 @@ describe Backup::Notifier::Prowl do
         notifier.on_failure.should == false
       end
 
-      it 'should override the configuration defaults' do
-        Backup::Configuration::Notifier::Prowl.defaults do |prowl|
-          prowl.application = 'old_app'
-          prowl.api_key     = 'old_api_key'
-
-          prowl.on_success = true
-          prowl.on_warning = false
-          prowl.on_failure = false
-        end
-        notifier = Backup::Notifier::Prowl.new(model) do |prowl|
-          prowl.application = 'new_app'
-          prowl.api_key     = 'new_api_key'
+      it 'should override pre-configured defaults' do
+        notifier = Backup::Notifier::Prowl.new(model) do |n|
+          n.application = 'new_app'
+          n.api_key     = 'new_api_key'
 
-          prowl.on_success = false
-          prowl.on_warning = true
-          prowl.on_failure = true
+          n.on_success = false
+          n.on_warning = true
+          n.on_failure = true
         end
 
         notifier.application.should == 'new_app'
@@ -67,8 +88,8 @@ describe Backup::Notifier::Prowl do
         notifier.on_warning.should == true
         notifier.on_failure.should == true
       end
-    end # context 'when using configuration defaults'
-  end
+    end # context 'when pre-configured defaults have been set'
+  end # describe '#initialize'
 
   describe '#notify!' do
     context 'when status is :success' do

data/spec/notifier/twitter_spec.rb

@@ -13,32 +13,63 @@ describe Backup::Notifier::Twitter do
     end
   end
 
+  it 'should be a subclass of Notifier::Base' do
+    Backup::Notifier::Twitter.
+      superclass.should == Backup::Notifier::Base
+  end
+
   describe '#initialize' do
-    it 'should sets the correct values' do
-      notifier.consumer_key.should       == 'consumer_key'
-      notifier.consumer_secret.should    == 'consumer_secret'
-      notifier.oauth_token.should        == 'oauth_token'
-      notifier.oauth_token_secret.should == 'oauth_token_secret'
-
-      notifier.on_success.should == true
-      notifier.on_warning.should == true
-      notifier.on_failure.should == true
+    after { Backup::Notifier::Twitter.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Notifier::Twitter.any_instance.expects(:load_defaults!)
+      notifier
     end
 
-    context 'when using configuration defaults' do
-      after { Backup::Configuration::Notifier::Twitter.clear_defaults! }
+    it 'should pass the model reference to Base' do
+      notifier.instance_variable_get(:@model).should == model
+    end
 
-      it 'should use the configuration defaults' do
-        Backup::Configuration::Notifier::Twitter.defaults do |twitter|
-          twitter.consumer_key       = 'some_consumer_key'
-          twitter.consumer_secret    = 'some_consumer_secret'
-          twitter.oauth_token        = 'some_oauth_token'
-          twitter.oauth_token_secret = 'some_oauth_token_secret'
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        notifier.consumer_key.should       == 'consumer_key'
+        notifier.consumer_secret.should    == 'consumer_secret'
+        notifier.oauth_token.should        == 'oauth_token'
+        notifier.oauth_token_secret.should == 'oauth_token_secret'
 
-          twitter.on_success = false
-          twitter.on_warning = false
-          twitter.on_failure = false
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+
+      it 'should use default values if none are given' do
+        notifier = Backup::Notifier::Twitter.new(model)
+        notifier.consumer_key.should       be_nil
+        notifier.consumer_secret.should    be_nil
+        notifier.oauth_token.should        be_nil
+        notifier.oauth_token_secret.should be_nil
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Notifier::Twitter.defaults do |n|
+          n.consumer_key       = 'some_consumer_key'
+          n.consumer_secret    = 'some_consumer_secret'
+          n.oauth_token        = 'some_oauth_token'
+          n.oauth_token_secret = 'some_oauth_token_secret'
+
+          n.on_success = false
+          n.on_warning = false
+          n.on_failure = false
         end
+      end
+
+      it 'should use pre-configured defaults' do
         notifier = Backup::Notifier::Twitter.new(model)
         notifier.consumer_key.should       == 'some_consumer_key'
         notifier.consumer_secret.should    == 'some_consumer_secret'
@@ -50,26 +81,16 @@ describe Backup::Notifier::Twitter do
         notifier.on_failure.should == false
       end
 
-      it 'should override the configuration defaults' do
-        Backup::Configuration::Notifier::Twitter.defaults do |twitter|
-          twitter.consumer_key       = 'old_consumer_key'
-          twitter.consumer_secret    = 'old_consumer_secret'
-          twitter.oauth_token        = 'old_oauth_token'
-          twitter.oauth_token_secret = 'old_oauth_token_secret'
+      it 'should override pre-configured defaults' do
+        notifier = Backup::Notifier::Twitter.new(model) do |n|
+          n.consumer_key       = 'new_consumer_key'
+          n.consumer_secret    = 'new_consumer_secret'
+          n.oauth_token        = 'new_oauth_token'
+          n.oauth_token_secret = 'new_oauth_token_secret'
 
-          twitter.on_success = true
-          twitter.on_warning = false
-          twitter.on_failure = false
-        end
-        notifier = Backup::Notifier::Twitter.new(model) do |twitter|
-          twitter.consumer_key       = 'new_consumer_key'
-          twitter.consumer_secret    = 'new_consumer_secret'
-          twitter.oauth_token        = 'new_oauth_token'
-          twitter.oauth_token_secret = 'new_oauth_token_secret'
-
-          twitter.on_success = false
-          twitter.on_warning = true
-          twitter.on_failure = true
+          n.on_success = false
+          n.on_warning = true
+          n.on_failure = true
         end
 
         notifier.consumer_key.should       == 'new_consumer_key'
@@ -81,8 +102,8 @@ describe Backup::Notifier::Twitter do
         notifier.on_warning.should == true
         notifier.on_failure.should == true
       end
-    end # context 'when using configuration defaults'
-  end
+    end # context 'when pre-configured defaults have been set'
+  end # describe '#initialize'
 
   describe '#notify!' do
     context 'when status is :success' do