httpadapter 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.1
+
+* added mock adapter for testing
+
 == 0.2.0
 
 * abstracted transmission of HTTP requests

data/lib/httpadapter/adapters/mock.rb

@@ -0,0 +1,43 @@
+# Copyright (C) 2010 Google Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'httpadapter'
+
+module HTTPAdapter #:nodoc:
+  ##
+  # A simple module for mocking the transmit method on an adapter.
+  #
+  # @example
+  #   # Using RSpec, verify that the request being sent includes a user agent.
+  #   adapter = HTTPAdapter::MockAdapter.request_adapter do |req, conn|
+  #     method, uri, headers, body = req
+  #     headers.should be_any { |k, v| k.downcase == 'user-agent' }
+  #   end
+  module MockAdapter
+    def self.request_adapter(&block)
+      return Class.new do
+        @@block = block
+
+        def self.transmit(*params)
+          response = @@block.call(*params)
+          if response.respond_to?(:each)
+            return response
+          else
+            return [200, [], ['']]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/httpadapter/adapters/net_http.rb

@@ -114,6 +114,21 @@ module HTTPAdapter #:nodoc:
           store = OpenSSL::X509::Store.new
           store.set_default_paths
           http.cert_store = store
+          context = http.instance_variable_get('@ssl_context')
+          if context && context.respond_to?(:tmp_dh_callback) &&
+              context.tmp_dh_callback == nil
+            context.tmp_dh_callback = lambda do |*args|
+              tmp_dh_key_file = File.expand_path(
+                ENV['TMP_DH_KEY_FILE'] || "~/.dhparams.pem"
+              )
+              if File.exists?(tmp_dh_key_file)
+                OpenSSL::PKey::DH.new(File.read(tmp_dh_key_file))
+              else
+                # Slow, fix with `openssl dhparam -out ~/.dhparams.pem 2048`
+                OpenSSL::PKey::DH.new(512)
+              end
+            end
+          end
         end
         http.start
         connection = HTTPAdapter::Connection.new(

data/lib/httpadapter/version.rb

@@ -18,7 +18,7 @@ unless defined? HTTPAdapter::VERSION
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 2
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/httpadapter/adapters/net_http_request_spec.rb

@@ -322,7 +322,9 @@ describe HTTPAdapter::NetHTTPRequestAdapter,
   end
 
   it 'should convert the body properly' do
-    @request.body.should == ''
+    # Net::HTTP is weird in that it treats nils like empty strings.
+    [nil, ''].should include(@request.body)
+    [nil, 0].should include(@request.content_length)
   end
 end
 

data/spec/httpadapter/adapters/net_http_transmission_spec.rb

@@ -60,7 +60,7 @@ describe HTTPAdapter::NetHTTPRequestAdapter, 'transmitting a GET tuple' do
   before do
     @tuple = [
       'GET',
-      'https://www.google.com/',
+      'https://encrypted.google.com/',
       [],
       []
     ]

data/tasks/gem.rake

@@ -30,7 +30,7 @@ namespace :gem do
     s.add_development_dependency("diff-lcs", "~> 1.1.2")
 
     s.add_development_dependency("typhoeus", "~> 0.1.31")
-    s.add_development_dependency("rack", "~> 1.2.1")
+    s.add_development_dependency("rack", "~> 1.2.0")
 
     s.require_path = "lib"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpadapter
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Bob Aman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,12 +122,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 31
         segments: 
         - 1
         - 2
-        - 1
-        version: 1.2.1
+        - 0
+        version: 1.2.0
   type: :development
   version_requirements: *id007
 description: |
@@ -141,6 +141,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- lib/httpadapter/adapters/mock.rb
 - lib/httpadapter/adapters/net_http.rb
 - lib/httpadapter/adapters/rack.rb
 - lib/httpadapter/adapters/typhoeus.rb