imap-backup 4.0.3 → 4.0.7

data/spec/unit/imap/backup/configuration/setup_spec.rb

@@ -3,8 +3,31 @@ describe Imap::Backup::Configuration::Setup do
 
   subject { described_class.new }
 
-  let(:normal) { {username: "account@example.com"} }
-  let(:accounts) { [normal] }
+  let(:normal_account) do
+    instance_double(
+      Imap::Backup::Account,
+      username: "account@example.com",
+      marked_for_deletion?: false,
+      modified?: false
+    )
+  end
+  let(:modified_account) do
+    instance_double(
+      Imap::Backup::Account,
+      username: "modified@example.com",
+      marked_for_deletion?: false,
+      modified?: true
+    )
+  end
+  let(:deleted_account) do
+    instance_double(
+      Imap::Backup::Account,
+      username: "delete@example.com",
+      marked_for_deletion?: true,
+      modified?: false
+    )
+  end
+  let(:accounts) { [normal_account] }
   let(:store) do
     instance_double(
       Imap::Backup::Configuration::Store,
@@ -63,9 +86,7 @@ describe Imap::Backup::Configuration::Setup do
     end
 
     describe "listing" do
-      let(:accounts) { [normal, modified, deleted] }
-      let(:modified) { {username: "modified@example.com", modified: true} }
-      let(:deleted) { {username: "deleted@example.com", delete: true} }
+      let(:accounts) { [normal_account, modified_account, deleted_account] }
 
       before { subject.run }
 
@@ -98,7 +119,7 @@ describe Imap::Backup::Configuration::Setup do
         allow(Imap::Backup::Configuration::Asker).to receive(:email).
           with(no_args) { "new@example.com" }
         allow(Imap::Backup::Configuration::Account).to receive(:new).
-          with(store, normal, anything) { account }
+          with(store, normal_account, anything) { account }
       end
 
       it "edits the account" do
@@ -134,19 +155,19 @@ describe Imap::Backup::Configuration::Setup do
       end
 
       it "sets username" do
-        expect(accounts[1][:username]).to eq(added_email)
+        expect(accounts[1].username).to eq(added_email)
       end
 
       it "sets blank password" do
-        expect(accounts[1][:password]).to eq("")
+        expect(accounts[1].password).to eq("")
       end
 
       it "sets local_path" do
-        expect(accounts[1][:local_path]).to eq(local_path)
+        expect(accounts[1].local_path).to eq(local_path)
       end
 
       it "sets folders" do
-        expect(accounts[1][:folders]).to eq([])
+        expect(accounts[1].folders).to eq([])
       end
 
       context "when the account is a GMail account" do
@@ -154,12 +175,12 @@ describe Imap::Backup::Configuration::Setup do
         let(:local_path) { "/base/path/new_gmail.com" }
 
         it "sets the server" do
-          expect(accounts[1][:server]).to eq(gmail_imap_server)
+          expect(accounts[1].server).to eq(gmail_imap_server)
         end
       end
 
       it "doesn't flag the unedited account as modified" do
-        expect(accounts[1][:modified]).to be_nil
+        expect(accounts[1].modified?).to be_falsey
       end
     end
 

data/spec/unit/imap/backup/configuration/store_spec.rb

@@ -8,10 +8,12 @@ describe Imap::Backup::Configuration::Store do
   let(:file_path) { File.join(directory, "/config.json") }
   let(:file_exists) { true }
   let(:directory_exists) { true }
-  let(:data) { {debug: debug, accounts: accounts} }
   let(:debug) { true }
-  let(:accounts) { [] }
   let(:configuration) { data.to_json }
+  let(:data) { {debug: debug, accounts: accounts.map(&:to_h)} }
+  let(:accounts) { [account1, account2] }
+  let(:account1) { Imap::Backup::Account.new({username: "username1"}) }
+  let(:account2) { Imap::Backup::Account.new({username: "username2"}) }
 
   before do
     stub_const(
@@ -48,8 +50,8 @@ describe Imap::Backup::Configuration::Store do
   end
 
   describe "#modified?" do
-    context "with accounts flagged 'modified'" do
-      let(:accounts) { [{name: "foo", modified: true}] }
+    context "with modified accounts" do
+      before { subject.accounts[0].username = "changed" }
 
       it "is true" do
         expect(subject.modified?).to be_truthy
@@ -57,7 +59,7 @@ describe Imap::Backup::Configuration::Store do
     end
 
     context "with accounts flagged 'delete'" do
-      let(:accounts) { [{name: "foo", delete: true}] }
+      before { subject.accounts[0].mark_for_deletion! }
 
       it "is true" do
         expect(subject.modified?).to be_truthy
@@ -65,8 +67,6 @@ describe Imap::Backup::Configuration::Store do
     end
 
     context "without accounts flagged 'modified'" do
-      let(:accounts) { [{name: "foo"}] }
-
       it "is false" do
         expect(subject.modified?).to be_falsey
       end
@@ -156,19 +156,14 @@ describe Imap::Backup::Configuration::Store do
       subject.save
     end
 
-    context "when accounts are modified" do
-      let(:accounts) { [{name: "foo", modified: true}] }
-
-      before { subject.save }
-
-      it "skips the 'modified' flag" do
-        expected = Marshal.load(Marshal.dump(data))
-        expected[:accounts][0].delete(:modified)
+    it "uses the Account#to_h method" do
+      allow(subject.accounts[0]).to receive(:to_h) { "Account1" }
+      allow(subject.accounts[1]).to receive(:to_h) { "Account2" }
 
-        expect(JSON).to receive(:pretty_generate).with(expected)
+      expect(JSON).to receive(:pretty_generate).
+        with(hash_including({accounts: ["Account1", "Account2"]}))
 
-        subject.save
-      end
+      subject.save
     end
 
     context "when accounts are to be deleted" do
@@ -179,11 +174,15 @@ describe Imap::Backup::Configuration::Store do
         ]
       end
 
-      it "does not save them" do
-        expected = Marshal.load(Marshal.dump(data))
-        expected[:accounts].pop
+      before do
+        allow(subject.accounts[0]).to receive(:to_h) { "Account1" }
+        allow(subject.accounts[1]).to receive(:to_h) { "Account2" }
+        subject.accounts[0].mark_for_deletion!
+      end
 
-        expect(JSON).to receive(:pretty_generate).with(expected)
+      it "does not save them" do
+        expect(JSON).to receive(:pretty_generate).
+          with(hash_including({accounts: ["Account2"]}))
 
         subject.save
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.7
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -182,10 +182,12 @@ files:
 - lib/email/mboxrd/message.rb
 - lib/email/provider.rb
 - lib/email/provider/apple_mail.rb
-- lib/email/provider/default.rb
+- lib/email/provider/base.rb
 - lib/email/provider/fastmail.rb
 - lib/email/provider/gmail.rb
+- lib/email/provider/unknown.rb
 - lib/imap/backup.rb
+- lib/imap/backup/account.rb
 - lib/imap/backup/account/connection.rb
 - lib/imap/backup/account/folder.rb
 - lib/imap/backup/cli.rb
@@ -235,11 +237,10 @@ files:
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
 - spec/support/higline_test_helpers.rb
-- spec/support/shared_examples/account_flagging.rb
 - spec/support/silence_logging.rb
 - spec/unit/email/mboxrd/message_spec.rb
 - spec/unit/email/provider/apple_mail_spec.rb
-- spec/unit/email/provider/default_spec.rb
+- spec/unit/email/provider/base_spec.rb
 - spec/unit/email/provider/fastmail_spec.rb
 - spec/unit/email/provider/gmail_spec.rb
 - spec/unit/email/provider_spec.rb
@@ -281,47 +282,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Backup GMail (or other IMAP) accounts to disk
 test_files:
 - spec/spec_helper.rb
+- spec/fixtures/connection.yml
+- spec/unit/email/provider/gmail_spec.rb
+- spec/unit/email/provider/apple_mail_spec.rb
+- spec/unit/email/provider/fastmail_spec.rb
+- spec/unit/email/provider/base_spec.rb
+- spec/unit/email/provider_spec.rb
+- spec/unit/email/mboxrd/message_spec.rb
 - spec/unit/imap/backup_spec.rb
-- spec/unit/imap/backup/configuration/account_spec.rb
-- spec/unit/imap/backup/configuration/list_spec.rb
+- spec/unit/imap/backup/cli/utils_spec.rb
+- spec/unit/imap/backup/cli/local_spec.rb
+- spec/unit/imap/backup/utils_spec.rb
+- spec/unit/imap/backup/client/default_spec.rb
+- spec/unit/imap/backup/downloader_spec.rb
+- spec/unit/imap/backup/configuration/store_spec.rb
 - spec/unit/imap/backup/configuration/connection_tester_spec.rb
-- spec/unit/imap/backup/configuration/setup_spec.rb
 - spec/unit/imap/backup/configuration/asker_spec.rb
+- spec/unit/imap/backup/configuration/setup_spec.rb
 - spec/unit/imap/backup/configuration/folder_chooser_spec.rb
-- spec/unit/imap/backup/configuration/store_spec.rb
+- spec/unit/imap/backup/configuration/account_spec.rb
+- spec/unit/imap/backup/configuration/list_spec.rb
+- spec/unit/imap/backup/account/folder_spec.rb
+- spec/unit/imap/backup/account/connection_spec.rb
 - spec/unit/imap/backup/serializer/mbox_spec.rb
 - spec/unit/imap/backup/serializer/mbox_store_spec.rb
 - spec/unit/imap/backup/serializer/mbox_enumerator_spec.rb
-- spec/unit/imap/backup/cli/utils_spec.rb
-- spec/unit/imap/backup/cli/local_spec.rb
-- spec/unit/imap/backup/downloader_spec.rb
 - spec/unit/imap/backup/uploader_spec.rb
-- spec/unit/imap/backup/account/folder_spec.rb
-- spec/unit/imap/backup/account/connection_spec.rb
-- spec/unit/imap/backup/utils_spec.rb
-- spec/unit/imap/backup/client/default_spec.rb
-- spec/unit/email/mboxrd/message_spec.rb
-- spec/unit/email/provider/gmail_spec.rb
-- spec/unit/email/provider/default_spec.rb
-- spec/unit/email/provider/apple_mail_spec.rb
-- spec/unit/email/provider/fastmail_spec.rb
-- spec/unit/email/provider_spec.rb
+- spec/support/fixtures.rb
+- spec/support/higline_test_helpers.rb
+- spec/support/silence_logging.rb
+- spec/gather_rspec_coverage.rb
 - spec/features/backup_spec.rb
 - spec/features/helper.rb
-- spec/features/restore_spec.rb
-- spec/features/support/email_server.rb
 - spec/features/support/backup_directory.rb
-- spec/features/support/shared/connection_context.rb
 - spec/features/support/shared/message_fixtures.rb
-- spec/support/fixtures.rb
-- spec/support/silence_logging.rb
-- spec/support/higline_test_helpers.rb
-- spec/support/shared_examples/account_flagging.rb
-- spec/fixtures/connection.yml
-- spec/gather_rspec_coverage.rb
+- spec/features/support/shared/connection_context.rb
+- spec/features/support/email_server.rb
+- spec/features/restore_spec.rb

data/spec/support/shared_examples/account_flagging.rb

@@ -1,23 +0,0 @@
-shared_examples "it flags the account as modified" do
-  it "flags that the account has changed" do
-    expect(account[:modified]).to be_truthy
-  end
-end
-
-shared_examples "it doesn't flag the account as modified" do
-  it "does not flag that the account has changed" do
-    expect(account[:modified]).to be_falsey
-  end
-end
-
-shared_examples "it flags the account to be deleted" do
-  it "flags that the account is to be deleted" do
-    expect(account[:delete]).to be_truthy
-  end
-end
-
-shared_examples "it doesn't flag the account to be deleted" do
-  it "does not flags that the account is to be deleted" do
-    expect(account[:delete]).to be_falsey
-  end
-end