right_http_connection 1.2.4 → 1.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8ba2dac9f5194cfcb8a8e6dec24f973418d07f22
+  data.tar.gz: 59e6d3f82e45ca7679849320fc7fd89f6e776d20
+SHA512:
+  metadata.gz: fd754b030589555f947f2a52bb64c4d3524c902f3e0d95c00fbecf5a340c06d7d6353360763b225b3e05464357610e2dae54d7e21df17b899a65c3bef5430c02
+  data.tar.gz: 2ee74c4fc7cf86908f8a06b96be6cd892aeb25e16a345ea959e0fbe7907712a126c73704c8a3da013dec9443cecd8cc6e1caace3ebd4737c7e0e4da4e5287488

data/History.txt

@@ -57,3 +57,30 @@ Initial public release
   * fixed a bug: <NoMethodError: You have a nil object when you didn't expect it!
                   The error occurred while evaluating nil.body_stream>
 
+== 1.2.5
+
+- ActiveSupport dependency removal 
+
+
+== 1.3.0
+ - Added:
+   - support for using through proxies
+   - functional tests
+
+== 1.3.1
+ - Added:
+   - SSL certificate handshake support
+   - more specs
+   - ability to give client side key and certificate inline
+ - Fixed: some minor glitches
+
+== 1.4.0
+  - Added
+    - license
+    - HTTP_PROXY env variable support
+  - Fixed
+    - context-length issue (thx kristianm)
+    - exception handling
+    - connection is now closed on any exception
+    - connection is reestablished when credentials change
+    - some other minor bugs

data/Manifest.txt

@@ -4,4 +4,5 @@ README.txt
 Rakefile
 lib/net_fix.rb
 lib/right_http_connection.rb
+lib/support.rb
 setup.rb

data/Rakefile

@@ -1,72 +1,34 @@
 require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
+#require 'rake/gempackagetask'
+#require 'rake/rdoctask'
+#require 'rake/contrib/rubyforgepublisher'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
 require 'fileutils'
-require 'hoe'
 include FileUtils
 require File.join(File.dirname(__FILE__), 'lib', 'right_http_connection')
 
-AUTHOR = 'RightScale'  # can also be an array of Authors
-EMAIL = "rubygems@rightscale.com"
-DESCRIPTION = "RightScale's robust HTTP/S connection module"
-GEM_NAME = 'right_http_connection' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'rightscale' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-NAME = "right_http_connection"
-REV = nil # UNCOMMENT IF REQUIRED: File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-VERS = RightHttpConnection::VERSION::STRING + (REV ? ".#{REV}" : "")
-CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
-RDOC_OPTS = ['--quiet', '--title', 'right_http_connection documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-# Suppress Hoe's self-inclusion as a dependency for our Gem. This also keeps
-# Rake & rubyforge out of the dependency list. Users must manually install
-# these gems to run tests, etc.
-# TRB 2/19/09: also do this for the extra_dev_deps array present in newer hoes.
-# Older versions of RubyGems will try to install developer-dependencies as
-# required runtime dependencies....
-class Hoe
-  def extra_deps
-    @extra_deps.reject do |x|
-      Array(x).first == 'hoe'
-    end
-  end
-  def extra_dev_deps
-    @extra_dev_deps.reject do |x|
-      Array(x).first == 'hoe'
-    end
-  end
-end
+Bundler::GemHelper.install_tasks
+
+=begin
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
-  p.remote_rdoc_dir = "right_http_gem_doc"
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+# == Gem == #
+
+gemtask = Rake::GemPackageTask.new(Gem::Specification.load("right_http_connection.gemspec")) do |package|
+  package.package_dir = ENV['PACKAGE_DIR'] || 'pkg'
+  package.need_zip = true
+  package.need_tar = true
 end
 
+directory gemtask.package_dir
+
+CLEAN.include(gemtask.package_dir)
 
 desc 'Generate website files'
 task :website_generate do
@@ -101,3 +63,30 @@ task :check_version do
     exit
   end
 end
+=end
+
+task :default => 'spec'
+
+# == Unit Tests == #
+
+desc "Run unit tests"
+RSpec::Core::RakeTask.new
+
+namespace :spec do
+  desc "Run unit tests with RCov"
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.rcov = true
+    t.rcov_opts = %q[--exclude "spec"]
+  end
+
+  desc "Print Specdoc for unit tests"
+  RSpec::Core::RakeTask.new(:doc) do |t|
+    t.rspec_opts = ["--format", "documentation"]
+  end
+end
+
+# == Functional tests == #
+desc "Run functional tests"
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--color --format pretty}
+end

data/lib/{net_fix.rb → base/net_fix.rb}

@@ -25,6 +25,7 @@
 # Net::HTTP and Net::HTTPGenericRequest fixes to support 100-continue on 
 # POST and PUT. The request must have 'expect' field set to '100-continue'.
 
+require 'timeout'
 
 module Net
   
@@ -48,7 +49,7 @@ module Net
     end
 
     def rbuf_fill
-      timeout(@read_timeout) {
+      Timeout.timeout(@read_timeout) {
         @rbuf << @io.sysread(@@socket_read_size)
       }
     end
@@ -91,18 +92,30 @@ module Net
     private
 
     def send_request_with_body(sock, ver, path, body, send_only=nil)
-      self.content_length = body.length
+      self.content_length = body.respond_to?(:bytesize) ? body.bytesize : body.length
       delete 'Transfer-Encoding'
       supply_default_content_type
       write_header(sock, ver, path) unless send_only == :body
-      sock.write(body)              unless send_only == :header
+      sock.write(body && body.to_s) unless send_only == :header
     end
 
     def send_request_with_body_stream(sock, ver, path, f, send_only=nil)
+      # KD: Fix 'content-length': it must not be greater than a piece of file left to be read.
+      # Otherwise the connection may behave like crazy causing 4xx or 5xx responses
+      #
+      # Only do this helpful thing if the stream responds to :pos (it may be something
+      # that responds to :read and :size but not :pos).
+      if f.respond_to?(:pos)
+        file_size           = f.respond_to?(:lstat) ? f.lstat.size : f.size
+        bytes_to_read       = [ file_size - f.pos, self.content_length.to_i ].sort.first
+        self.content_length = bytes_to_read
+      end
+
       unless content_length() or chunked?
         raise ArgumentError,
             "Content-Length not given and Transfer-Encoding is not `chunked'"
       end
+      bytes_to_read ||= content_length()
       supply_default_content_type
       write_header(sock, ver, path) unless send_only == :body
       unless send_only == :header
@@ -112,8 +125,14 @@ module Net
           end
           sock.write "0\r\n\r\n"
         else
-          while s = f.read(@@local_read_size)
+          # KD: When we read/write over file EOF it sometimes make the connection unstable
+          read_size = [ @@local_read_size, bytes_to_read ].sort.first
+          while s = f.read(read_size)
             sock.write s
+            # Make sure we do not read over EOF or more than expected content-length
+            bytes_to_read -= read_size
+            break if bytes_to_read <= 0
+            read_size = bytes_to_read if bytes_to_read < read_size
           end
         end
       end
@@ -144,6 +163,7 @@ module Net
         req.exec @socket, @curr_http_version, edit_path(req.path), send_only
         begin
           res = HTTPResponse.read_new(@socket)
+          res.decode_content = req.decode_content if RUBY_VERSION > '2.0'
           # if we expected 100-continue then send a body
           if res.is_a?(HTTPContinue) && send_only && req['content-length'].to_i > 0
             req.exec @socket, @curr_http_version, edit_path(req.path), :body

data/lib/base/support.rb

@@ -0,0 +1,109 @@
+  # These are ActiveSupport-;like extensions to do a few handy things in the gems
+  # Derived from ActiveSupport, so the AS copyright notice applies:
+  #
+  #
+  #
+  # Copyright (c) 2005 David Heinemeier Hansson
+  #
+  # Permission is hereby granted, free of charge, to any person obtaining
+  # a copy of this software and associated documentation files (the
+  # "Software"), to deal in the Software without restriction, including
+  # without limitation the rights to use, copy, modify, merge, publish,
+  # distribute, sublicense, and/or sell copies of the Software, and to
+  # permit persons to whom the Software is furnished to do so, subject to
+  # the following conditions:
+  #
+  # The above copyright notice and this permission notice shall be
+  # included in all copies or substantial portions of the Software.
+  #
+  # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  #++
+  #
+  #
+  class String #:nodoc:
+
+    # Constantize tries to find a declared constant with the name specified
+    # in the string. It raises a NameError when the name is not in CamelCase
+    # or is not initialized.
+    #
+    # Examples
+    #   "Module".constantize #=> Module
+    #   "Class".constantize #=> Class
+    def right_constantize()
+      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ self
+        raise NameError, "#{self.inspect} is not a valid constant name!"
+      end
+      Object.module_eval("::#{$1}", __FILE__, __LINE__)
+    end
+
+    def right_camelize()
+      self.dup.split(/_/).map{ |word| word.capitalize }.join('')
+    end
+
+  end
+
+
+  class Object #:nodoc:
+    # "", "   ", nil, [], and {} are blank
+    def right_blank?
+      if respond_to?(:empty?) && respond_to?(:strip)
+        empty? or strip.empty?
+      elsif respond_to?(:empty?)
+        empty?
+      else
+        !self
+      end
+    end
+  end
+
+  class NilClass #:nodoc:
+    def right_blank?
+      true
+    end
+  end
+
+  class FalseClass #:nodoc:
+    def right_blank?
+      true
+    end
+  end
+
+  class TrueClass #:nodoc:
+    def right_blank?
+      false
+    end
+  end
+
+  class Array #:nodoc:
+    alias_method :right_blank?, :empty?
+  end
+
+  class Hash #:nodoc:
+    alias_method :right_blank?, :empty?
+
+    # Return a new hash with all keys converted to symbols.
+    def right_symbolize_keys
+      inject({}) do |options, (key, value)|
+        options[key.to_sym] = value
+        options
+      end
+    end
+  end
+
+  class String #:nodoc:
+    def right_blank?
+      empty? || strip.empty?
+    end
+  end
+
+  class Numeric #:nodoc:
+    def right_blank?
+      false
+    end
+  end

data/lib/base/version.rb

@@ -0,0 +1,32 @@
+#--  -*- mode: ruby; encoding: utf-8 -*-
+# Copyright: Copyright (c) 2010 RightScale, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# 'Software'), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+module RightHttpConnection #:nodoc:
+  module VERSION #:nodoc:
+    MAJOR = 1  unless defined?(MAJOR)
+    MINOR = 5  unless defined?(MINOR)
+    TINY  = 1  unless defined?(TINY)
+
+    STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)
+  end
+end