responsys-api 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c58dabbbc30ada0598409ef51e03261727c7e9f
-  data.tar.gz: 99998f69378d08f201ef7f2237f5ba539ba7f835
+  metadata.gz: 84547cf31f537da62287c2dcb67e45d3ca767323
+  data.tar.gz: 465b7023b7b30abf01d29392b76699d2666927d2
 SHA512:
-  metadata.gz: ed4209c6e94719176a85d2a509473a324a73663ccc2ab98b947802a98c38bcbd990da8eafcca56a7efeae46a4cb6e7325171f43ee16212f64827d31528088f8b
-  data.tar.gz: 6f1c45aede0988f1d8bbe4961eb70dedbc3d062f7be0d8bff92177fc07b862f155de88a3a5b4be2672711162e497c173c3cd34a9e39667f16792bfd7331362b2
+  metadata.gz: 063b69c6e94269e0bd9b91cc2c3898ad8d5f94b531424b893c0a3f5adbbb953c5ee016b01379acecdb61bc1c9ad71875177eb2d4d6f5dbddb834870e238cecf2
+  data.tar.gz: d21ec3c1160d93e4197eb1867bd7ad54ab52f8ab999acace83c1bf236b2f869c65b7e9c74b3fc5416b959aefe50e943c5cd66526e093093029301a5c3886633a

data/lib/responsys/helper.rb

@@ -64,13 +64,13 @@ module Responsys
 
     def self.format_response_with_errors(error)
       error_response = { status: "failure" }
-
-      if error.to_hash[:fault].has_key?(:detail) and !error.to_hash[:fault][:detail].nil?
-        key = error.to_hash[:fault][:detail].keys[0]
-        error_response[:error] = { http_status_code: error.http.code, code: error.to_hash[:fault][:detail][key][:exception_code], message: error.to_hash[:fault][:detail][key][:exception_message] }
-        error_response[:error][:trace] = error.to_hash[:fault][:detail][:source] if error.to_hash[:fault][:detail].has_key?(:source)
-      else
-        error_response[:error] = { http_status_code: error.http.code, code: error.to_hash[:fault][:faultcode], message: error.to_hash[:fault][:faultstring] }
+      case error
+        when Savon::SOAPFault
+          error_response.merge!(format_soap_fault(error))
+        when Savon::HTTPError
+          error_response.merge!(format_http_error(error))
+        else
+          raise error
       end
 
       error_response
@@ -87,5 +87,30 @@ module Responsys
         I18n.t(key, scope: :responsys_api, locale: :en, default: "Responsys - Unknown message '#{key}'")
       end
     end
+
+    class << self
+      private
+      def format_soap_fault(error)
+        error_response = {}
+        if error.to_hash[:fault].has_key?(:detail) and !error.to_hash[:fault][:detail].nil?
+          key = error.to_hash[:fault][:detail].keys[0]
+          error_response[:error] = { http_status_code: error.http.code, code: error.to_hash[:fault][:detail][key][:exception_code], message: error.to_hash[:fault][:detail][key][:exception_message] }
+          error_response[:error][:trace] = error.to_hash[:fault][:detail][:source] if error.to_hash[:fault][:detail][:source]
+        else
+          error_response[:error] = { http_status_code: error.http.code, code: error.to_hash[:fault][:faultcode], message: error.to_hash[:fault][:faultstring] }
+        end
+        error_response
+      end
+
+      def format_http_error(error)
+        {
+          error: {
+            http_status_code: error.to_hash[:code],
+            message: error.to_hash[:body],
+          }
+        }
+      end
+    end
+
   end
 end

data/responsys-api.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "responsys-api"
-  spec.version       = "0.2.6"
+  spec.version       = "0.2.7"
   spec.authors       = ["Dan DeMeyere", "Florian Lorrain", "Morgan Griggs", "Mike Rocco"]
   spec.email         = ["dan@thredup.com", "florian.lorrain@thredup.com", "morgan@thredup.com", "michael.rocco@thredup.com"]
   spec.description   = "A gem to integrate with the Responsys SOAP API"

data/spec/fixtures/soap_fault.xml

@@ -0,0 +1,8 @@
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Body>
+    <soap:Fault>
+      <faultcode>soap:Server</faultcode>
+      <faultstring>Fault occurred while processing.</faultstring>
+    </soap:Fault>
+  </soap:Body>
+</soap:Envelope>

data/spec/helper_spec.rb

@@ -35,6 +35,40 @@ describe Responsys::Helper do
       expect(Responsys::Helper.get_message(message_key))
         .to eq("Responsys - Unknown message 'member.record_not_found'")
     end
+  end
+
+  describe '#format_response_with_error' do
+    let(:nori) { Nori.new(:strip_namespaces => true, :convert_tags_to => lambda { |tag| tag.snakecase.to_sym }) }
+
+    it 'will format a Savon::SOAPFault response' do
+      fault_body = File.read File.expand_path "../fixtures/soap_fault.xml", __FILE__
+      http_response = HTTPI::Response.new 500, {}, fault_body
+      soap_fault = Savon::SOAPFault.new http_response, nori
+
+      result = Responsys::Helper.format_response_with_errors(soap_fault)
+      expect(result[:status]).to eq "failure"
+      expect(result[:error][:http_status_code]).to eq 500
+      expect(result[:error][:code]).to eq "soap:Server"
+      expect(result[:error][:message]).to eq "Fault occurred while processing."
+    end
+
+    it 'will format a Savon::HTTPError' do
+      http_response = HTTPI::Response.new 503, {}, "Service unavailable"
+      http_error = Savon::HTTPError.new(http_response)
+      result = Responsys::Helper.format_response_with_errors(http_error)
+
+      expect(result[:status]).to eq "failure"
+      expect(result[:error][:http_status_code]).to eq 503
+      expect(result[:error][:message]).to eq "Service unavailable"
+    end
+
+    it 'will re-raise a unformattable Savon error' do
+      unformattable_error = Savon::InvalidResponseError.new
+      expect{
+        Responsys::Helper.format_response_with_errors(unformattable_error)
+      }.to raise_error(Savon::InvalidResponseError)
+    end
 
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: responsys-api
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Dan DeMeyere
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyntlm
@@ -274,6 +274,7 @@ files:
 - spec/api/table_spec.rb
 - spec/api_credentials.sample.yml
 - spec/configuration_spec.rb
+- spec/fixtures/soap_fault.xml
 - spec/fixtures/vcr_cassettes/api/campaign/trigger_custom_event_1.yml
 - spec/fixtures/vcr_cassettes/api/campaign/trigger_custom_event_2.yml
 - spec/fixtures/vcr_cassettes/api/campaign/trigger_message_1.yml
@@ -339,6 +340,7 @@ test_files:
 - spec/api/table_spec.rb
 - spec/api_credentials.sample.yml
 - spec/configuration_spec.rb
+- spec/fixtures/soap_fault.xml
 - spec/fixtures/vcr_cassettes/api/campaign/trigger_custom_event_1.yml
 - spec/fixtures/vcr_cassettes/api/campaign/trigger_custom_event_2.yml
 - spec/fixtures/vcr_cassettes/api/campaign/trigger_message_1.yml