Handle legacy configuration format better

Author: joeyates

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 14.4.0 - 2023-11-15
+
+### Changed
+
+* Always check whether the configuration file has folders
+  listed as an Array of Hashes, and convert to the newer,
+  simpler, structure. See #184
+
 ## 14.3.0 - 2023-11-03
 
 ### Added

lib/imap/backup/configuration.rb

@@ -122,27 +122,30 @@ def data
             else
               DEFAULT_STRATEGY
             end
-          if data[:version] == VERSION_2_1
-            dehashify_folders(data)
-          else
-            data
-          end
+          dehashify_folders(data)
         else
           {accounts: [], download_strategy: DEFAULT_STRATEGY}
         end
     end
 
     def dehashify_folders(data)
-      data[:version] = VERSION
-
       data[:accounts].each do |account|
         next if !account.key?(:folders)
 
         folders = account[:folders]
-        names = folders.map { |f| f[:name] }
+        names = folders.map do |f|
+          case f
+          when Hash
+            f[:name]
+          else
+            f
+          end
+        end
         account[:folders] = names
       end
 
+      data[:version] = VERSION
+
       data
     end
 

lib/imap/backup/version.rb

@@ -2,7 +2,7 @@ module Imap; end
 
 module Imap::Backup
   MAJOR    = 14
-  MINOR    = 3
+  MINOR    = 4
   REVISION = 0
   PRE      = nil
   VERSION  = [MAJOR, MINOR, REVISION, PRE].compact.map(&:to_s).join(".")

spec/unit/configuration_spec.rb

@@ -188,10 +188,10 @@ module Imap::Backup
       end
     end
 
-    context "when a version 2.1 file is present" do
+    context "when a folders are stored as Hashes" do
       let(:file) { instance_double(File, write: nil) }
       let(:configuration) do
-        {version: "2.1", accounts: [{username: "account", folders: [{name: "foo"}]}]}.to_json
+        {accounts: [{username: "account", folders: [{name: "foo"}]}]}.to_json
       end
 
       before do