zuora_api 1.3.999992 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e16db7660f468c8131a614af479710e16bcf0b75
-  data.tar.gz: aaf9738044021f91b076d495ae3a07f8d3626763
+  metadata.gz: 023d51f61b28c69e9371fc59b16880106fdc8782
+  data.tar.gz: 246af4a2749dcbdf9ef8285d385e8d97fb0a912d
 SHA512:
-  metadata.gz: d7f1814714cbeccb40b5feaf1efafd62e99df28fcb38f5c4e5e7a17a79b8e3d0fbb5f156ca0e6d09c317e749b4be599cf324a840d3aea93317a53f5bc9c2cc9c
-  data.tar.gz: 38dadd75f068a6db1b60bbc52632d66d499800bcd210ace30da7ab29a6968904beac5471078075fd8f7aac00c42ec9e5e33ef06ccba38a3609ad739a859f3178
+  metadata.gz: 5bd2b25793d66dc74077e4454544b0a50850ffc22a92d6938b1d1ff83aa3d206dc31de15f19184eb99cab3751b35de89e6173354742793f166bbd3d5864c88dd
+  data.tar.gz: 9f81b7d43aabd6b2e9fabe87e86b5abd2185ea85ce5050f445021c719a5e8afe527b1a096017cda80305b044be71099d52a1b813a6e35e0e211b73adb62edcd0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.3.999992)
+    zuora_api (1.4.0)
       httparty
       nokogiri (~> 1.6.8)
       railties (>= 4.1.0, < 5.1)
@@ -35,10 +35,10 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
-    hashdiff (0.3.6)
+    hashdiff (0.3.7)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     i18n (0.9.1)
@@ -53,7 +53,7 @@ GEM
     multi_xml (0.6.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    public_suffix (3.0.0)
+    public_suffix (3.0.1)
     rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -69,19 +69,19 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     simplecov (0.15.1)
@@ -93,7 +93,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    webmock (3.0.1)
+    webmock (3.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/lib/insights_api/login.rb

@@ -1,5 +1,4 @@
 require "httparty"
-require "zip"
 module InsightsAPI
   class Login
     attr_accessor :api_token, :url
@@ -189,6 +188,7 @@ module InsightsAPI
     end
 
     def gzip_file(filePath)
+      require "zip"
       Zlib::GzipWriter.open(filePath + ".gz") do |gzip|
          open(filePath, "rb") do |f|
             f.each_chunk() {|chunk| gzip.write chunk }

data/lib/zuora_api/login.rb

@@ -1,5 +1,4 @@
 require "httparty"
-require "zip"
 require "nokogiri"
 module ZuoraAPI
   class Login
@@ -554,7 +553,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, file_path: Rails.root.join('tmp'), timeout_retries: 2, timeout: 120, **execute_params)
+    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -634,7 +633,8 @@ module ZuoraAPI
             file_handle = nil
             timestamp =  Time.now.to_i
             if tempfile
-              file_handle = Tempfile.new(["#{filename}_#{timestamp}", "#{file_ending}"], file_path)
+              require 'tempfile'
+              file_handle = ::Tempfile.new(["#{filename}_#{timestamp}", "#{file_ending}"], file_path)
               file_handle.binmode
             else
               file_handle = File.new(file_path.join("#{filename}_#{timestamp}#{file_ending}"), "w+")
@@ -692,7 +692,7 @@ module ZuoraAPI
       response_query = HTTParty.post(self.url, body: request.to_xml, headers: {'Content-Type' => "application/json; charset=utf-8"}, :timeout => 120)
       output_xml = Nokogiri::XML(response_query.body)
 
-      return 'Export Creation Unsuccessful : ' + output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+      raise 'Export Creation Unsuccessful : ' + output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
       id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
 
       confirmRequest = Nokogiri::XML::Builder.new do |xml|
@@ -704,7 +704,7 @@ module ZuoraAPI
           end
           xml['SOAP-ENV'].Body do
             xml['ns1'].query do
-              xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where id='" + id + "'"
+              xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}"
             end
           end
         end
@@ -714,9 +714,11 @@ module ZuoraAPI
         sleep 3
         response_query = HTTParty.post(self.url, body: confirmRequest.to_xml, headers: {'Content-Type' => "application/json; charset=utf-8"}, :timeout => 120)
         output_xml = Nokogiri::XML(response_query.body)
+
         result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
-        raise 'Export Creation Unsuccessful : ' + output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text if result == "Failed"
+        raise "Export Creation Unsuccessful : #{output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text}" if result.blank? || result == "Failed"
       end
+
       file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
       Rails.logger.info('Export') {'=====> Export finished'}
       export_file = get_file(:url => self.fileURL(file_id))
@@ -724,6 +726,7 @@ module ZuoraAPI
       Rails.logger.info('Export') {"=====> Export path #{export_file.path}"}
 
       if extract && zip
+        require "zip"
         new_path = export_file_path.partition('.zip').first
         zipped = Zip::File.open(export_file_path)
         file_handle = zipped.entries.first

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.3.999992"
+  VERSION = "1.4.0"
 end

data/lib/zuora_api.rb

@@ -1,5 +1,4 @@
 require 'rails'
-
 require "zuora_api/login"
 require 'zuora_api/exceptions'
 require "insights_api/login"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.3.999992
+  version: 1.4.0
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler