grackle 0.1.7 → 0.1.8

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.1.8 (2010-2-2)
+* Added proxy support to Grackle::Transport via proxy attribute. Can specify a Proc that returns a Net::HTTP subclass or a Net::HTTP subclass directly. Typically this will be from Net::HTTP.Proxy.
+
 == 0.1.7 (2009-12-13)
 * Fixed a bug in Ruby 1.9 where the client was incorrectly handling request method parameters
 * Fixed a bug in the _ method that wasn't correctly appending numeric path elements

data/grackle.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grackle}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hayes Davis"]
-  s.date = %q{2009-12-13}
+  s.date = %q{2010-2-2}
   s.description = %q{Grackle is a lightweight library for the Twitter REST and Search API.}
   s.email = %q{hayes@appozite.com}
   s.files = ["CHANGELOG.rdoc", "README.rdoc", "grackle.gemspec", "lib/grackle.rb", "lib/grackle/client.rb", "lib/grackle/handlers.rb", "lib/grackle/transport.rb", "lib/grackle/utils.rb", "test/test_grackle.rb", "test/test_helper.rb", "test/test_client.rb", "test/test_handlers.rb"]

data/lib/grackle/transport.rb

@@ -13,7 +13,7 @@ module Grackle
   
   class Transport
     
-    attr_accessor :debug
+    attr_accessor :debug, :proxy
   
     CRLF = "\r\n"
     DEFAULT_REDIRECT_LIMIT = 5
@@ -46,7 +46,7 @@ module Grackle
     end
     
     def execute_request(method,url,options={})
-      conn = Net::HTTP.new(url.host, url.port)
+      conn = http_class.new(url.host, url.port)
       conn.use_ssl = (url.scheme == 'https')
       if conn.use_ssl?
         configure_ssl(conn)
@@ -199,6 +199,18 @@ module Grackle
         end
       end
 
+      def http_class
+        if proxy
+          if proxy.kind_of?(Proc)
+            proxy.call(self)
+          else
+            proxy
+          end
+        else
+          Net::HTTP
+        end
+      end
+
       def configure_ssl(conn)
         if self.class.ca_cert_file
           conn.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/lib/grackle.rb

@@ -1,7 +1,7 @@
 module Grackle
 
   # :stopdoc:
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/test/test_client.rb

@@ -21,7 +21,24 @@ class TestClient < Test::Unit::TestCase
         self.class.response
       end
     end
-  end  
+  end
+  
+  class MockProxy < Net::HTTP
+    class << self
+      attr_accessor :started
+      [:response,:request,:last_instance,:responder].each do |m|
+        class_eval "
+          def #{m}; Net::HTTP.#{m}; end
+          def #{m}=(val); Net::HTTP.#{m} = val; end
+        "
+      end
+    end
+    
+    def start
+      self.class.started = true
+      super
+    end
+  end
   
   #Mock responses that conform to HTTPResponse's interface
   class MockResponse < Net::HTTPResponse
@@ -258,6 +275,24 @@ class TestClient < Test::Unit::TestCase
     assert_equal(12345,value.id)
   end
   
+  def test_transport_proxy_setting_is_used
+    client = new_client(200,'{"id":12345,"screen_name":"test_user"}')
+    called = false
+    call_trans = nil
+    client.transport.proxy = Proc.new {|trans| call_trans = trans; called = true; MockProxy }
+    client.users.show._(12345).json?
+    assert(called,"Proxy proc should be called during request")
+    assert(MockProxy.started,"Proxy should have been called")
+    assert_equal(client.transport,call_trans,"Proxy should have been called with transport")
+    MockProxy.started = false
+    client.transport.proxy = MockProxy
+    client.users.show._(12345).json?
+    assert(MockProxy.started,"Proxy should have been called")
+    MockProxy.started = false
+    client.transport.proxy = nil
+    assert_equal(false,MockProxy.started,"Proxy should not have been called")
+  end
+  
   private
     def with_http_responder(responder)
       Net::HTTP.responder = responder

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grackle
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Hayes Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -06:00
+date: 2010-02-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency