citygrid_api 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/citygrid_api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "citygrid_api"
-  s.version = "0.0.19"
+  s.version = "0.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elpizo Choi"]
-  s.date = "2012-09-11"
+  s.date = "2012-10-22"
   s.description = "Ruby wrapper for CityGrid APIs"
   s.email = "fu7iin@gmail.com"
   s.extra_rdoc_files = [

data/lib/citygrid/api.rb

@@ -182,12 +182,19 @@ class CityGrid
 
         begin
           response = req.perform
-        rescue => ex
-          raise CityGridExceptions::RequestError.new req_for_airbrake, ex
+        rescue => ex  
+          if defined?(Rails.logger)
+            Rails.logger.error safe_req_options
+            Rails.logger.error req_to_output
+            Rails.logger.error req_for_airbrake
+            Rails.logger.error ex
+          end
+          raise CityGridExceptions::RequestError.new req_for_airbrake, nil, ex.message, req_to_output.to_curl
         ensure
           if CityGrid.print_curls? 
             if defined?(Rails.logger)
               Rails.logger.info req_to_output.to_curl
+              puts req_to_output.to_curl
             else
               puts req_to_output.to_curl
             end
@@ -200,11 +207,11 @@ class CityGrid
           # catch unparsable responses (html etc)
           if !response.parsed_response.is_a?(Hash)
             #pp "[gem] the response was unparsable (response was not a hash)"
-            raise CityGridExceptions::ResponseParseError.new req_for_airbrake, response
+            raise CityGridExceptions::ResponseParseError.new req_for_airbrake, response, "the response was unparsable (response was not a hash)", req_to_output.to_curl
           else
             # Parse and handle new response codes 
             if !response_status.nil? && response_status["code"] != "SUCCESS" && response_status["code"] != 200
-              raise CityGridExceptions.appropriate_error(response_status["code"]).new req_for_airbrake, response, response_status["message"].to_s #+ " " + CityGridExceptions.print_superclasses(response_status["code"])
+              raise CityGridExceptions.appropriate_error(response_status["code"]).new req_for_airbrake, response, response_status["message"].to_s, req_to_output.to_curl
             else
               return CityGrid::API::Response.new response
             end

data/lib/citygrid/citygrid_exceptions.rb

@@ -3,11 +3,12 @@ module CityGridExceptions
   # Define parent error classes
   # All errors thrown in the API should extend APIError - Level 1
   class APIError < StandardError
-    attr_accessor :request, :response
+    attr_accessor :request, :response, :curl
     
-    def initialize request, response, msg = "An API error occurred"
+    def initialize request, response, msg = "An API error occurred", curl=nil
       @request = request
       @response = response
+      @curl = curl
       super msg
     end
   end
@@ -19,10 +20,11 @@ module CityGridExceptions
 
   class ResponseParseError < APIError
     attr_accessor :server_msg, :description, :raw_response
-    def initialize request, response, msg = nil
+    def initialize request, response, msg = nil, curl=nil
       self.raw_response = response
       # parse Tomcat error report
-      if response.match /<title>Apache Tomcat.* - Error report<\/title>/
+      Rails.logger.error response.body if defined?(Rails.logger)
+      if response.body.include?("<title>Apache Tomcat.* - Error report<\/title>")
         response.scan(/<p><b>(message|description)<\/b> *<u>(.*?)<\/u><\/p>/).each do |match|
           case match[0]
           when "message"
@@ -150,8 +152,8 @@ module CityGridExceptions
   { 
     0 => ResponseError, nil => ResponseParseError, "" => ResponseParseError, 400 => RequestError,
     401 => AuthenticationError, 403 => RequestError, 405 => RequestError, 406 => HeaderError,
-    409 => RequestError, 410 => RequestError, 415 => RequestError, 413 => RequestError, 414 => RequestError,
-    424 => AuthTokenInvalidError, 500 => ResponseError, "CONTENT_API_ERROR" => ContentApiError, "SYSTEM_ERROR_TRY_AGAIN" => SystemErrorTryAgainError,
+    409 => RequestError, 410 => RequestError, 415 => RequestError, 413 => RequestError, 414 => RequestError, 
+    500 => ResponseError, "CONTENT_API_ERROR" => ContentApiError, "SYSTEM_ERROR_TRY_AGAIN" => SystemErrorTryAgainError,
     "SYSTEM_ERROR_UNKNOWN" => SystemErrorUnknownError, "BAD_REQUEST_TYPE" => BadRequestTypeError,
     "INVALID_REQUEST_BODY" => InvalidRequestBodyError,
     "HEADER_CONTENT_TYPE_IS_REQUIRED" => ContentTypeRequiredError, "HEADER_CONTENT_TYPE_INVALID" => ContentTypeInvalidError,
@@ -188,13 +190,4 @@ module CityGridExceptions
     end
   end
 
-  def CityGridExceptions.print_superclasses error_code
-    begin
-      raise appropriate_error[error_code]
-    rescue => ex
-      class_hierarchy = ex.class.ancestors
-      class_hierarchy.slice!(class_hierarchy.index(StandardError)..-1)
-      return class_hierarchy.reverse.join("::")
-    end
-  end
 end

metadata

@@ -2,7 +2,7 @@
 name: citygrid_api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors: 
 - Elpizo Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-11 00:00:00 Z
+date: 2012-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty