DistelliClientFramework 1.0 → 1.1

data/lib/distelli/clientframework.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'set'
-require 'logger'
+require 'logging'
 require 'distelli/servicemarshallers'
 require 'securerandom'
 require 'net/http'
@@ -11,15 +11,6 @@ require 'openssl'
 require 'base64'
 
 module Distelli
-  module Logging
-    def logger
-      Logging.logger
-    end
-
-    def self.logger
-      @logger ||= Logger.new(STDOUT)
-    end
-  end
 
   class ClientException < StandardError
   end
@@ -33,8 +24,8 @@ module Distelli
   end
 
   class RequestSigner
-    include Distelli::Logging
     def initialize()
+      @logger = Logging::Logger['RequestSigner']
     end
 
     def get_string_to_sign(request_info)
@@ -99,7 +90,7 @@ module Distelli
 
     def get_signature(secret_key, request_info)
       string_to_sign = get_string_to_sign(request_info)
-      logger.debug("StringToSign:\n"+string_to_sign)
+      @logger.debug("StringToSign:\n"+string_to_sign)
       return hmacsha(secret_key, string_to_sign)
     end
 
@@ -111,13 +102,12 @@ module Distelli
   end
 
   class ClientBase
-    include Distelli::Logging
     def initialize(credentials, endpoint=nil)
       @credentials = credentials
       @endpoint = endpoint
       @json_marshaller = JsonMarshaller.new
       @xml_marshaller = XmlMarshaller.new
-      @logger = nil
+      @logger = Logging::Logger['ClientBase']
     end
 
     def set_endpoint(endpoint)
@@ -136,7 +126,7 @@ module Distelli
       if @endpoint == nil
         raise ClientException.new("Invalid endpoint: "+@endpoint.to_s)
       end
-      logger.debug("Executing request to endpoint: "+@endpoint.to_s)
+      @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
@@ -179,15 +169,14 @@ module Distelli
 
       http_method = request_info.http_method
       http_client = Net::HTTP.new(uri.host, uri.port)
-      http_client.set_debug_output($stdout)
       if http_method == ServiceConstants::HTTP_METHOD_GET
-        logger.debug("Executing GET: "+request_info.to_s)
+        @logger.debug("Executing GET: "+request_info.to_s)
         # Create the http request with the URI, Query Params and Headers
         http_request = Net::HTTP::Get.new(uri.request_uri, request_info.headers)
         # Execute the request to get the response
         response = http_client.request(http_request)
       elsif http_method == ServiceConstants::HTTP_METHOD_POST
-        logger.debug("Executing POST: "+request_info.to_s)
+        @logger.debug("Executing POST: "+request_info.to_s)
         payload = get_payload(request_info)
         # Create the http request with the URI, Query Params and Headers
         http_request = Net::HTTP::Post.new(uri.request_uri, request_info.headers)
@@ -196,7 +185,7 @@ module Distelli
         # Execute the request to get the response
         response = http_client.request(http_request)
       elsif http_method == ServiceConstants::HTTP_METHOD_PUT
-        logger.debug("Executing PUT: "+request_info.to_s)
+        @logger.debug("Executing PUT: "+request_info.to_s)
         payload = get_payload(request_info)
         # Create the http request with the URI, Query Params and Headers
         http_request = Net::HTTP::Put.new(uri.request_uri, request_info.headers)
@@ -205,7 +194,7 @@ module Distelli
         # Execute the request to get the response
         response = http_client.request(http_request)
       elsif http_method == ServiceConstants::HTTP_METHOD_DELETE
-        logger.debug("Executing DELETE: "+request_info.to_s)
+        @logger.debug("Executing DELETE: "+request_info.to_s)
         # Create the http request with the URI, Query Params and Headers
         http_request = Net::HTTP::Delete.new(uri.request_uri, request_info.headers)
         # Execute the request to get the response
@@ -225,11 +214,11 @@ module Distelli
       if request != nil
         if request_info.content_type == nil or request_info.content_type == ServiceConstants::CONTENT_TYPE_JSON
           marshalled_payload = @json_marshaller.marshall(request)
-          logger.debug("Marshalled Payload: "+marshalled_payload)
+          @logger.debug("Marshalled Payload: "+marshalled_payload)
           return marshalled_payload
         elsif request_info.content_type == ServiceConstants.CONTENT_TYPE_XML
           marshalled_payload = @xml_marshaller.marshall(request)
-          logger.debug("Marshalled Payload: "+marshalled_payload)
+          @logger.debug("Marshalled Payload: "+marshalled_payload)
           return marshalled_payload
         end
       end
@@ -238,7 +227,7 @@ module Distelli
     def handle_response(response)
       http_status_code = response.code
       content_type = response[ServiceConstants::CONTENT_TYPE_HEADER]
-      logger.debug("Received Response "+http_status_code.to_s+", Content-Type: "+content_type.to_s+", Payload: "+response.body.to_s)
+      @logger.debug("Received Response "+http_status_code.to_s+", Content-Type: "+content_type.to_s+", Payload: "+response.body.to_s)
       if http_status_code.to_i/100 != 2
         error = nil
         if content_type != nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DistelliClientFramework
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: DistelliServiceMarshallers