imap-backup 1.3.0 → 1.4.0

data/spec/unit/configuration/account_spec.rb

@@ -35,7 +35,9 @@ describe Imap::Backup::Configuration::Account do
   context "#run" do
     let(:highline) { double("Highline") }
     let(:menu) { MockHighlineMenu.new }
-    let(:store) { double("Imap::Backup::Configuration::Store", accounts: accounts) }
+    let(:store) do
+      double("Imap::Backup::Configuration::Store", accounts: accounts)
+    end
     let(:accounts) { [account, account1] }
     let(:account) do
       {
@@ -132,7 +134,8 @@ describe Imap::Backup::Configuration::Account do
 
     context "email" do
       before do
-        allow(Imap::Backup::Configuration::Asker).to receive(:email).and_return(new_email)
+        allow(Imap::Backup::Configuration::Asker).
+          to receive(:email) { new_email }
         subject.run
         menu.choices["modify email"].call
       end
@@ -176,7 +179,8 @@ describe Imap::Backup::Configuration::Account do
         let(:new_email) { other_email }
 
         it "indicates the error" do
-          expect(subject).to have_received(:puts).with("There is already an account set up with that email address")
+          expect(subject).to have_received(:puts).
+            with("There is already an account set up with that email address")
         end
 
         it "doesn't set the email" do
@@ -191,7 +195,8 @@ describe Imap::Backup::Configuration::Account do
       let(:new_password) { "new_password" }
 
       before do
-        allow(Imap::Backup::Configuration::Asker).to receive(:password).and_return(new_password)
+        allow(Imap::Backup::Configuration::Asker).
+          to receive(:password) { new_password }
         subject.run
         menu.choices["modify password"].call
       end
@@ -239,7 +244,9 @@ describe Imap::Backup::Configuration::Account do
 
       before do
         @validator = nil
-        allow(Imap::Backup::Configuration::Asker).to receive(:backup_path) do |path, validator|
+        allow(
+          Imap::Backup::Configuration::Asker
+        ).to receive(:backup_path) do |path, validator|
           @validator = validator
           new_backup_path
         end
@@ -262,7 +269,8 @@ describe Imap::Backup::Configuration::Account do
       let(:chooser) { double(run: nil) }
 
       before do
-        allow(Imap::Backup::Configuration::FolderChooser).to receive(:new).and_return(chooser)
+        allow(Imap::Backup::Configuration::FolderChooser).
+          to receive(:new) { chooser }
         subject.run
         menu.choices["choose backup folders"].call
       end
@@ -274,14 +282,16 @@ describe Imap::Backup::Configuration::Account do
 
     context "connection test" do
       before do
-        allow(Imap::Backup::Configuration::ConnectionTester).to receive(:test).and_return("All fine")
+        allow(Imap::Backup::Configuration::ConnectionTester).
+          to receive(:test).and_return("All fine")
         allow(highline).to receive(:ask)
         subject.run
         menu.choices["test connection"].call
       end
 
       it "tests the connection" do
-        expect(Imap::Backup::Configuration::ConnectionTester).to have_received(:test).with(account)
+        expect(Imap::Backup::Configuration::ConnectionTester).
+          to have_received(:test).with(account)
       end
     end
 

data/spec/unit/configuration/asker_spec.rb

@@ -81,8 +81,10 @@ module Imap::Backup
 
       before do
         @i = 0
-        allow(highline).to receive(:ask).with("password: ").and_return(password1)
-        allow(highline).to receive(:ask).with("repeat password: ").and_return(password2)
+        allow(highline).to receive(:ask).
+          with("password: ").and_return(password1)
+        allow(highline).to receive(:ask).
+          with("repeat password: ").and_return(password2)
         allow(highline).to receive(:agree) do
           answer = answers[@i]
           @i += 1
@@ -107,7 +109,8 @@ module Imap::Backup
         let(:password2) { "secret" }
 
         it "asks to continue" do
-          expect(highline).to have_received(:agree).at_least(1).times.with(/Continue\?/)
+          expect(highline).to have_received(:agree).
+            at_least(1).times.with(/Continue\?/)
         end
       end
     end

data/spec/unit/configuration/connection_tester_spec.rb

@@ -5,7 +5,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
     let(:connection) { double("Imap::Backup::Account::Connection", imap: nil) }
 
     before do
-      allow(Imap::Backup::Account::Connection).to receive(:new).and_return(connection)
+      allow(Imap::Backup::Account::Connection).to receive(:new) { connection }
     end
 
     context "call" do

data/spec/unit/configuration/folder_chooser_spec.rb

@@ -4,14 +4,17 @@ describe Imap::Backup::Configuration::FolderChooser do
   include HighLineTestHelpers
 
   context "#run" do
-    let(:connection) { double("Imap::Backup::Account::Connection", folders: remote_folders) }
+    let(:connection) do
+      double("Imap::Backup::Account::Connection", folders: remote_folders)
+    end
     let(:account) { {folders: []} }
     let(:remote_folders) { [] }
 
     subject { described_class.new(account) }
 
     before do
-      allow(Imap::Backup::Account::Connection).to receive(:new).with(account).and_return(connection)
+      allow(Imap::Backup::Account::Connection).
+        to receive(:new).with(account) { connection }
       @input, @output = prepare_highline
       allow(subject).to receive(:system)
       allow(Imap::Backup.logger).to receive(:warn)
@@ -32,7 +35,8 @@ describe Imap::Backup::Configuration::FolderChooser do
     context "folder listing" do
       let(:account) { {folders: [{name: "my_folder"}]} }
       let(:remote_folders) do
-        folder1 = double("folder", name: "my_folder") # this one is already backed up
+        # this one is already backed up:
+        folder1 = double("folder", name: "my_folder")
         folder2 = double("folder", name: "another_folder")
         [folder1, folder2]
       end
@@ -57,7 +61,7 @@ describe Imap::Backup::Configuration::FolderChooser do
         end
 
         specify "are added to the account" do
-          expect(account[:folders]).to include({name: "another_folder"})
+          expect(account[:folders]).to include(name: "another_folder")
         end
 
         include_examples "it flags the account as modified"
@@ -71,7 +75,7 @@ describe Imap::Backup::Configuration::FolderChooser do
         end
 
         specify "are removed from the account" do
-          expect(account[:folders]).to_not include({name: "my_folder"})
+          expect(account[:folders]).to_not include(name: "my_folder")
         end
 
         include_examples "it flags the account as modified"
@@ -82,28 +86,34 @@ describe Imap::Backup::Configuration::FolderChooser do
       let(:remote_folders) { nil }
 
       before do
-        allow(Imap::Backup::Configuration::Setup.highline).to receive(:ask).and_return("q")
+        allow(Imap::Backup::Configuration::Setup.highline).
+          to receive(:ask).and_return("q")
         subject.run
       end
 
       it "asks to press a key" do
-        expect(Imap::Backup::Configuration::Setup.highline).to have_received(:ask).with("Press a key ")
+        expect(Imap::Backup::Configuration::Setup.highline).
+          to have_received(:ask).with("Press a key ")
       end
     end
 
     context "with connection errors" do
       before do
-        allow(Imap::Backup::Account::Connection).to receive(:new).with(account).and_raise("error")
-        allow(Imap::Backup::Configuration::Setup.highline).to receive(:ask).and_return("q")
+        allow(Imap::Backup::Account::Connection).
+          to receive(:new).with(account).and_raise("error")
+        allow(Imap::Backup::Configuration::Setup.highline).
+          to receive(:ask).and_return("q")
         subject.run
       end
 
       it "prints an error message" do
-        expect(Imap::Backup.logger).to have_received(:warn).with("Connection failed")
+        expect(Imap::Backup.logger).
+          to have_received(:warn).with("Connection failed")
       end
 
       it "asks to continue" do
-        expect(Imap::Backup::Configuration::Setup.highline).to have_received(:ask).with("Press a key ")
+        expect(Imap::Backup::Configuration::Setup.highline).
+          to have_received(:ask).with("Press a key ")
       end
     end
   end

data/spec/unit/configuration/list_spec.rb

@@ -11,14 +11,21 @@ describe Imap::Backup::Configuration::List do
     double("Imap::Backup::Configuration::Store", accounts: accounts)
   end
   let(:exists) { true }
-  let(:connection1) { double("Imap::Backup::Account::Connection", disconnect: nil) }
-  let(:connection2) { double("Imap::Backup::Account::Connection", disconnect: nil) }
+  let(:connection1) do
+    double("Imap::Backup::Account::Connection", disconnect: nil)
+  end
+  let(:connection2) do
+    double("Imap::Backup::Account::Connection", disconnect: nil)
+  end
 
   before do
-    allow(Imap::Backup::Configuration::Store).to receive(:new).and_return(store)
-    allow(Imap::Backup::Configuration::Store).to receive(:exist?).and_return(exists)
-    allow(Imap::Backup::Account::Connection).to receive(:new).with(accounts[0]).and_return(connection1)
-    allow(Imap::Backup::Account::Connection).to receive(:new).with(accounts[1]).and_return(connection2)
+    allow(Imap::Backup::Configuration::Store).to receive(:new) { store }
+    allow(Imap::Backup::Configuration::Store).
+      to receive(:exist?) { exists }
+    allow(Imap::Backup::Account::Connection).
+      to receive(:new).with(accounts[0]) { connection1 }
+    allow(Imap::Backup::Account::Connection).
+      to receive(:new).with(accounts[1]) { connection2 }
   end
 
   subject { described_class.new }

data/spec/unit/configuration/setup_spec.rb

@@ -29,7 +29,7 @@ describe Imap::Backup::Configuration::Setup do
     let(:modified) { false }
 
     before :each do
-      allow(Imap::Backup::Configuration::Store).to receive(:new).and_return(store)
+      allow(Imap::Backup::Configuration::Store).to receive(:new) { store }
       allow(Imap::Backup).to receive(:setup_logging)
       @input, @output = prepare_highline
       allow(@input).to receive(:eof?).and_return(false)
@@ -100,8 +100,10 @@ describe Imap::Backup::Configuration::Setup do
 
       before do
         allow(@input).to receive(:gets).and_return("add\n", "exit\n")
-        allow(Imap::Backup::Configuration::Asker).to receive(:email).with(no_args).and_return("new@example.com")
-        allow(Imap::Backup::Configuration::Account).to receive(:new).with(store, blank_account, anything).and_return(account)
+        allow(Imap::Backup::Configuration::Asker).to receive(:email).
+          with(no_args).and_return("new@example.com")
+        allow(Imap::Backup::Configuration::Account).to receive(:new).
+          with(store, blank_account, anything).and_return(account)
 
         subject.run
       end

data/spec/unit/configuration/store_spec.rb

@@ -12,11 +12,15 @@ describe Imap::Backup::Configuration::Store do
   let(:configuration) { data.to_json }
 
   before do
-    stub_const("Imap::Backup::Configuration::Store::CONFIGURATION_DIRECTORY", directory)
-    allow(File).to receive(:directory?).with(directory).and_return(directory_exists)
-    allow(File).to receive(:exist?).with(file_path).and_return(file_exists)
-    allow(Imap::Backup::Utils).to receive(:stat).with(directory).and_return(0700)
-    allow(Imap::Backup::Utils).to receive(:stat).with(file_path).and_return(0600)
+    stub_const(
+      "Imap::Backup::Configuration::Store::CONFIGURATION_DIRECTORY", directory
+    )
+    allow(File).to receive(:directory?).with(directory) { directory_exists }
+    allow(File).to receive(:exist?).with(file_path) { file_exists }
+    allow(Imap::Backup::Utils).
+      to receive(:stat).with(directory).and_return(0o700)
+    allow(Imap::Backup::Utils).
+      to receive(:stat).with(file_path).and_return(0o600)
     allow(Imap::Backup::Utils).to receive(:check_permissions).and_return(nil)
     allow(File).to receive(:read).with(file_path).and_return(configuration)
   end
@@ -151,7 +155,7 @@ describe Imap::Backup::Configuration::Store do
 
     context "when accounts are modified" do
       let(:accounts) { [{name: "foo", modified: true}] }
-      
+
       before { subject.save }
 
       it "skips the 'modified' flag" do
@@ -184,7 +188,7 @@ describe Imap::Backup::Configuration::Store do
       before { subject.save }
 
       it "sets them to 0600" do
-        expect(FileUtils).to have_received(:chmod).with(0600, file_path)
+        expect(FileUtils).to have_received(:chmod).with(0o600, file_path)
       end
     end
 
@@ -202,7 +206,8 @@ describe Imap::Backup::Configuration::Store do
       let(:file_exists) { true }
 
       before do
-        allow(Imap::Backup::Utils).to receive(:check_permissions).with(file_path, 0600).and_raise("Error")
+        allow(Imap::Backup::Utils).to receive(:check_permissions).
+          with(file_path, 0o600).and_raise("Error")
       end
 
       it "fails" do

data/spec/unit/downloader_spec.rb

@@ -3,7 +3,9 @@ require "spec_helper"
 describe Imap::Backup::Downloader do
   describe "#run" do
     let(:message) { {"RFC822" => "blah"} }
-    let(:folder) { double("Imap::Backup::Account::Folder", fetch: message, name: "folder") }
+    let(:folder) do
+      double("Imap::Backup::Account::Folder", fetch: message, name: "folder")
+    end
     let(:folder_uids) { ["111", "222", "333"] }
     let(:serializer) { double("Imap::Backup::Serializer", save: nil) }
     let(:serializer_uids) { ["222"] }

data/spec/unit/email/mboxrd/message_spec.rb

@@ -27,11 +27,28 @@ describe Email::Mboxrd::Message do
   let(:message_body) do
     double("Body", clone: cloned_message_body, force_encoding: nil)
   end
-  let(:cloned_message_body) { "Foo\nBar\nFrom at the beginning of the line\n>>From quoted" }
+  let(:cloned_message_body) do
+    "Foo\nBar\nFrom at the beginning of the line\n>>From quoted"
+  end
 
   subject { described_class.new(message_body) }
 
-  context "#to_s" do
+  describe ".from_serialized" do
+    let(:serialized_message) { "From foo@a.com\n#{imap_message}" }
+    let(:imap_message) { "Delivered-To: me@example.com\nFrom Me\n" }
+
+    before { @result = described_class.from_serialized(serialized_message) }
+
+    it "returns the message" do
+      expect(@result).to be_a(described_class)
+    end
+
+    it "removes one level of > before From" do
+      expect(@result.supplied_body).to eq(imap_message)
+    end
+  end
+
+  context "#to_serialized" do
     let(:mail) { double("Mail", from: [from], date: date) }
 
     before do
@@ -39,33 +56,34 @@ describe Email::Mboxrd::Message do
     end
 
     it "does not modify the message" do
-      subject.to_s
+      subject.to_serialized
 
       expect(message_body).to_not have_received(:force_encoding).with("binary")
     end
 
     it "adds a 'From ' line at the start" do
-      expect(subject.to_s).to start_with("From " + from + " " + date.asctime + "\n")
+      expected = "From #{from} #{date.asctime}\n"
+      expect(subject.to_serialized).to start_with(expected)
     end
 
     it "replaces existing 'From ' with '>From '" do
-      expect(subject.to_s).to include("\n>From at the beginning")
+      expect(subject.to_serialized).to include("\n>From at the beginning")
     end
 
     it "appends > before '>+From '" do
-      expect(subject.to_s).to include("\n>>>From quoted")
+      expect(subject.to_serialized).to include("\n>>>From quoted")
     end
 
     context "when date is missing" do
       let(:date) { nil }
 
       it "does no fail" do
-        expect { subject.to_s }.to_not raise_error
+        expect { subject.to_serialized }.to_not raise_error
       end
     end
   end
 
-  context '#from' do
+  context "#from" do
     before do
       # call original for these tests because we want to test the behaviour of
       # class-under-test given different behaviour of the Mail parser
@@ -75,7 +93,7 @@ describe Email::Mboxrd::Message do
     context "when original message 'from' is nil" do
       let(:message_body) { msg_no_from }
       it "'from' is empty string" do
-        expect(subject.to_s).to start_with("From  \n")
+        expect(subject.to_serialized).to start_with("From \n")
       end
     end
 
@@ -83,15 +101,16 @@ describe Email::Mboxrd::Message do
       let(:message_body) { msg_bad_from }
 
       it "'from' is empty string" do
-        expect(subject.to_s).to start_with("From  \n")
+        expect(subject.to_serialized).to start_with("From \n")
       end
     end
 
-    context "when original message 'from' is nil and 'envelope from' is nil and 'return path' is available" do
+    context "when original message 'from' is nil and " \
+      "'envelope from' is nil and 'return path' is available" do
       let(:message_body) { msg_no_from_but_return_path }
 
       it "'return path' is used as 'from'" do
-        expect(subject.to_s).to start_with("From " + from + " \n")
+        expect(subject.to_serialized).to start_with("From " + from + "\n")
       end
     end
 
@@ -99,7 +118,7 @@ describe Email::Mboxrd::Message do
       let(:message_body) { msg_no_from_but_sender }
 
       it "Sender is used as 'from'" do
-        expect(subject.to_s).to start_with("From " + from + " \n")
+        expect(subject.to_serialized).to start_with("From " + from + "\n")
       end
     end
   end

data/spec/unit/email/provider_spec.rb

@@ -3,7 +3,10 @@ require "spec_helper"
 describe Email::Provider do
   describe ".for_address" do
     context "known providers" do
-      [["gmail.com", :gmail], ["fastmail.fm", :fastmail]].each do |domain, provider|
+      [
+        ["gmail.com", :gmail],
+        ["fastmail.fm", :fastmail]
+      ].each do |domain, provider|
         it "recognizes #{provider}" do
           address = "foo@#{domain}"
           expect(described_class.for_address(address).provider).to eq(provider)
@@ -13,7 +16,8 @@ describe Email::Provider do
 
     context "with unknown providers" do
       it "returns a default provider" do
-        expect(described_class.for_address("foo@unknown.com").provider).to eq(:default)
+        result = described_class.for_address("foo@unknown.com").provider
+        expect(result).to eq(:default)
       end
     end
   end
@@ -22,7 +26,7 @@ describe Email::Provider do
 
   describe "#options" do
     it "returns options" do
-      expect(subject.options).to eq(port: 993, ssl: true)
+      expect(subject.options).to be_a(Hash)
     end
   end
 

data/spec/unit/serializer/base_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Imap::Backup::Serializer::Base do
   context "#initialize" do
-    let(:stat) { double("File::Stat", mode: 0345) }
+    let(:stat) { double("File::Stat", mode: 0o345) }
 
     before do
       allow(File).to receive(:exist?).with("/base/path").and_return(true)
@@ -10,9 +10,10 @@ describe Imap::Backup::Serializer::Base do
     end
 
     it "should fail if file permissions are to lax" do
+      message = "Permissions on '/base/path' should be 0700, not 0345"
       expect do
         described_class.new("/base/path", "my_folder")
-      end.to raise_error(RuntimeError, "Permissions on '/base/path' should be 0700, not 0345")
+      end.to raise_error(RuntimeError, message)
     end
   end
 end