zuora_api 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa72c28936f7cc79bea9eb9b9e582080ad6721c
-  data.tar.gz: ed92237fb7c80a733922db3c33203b8be39d4d89
+  metadata.gz: 3519744d15acf7d302117624b6cddc11c9b1b029
+  data.tar.gz: 0636d89e841e13da8a2736ffd41f17f033527df6
 SHA512:
-  metadata.gz: d7573ebb6e0b2affa89490a8560f6f72d9601ef19a421a56ed5ed9c4c5c66104775d4c3c446f9cd24fe6f2e89e654e49261f333e4c39b361d0fe41be0bd21640
-  data.tar.gz: c28cab00aacdeb65daba3279904b0f2432da82aa97c8819af80fd955a4410fb6284dbcdf685df168c7723f5355ed2e81a6e7f09a1e98153637a7ce0c305d98a0
+  metadata.gz: f407d285e5e902c94723b152f60978656798826b208c003a37cab039063f96b7d9ade77c434807700ad603dd914a4c75fddf0206e5576ab59eb190a53a7c8614
+  data.tar.gz: 73582f5e5f6c3cc4701790b46302eefe8f430dbbbb133e5d06bb629e621191505253672debbd348095b1cea3d452978f8b5d41268c9f02cd77867af3a3ad2c66

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' ]
 
-    attr_accessor :username, :password, :url, :wsdl_number, :status, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :export_progress, :export_size
+    attr_accessor :username, :password, :url, :wsdl_number, :status, :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
@@ -99,6 +99,7 @@ module ZuoraAPI
               xml['api'].login do
                 xml['api'].username self.username
                 xml['api'].password self.password
+                xml['api'].entityId self.entity_id if !self.entity_id.blank?
               end
             end
           end
@@ -239,7 +240,8 @@ module ZuoraAPI
       self.get_session
       base = self.url.include?(".com") ? self.url.split(".com")[0] : self.url.split(".eu")[0]
       url = object ? "#{base}.com/apps/api/describe/#{object}" : "#{base}.com/apps/api/describe/"
-      response = HTTParty.get(url, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, basic_auth: {:username => self.username, :password => self.password})
+      headers = !self.entity_id.nil? ? {"entityId" => self.entity_id, 'Content-Type' => "text/xml; charset=utf-8"} : {'Content-Type' => "text/xml; charset=utf-8"}
+      response = HTTParty.get(url, :headers => headers , basic_auth: {:username => self.username, :password => self.password})
       output_xml = Nokogiri::XML(response.body)
       des_hash = Hash.new
       if object == nil
@@ -267,6 +269,7 @@ module ZuoraAPI
 
     def rest_call(method: :get, body: {},headers: {}, url: rest_endpoint("catalog/products?pageSize=4") , debug: true, **keyword_args)
       tries ||= 2
+      headers["entityId"] = self.entity_id if !self.entity_id.nil?
       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", "Authorization" => "ZSession #{self.get_session}"}.merge(headers)).perform
       Rails.logger.debug('Connect') { response.code} if debug
@@ -348,16 +351,16 @@ module ZuoraAPI
             temp_file = Tempfile.new([filename.rpartition('.').first, ".zip"], "#{Rails.root}/tmp")
             temp_file.binmode
 
-            size, self.export_progress = [0, 0]
-            self.export_size = response.header["Content-Length"].to_i
+            size, export_progress = [0, 0]
+            export_size = response.header["Content-Length"].to_i
             response.read_body do |chunk|
               temp_file << chunk.force_encoding("UTF-8")
               size += chunk.size
-              new_progress = (size * 100) / self.export_size
-              unless new_progress == self.export_progress
+              new_progress = (size * 100) / export_size
+              unless new_progress == export_progress
                 Rails.logger.debug("Login: #{self.username} Export Downloading %s (%3d%%)" % [filename, new_progress])
               end
-              self.export_progress = new_progress
+              export_progress = new_progress
             end
 
             temp_file.close
@@ -385,7 +388,7 @@ module ZuoraAPI
             xml['ns1'].create do
               xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
                 xml['ns2'].Format 'csv'
-                xml['ns2'].Zip "#{zip}"
+                xml['ns2'].Zip zip
                 xml['ns2'].Name 'googman'
                 xml['ns2'].Query query
                 xml['ns2'].Encrypted encrypted
@@ -429,6 +432,10 @@ module ZuoraAPI
         location = extract_zip(zip_file.path, "#{file_id}")
         File.delete(zip_file.path)
         return location
+      elsif !zip
+        file = get_file(:file_name => "#{file_id}.gpg" ,:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}", headers: {"Authorization" => "ZSession " + self.current_session})
+        puts file.path
+        return file.path
       else
         return zip_file.path
       end

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler