lib/vkontakte_api/configuration.rb in vkontakte_api-0.2.1 vs lib/vkontakte_api/configuration.rb in vkontakte_api-1.0.rc

@@ -1,30 +1,48 @@
+require 'logger'
+
 module VkontakteApi
   # General configuration module.
   # 
-  # It extends `VkontakteApi` so it's methods should be called from there.
+  # @note `VkontakteApi::Configuration` extends `VkontakteApi` so these methods should be called from the latter.
   module Configuration
     # Available options.
-    OPTION_NAMES = [:app_id, :app_secret, :adapter]
+    OPTION_NAMES = [:app_id, :app_secret, :redirect_uri, :adapter, :logger, :log_requests, :log_errors, :log_responses]
     
     attr_accessor *OPTION_NAMES
     
+    alias_method :log_requests?,  :log_requests
+    alias_method :log_errors?,    :log_errors
+    alias_method :log_responses?, :log_responses
+    
     # Default HTTP adapter.
-    DEFAULT_ADAPTER = :net_http
+    DEFAULT_ADAPTER = Faraday.default_adapter
     
+    # Logger default options.
+    DEFAULT_LOGGER_OPTIONS = {
+      :requests  => true,
+      :errors    => true,
+      :responses => false
+    }
+    
     # A global configuration set via the block.
     # @example
     #   VkontakteApi.configure do |config|
     #     config.adapter = :net_http
+    #     config.logger  = Rails.logger
     #   end
     def configure
       yield self if block_given?
       self
     end
     
     # Reset all configuration options to defaults.
     def reset
-      @adapter = DEFAULT_ADAPTER
+      @adapter       = DEFAULT_ADAPTER
+      @logger        = ::Logger.new(STDOUT)
+      @log_requests  = DEFAULT_LOGGER_OPTIONS[:requests]
+      @log_errors    = DEFAULT_LOGGER_OPTIONS[:errors]
+      @log_responses = DEFAULT_LOGGER_OPTIONS[:responses]
     end
     
     # When this module is extended, set all configuration options to their default values.
     def self.extended(base)
       base.reset