Merge pull request #4 from mil/fix-exists-is-deprecated

[rbdr/lyricli.rb] / lib / lyricli / configuration.rb

diff --git a/lib/lyricli/configuration.rb b/lib/lyricli/configuration.rb
index 031101720bc87ee74b6bbdec421fb5908cec1cfd..53a3e2bb9566b6c8b533330d18af0990dc0bccbb 100644 (file)
--- a/lib/lyricli/configuration.rb
+++ b/lib/lyricli/configuration.rb
@@ -1,6 +1,9 @@
 module Lyricli
+
+  # This class handles the configuration of Lyricli
   class Configuration
 
+    # Defines the paths to the default and user configuration files
     def initialize
       @config_path = "~/.lyricli.conf"
       @defaults_path = "defaults.json"
@@ -9,21 +12,37 @@ module Lyricli
 
     @@instance = Configuration.new
 
+    # Ensure this is only called once. Only use the instance class variable
+    # to access this method, as its constructor is private.
     def self.instance
       @@instance
     end
 
+    # Access configuration properties, loads config if needed beforehand.
+    #
+    # @param [String] key the configuration key to access
+    # @return [String, Hash, Array] the value of the configuration key.
     def [](key)
       load_config unless @config
       @config[key]
     end
 
+    # Assigns a new value to a configuration key, loads config if needed and
+    # saves it after updating.
+    #
+    # @param [String] key the configuration key to set
+    # @param [Object] value the value for the configuration key, can be any
+    #                 object as long as it can be converted to JSON
     def []=(key, value)
       load_config unless @config
       @config[key] = value
       save_config
     end
 
+    # Deletes a key from the configuration, loads config if needed and saves
+    # it after deleting.
+    #
+    # @param [String] key the key to delete
     def delete(key)
       load_config unless @config
       @config.delete(key)
@@ -32,12 +51,12 @@ module Lyricli
 
     private_class_method :new
 
-    # TODO: Apart from this, load a default yml that will be used for this.
-    # And just extend everything from the user's config.
+    # Loads the configuration from the user file, attempts to create it from
+    # defaults if it's not present. sets the `@config` instance variable.
     def load_config
       path = File.expand_path(@config_path)
 
-      if File.exists?(path)
+      if File.exist?(path)
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else
@@ -45,6 +64,7 @@ module Lyricli
       end
     end
 
+    # Serializes the `@config` Hash to JSON and saves it to a file.
     def save_config
       path = File.expand_path(@config_path)
       file = File.new(path, "w")
@@ -54,12 +74,12 @@ module Lyricli
 
     private
 
+    # Loads the default configuration from a JSON file
     def load_default_config
       # Load the default
-      path_root = File.expand_path(File.dirname(__FILE__))
-      path = File.join(path_root, @defaults_path)
+      path = File.join(::Lyricli.root, "config", @defaults_path)
 
-      if File.exists?(path)
+      if File.exist?(path)
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else