@@ -1,3 +1,6 @@ +0.1.7 - unreleased +* Added support for HTTP proxies + 0.1.6 - 2008-03-07 * Added Room#topic for getting the current topic [Even Weaver] * Trap INT in #listen(&block) [borrowed from Chris Shea's Pyre] CHANGELOG.txt @@ -11,7 +11,11 @@ module Tinder attr_reader :subdomain, :uri # Create a new connection to the campfire account with the given +subdomain+. - # There's an +:ssl+ option to use SSL for the connection. + # + # == Options: + # * +:ssl+: use SSL for the connection, which is required if you have a Campfire SSL account. + # Defaults to false + # * +:proxy+: a proxy URI. (e.g. :proxy => 'http://user:pass@example.com:8000') # # c = Tinder::Campfire.new("mysubdomain", :ssl => true) def initialize(subdomain, options = {}) @@ -19,6 +23,12 @@ module Tinder @cookie = nil @subdomain = subdomain @uri = URI.parse("#{options[:ssl] ? 'https' : 'http' }://#{subdomain}.campfirenow.com") + if options[:proxy] + uri = URI.parse(options[:proxy]) + @http = Net::HTTP::Proxy(uri.host, uri.port, uri.user, uri.password) + else + @http = Net::HTTP + end @logged_in = false end @@ -32,7 +42,7 @@ module Tinder # Returns true when successfully logged in def logged_in? - @logged_in === true + @logged_in == true end def logout @@ -132,7 +142,7 @@ module Tinder def perform_request(options = {}, &block) @request = prepare_request(yield, options) - http = Net::HTTP.new(uri.host, uri.port) + http = @http.new(uri.host, uri.port) http.use_ssl = ssl? http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ssl? @response = returning http.request(@request) do |response| @@ -154,8 +164,8 @@ module Tinder def verify_response(response, options = {}) if options.is_a?(Symbol) codes = case options - when :success then [200] - when :redirect then 300..399 + when :success; [200] + when :redirect; 300..399 else raise ArgumentError.new("Unknown response #{options}") end codes.include?(response.code.to_i) lib/tinder/campfire.rb 000a0432334d7660634d2031d0d25e6693303725 Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/tinder/commit/e99e0b698de2a66e7e7c08f9e4c9b8ffe83eacc8 e99e0b698de2a66e7e7c08f9e4c9b8ffe83eacc8 2008-04-18T01:14:27-07:00 2008-04-18T01:14:27-07:00 Added support for HTTP proxies 2b45afd3834cdd6a5540b4f913a51cc22e922ba3 Brandon Keepers brandon@collectiveidea.com