lib/bunny/session.rb in bunny-1.0.0.pre5 vs lib/bunny/session.rb in bunny-1.0.0.pre6

@@ -112,11 +112,11 @@
     def initialize(connection_string_or_opts = Hash.new, optz = Hash.new)
       opts = case (ENV["RABBITMQ_URL"] || connection_string_or_opts)
              when nil then
                Hash.new
              when String then
-               self.class.parse_uri(connection_string_or_opts)
+               self.class.parse_uri(ENV["RABBITMQ_URL"] || connection_string_or_opts)
              when Hash then
                connection_string_or_opts
              end.merge(optz)
 
       @opts            = opts
@@ -629,10 +629,10 @@
       options[:username] || options[:user] || DEFAULT_USER
     end
 
     # @private
     def password_from(options)
-      options[:password] || options[:pass] || options [:pwd] || DEFAULT_PASSWORD
+      options[:password] || options[:pass] || options[:pwd] || DEFAULT_PASSWORD
     end
 
     # @private
     def heartbeat_from(options)
       options[:heartbeat] || options[:heartbeat_interval] || options[:requested_heartbeat] || DEFAULT_HEARTBEAT