lib/httpi.rb in httpi-2.2.0 vs lib/httpi.rb in httpi-2.2.1
- old
+ new
@@ -1,8 +1,7 @@
-require "logger"
-
require "httpi/version"
+require "httpi/logger"
require "httpi/request"
require "httpi/adapter/httpclient"
require "httpi/adapter/curb"
require "httpi/adapter/excon"
@@ -143,58 +142,18 @@
# Shortcut for setting the default adapter to use.
def adapter=(adapter)
Adapter.use = adapter
end
- # Sets whether to log HTTP requests.
- attr_writer :log
-
- # Returns whether to log HTTP requests. Defaults to +true+.
- def log?
- @log != false
- end
-
- # Sets the logger to use.
- attr_writer :logger
-
- # Returns the logger. Defaults to an instance of +Logger+ writing to STDOUT.
- def logger
- @logger ||= ::Logger.new($stdout)
- end
-
- # Sets the log level.
- attr_writer :log_level
-
- # Returns the log level. Defaults to :debug.
- def log_level
- @log_level ||= DEFAULT_LOG_LEVEL
- end
-
- # Logs a given +message+.
- def log(message)
- logger.send(log_level, message) if log?
- end
-
- # Reset the default config.
- def reset_config!
- @log = nil
- @logger = nil
- @log_level = nil
- end
-
private
def request_and_adapter_from(args)
return args if args[0].kind_of? Request
[Request.new(:url => args[0], :body => args[1]), args[2]]
end
def load_adapter(adapter, request)
Adapter.load(adapter).new(request)
- end
-
- def log_request(method, request, adapter)
- log("HTTPI #{method.to_s.upcase} request to #{request.url.host} (#{adapter})")
end
end
end