restfully in restfully-0.7.1.rc5

- old
+ new

@@ -17,11 +17,11 @@
   old_pp(*args); nil
 end
 
 logger = Logger.new(STDERR)
 logger.level = Logger::WARN
-@options = {"logger" => logger, "require" => []}
+@options = {"logger" => logger}
 
 option_parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
 * Description
   Restfully #{Restfully::VERSION} - Access REST APIs effortlessly
@@ -38,10 +38,11 @@
   end
   opts.on("-c=", "--config=", "Sets the various options based on a custom YAML configuration file") do |v|
     @options["configuration_file"] = v
   end
   opts.on("-r=", "--require=", "Require an additional media-type") do |v|
+    @options["require"] ||= []
     @options["require"].push(v)
   end
   opts.on("--log=", "Outputs log messages to the given file. Defaults to stdout") do |v|
     original_logger_level = logger.level
     logger = Logger.new(File.expand_path(v))
@@ -61,26 +62,12 @@
   
 end
 
 option_parser.parse!
 
-if @options["configuration_file"]
-  @options.merge!(YAML.load_file(
-    File.expand_path(@options["configuration_file"])
-  ))
-end
-
-@options["require"].each do |r|
-  logger.info "Requiring #{r} media-type..."
-  require "restfully/media_type/#{r.underscore}"
-end
-
 if given_uri = ARGV.shift
   @options["uri"] = given_uri
 end
-
-# Compatibility with restfully < 0.6
-@options["uri"] ||= @options.delete("base_uri")
 
 @session = Restfully::Session.new(@options)
 
 def session
   @session
\ No newline at end of file