presto-client 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9766f45b1fccb135815e0e24e710a344d3f52758
-  data.tar.gz: 8f08cf0d14c1290665806ff20f72aa0152892897
+SHA256:
+  metadata.gz: 8057cfffdbe9a99760500827e16e2acfa2226c8fe70c7a20ce3fe4708ed80c02
+  data.tar.gz: 7655979e2fc05d9805c0ea704fba1b37c029a5051c2d4eb3a5d5f2d0d1f392ce
 SHA512:
-  metadata.gz: 1b75b118f64cc17d459c6a15954cf785c41f9fe47fa7e3dd31352be4bfbe97b67a8e1564f1d1138d1f3a6743cb9285cea0dc2244c87fae0b8b6f95e3852ae316
-  data.tar.gz: e6237ed2c819394162fd6691e9fcf9e9902db9ea2d173bbecc6352822eaeff70448a998bf06b042c03499c44bd4c5c14f177f97cdeb324594fb6e43d54fc0717
+  metadata.gz: 554e580324ff6bcf0cb0a5d38360147ac731e1abe0a93390ce3a8a8c2de6683d6e0365ec14022d6a888e44abcafb7eb4756a8a7bf2f45f0f9baf62c6c7bbf616
+  data.tar.gz: 5b647ad42f45cbb703c6d4ac5dc7ae0bc7ba6f6f36eea5826d7659b7fb704cee11dc562f3fb1eed47b0f4ce3a1a586b8ee7ddd43ae979b259b7ee9d3829af9de

data/ChangeLog

@@ -1,3 +1,8 @@
+2018-06-27 version 0.5.11
+
+* Support multiple session properties
+* Check invalid JSON data response
+
 2018-03-22 version 0.5.10
 
 * Added client_info, client_tags, and http_headers options.

data/lib/presto/client/faraday_client.rb

@@ -146,7 +146,6 @@ module Presto::Client
   HTTP11_CTL_CHARSET_REGEXP = /[#{Regexp.escape(HTTP11_CTL_CHARSET.join)}]/
 
   def self.encode_properties(properties)
-    # this is a hack to set same header multiple times.
     properties.map do |k, v|
       token = k.to_s
       field_value = v.to_s  # TODO LWS encoding is not implemented
@@ -157,7 +156,7 @@ module Presto::Client
         raise Faraday::ClientError, "Value of properties can't include HTTP/1.1 control characters"
       end
       "#{token}=#{field_value}"
-    end.join("\r\n#{PrestoHeaders::PRESTO_SESSION}: ")
+    end
   end
 
   def self.encode_client_info(info)

data/lib/presto/client/statement_client.rb

@@ -140,11 +140,16 @@ module Presto::Client
     private :decode_model
 
     def parse_body(response)
-      case response.headers['Content-Type']
-      when 'application/x-msgpack'
-        MessagePack.load(response.body)
-      else
-        JSON.parse(response.body, opts = JSON_OPTIONS)
+      begin
+        case response.headers['Content-Type']
+        when 'application/x-msgpack'
+          MessagePack.load(response.body)
+        else
+          JSON.parse(response.body, opts = JSON_OPTIONS)
+        end
+      rescue => e
+        @exception = PrestoHttpError.new(500, "Presto API returned unexpected data format. #{e}")
+        raise @exception
       end
     end
 

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.5.10"
+    VERSION = "0.5.11"
   end
 end

data/spec/statement_client_spec.rb

@@ -133,8 +133,8 @@ describe Presto::Client::StatementClient do
   end
 
   describe '#query_info' do
-    it "raises an exception with sample JSON if response is unexpected" do
-      headers = {
+    let :headers do
+      {
         "User-Agent" => "presto-ruby/#{VERSION}",
         "X-Presto-Catalog" => options[:catalog],
           "X-Presto-Schema" => options[:schema],
@@ -142,21 +142,32 @@ describe Presto::Client::StatementClient do
           "X-Presto-Language" => options[:language],
           "X-Presto-Time-Zone" => options[:time_zone],
       }
+    end
 
+    let :statement_client do
       stub_request(:post, "http://localhost/v1/statement").
         with(body: query, headers: headers).
         to_return(body: response_json2.to_json)
+      StatementClient.new(faraday, query, options)
+    end
 
-      sc = StatementClient.new(faraday, query, options)
-
-      stub_request(:get, "http://localhost/v1/query/#{response_json2[:id]}").
-        with(headers: headers).
-        to_return(body: {"session" => "invalid session structure"}.to_json)
-
+    it "raises an exception with sample JSON if response is unexpected" do
       lambda do
-        sc.query_info
+        stub_request(:get, "http://localhost/v1/query/#{response_json2[:id]}").
+          with(headers: headers).
+          to_return(body: {"session" => "invalid session structure"}.to_json)
+        statement_client.query_info
       end.should raise_error(PrestoHttpError, /Presto API returned unexpected structure at \/v1\/query\/queryid\. Expected Presto::Client::ModelVersions::.*::QueryInfo but got {"session":"invalid session structure"}/)
     end
+
+    it "raises an exception if response format is unexpected" do
+      lambda do
+        stub_request(:get, "http://localhost/v1/query/#{response_json2[:id]}").
+          with(headers: headers).
+          to_return(body: "unexpected data structure (not JSON)")
+        statement_client.query_info
+      end.should raise_error(PrestoHttpError, /Presto API returned unexpected data format./)
+    end
   end
 
   describe "Killing a query" do
@@ -196,7 +207,7 @@ describe Presto::Client::StatementClient do
       stub_request(:post, "localhost/v1/statement").
         with(body: query,
              headers: headers.merge({
-               "X-Presto-Session" => options[:properties].map {|k,v| "#{k}=#{v}"}.join("\r\nX-Presto-Session: ")
+               "X-Presto-Session" => options[:properties].map {|k,v| "#{k}=#{v}"}.join(", ")
              })).
         to_return(body: response_json.to_json)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Presto client library