nfg-client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzY4OGY4MGQ0ZTRhY2FkYzQ5NTU0MTdlODE3YWY1YjkwOWViM2JiNw==
+    OGRmZDY3ZDM3OTM0ODdkM2RjNmY2NDhkOTNkZTgzMThkNTI1MjJhMQ==
   data.tar.gz: !binary |-
-    MWZkMzFiZTQ0N2E4ZGYxN2VhMjI0NmJjN2Y5MmY4M2NhODJmMGE4ZQ==
+    YWVlNjNkZWUxNzNiN2E2ZmNhMTMxNDRiMDFiMWRmYzI5NDY1MWUwOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTZhOGFkMTZlMjM0MThhY2EyNzgzMTMzZTQyYTgyYTU5YWJiNDg4Mzk1OWY0
-    N2MwYzhhZjBlNWQ0YjNlYTkxMzA5NGFjMmQ1N2FiZDJkZjNjZDg5MDYwMzE5
-    NjRlZDQwZjJjZmJhMTYxMGFlMTY5YzQ2MWVjZDU0YTc4MjJlNTk=
+    ZjFhYjcwN2E0NDkyYjU5NGY4MTM4YWQzYzk0YzIwYjg2YjlmYTlmNDk0ZTY4
+    NGJkOTQ5N2VjMjlmNDJhMWI3YjM3ZmQ3ZDVjODE5ODUzZTUyM2U2YTY2NjRl
+    ZTkxMjFlNzhhZTFjNjFhYjI0OWUzZDBmOTE1NjJkYjM1ZDBmNjU=
   data.tar.gz: !binary |-
-    NDBmOTJkMjA1OWE4NjU3NTVjZDdmNDNmYzQ2NWMyZGIyNGQ5NjBjNjYzZThi
-    Yjc5OGJhOWExM2YxNGE4YmFmNThhYzM5MmY4YjkyNDZlMzI4ZTI5MTljYjZi
-    YzEwZDhjNjAzMDZmZDVkNDhhMGM2NzBkNTFmYmM1MDQxNTZkNWM=
+    Y2M3ZGIzMjk2ZjE0YmZkNTBkNWIyYzZhMjc4OTk4MDUyZmE4MjI3ODU3ZTRm
+    NzY0MTc5NTRkYWZhZmFkODU2NzExMTM5ZmRlMTNjYjBmNTdlZWY3YWVjYjQ2
+    ODc2YjgzZWM5YzVmNmIyZWFmNTNkYmMyZTAxN2U5ZTkxYTE0NDc=

data/lib/nfg-client/utils.rb

@@ -23,34 +23,18 @@ module NFGClient
     #   params: (Hash)
     def nfg_soap_request(nfg_method, params)
       if (nfg_method.is_a? String) && (params.is_a? Hash)
-        
+
         # Build SOAP 1.2 request
         soap_request = build_nfg_soap_request(nfg_method, params)
 
         headers = format_headers(nfg_method, soap_request)
 
-        return_value = Hash.new
-
         # Being HTTP Post
         begin
           response = ssl_post(soap_request, headers)
-          if response.code == '200'
-            parsed = REXML::Document.new(response.body)
-            # Build return hash parsing XML response
-            if parsed.root.nil?
-              return_value['StatusCode'] = 'MissingParameter'
-              return_value['Message'] = response.body
-              return_value['ErrorDetails'] = nil
-            else
-              return_value = parsed.root.elements['soap:Body'].elements["#{nfg_method}Response"].elements["#{nfg_method}Result"]
-            end
-          else
-            return_value['StatusCode'] = 'UnexpectedError'
-            return_value['Message'] = response.message
-            return_value['ErrorDetails'] = response.body
-          end
+          return_value = parse_result(response.code, response.body, response.message, nfg_method)
         rescue StandardError => e
-          p e
+          return_value = Hash.new
           return_value['StatusCode'] = 'UnexpectedError'
           return_value['Message'] = e
           return_value['ErrorDetails'] = e.backtrace.join(' ')
@@ -67,6 +51,33 @@ module NFGClient
       get_nfg_soap_request_template.gsub('|body|',"<#{nfg_method} xmlns=\"http://api.networkforgood.org/partnerdonationservice\">#{hash_to_xml(params)}</#{nfg_method}>")
     end
 
+    # Parses the response code and body and returns and appropriate result hash
+    #
+    # Arguments:
+    #   code: (String)
+    #   body: (XML string)
+    #   message: string
+    #   nfg_method: string
+    def parse_result(code, body, message, nfg_method)
+      return_value = Hash.new
+      if code == '200'
+        parsed = REXML::Document.new(body)
+        # Build return hash parsing XML response
+        if parsed.root.nil?
+          return_value['StatusCode'] = 'MissingParameter'
+          return_value['Message'] = body
+          return_value['ErrorDetails'] = nil
+        else
+          return_value = parsed.root.elements['soap:Body'].elements["#{nfg_method}Response"].elements["#{nfg_method}Result"]
+        end
+      else
+        return_value['StatusCode'] = 'UnexpectedError'
+        return_value['Message'] = message
+        return_value['ErrorDetails'] = body
+      end
+      return_value
+    end
+
     # Returns a SOAP template with no body
     def get_nfg_soap_request_template
       "<?xml version=\"1.0\" encoding=\"utf-8\"?><soap12:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap12=\"http://www.w3.org/2003/05/soap-envelope\"><soap12:Body>|body|</soap12:Body></soap12:Envelope>"

data/lib/nfg-client/version.rb

@@ -1,3 +1,3 @@
 module NFGClient
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/remote/nfg-client_remote_spec.rb

@@ -101,14 +101,15 @@ describe NFGClient do
   end
 
   describe "get_donor_donation_history" do
-    it "should return something" do
+    it "should return the donation history for the donor" do
       result = nfg_client.create_cof(create_cof_params)
       params = make_donation_add_cof_params
       result = nfg_client.make_donation_add_cof(params)
       result =  nfg_client.get_donor_donation_history(DonorToken: params[:DonorToken])
 
       expect(result["StatusCode"]).to eql('Success')
-      expect(result["Donations"]).to eql('Success')
+      expect(result["Donations"].length).to eql(1)
+      expect(result["Donations"].first["ChargeId"]).to_not be_empty
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nfg-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Antonio Ruano Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: andand