zuora_api 0.2.6.5 → 0.2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c1f8874502663f7cdee03e9070150a4a4a00f8
-  data.tar.gz: 25aad3a7dcb1641458d3c2534b7d5fa70dcc8d49
+  metadata.gz: 1053ff11c1376a088bd917846d947ad723474283
+  data.tar.gz: e8362876fe1320b101392870e2343670243b98f0
 SHA512:
-  metadata.gz: f42b415b8c7fdddb15c28c5473e8697246af6b31fbe29021dc0ee3621c63a792b561211ffa6b035ceb6015a38740256d87ca680716e930754bd84d6583217bac
-  data.tar.gz: f644c667eb2585a42523985fea64c50164b5a0731524af4473f6dede562324049208c8eaf3153884859ce8342643a4ef86109f8b03a7e3a6927c4043ac82c666
+  metadata.gz: ab9da8db92b5687dc45646530ec128b0061cd16814d3125a9305c3b7ad5fa905932fa23fa27977a2971bf7fb0994d2a64b52b11e28f2b40dac2c611417286608
+  data.tar.gz: d7fdb8d1e2bf9eb71f3dc6d30ea99b63e99db1670e5e641cf77c0bf34dbecfa940af9dddfee11d9439c65ea279f856394d44b48b4322e3f8b7c5656961a10717

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (0.2.6.5)
+    zuora_api (0.2.6.6)
       httparty
       nokogiri (~> 1.6.8)
       railties (>= 4.1.0, < 5.1)

data/lib/zuora_api/login.rb

@@ -1,4 +1,5 @@
 require "httparty"
+require "zip"
 require "nokogiri"
 module ZuoraAPI
   class Login
@@ -316,7 +317,7 @@ module ZuoraAPI
             temp_file ||= tmp_file
             tmp_file.binmode if (response.to_hash["content-type"].include?("application/zip") || response.to_hash["content-type"] == "application/zip")
             response.read_body do |chunk|
-              tmp_file.write chunk
+              tmp_file.write chunk.force_encoding("UTF-8")
             end
           end if response.is_a?(Net::HTTPSuccess)
         end
@@ -333,7 +334,7 @@ module ZuoraAPI
       return temp_file
     end
 
-    def getDataSourceExport(query)
+    def getDataSourceExport(query, extract: true)
       Rails.logger.info('Export') {"Build export"}
       Rails.logger.info('Export query') {"#{query}"}
       request = Nokogiri::XML::Builder.new do |xml|
@@ -385,44 +386,25 @@ module ZuoraAPI
       end
       file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
       Rails.logger.info('Export') {'=====> Export finished'}
-      #return get_file(:file_name => "data_export#{Time.now}.csv" ,:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}", headers: {"Authorization" => "ZSession " + self.current_session})
+      zip_file = get_file(:file_name => "#{file_id}.zip" ,:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}", headers: {"Authorization" => "ZSession " + self.current_session})
+      if extract
+        location = extract_zip(zip_file.path, "#{file_id}")
+        File.delete(zip_file.path)
+        return location
+      else
+        return zip_file.path
+      end
+    end
 
-      response_query = HTTParty.get(self.fileURL  + file_id, body: request.to_xml, headers: {"Authorization" => "ZSession " + self.current_session}, query: {"file-id" => file_id})
-      Rails.logger.info('Export') {'=====> Export finished'}
-      list = Array.new
-      headers = Array.new
-      i=0
-      Zip::Archive.open_buffer(response_query.body) do |ar|
-        ar.fopen(0) do |zf|
-          open(zf.name, 'wb') do |f|
-            CSV.parse(zf.read) do |row|
-              j=0
-              values = Hash.new
-              storename = ''
-              row.each do |col|
-                if i == 0
-                  headers[j] = col
-                else
-                  #Is this needed - can just store all dates as string
-                  if headers[j].include? 'CreatedDate'
-                    values[headers[j]] = Date.strptime(row[j], self.dateFormat)
-                  elsif row[j].nil?
-                    values[headers[j]] = ''
-                  else
-                    values[headers[j]] = row[j]
-                  end
-                end
-                j += 1
-              end
-              if i!=0
-                list[i-1] = values
-              end
-              i += 1
-            end
-          end
+    def extract_zip(file,filename)
+      FileUtils.mkdir_p("#{Rails.root}/tmp/#{filename}")
+      ::Zip::File.open(file) do |zip_file|
+        zip_file.each do |f|
+          fpath = File.join("#{Rails.root}/tmp/#{filename}", f.name)
+          zip_file.extract(f, fpath) unless File.exist?(fpath)
         end
       end
-      return list
+      return "#{Rails.root}/tmp/#{filename}"
     end
 
     def query(query)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "0.2.6.5"
+  VERSION = "0.2.6.6"
 end

metadata

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