DistelliServiceFrameworkRails 1.0 → 1.1

data/lib/distelli/serviceframeworkrails.rb

@@ -7,7 +7,8 @@ module DistelliServiceFrameworkRails
   $json_marshaller = Distelli::JsonMarshaller.new
 
   def get_request_id()
-    request_id = request.headers[Distelli::ServiceConstants::REQUEST_ID_HEADER]
+    header_name = Distelli::ServiceConstants::REQUEST_ID_HEADER.upcase().gsub("-", "_")
+    request_id = request.headers[header_name]
     if request_id != nil
       return request_id
     end
@@ -19,12 +20,13 @@ module DistelliServiceFrameworkRails
 
     # Create a new request id
     request_id = SecureRandom.uuid
-    request.headers[Distelli::ServiceConstants::REQUEST_ID_HEADER] = request_id
+    request.headers[header_name] = request_id
     return request_id
   end
 
   def get_response_type()
-    response_type = request.headers[Distelli::ServiceConstants::RESPONSE_TYPE_HEADER]
+    header_name = Distelli::ServiceConstants::RESPONSE_TYPE_HEADER.upcase().gsub("-","_")
+    response_type = request.headers[header_name]
     if response_type != nil
       return validate_response_type(response_type)
     end
@@ -38,12 +40,8 @@ module DistelliServiceFrameworkRails
   end
 
   def get_operation()
-    # First check to see if there is the operation header.
-    # If there is then thats the operation
-    # If not then check to see if there is the operation query param
-    # If it is then thats the operation
-    # else the operation is null
-    op_name = request.headers[Distelli::ServiceConstants::OPERATION_HEADER]
+    header_name = Distelli::ServiceConstants::OPERATION_HEADER.upcase().gsub("-","_")
+    op_name = request.headers[header_name]
     if op_name != nil
       return op_name
     end
@@ -55,12 +53,11 @@ module DistelliServiceFrameworkRails
     return params[Distelli::ServiceConstants::OPERATION_PARAM]
   end
 
-  # def handle_stuff(status, content_type, body)
-  #   response.status = status
-  #   response.headers["Content-Type"] = content_type
-  #   #    render :inline => body, :status => status
-  #   self.response_body = "DistelliSFR Body: "+body
-  # end
+  def get_content_type()
+    header_name = Distelli::ServiceConstants::CONTENT_TYPE_HEADER.upcase().gsub("-","_")
+    content_type = request.headers[header_name]
+    return content_type
+  end
 
   def validate_response_type(response_type)
     if response_type == nil
@@ -77,7 +74,7 @@ module DistelliServiceFrameworkRails
   end
 
   def unmarshall_request()
-    content_type = request.headers[Distelli::ServiceConstants::CONTENT_TYPE_HEADER]
+    content_type = get_content_type()
     if content_type == Distelli::ServiceConstants::CONTENT_TYPE_JSON
       return $json_marshaller.unmarshall(request.body)
     elsif content_type == Distelli::ServiceConstants::CONTENT_TYPE_XML
@@ -119,6 +116,7 @@ module DistelliServiceFrameworkRails
     if error.is_a?(Distelli::BaseException)
       response.status = error.http_code
     else
+#      LOGGER.error("Unhandled Exception: "+error.message+" "+error.backtrace.join("    \n"))
       error = Distelli::ServerError.new("Cannot marshall error of type "+error.class.name+" Defaulting to ServerError")
       response.status = error.http_code
     end
@@ -136,7 +134,7 @@ module DistelliServiceFrameworkRails
       response.headers.update(headers_hash)
       self.response_body = $xml_marshaller.marshall_error(error)
     else
-      LOGGER.error("Invalid Response Type: "+response_type)
+#      LOGGER.error("Invalid Response Type: "+response_type)
       error = ServerError.new("Invalid response type: "+response_type)
       response.status = error.http_code
       headers_hash[Distelli::ServiceConstants::CONTENT_TYPE_HEADER] = Distelli::ServiceConstants::CONTENT_TYPE_JSON

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DistelliServiceFrameworkRails
 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-10-04 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails