redash_dynamic_query 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 820ca9c05060b5aae4a6661b18b720ec61ab49c504bc7266ae2f2f95f8bc9c29
-  data.tar.gz: d128117115042c3c903a5105cb97bca545349a6fe92ca4e8f911e873453ccdb8
+  metadata.gz: cbccab07df2c10d248989d87ea9a78fc3ae1db3258ab6f48295226f2f3af73ae
+  data.tar.gz: 9b41d7b04339be2ca31e362231fc1c642edd1025ba018837c0087a873963d7b0
 SHA512:
-  metadata.gz: 2db7e63f32aa032ce1bb093bc7e43e2695e2234d8d2d5903c0cb4bb35c7a69ec1be5d65a757df436c49e1f6e8eeb123456fd00e684492723ebd7d144cb92e9f8
-  data.tar.gz: 0a93e43b35ba0938005dc4401b02c5576128dc0ed8fc09044fb14b6d842ff352271a3bdfb5115e624ca324387bef05d72ac8128d4dc64fd9ec93df160be1dc89
+  metadata.gz: 350d58641bec262b0280b1864e50b0eaefb80d76aece85d241db583ef127cb5240764cf70ca6848492adb3c1ed10426a49aaabc655f720d23bf02c5af47647eb
+  data.tar.gz: 96bfd047ea1a0403fe38ea02ce60411b384af93b2e0a5d927af66a78ac4da004e440db2804ed0468900b2b0f69276904e7d47f71e0a49e53a38b006ad0bfcacc

data/Gemfile

@@ -2,5 +2,7 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
+gem 'pry'
+
 # Specify your gem's dependencies in redash_dynamic_query.gemspec
 gemspec

data/Gemfile.lock

@@ -6,7 +6,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
+    method_source (0.9.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -27,6 +32,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.17)
+  pry
   rake (~> 10.0)
   redash_dynamic_query!
   rspec (~> 3.0)

data/bin/console

@@ -10,5 +10,5 @@ require "redash_dynamic_query"
 # require "pry"
 # Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+require "pry"
+Pry.start(__FILE__)

data/lib/redash_dynamic_query/client.rb

@@ -2,49 +2,89 @@ require 'net/https'
 require 'json'
 module RedashDynamicQuery
   class Client
-    attr_reader :api_key, :endpoint, :wait_interval
+    attr_reader :api_key, :endpoint, :interval, :timeout
 
-    def initialize(user_apikey:, endpoint:, wait_interval: 0.1)
-      @api_key = user_apikey
+    def initialize(user_apikey:, endpoint:, interval: 0.1, timeout: 10)
+      @api_key  = user_apikey
       @endpoint = endpoint
-      @wait_interval = wait_interval
+      @interval = interval
+      @timeout  = timeout
     end
 
     def query(query_id:, params:)
       job_id = post_job_request(query_id: query_id, params: params)
 
+      raise 'job_id not fuond.' if job_id.nil?
+
       query_result_id = poll_job(job_id: job_id)
 
+      raise 'query_result_id not fuond.' if query_result_id.nil?
+
       get_query_result(query_result_id: query_result_id)
     end
 
     private
 
     def post_job_request(query_id:, params:)
-      query_string = URI.encode_www_form(params.transform_keys { |k| "p_#{k}" })
-      url = "#{endpoint}/api/queries/#{query_id}/refresh?api_key=#{api_key}&#{query_string}"
-      res = Net::HTTP.post_form(URI.parse(url), {})
+      res = with_error_handling do
+        Net::HTTP.post_form(
+          post_job_url(id: query_id, queries: query_string(params: params)),
+          {}
+        )
+      end
+
       json = JSON.parse(res.body)
-      json.dig('job','id')
+      json.dig('job', 'id')
+    end
+
+    def poll_job(job_id:, count: 0)
+      res = with_error_handling do
+        Net::HTTP.get(poll_job_url(id: job_id))
+      end
+      id = JSON.parse(res).dig('job', 'query_result_id')
+
+      return id unless id.nil?
+
+      raise "wait timeout with #{timeout} seconds." if reach_limit?(count)
+
+      sleep interval
+      poll_job(job_id: job_id, count: count + 1)
     end
 
     def get_query_result(query_result_id:)
-      url = "#{endpoint}/api/query_results/#{query_result_id}.json?api_key=#{api_key}"
-      res = Net::HTTP.get(URI.parse(url))
+      res = with_error_handling do
+        Net::HTTP.get(query_result_url(id: query_result_id))
+      end
+
       JSON.parse(res)
     end
 
-    def poll_job(job_id:)
-      url = "#{endpoint}/api/jobs/#{job_id}?api_key=#{api_key}"
-      res = Net::HTTP.get(URI.parse(url))
-      id = JSON.parse(res).dig('job', 'query_result_id')
+    def post_job_url(id:, queries:)
+      URI.parse(
+        "#{endpoint}/api/queries/#{id}/refresh?api_key=#{api_key}&#{queries}"
+      )
+    end
 
-      if id.nil?
-        sleep wait_interval
-        poll_job(job_id: job_id)
-      else
-        id
-      end
+    def poll_job_url(id:)
+      URI.parse("#{endpoint}/api/jobs/#{id}?api_key=#{api_key}")
+    end
+
+    def query_result_url(id:)
+      URI.parse("#{endpoint}/api/query_results/#{id}.json?api_key=#{api_key}")
+    end
+
+    def query_string(params:)
+      URI.encode_www_form(params.transform_keys { |k| "p_#{k}" })
+    end
+
+    def reach_limit?(count)
+      count * interval > timeout
+    end
+
+    def with_error_handling
+      res = yield
+      raise res.body if res.is_a? Net::HTTPClientError
+      res
     end
   end
 end

data/lib/redash_dynamic_query/version.rb

@@ -1,3 +1,3 @@
 module RedashDynamicQuery
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redash_dynamic_query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - swfz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Redash query with dynamic parameter