right_cloud_api_base 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93876f7645c63a599b1cdde9e5752490efcb6b9e
-  data.tar.gz: cf0a599994e10d1c17c2cf014e03ab303a18deed
+  metadata.gz: a15b1f9a44a3084eb718cb87639fb3c96c015157
+  data.tar.gz: 99545b9605f6d1b63c2ad1a138fd3ac614a9a811
 SHA512:
-  metadata.gz: 76b486fbb4c8392dff74a77e953c051b7eabeb8a2e723f795d0efb1bf66c3cebbcb6c543bc36e4674e41adee214e8bac4955fda97cd69b8a79e11ad7a4752e9c
-  data.tar.gz: ba3b90502877bbe162ceae9bfba958bb4682cc5ee2083fc1cd71c36b435c1ca8bb078cd522861683fb91fa30d3bf82855758936e803c2b04275e654a06e8b44a
+  metadata.gz: 710087ad760c2ec6b5e553e10848c4e54916f9568b957a28a579d1b1d7ca5613015a7604c58b3b07a43c3bbcd0bfbf5c89b7c08f9bf44761d38f576183a560fb
+  data.tar.gz: 24018fc8b936dc861528452f14e55adc4341297443cd1078c36f9bd03ea1ba359668135ae026e32325dd04633ad1c911ef595b3ce659ffa528f824cfa101f84e

data/HISTORY

@@ -1,6 +1,13 @@
+== 2015-03-11, v0.2.2
+  - Fixed "Cannot do block-based chunk gets on S3" issue
+    https://github.com/rightscale/right_aws_api/issues/24
+
+== 2015-01-23, v0.2.1.1
+  - Removed RightHttpConnection gem related code
+
+== 2014-11-03, v0.2.1
+  - Fix object._blank? issue for IO objects.
+
 == 2013-06-28
   - pre-release candidate created
 
-== 2014-11-03
-  - Fix object._blank? issue for IO objects.
-  - version bumped to 0.1.1

data/lib/base/api_manager.rb

@@ -165,10 +165,7 @@ module RightScale
       #
       # @option options [String]  :connection_proxy
       #   Connection proxy class (when it need to be different from the default one).
-      #   Only RightScale::CloudApi::ConnectionProxy::NetHttpPersistentProxy (default) and
-      #   RightScale::CloudApi::ConnectionProxy::RightHttpConnectionProxy are supported.
-      #   The last one requires 'right_http_connection' gem to be manually installed, and it is
-      #   not recommended to use because it monkey patches Net::HTTP.
+      #   Only RightScale::CloudApi::ConnectionProxy::NetHttpPersistentProxy is supported so far.
       #
       # @option options [Integer]  :connection_read_timeout
       #   Connection read timeout (in seconds).

data/lib/base/helpers/http_request.rb

@@ -83,7 +83,7 @@ module RightScale
         # Create a request
         @verb     = verb.to_s.downcase
         @path     = path
-        @raws     = raw
+        @raw      = raw
         @headers  = HTTPHeaders::new(headers)
         self.body = body
       end
@@ -122,7 +122,6 @@ module RightScale
           file.binmode if file.respond_to?(:binmode)
           # Fix 'content-length': it must not be bigger than a piece of a File left to be read or a String body size.
           # Otherwise the connection may behave like crazy causing 4xx or 5xx responses
-          # KD: Make sure this code is used with the patched RightHttpConnection gem (see net_fix.rb)
           file_size     = file.respond_to?(:lstat) ? file.lstat.size : file.size
           bytes_to_read = [ file_size - file.pos, self['content-length'].first ].compact.map{|v| v.to_i }.sort.first # remove nils then make values Integers
           if self['content-length'].first._blank? || self['content-length'].first.to_i > bytes_to_read

data/lib/base/helpers/query_api_patterns.rb

@@ -79,7 +79,7 @@ module RightScale
         #
         #       query_api_pattern 'PutObject',   :put, '{:Bucket}/{:Object}',
         #                                        :body    => Utils::MUST_BE_SET,
-        #                                        :headers => { 'content-type' => ['application/octet-stream'] }
+        #                                        :headers => { 'content-type' => ['binary/octet-stream'] }
         #       ..
         #     end
         #   end
@@ -99,7 +99,7 @@ module RightScale
         #
         #        base.query_api_pattern 'PutObject',   :put, '{:Bucket:}/{:Object:}',
         #                                              :body    => Utils::MUST_BE_SET,
-        #                                              :headers => { 'content-type' => ['application/octet-stream'] }
+        #                                              :headers => { 'content-type' => ['binary/octet-stream'] }
         #
         #        base.query_api_pattern 'UploadPartCopy', :put,'{:DestinationBucket}/{:DestinationObject}',
         #                                                 :params  => { 'partNumber' => :PartNumber, 'uploadId'   => :UploadId },

data/lib/base/routines/connection_proxies/net_http_persistent_proxy.rb

@@ -63,9 +63,9 @@ module RightScale
           begin
             make_request_with_retries(connection, @data[:connection][:uri], http_request)
           rescue => e
-           fail(ConnectionError, e.message)
+            fail(ConnectionError, e.message)
           ensure
-           connection.shutdown
+            connection.shutdown
           end
         end
 
@@ -180,9 +180,12 @@ module RightScale
                 # then there is no low level retry is allowed. Otherwise we would need to reset the
                 # IO pointer, etc.
                 connection_retry_count = 0
-                # Set IO response
-                set_http_response(response)
-                response.read_body(&block)
+                if response.is_a?(Net::HTTPSuccess)
+                  set_http_response(response, :skip_body)
+                  response.read_body(&block)
+                else
+                  set_http_response(response)
+                end
               end
             else
               # Set text response
@@ -213,10 +216,10 @@ module RightScale
         #
         # @return [void]
         #
-        def set_http_response(response)
+        def set_http_response(response, skip_body=false)
           @data[:response][:instance] = HTTPResponse.new(
             response.code,
-            response.body.is_a?(IO) ? nil : response.body,
+            skip_body ? nil : response.body,
             response.to_hash,
             response
           )

data/lib/base/routines/connection_proxy.rb

@@ -38,12 +38,10 @@ module RightScale
       def process
         unless @connection_proxy
           # Try to use a user defined connection proxy. The options are:
-          #  - RightScale::CloudApi::ConnectionProxy::RightHttpConnectionProxy,
           #  - RightScale::CloudApi::ConnectionProxy::NetHttpPersistentProxy
           connection_proxy_class = data[:options][:connection_proxy]
           unless connection_proxy_class
             # If it is not defined then load right_http_connection gem and use it.
-            # connection_proxy_class = ConnectionProxy::RightHttpConnectionProxy
             connection_proxy_class = RightScale::CloudApi::ConnectionProxy::NetHttpPersistentProxy
           end
           @connection_proxy = connection_proxy_class.new

data/lib/right_cloud_api_base.rb

@@ -62,7 +62,6 @@ require "base/routines/retry_manager"
 require "base/routines/request_initializer"
 require "base/routines/request_generator"
 require "base/routines/connection_proxy"
-require "base/routines/connection_proxies/right_http_connection_proxy"
 require "base/routines/connection_proxies/net_http_persistent_proxy"
 require "base/routines/response_parser"
 require "base/routines/request_analyzer"

data/lib/right_cloud_api_base_version.rb

@@ -19,7 +19,7 @@
 # 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.
-#++
+#++`
 
 # RightScale namespace
 #
@@ -31,7 +31,7 @@ module RightScale
     # CloudApi gem version namespace
     module VERSION
       # The gem version
-      STRING = '0.2.1'
+      STRING = '0.2.2'
     end
   end
 end

data/spec/routines/connection_proxies/test_net_http_persistent_proxy_spec.rb

@@ -57,7 +57,8 @@ describe "RightScale::CloudApi::ConnectionProxy::NetHTTPPersistentProxy" do
     before :each do
       @connection = double(
         :request                => @response,
-        :retry_change_requests= => true )
+        :retry_change_requests= => true,
+        :shutdown               => true )
       expect(Net::HTTP::Persistent).to receive(:new).and_return(@connection)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_cloud_api_base
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - RightScale, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -144,7 +144,6 @@ files:
 - lib/base/parsers/sax.rb
 - lib/base/routines/cache_validator.rb
 - lib/base/routines/connection_proxies/net_http_persistent_proxy.rb
-- lib/base/routines/connection_proxies/right_http_connection_proxy.rb
 - lib/base/routines/connection_proxy.rb
 - lib/base/routines/request_analyzer.rb
 - lib/base/routines/request_generator.rb

data/lib/base/routines/connection_proxies/right_http_connection_proxy.rb

@@ -1,227 +0,0 @@
-#--
-# Copyright (c) 2013 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 RightScale
-  module CloudApi
-    class ConnectionProxy
-      
-      class RightHttpConnectionProxy
-        @@storage = {}
-
-        def self.storage
-          @@storage
-        end
-
-        # Remove dead threads/fibers from the storage
-        def self.clean_storage
-          Utils::remove_dead_fibers_and_threads_from_storage(storage)
-        end
-
-        class Error < CloudApi::Error
-        end
-
-        # Performs an HTTP request.
-        #
-        # @param [Hash] data The API request +data+ storage.
-        #   See {RightScale::CloudApi::ApiManager.initialize_api_request_options} code for its explanation.
-        #
-        def request(data)
-          require "right_http_connection"
-
-          @data = data
-          @data[:response] = {}
-          # Create a connection
-          @uri = @data[:connection][:uri].dup
-
-          # Create/Get RightHttpConnection instance
-          remote_endpoint       = current_endpoint
-          right_http_connection = current_connection
-
-          # Register a callback to close current connection
-          @data[:callbacks][:close_current_connection] = Proc::new{|reason| close_connection(remote_endpoint, reason); log "Current connection closed: #{reason}" }
-
-          # Create a real HTTP request
-          fake = @data[:request][:instance]
-          http_request = "Net::HTTP::#{fake.verb._camelize}"._constantize::new(fake.path)
-          if fake.is_io?
-            http_request.body_stream = fake.body
-          else
-            http_request.body = fake.body
-          end
-          fake.headers.each{|header, value| http_request[header] = value }
-          fake.raw = http_request
-
-          # Set all the options are suported by RightHttpConnection (if they are)
-          http_connection_data = {
-            :server    => @uri.host,
-            :port      => @uri.port,
-            :protocol  => @uri.scheme,
-            :request   => http_request,
-            :exception => ConnectionError
-          }
-
-          # Set all required options
-          http_connection_data[:logger]                       = @data[:options][:cloud_api_logger].logger
-          http_connection_data[:user_agent]                   = @data[:options][:connection_user_agent]   if @data[:options].has_key?(:connection_user_agent)
-          http_connection_data[:ca_file]                      = @data[:options][:connection_ca_file]      if @data[:options].has_key?(:connection_ca_file)
-          http_connection_data[:http_connection_retry_count]  = @data[:options][:connection_retry_count]  if @data[:options].has_key?(:connection_retry_count)
-          http_connection_data[:http_connection_read_timeout] = @data[:options][:connection_read_timeout] if @data[:options].has_key?(:connection_read_timeout)
-          http_connection_data[:http_connection_open_timeout] = @data[:options][:connection_open_timeout] if @data[:options].has_key?(:connection_open_timeout)
-          http_connection_data[:http_connection_retry_delay]  = @data[:options][:connection_retry_delay]  if @data[:options].has_key?(:connection_retry_delay)
-          http_connection_data[:raise_on_timeout]             = @data[:options][:abort_on_timeout]        if @data[:options][:abort_on_timeout]
-          http_connection_data[:cert]                         = @data[:credentials][:cert]                if @data[:credentials].has_key?(:cert)
-          http_connection_data[:key]                          = @data[:credentials][:key]                 if @data[:credentials].has_key?(:key)
-          if @data[:options].has_key?(:connection_verify_mode)
-            http_connection_data[:use_server_auth] = (@data[:options][:connection_verify_mode] !=  OpenSSL::SSL::VERIFY_NONE)
-          end
-
-          #log "HttpConnection request: #{http_connection_data.inspect}"
-
-          # Make a request:
-          block = @data[:vars][:system][:block]
-          if block
-            # If block is given - pass there all the chunks of a response and stop
-            # (dont do any parsing, analysing etc)
-            # 
-            # TRB 9/17/07 Careful - because we are passing in blocks, we get a situation where
-            # an exception may get thrown in the block body (which is high-level
-            # code either here or in the application) but gets caught in the
-            # low-level code of HttpConnection.  The solution is not to let any
-            # exception escape the block that we pass to HttpConnection::request.
-            # Exceptions can originate from code directly in the block, or from user
-            # code called in the other block which is passed to response.read_body.
-            # 
-            # TODO: the suggested fix for RightHttpConnection if to catch 
-            # Interrupt and SystemCallError instead of Exception in line 402
-            response = nil
-            begin
-              block_exception = nil
-              # Response.body will be a Net::ReadAdapter instance here - it cant be read as a string.
-              # WEB: On its own, Net::HTTP causes response.body to be a Net::ReadAdapter when you make a request with a block 
-              # that calls read_body on the response.
-              response = right_http_connection.request(http_connection_data) do |res|
-                begin
-                  # Update temp response
-                  @data[:response][:instance] = HTTPResponse::new( res.code,
-                                                                   nil,
-                                                                   res.to_hash,
-                                                                   res )
-                  res.read_body(&block) if res.is_a?(Net::HTTPSuccess)
-                rescue Exception => e
-                  block_exception = e
-                  break
-                end
-              end
-              raise block_exception if block_exception
-            rescue Exception => e
-              right_http_connection.finish(e.message)
-              raise e
-            end
-          else
-            # Things are simple if there is no any block
-            response = right_http_connection.request(http_connection_data)
-          end
-
-          @data[:response][:instance] = HTTPResponse::new( response.code,
-                                                           response.body,
-                                                           response.to_hash,
-                                                           response )
-
-  #        # HACK: KD 
-  #        # 
-  #        # When one uploads a file with pos > 0 and 'content-length' != File.size - pos
-  #        # then the next request through this connection fails with 400 or 505...
-  #        # It seems that it expects the file to be read until EOF.
-  #        # 
-  #        # KIlling the current connection seems to help but it is not good...
-  #        #
-  #        if @data[:request][:instance].body_stream #&& !@data[:request][:instance].body_stream.eof
-  #          pp @data[:request][:instance].body_stream.pos
-  #          log "closing current connection because of an issue when an IO object is not read until EOF"
-  #          @connection.finish
-  #        end
-        end
-        
-        def log(message)     
-          @data[:options][:cloud_api_logger].log(message, :connection_proxy)
-        end
-        
-        #----------------------------
-        # HTTP Connections handling
-        #----------------------------
-
-        def storage # :nodoc:
-          @@storage[Utils::current_thread_and_fiber] ||= {}
-        end
-
-        def current_endpoint # :nodoc:
-          "#{@uri.scheme}://#{@uri.host}:#{@uri.port}"
-        end
-
-        def close_connection(endpoint, reason='') # :nodoc:
-          return nil unless storage[endpoint]
-
-          log "Destroying RightHttpConnection to #{endpoint}, reason: #{reason}"
-          storage[endpoint][:connection].finish(reason)
-        rescue => e
-          log "Exception in close_connection: #{e.class.name}: #{e.message}"
-        ensure
-          storage.delete(endpoint) if endpoint
-        end
-
-        INACTIVE_LIFETIME_LIMIT = 900 # seconds
-
-        # Delete out-of-dated connections for current Thread/Fiber
-        def clean_outdated_connections
-          life_time_scratch = Time::now - INACTIVE_LIFETIME_LIMIT
-          storage.each do |endpoint, connection|
-            if connection[:last_used_at] < life_time_scratch
-              close_connection(endpoint, 'out-of-date')
-            end
-          end
-        end
-
-        # Expire the connection if it has expired.
-        def current_connection # :nodoc:
-          # Remove dead threads/fibers from the storage
-          self.class::clean_storage
-          # Delete out-of-dated connections
-          clean_outdated_connections
-          # Get current_connection
-          endpoint = current_endpoint
-          unless storage[endpoint]
-            storage[endpoint] = {}
-            storage[endpoint][:connection] = Rightscale::HttpConnection.new( :exception => CloudError, 
-                                                                             :logger    => @data[:options][:cloud_api_logger].logger )
-            log "Creating RightHttpConection to #{endpoint.inspect}"
-          else
-            log "Reusing RightHttpConection to #{endpoint.inspect}"
-          end
-          storage[endpoint][:last_used_at] = Time::now
-          storage[endpoint][:connection]
-        end
-      end
- 
-    end
-  end
-end