config.rb in cdq-0.1.9

- old
+ new

@@ -7,11 +7,12 @@
   # override the names used when setting up the database file and finding the
   # model file.  This file is named <tt>cdq.yml</tt> and must be found at the
   # root of your resources directory.  It supports the following top-level keys:
   #
   #   [name]          The root name for both database and model
-  #   [database_name] The root name for the database file (relative to the documents directory)
+  #   [database_dir]  The root name for the database directory (NSDocumentDirectory or NSApplicationSupportDirectory)
+  #   [database_name] The root name for the database file (relative to the database_dir)
   #   [model_name]    The root name for the model file (relative to the bundle directory)
   #
   # Using the config file is not necessary.  If you do not include it, the bundle display name
   # will be used.  For most people with a new app, this is what you want to do, especially if
   # you are using ruby-xcdm schemas.  The only case where using the config file is required
@@ -19,11 +20,11 @@
   # class loading order of operations makes it impossible to configure from within your
   # AppDelegate.
   #
   class CDQConfig
 
-    attr_reader :config_file, :database_name, :model_name, :name
+    attr_reader :config_file, :database_name, :database_dir, :model_name, :name
 
     def initialize(config_file)
       case config_file
       when String
         @config_file = config_file
@@ -37,16 +38,17 @@
       else
         h = {}
       end
 
       @name = h['name'] || h[:name] || NSBundle.mainBundle.objectForInfoDictionaryKey("CFBundleDisplayName")
+      @database_dir = search_directory_for h['database_dir'] || h[:database_dir]
       @database_name = h['database_name'] || h[:database_name] || name
       @model_name = h['model_name'] || h[:model_name] || name
     end
 
     def database_url
-      dir = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true).last
+      dir = NSSearchPathForDirectoriesInDomains(database_dir, NSUserDomainMask, true).last
       path = File.join(dir, database_name + '.sqlite')
       NSURL.fileURLWithPath(path)
     end
 
     def model_url
@@ -58,9 +60,23 @@
         begin
           cf_file = NSBundle.mainBundle.pathForResource("cdq", ofType: "yml");
           new(cf_file)
         end
     end
+
+
+    private
+
+      def search_directory_for dir_name
+        supported_dirs = {
+          "NSDocumentDirectory" => NSDocumentDirectory,
+          :NSDocumentDirectory => NSDocumentDirectory,
+          "NSApplicationSupportDirectory" => NSApplicationSupportDirectory,
+          :NSApplicationSupportDirectory => NSApplicationSupportDirectory,
+        }
+        supported_dirs[dir_name] || NSDocumentDirectory
+      end
+
   end
 
 end
 
 