DistelliClientFramework 1.1 → 1.2

data/lib/distelli/clientframework.rb

@@ -62,10 +62,10 @@ module Distelli
       end
 
       # Canonicalize the resource
-      if request_info.resource_uri == nil
+      if request_info.resource == nil
         string_to_sign.push("")
       else
-        string_to_sign.push(request_info.resource_uri)
+        string_to_sign.push(request_info.resource)
       end
 
       sorted_params = Array.new
@@ -122,15 +122,30 @@ module Distelli
 
     end
 
+    private
+    def get_netloc(endpoint)
+      uriparse_result = URI.parse(endpoint)
+      netloc = uriparse_result.host
+      scheme = uriparse_result.scheme
+      port = uriparse_result.port
+      if port != nil
+        if scheme == "http" and port != 80
+            netloc = netloc+":"+port.to_s
+        else
+          netloc = netloc+":"+port
+        end
+      end
+      if scheme != nil and scheme.length() > 0
+          return scheme+"://"+netloc
+      end
+      return netloc
+    end
+
     def execute(request_info)
       if @endpoint == nil
         raise ClientException.new("Invalid endpoint: "+@endpoint.to_s)
       end
-      @logger.debug("Executing request to endpoint: "+@endpoint.to_s)
-      # uri_str = @endpoint
-      # if request_info.resource_uri != nil
-      #   uri_str = uri_str+request_info.resource_uri
-      # end
+#      @logger.debug("Executing request to endpoint: "+@endpoint.to_s)
 
       request_info.add_header(ServiceConstants::OPERATION_HEADER, request_info.operation)
       request_info.add_header(ServiceConstants::CONTENT_TYPE_HEADER, request_info.content_type)
@@ -154,10 +169,21 @@ module Distelli
       request_info.add_header(ServiceConstants::DATE_HEADER, cur_time.strftime("%a, %d %b %Y %H:%M:%S %z"))
 
       # Create the URI
-      uri = URI.parse(request_info.get_uri(@endpoint))
+      endpoint = get_netloc(@endpoint)
+      if request_info.resource == nil
+        request_info.resource = "/"
+      end
 
-      # TODO: Set the Content-MD5 header
+      query_string = request_info.get_query_string()
+      if query_string == nil
+        uri = URI.join(endpoint.to_s, request_info.resource.to_s)
+      else
+        uri = URI.join(endpoint.to_s, request_info.resource.to_s, query_string.to_s)
+      end
 
+      @logger.debug("Executing request to [#{endpoint}], [#{request_info.resource}] uri: "+uri.to_s)
+
+      # TODO: Set the Content-MD5 header
       # Set the authentication headers
       if @credentials != nil
         signer = RequestSigner.new
@@ -278,14 +304,14 @@ module Distelli
   end
 
   class RequestInfo
-    attr_accessor :query_params, :headers, :resource_uri, :operation, :request_id, :request, :request_bytes
+    attr_accessor :query_params, :headers, :resource, :operation, :request_id, :request, :request_bytes
     VALID_CONTENT_TYPES = Set.new [ServiceConstants::CONTENT_TYPE_JSON, ServiceConstants::CONTENT_TYPE_XML, ServiceConstants::CONTENT_TYPE_OCTET_STREAM]
     VALID_HTTP_METHODS = Set.new [ServiceConstants::HTTP_METHOD_GET, ServiceConstants::HTTP_METHOD_PUT, ServiceConstants::HTTP_METHOD_POST, ServiceConstants::HTTP_METHOD_DELETE]
     VALID_RESPONSE_TYPES = Set.new [ServiceConstants::RESPONSE_TYPE_XML, ServiceConstants::RESPONSE_TYPE_JSON]
     def initialize()
       @query_params = Hash.new
       @headers = Hash.new
-      @resource_uri = "/"
+      @resource = "/"
       @operation = nil
       @request_id = nil
       @content_type = ServiceConstants::CONTENT_TYPE_JSON
@@ -295,26 +321,17 @@ module Distelli
       @response_type = ServiceConstants::RESPONSE_TYPE_JSON
     end
 
-    # Returns tho fully qualified uri by concatenating the endpoint
-    # and the resource_uri and adding the query params
-    def get_uri(endpoint)
-      uriparse_result = URI.parse(endpoint)
-      uri_str = endpoint
-      resource_uri = uriparse_result.path
-      if resource_uri == nil or resource_uri.length() == 0
-        resource_uri = "/"
-        uri_str = endpoint+resource_uri
-      end
-
-      @resource_uri = resource_uri
-      # now build the query string
+    def get_query_string()
       query_param_list = Array.new
       @query_params.each_pair do |k,v|
         v.each do |x|
           query_param_list.push(k+'='+x)
         end
       end
-      return uri_str+'?'+query_param_list.join('&')
+      if query_param_list.length() > 0
+        return '?'+query_param_list.join('&')
+      end
+      return nil
     end
 
     #Lets implement the to_s method of the RequestInfo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DistelliClientFramework
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: DistelliServiceMarshallers
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Distelli Client classes and marshallers for Ruby Clients