imap-backup 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ba4f6a03ae0efc265699ae27662d4089867f60
-  data.tar.gz: 645ee02996bcf94bddc4d890ce6d22c248584fb3
+  metadata.gz: f7b1789e72adf3229dc78e51f865b55b051c1915
+  data.tar.gz: 2f6918a2cd223adc68cc37a5cff138cd30332d6e
 SHA512:
-  metadata.gz: bd1aea391344bc6a3d66d2748f4de0f8400363e5bfdb747d440aacbd1cc1c67b145ee3025431afaf233e6cab69ec14e84448634c0ba87caaf20f42384fa16847
-  data.tar.gz: d891fc0666d94a25ee6c9f201944b7f29eea73742e81c6ce44f8e87b44568f1a8a2214eeeef7bff6c977ee79d9be2b591e46592760f79d9690b56d2ed622d34f
+  metadata.gz: 0cf0f94758f44e4b5920aea52f363141d10bb3353d92635d8e4285f561498515c60e8c7494bf80245c046a59013c0aa7abf17e1263ebc3aed987479987505b7e
+  data.tar.gz: f77e1381ddae8bbcf0e99c93bb337f49ee9d2de5940fa30f450432e890e96fc304829d85c2a68f36cf5b6e3b62dec05859fd14195eb7c1203f2c03fd063afe84

data/lib/imap/backup/account/connection.rb

@@ -6,11 +6,11 @@ module Imap::Backup
   class Account::Connection
     attr_reader :username
     attr_reader :local_path
-    attr_reader :backup_folders
 
     def initialize(options)
       @username, @password = options[:username], options[:password]
-      @local_path, @backup_folders = options[:local_path], options[:folders]
+      @local_path = options[:local_path]
+      @backup_folders = options[:folders]
       @server = options[:server]
     end
 
@@ -63,6 +63,11 @@ module Imap::Backup
     def masked_password
       password.gsub(/./, 'x')
     end
+    
+    def backup_folders
+      return @backup_folders if @backup_folders and @backup_folders.size > 0
+      folders.map { |f| {:name => f} }
+    end
 
     def host_for(username)
       case username

data/lib/imap/backup/version.rb

@@ -3,6 +3,6 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 1
   MINOR    = 0
-  REVISION = 13
+  REVISION = 14
   VERSION  = [MAJOR, MINOR, REVISION].map(&:to_s).join('.')
 end

data/spec/unit/account/connection_spec.rb

@@ -2,19 +2,26 @@
 require 'spec_helper'
 
 describe Imap::Backup::Account::Connection do
+  def self.backup_folder
+    'backup_folder'
+  end
+
   def self.folder_config
-    {:name => 'backup_folder'}
+    {:name => backup_folder}
   end
 
-  let(:imap) { double('Net::IMAP', :login => nil, :list => []) }
+  let(:imap) { double('Net::IMAP', :login => nil, :list => imap_folders) }
+  let(:imap_folders) { [] }
   let(:options) do
     {
       :username => username,
       :password => 'password',
-      :local_path => 'local_path',
-      :folders => [self.class.folder_config],
+      :local_path => local_path,
+      :folders => backup_folders,
     }
   end
+  let(:local_path) { 'local_path' }
+  let(:backup_folders) { [self.class.folder_config] }
   let(:username) { 'username@gmail.com' }
 
   before do
@@ -82,12 +89,12 @@ describe Imap::Backup::Account::Connection do
   end
 
   context '#folders' do
-    let(:folders) { 'folders' }
+    let(:imap_folders) { ['imap_folder'] }
 
-    before { allow(imap).to receive(:list).and_return(folders) }
+    before { allow(imap).to receive(:list).and_return(imap_folders) }
 
     it 'returns the list of folders' do
-      expect(subject.folders).to eq(folders)
+      expect(subject.folders).to eq(imap_folders)
     end
   end
 
@@ -103,7 +110,7 @@ describe Imap::Backup::Account::Connection do
     end
 
     it 'should return the names of folders' do
-      expect(subject.status[0][:name]).to eq('backup_folder')
+      expect(subject.status[0][:name]).to eq(self.class.backup_folder)
     end
 
     it 'returns local message uids' do
@@ -132,15 +139,53 @@ describe Imap::Backup::Account::Connection do
     let(:downloader) { double('downloader', :run => nil) }
 
     before do
-      allow(Imap::Backup::Account::Folder).to receive(:new).and_return(folder)
-      allow(Imap::Backup::Serializer::Mbox).to receive(:new).and_return(serializer)
       allow(Imap::Backup::Downloader).to receive(:new).and_return(downloader)
     end
 
-    before { subject.run_backup }
+    context 'with supplied backup_folders' do
+      before do
+        allow(Imap::Backup::Account::Folder).to receive(:new).
+          with(subject, self.class.backup_folder).and_return(folder)
+        allow(Imap::Backup::Serializer::Mbox).to receive(:new).
+          with(local_path, self.class.backup_folder).and_return(serializer)
+      end
+
+      before { subject.run_backup }
+
+      it 'runs the downloader' do
+        expect(downloader).to have_received(:run)
+      end
+    end
+
+    context 'without supplied backup_folders' do
+      let(:imap_folders) { ['foo'] }
+
+      before do
+        allow(Imap::Backup::Account::Folder).to receive(:new).
+          with(subject, 'foo').and_return(folder)
+        allow(Imap::Backup::Serializer::Mbox).to receive(:new).
+          with(local_path, 'foo').and_return(serializer)
+      end
+
+      context 'when supplied backup_folders is nil' do
+        let(:backup_folders) { nil }
+
+        before { subject.run_backup }
+
+        it 'runs the downloader' do
+          expect(downloader).to have_received(:run)
+        end
+      end
+
+      context 'when supplied backup_folders is an empty list' do
+        let(:backup_folders) { [] }
+
+        before { subject.run_backup }
 
-    it 'runs downloaders' do
-      expect(downloader).to have_received(:run)
+        it 'runs the downloader' do
+          expect(downloader).to have_received(:run)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Joe Yates