zuora_api 1.3.9993 → 1.3.9994

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0202e43f863f6c4e5956313337ed743e5857fa3
-  data.tar.gz: 0b57363605fb505c7ebab46ebcb2c638e59dddfb
+  metadata.gz: bb771efe44918a884178a46340720e08717a0e35
+  data.tar.gz: 0d22b870b2ed2543d57fed05f0ac56cc16636b98
 SHA512:
-  metadata.gz: 342e6a5e2f71092949e01a1a2c139e4f7ae86a7d57d2fe5b45671d279e0a021342c58e12192b4fb1cb44289ec272db2cadc154ac3500cce4f3c83b9cb66a31be
-  data.tar.gz: dcd429dca5c927f183766dc4c6df92cc0332f41b952a32c6161c22116d7624f187f5ee70c0e5ea0e040fe51a315a93225505e609182ad21e55a5b3422434a91a
+  metadata.gz: 65e01572cf4210b43f4718aecd47d62952204b33e5a8772d1a2764913129326e1097cadbdb30fd1e004ecea52873f9596860cae091459114a596e42d5a32b771
+  data.tar.gz: acef40f0eaac21596127aea716f321bf7b99d17f61a13cd81340e4fc68f8d8e612dfbb20f9416fb94d071af71d171c3cfcd71de4157d7335192c0ab12116f665

data/.gitlab-ci.yml

@@ -29,9 +29,8 @@ security-testing:
 
 rspec-testing:
   stage: test
-  allow_failure: true
   script:
-  - gem install rspec
+  - bundle install --path /cache
   - rspec
 
 rubygems-deploy:

data/lib/zuora_api/login.rb

@@ -5,7 +5,7 @@ module ZuoraAPI
   class Login
     ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown' ]
     REGIONS = [EU = 'EU', US = 'US' ]
-    attr_accessor :username, :password, :region,:url, :wsdl_number, :status, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id
+    attr_accessor :username, :password, :region,:url, :wsdl_number, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id
 
     def initialize(username: nil, password: nil, url: nil, entity_id: nil, session: nil, **keyword_args)
       @username = username
@@ -115,6 +115,7 @@ module ZuoraAPI
       end
       @response_query = HTTParty.post(self.url,:body => request.to_xml, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => 10)
       @output_xml = Nokogiri::XML(@response_query.body)
+
       if !@response_query.success?
         self.current_session = nil
         if @output_xml.namespaces.size > 0  && @output_xml.xpath('//soapenv:Fault').size > 0
@@ -162,8 +163,18 @@ module ZuoraAPI
           self.status = 'No Service'
         end
       else
-        self.current_session   = (self.password.blank? && !self.current_session.blank?) ?  self.current_session :  @output_xml.xpath('//ns1:Session', 'ns1' =>'http://api.zuora.com/').text
-        self.username          = @output_xml.xpath('//ns1:Username', 'ns1' =>'http://api.zuora.com/').text if self.username.blank?
+        #If Session only is used for Gem TODO Depercate
+        if (self.password.blank? && self.current_session.present?)
+          self.current_session = self.current_session 
+          self.username        = @output_xml.xpath('//ns1:Username', 'ns1' =>'http://api.zuora.com/').text if self.username.blank?
+          
+        #Username & password combo
+        elsif (self.password.present? && self.username.present?)
+          retrieved_session = @output_xml.xpath('//ns1:Session', 'ns1' =>'http://api.zuora.com/').text
+          raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("No session found for api call.") if retrieved_session.blank?
+          self.current_session = retrieved_session
+        end
+        
         self.current_error     = nil
         self.status            = 'Active'
       end
@@ -252,35 +263,69 @@ module ZuoraAPI
     def raise_errors(type: :SOAP, body: nil, response: nil)
       case type
       when :SOAP
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text}::#{body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text}")  if (!body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text.blank? && body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text == "INVALID_SESSION")
-  
-        raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text}::#{body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text}")  if (!body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text.blank? && body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text == "REQUEST_EXCEEDED_LIMIT")
-        raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text}::#{body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text}")  if (!body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text.blank? && body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text == "REQUEST_EXCEEDED_LIMIT")
 
-        raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text}::#{body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text}")  if (!body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text.blank? && body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text == "LOCK_COMPETITION")
-        raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text}::#{body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text}")  if (!body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text.blank? && body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text == "LOCK_COMPETITION")
+        error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
+        message = body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
 
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text}::#{body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text}") if !body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text.blank?
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body.xpath('//faultcode').text}::#{body.xpath('//faultstring').text}")  if !body.xpath('//faultcode').text.blank?
+        if error.blank? || message.blank?
+          error   = body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text
+          message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text
+        end
+        if error.blank? || message.blank?
+          error   = body.xpath('//faultcode').text
+          message = body.xpath('//faultstring').text
+        end
+
+        if error.present?
+          if error == "INVALID_SESSION"
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}")
+          end
+          if error == "REQUEST_EXCEEDED_LIMIT"
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}")
+          end
+          if error == "LOCK_COMPETITION"
+            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}")
+          end
+          if error.present?
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}")
+          end
+        end
  
-      when :JSON
-        #Zuora Regular REST API Unauthorized
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["reasons"][0]["message"]}") if body.class != Array &&  (!body["success"] && !body["reasons"].blank? && body["reasons"] == Array &&  body["reasons"][0]["code"] == 90000011 && response.code == 401)
-        #Zuora AQuA Unauthorized
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Unauthorized") if response.code == 401
-       
-        #Zuora REST API Limit Errors
-        raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["reasons"][0]["message"]}") if body.class != Array && (!body["success"] && !body["reasons"].blank? && body["reasons"] == Array &&  body["reasons"][0]["code"] == 50000070 && response.code == 429)
-        
-        raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["reasons"][0]["message"]}") if (!body["success"] && !body["reasons"].blank? && body["reasons"] == Array &&  body["reasons"][0]["code"] == 53200050)
+      when :JSON        
+        if body.class == Hash && (!body["success"] || !body["Success"] || response.code != 200)
+          messages_array = (body["reasons"] || []).map {|error| error['message']}.compact
+          codes_array = (body["reasons"] || []).map {|error| error['code']}.compact
+
+          #Authentication failed
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(11) || response.code == 401
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}")
+          end
 
-        #Zuora REST Query Errors
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}") if body.class != Array &&  !body["faultcode"].blank?
-        #Zuora REST actions error
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["Errors"][0]["Code"]}::#{body["Errors"][0]["Message"]}") if body.class != Array && !body["Success"] && body["Errors"]
-        #Zuora All Other API Errors
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}") if response.code != 200
+          #Request exceeded limit
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}")
+          end
+
+          #Locking contention
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(50)
+            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}")
+          end
+
+          #Zuora REST Query Errors
+          if body["faultcode"].present?
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}")
+          end
+        end
 
+        if body.class == Array && (!body[0]["Success"])
+          #Zuora REST Actions error (Create, Update, Delete)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body[0]["Errors"][0]["Code"]}::#{body[0]["Errors"][0]["Message"]}") 
+        end
+
+        #All other errors
+        if response.code != 200
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}")
+        end
       end
     end
 
@@ -365,9 +410,14 @@ module ZuoraAPI
       headers["entityId"] = self.entity_id if !self.entity_id.blank?
       raise "Method not supported, supported methods include: :get, :post, :put, :delete, :patch, :head, :options" if ![:get, :post, :put, :delete, :patch, :head, :options].include?(method)
       response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: {'Content-Type' => "application/json; charset=utf-8"}.merge(z_session ? {"Authorization" => "ZSession #{self.get_session}"} : {}).merge(headers), timeout: 120).perform
-      Rails.logger.debug('Connect') { response.code} if debug
-      output_json = JSON.parse(response.body)
-      Rails.logger.debug('Connect') {"Response JSON: #{output_json}"} if debug
+
+      Rails.logger.debug('Connect') {"Response Code: #{response.code}" } if debug
+      begin
+        output_json = JSON.parse(response.body)
+      rescue JSON::ParserError => ex
+        output_json = {}
+      end
+      Rails.logger.debug('Connect') {"Response JSON: #{output_json}"} if debug && output_json.present?
 
       raise_errors(type: :JSON, body: output_json, response: response)
 

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.3.9993"
+  VERSION = "1.3.9994"
 end

data/zuora_api.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency("webmock")
+  spec.add_development_dependency("simplecov")
   spec.add_dependency("nokogiri", "~>1.6.8")
   spec.add_dependency("httparty")
   spec.add_dependency("rubyzip")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.3.9993
+  version: 1.3.9994
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +149,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"