power-bi 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '053216118d9fed6cb0cb3dff7a8bbe03c64be8a80f2cf26205a1c1b2ee48699c'
-  data.tar.gz: 29908d4c0d9c2c988073f42c7b1180e21863a755ee14c68858016a0d74f437b3
+  metadata.gz: 2cdaf275d6377b0f772985c4e6b616030022652fd88201f7cc79b04cfe009d67
+  data.tar.gz: 654d2e658ffbc996beb652976094eceecf95256897ad70ff59b461e46810ff82
 SHA512:
-  metadata.gz: b466f3f6b3d67701d40635ac0035b4a94d5aa9a1908152e2f32e244cbfe9f27f8c35f7978ec47bb2a3bccc7e681f14247d76128074c6a93006c2fc2b0c7f8438
-  data.tar.gz: b43176b8de6c021e9c2529aafa9f137fab06877d320b26acc9ea0d7e7edfaee5d37a03d81dbf9f2672beae4399e25a24958aad94f39cecbaaf4d4ecf29edeb4f
+  metadata.gz: ccf88e40d284bc8e91e0bc683ed077a42a077a810e409346ac6dce508e8803b9313c7ccc1ec3ab0937c43d53169dfdbb04db64c3c73d55b52180a4f2d59a0dc0
+  data.tar.gz: 221a648dbbc8e35ab2ed75834dfbe756e57f5583282a5f1224194489378c6c17d3c10f5f2578c50f377e1536b14bd9398b7a586ba89ec751bfa89eb15c0ca79e

data/lib/power-bi/page.rb

@@ -3,7 +3,7 @@ module PowerBI
     attr_reader :display_name, :name, :order, :report
 
     def initialize(tenant, data)
-      @name = data[:Name]
+      @name = data[:name]
       @display_name = data[:displayName]
       @order = data[:order]
       @report = data[:report]

data/lib/power-bi/tenant.rb

@@ -2,10 +2,11 @@ module PowerBI
   class Tenant
     attr_reader :workspaces, :gateways
 
-    def initialize(token_generator, retries: 5)
+    def initialize(token_generator, retries: 5, logger: nil)
       @token_generator = token_generator
       @workspaces = WorkspaceArray.new(self)
       @gateways = GatewayArray.new(self)
+      @logger = logger
 
       ## WHY RETRIES? ##
       # It is noticed that once in a while (~0.1% API calls), the Power BI server returns a 500 (internal server error) withou apparent reason, just retrying works :-)
@@ -18,11 +19,18 @@ module PowerBI
         interval: 0.2,
         interval_randomness: 0,
         backoff_factor: 4,
-        retry_block: -> (env, options, retries, exc) { puts "retrying...!! (@ #{Time.now.to_s}), exception: #{exc.to_s} ---- #{exc.message}" },
+        retry_block: -> (env, options, retries, exc) { self.log "retrying...!! exception: #{exc.to_s} ---- #{exc.message}, request URL: #{env.url}" },
       }
     end
 
+    def log(message, level: :info)
+      if @logger
+        @logger.send(level, message) # hence, the logger needs to implement the 'level' methods
+      end
+    end
+
     def get(url, params = {})
+      t0 = Time.now
       conn = Faraday.new do |f|
         f.request :retry, @retry_options
       end
@@ -35,12 +43,14 @@ module PowerBI
       unless [200, 202].include? response.status
         raise APIError.new("Error calling Power BI API (status #{response.status}): #{response.body}")
       end
+      log "Calling (GET) #{url} - took #{((Time.now - t0) * 1000).to_i} ms"
       unless response.body.empty?
         JSON.parse(response.body, symbolize_names: true)
       end
     end
 
     def get_raw(url, params = {})
+      t0 = Time.now
       conn = Faraday.new do |f|
         f.request :retry, @retry_options
       end
@@ -49,6 +59,7 @@ module PowerBI
         req.headers['authorization'] = "Bearer #{token}"
         yield req if block_given?
       end
+      log "Calling (GET - raw) #{url} - took #{((Time.now - t0) * 1000).to_i} ms"
       unless [200, 202].include? response.status
         raise APIError.new("Error calling Power BI API (status #{response.status}): #{response.body}")
       end
@@ -56,6 +67,7 @@ module PowerBI
     end
 
     def post(url, params = {})
+      t0 = Time.now
       conn = Faraday.new do |f|
         f.request :retry, @retry_options
       end
@@ -66,6 +78,7 @@ module PowerBI
         req.headers['authorization'] = "Bearer #{token}"
         yield req if block_given?
       end
+      log "Calling (POST) #{url} - took #{((Time.now - t0) * 1000).to_i} ms"
       unless [200, 201, 202].include? response.status
         raise APIError.new("Error calling Power BI API (status #{response.status}): #{response.body}")
       end
@@ -75,6 +88,7 @@ module PowerBI
     end
 
     def patch(url, params = {})
+      t0 = Time.now
       conn = Faraday.new do |f|
         f.request :retry, @retry_options
       end
@@ -85,6 +99,7 @@ module PowerBI
         req.headers['authorization'] = "Bearer #{token}"
         yield req if block_given?
       end
+      log "Calling (PATCH) #{url} - took #{((Time.now - t0) * 1000).to_i} ms"
       unless [200, 202].include? response.status
         raise APIError.new("Error calling Power BI API (status #{response.status}): #{response.body}")
       end
@@ -94,6 +109,7 @@ module PowerBI
     end
 
     def delete(url, params = {})
+      t0 = Time.now
       conn = Faraday.new do |f|
         f.request :retry, @retry_options
       end
@@ -103,6 +119,7 @@ module PowerBI
         req.headers['authorization'] = "Bearer #{token}"
         yield req if block_given?
       end
+      log "Calling (DELETE) #{url} - took #{((Time.now - t0) * 1000).to_i} ms"
       unless [200, 202].include? response.status
         raise APIError.new("Error calling Power BI API (status #{response.status}): #{response.body}")
       end
@@ -112,6 +129,7 @@ module PowerBI
     end
 
     def post_file(url, file, params = {})
+      t0 = Time.now
       conn = Faraday.new do |f|
         f.request :multipart
         f.request :retry, @retry_options
@@ -124,6 +142,7 @@ module PowerBI
         req.body = {value: Faraday::UploadIO.new(file, 'application/octet-stream')}
         req.options.timeout = 120  # default is 60 seconds Net::ReadTimeout
       end
+      log "Calling (POST - file) #{url} - took #{((Time.now - t0) * 1000).to_i} ms"
       if response.status != 202
         raise APIError.new("Error calling Power BI API (status #{response.status}): #{response.body}")
       end

data/lib/power-bi/workspace.rb

@@ -23,13 +23,13 @@ module PowerBI
       status_history = ''
       old_status = ''
       while !success
-        sleep 0.1
+        sleep 0.5
         iterations += 1
-        raise UploadError.new("Upload did not succeed after #{timeout} seconds. Status history:#{status_history}") if iterations > (10 * timeout)
+        raise UploadError.new("Upload did not succeed after #{timeout} seconds. Status history:#{status_history}") if iterations > (2 * timeout)
         new_status = @tenant.get("/groups/#{@id}/imports/#{import_id}")[:importState].to_s
         success = (new_status == "Succeeded")
         if new_status != old_status
-          status_history += "\nStatus change after #{iterations/10.0}s: '#{old_status}' --> '#{new_status}'"
+          status_history += "\nStatus change after #{iterations/2}s: '#{old_status}' --> '#{new_status}'"
           old_status = new_status
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power-bi
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Lode Cools
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: pry-byebug
+  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: oauth2
+  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'
 description: Ruby wrapper for the Power BI API
 email: lode.cools1@gmail.com
 executables: []
@@ -78,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Power BI API