backup 3.0.23 → 3.0.24

data/spec/storage/ftp_spec.rb

@@ -13,22 +13,26 @@ describe Backup::Storage::FTP do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::FTP.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.username.should     == 'my_username'
-      storage.password.should     == 'my_password'
-      storage.ip.should           == '123.45.678.90'
-      storage.port.should         == 21
-      storage.path.should         == 'backups'
-      storage.passive_mode.should == false
-
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    after { Backup::Storage::FTP.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::FTP.any_instance.expects(:load_defaults!)
+      storage
+    end
+
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
     end
 
-    it 'should set a storage_id if given' do
-      ftp = Backup::Storage::FTP.new(model, 'my storage_id')
-      ftp.storage_id.should == 'my storage_id'
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::FTP.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
     end
 
     it 'should remove any preceeding tilde and slash from the path' do
@@ -38,20 +42,50 @@ describe Backup::Storage::FTP do
       storage.path.should == 'my_backups/path'
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::FTP.clear_defaults! }
-
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::FTP.defaults do |ftp|
-          ftp.username     = 'some_username'
-          ftp.password     = 'some_password'
-          ftp.ip           = 'some_ip'
-          ftp.port         = 'some_port'
-          ftp.path         = 'some_path'
-          ftp.passive_mode = 'some_passive_mode'
-          ftp.keep         = 'some_keep'
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.username.should     == 'my_username'
+        storage.password.should     == 'my_password'
+        storage.ip.should           == '123.45.678.90'
+        storage.port.should         == 21
+        storage.path.should         == 'backups'
+        storage.passive_mode.should == false
+
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::FTP.new(model)
+
+        storage.username.should     be_nil
+        storage.password.should     be_nil
+        storage.ip.should           be_nil
+        storage.port.should         == 21
+        storage.path.should         == 'backups'
+        storage.passive_mode.should == false
+
+        storage.storage_id.should be_nil
+        storage.keep.should       be_nil
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Storage::FTP.defaults do |s|
+          s.username     = 'some_username'
+          s.password     = 'some_password'
+          s.ip           = 'some_ip'
+          s.port         = 'some_port'
+          s.path         = 'some_path'
+          s.passive_mode = 'some_passive_mode'
+          s.keep         = 'some_keep'
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::FTP.new(model)
+
         storage.username.should     == 'some_username'
         storage.password.should     == 'some_password'
         storage.ip.should           == 'some_ip'
@@ -63,24 +97,15 @@ describe Backup::Storage::FTP do
         storage.keep.should       == 'some_keep'
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::FTP.defaults do |ftp|
-          ftp.username     = 'old_username'
-          ftp.password     = 'old_password'
-          ftp.ip           = 'old_ip'
-          ftp.port         = 'old_port'
-          ftp.path         = 'old_path'
-          ftp.passive_mode = 'old_passive_mode'
-          ftp.keep         = 'old_keep'
-        end
-        storage = Backup::Storage::FTP.new(model) do |ftp|
-          ftp.username     = 'new_username'
-          ftp.password     = 'new_password'
-          ftp.ip           = 'new_ip'
-          ftp.port         = 'new_port'
-          ftp.path         = 'new_path'
-          ftp.passive_mode = 'new_passive_mode'
-          ftp.keep         = 'new_keep'
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::FTP.new(model) do |s|
+          s.username     = 'new_username'
+          s.password     = 'new_password'
+          s.ip           = 'new_ip'
+          s.port         = 'new_port'
+          s.path         = 'new_path'
+          s.passive_mode = 'new_passive_mode'
+          s.keep         = 'new_keep'
         end
 
         storage.username.should     == 'new_username'
@@ -93,8 +118,7 @@ describe Backup::Storage::FTP do
         storage.storage_id.should be_nil
         storage.keep.should       == 'new_keep'
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#connection' do

data/spec/storage/local_spec.rb

@@ -13,17 +13,26 @@ describe Backup::Storage::Local do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::Local.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.path.should == storage_path
+    after { Backup::Storage::Local.clear_defaults! }
 
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::Local.any_instance.expects(:load_defaults!)
+      storage
     end
 
-    it 'should set a storage_id if given' do
-      local = Backup::Storage::Local.new(model, 'my storage_id')
-      local.storage_id.should == 'my storage_id'
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
+    end
+
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::Local.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
     end
 
     it 'should expand any path given' do
@@ -33,29 +42,45 @@ describe Backup::Storage::Local do
       storage.path.should == File.expand_path('my_backups/path')
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::Local.clear_defaults! }
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.path.should == storage_path
+
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::Local.new(model)
+
+        storage.path.should == storage_path
 
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::Local.defaults do |local|
-          local.path = 'some_path'
-          local.keep = 'some_keep'
+        storage.storage_id.should be_nil
+        storage.keep.should       be_nil
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Storage::Local.defaults do |s|
+          s.path = 'some_path'
+          s.keep = 'some_keep'
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::Local.new(model)
+
         storage.path.should == File.expand_path('some_path')
 
         storage.storage_id.should be_nil
         storage.keep.should       == 'some_keep'
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::Local.defaults do |local|
-          local.path = 'old_path'
-          local.keep = 'old_keep'
-        end
-        storage = Backup::Storage::Local.new(model) do |local|
-          local.path = 'new_path'
-          local.keep = 'new_keep'
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::Local.new(model) do |s|
+          s.path = 'new_path'
+          s.keep = 'new_keep'
         end
 
         storage.path.should == File.expand_path('new_path')
@@ -63,8 +88,7 @@ describe Backup::Storage::Local do
         storage.storage_id.should be_nil
         storage.keep.should       == 'new_keep'
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#transfer!' do

data/spec/storage/ninefold_spec.rb

@@ -12,32 +12,63 @@ describe Backup::Storage::Ninefold do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::Ninefold.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.storage_token.should  == 'my_token'
-      storage.storage_secret.should == 'my_secret'
-      storage.path.should       == 'backups'
+    after { Backup::Storage::Ninefold.clear_defaults! }
 
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::Ninefold.any_instance.expects(:load_defaults!)
+      storage
     end
 
-    it 'should set a storage_id if given' do
-      nf = Backup::Storage::Ninefold.new(model, 'my storage_id')
-      nf.storage_id.should == 'my storage_id'
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::Ninefold.clear_defaults! }
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::Ninefold.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
+    end
+
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.storage_token.should  == 'my_token'
+        storage.storage_secret.should == 'my_secret'
+        storage.path.should       == 'backups'
+
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::Ninefold.new(model)
+
+        storage.storage_token.should  be_nil
+        storage.storage_secret.should be_nil
+        storage.path.should       == 'backups'
 
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::Ninefold.defaults do |nf|
-          nf.storage_token    = 'some_token'
-          nf.storage_secret   = 'some_secret'
-          nf.path             = 'some_path'
-          nf.keep             = 15
+        storage.storage_id.should be_nil
+        storage.keep.should       be_nil
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Storage::Ninefold.defaults do |s|
+          s.storage_token    = 'some_token'
+          s.storage_secret   = 'some_secret'
+          s.path             = 'some_path'
+          s.keep             = 15
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::Ninefold.new(model)
+
         storage.storage_token.should  == 'some_token'
         storage.storage_secret.should == 'some_secret'
         storage.path.should           == 'some_path'
@@ -46,18 +77,12 @@ describe Backup::Storage::Ninefold do
         storage.keep.should       == 15
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::Ninefold.defaults do |nf|
-          nf.storage_token    = 'old_token'
-          nf.storage_secret   = 'old_secret'
-          nf.path             = 'old_path'
-          nf.keep             = 15
-        end
-        storage = Backup::Storage::Ninefold.new(model) do |nf|
-          nf.storage_token    = 'new_token'
-          nf.storage_secret   = 'new_secret'
-          nf.path             = 'new_path'
-          nf.keep             = 10
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::Ninefold.new(model) do |s|
+          s.storage_token    = 'new_token'
+          s.storage_secret   = 'new_secret'
+          s.path             = 'new_path'
+          s.keep             = 10
         end
 
         storage.storage_token.should  == 'new_token'
@@ -67,8 +92,7 @@ describe Backup::Storage::Ninefold do
         storage.storage_id.should be_nil
         storage.keep.should       == 10
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#provider' do

data/spec/storage/rsync_spec.rb

@@ -13,45 +13,72 @@ describe Backup::Storage::RSync do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::RSync.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.username.should == 'my_username'
-      storage.password.should == 'my_password'
-      storage.ip.should       == '123.45.678.90'
-      storage.port.should     == 22
-      storage.path.should     == 'backups'
-      storage.local.should    == false
-
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    after { Backup::Storage::RSync.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::RSync.any_instance.expects(:load_defaults!)
+      storage
     end
 
-    it 'should set a storage_id if given' do
-      rsync = Backup::Storage::RSync.new(model, 'my storage_id')
-      rsync.storage_id.should == 'my storage_id'
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
     end
 
-    it 'should remove any preceeding tilde and slash from the path' do
-      storage = Backup::Storage::RSync.new(model) do |rsync|
-        rsync.path = '~/my_backups/path'
-      end
-      storage.path.should == 'my_backups/path'
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::RSync.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::RSync.clear_defaults! }
-
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::RSync.defaults do |rsync|
-          rsync.username  = 'some_username'
-          rsync.password  = 'some_password'
-          rsync.ip        = 'some_ip'
-          rsync.port      = 'some_port'
-          rsync.path      = 'some_path'
-          rsync.local     = 'some_local'
-          rsync.keep      = 'some_keep'
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.username.should == 'my_username'
+        storage.password.should == 'my_password'
+        storage.ip.should       == '123.45.678.90'
+        storage.port.should     == 22
+        storage.path.should     == 'backups'
+        storage.local.should    == false
+
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::RSync.new(model)
+
+        storage.username.should be_nil
+        storage.password.should be_nil
+        storage.ip.should       be_nil
+        storage.port.should     == 22
+        storage.path.should     == 'backups'
+        storage.local.should    == false
+
+        storage.storage_id.should be_nil
+        storage.keep.should       be_nil
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Storage::RSync.defaults do |s|
+          s.username  = 'some_username'
+          s.password  = 'some_password'
+          s.ip        = 'some_ip'
+          s.port      = 'some_port'
+          s.path      = 'some_path'
+          s.local     = 'some_local'
+          s.keep      = 'some_keep'
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::RSync.new(model)
+
         storage.username.should == 'some_username'
         storage.password.should == 'some_password'
         storage.ip.should       == 'some_ip'
@@ -63,24 +90,15 @@ describe Backup::Storage::RSync do
         storage.keep.should       == 'some_keep'
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::RSync.defaults do |rsync|
-          rsync.username  = 'old_username'
-          rsync.password  = 'old_password'
-          rsync.ip        = 'old_ip'
-          rsync.port      = 'old_port'
-          rsync.path      = 'old_path'
-          rsync.local     = 'old_local'
-          rsync.keep      = 'old_keep'
-        end
-        storage = Backup::Storage::RSync.new(model) do |rsync|
-          rsync.username  = 'new_username'
-          rsync.password  = 'new_password'
-          rsync.ip        = 'new_ip'
-          rsync.port      = 'new_port'
-          rsync.path      = 'new_path'
-          rsync.local     = 'new_local'
-          rsync.keep      = 'new_keep'
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::RSync.new(model) do |s|
+          s.username  = 'new_username'
+          s.password  = 'new_password'
+          s.ip        = 'new_ip'
+          s.port      = 'new_port'
+          s.path      = 'new_path'
+          s.local     = 'new_local'
+          s.keep      = 'new_keep'
         end
 
         storage.username.should == 'new_username'
@@ -93,8 +111,7 @@ describe Backup::Storage::RSync do
         storage.storage_id.should be_nil
         storage.keep.should       == 'new_keep'
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#remote_path_for' do