presto-client 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc62d8a09800529582760c70ab8b9edac4c96da1
-  data.tar.gz: cc1c5b78f899093813f80d3176595cba68f41b3a
+  metadata.gz: 0bee1b8fb22804f12e8a2fe9ee8f9fca6262cf4f
+  data.tar.gz: 2bd49e06c846141c5d909c507716970454565270
 SHA512:
-  metadata.gz: 075a2ef5b04abd2677b18ac84d13df013eeaaaa60faaa6a0e686a5c2ecc35bffe8c0273db0dcce997d59dfad93e010b50a45f6e3e1cf4bc2e376eb96c8daa310
-  data.tar.gz: cd1751cc00c4f8ddc93737b48778d3878ba9a7cb50049d3244a32936db11103289b94b32198462ff7b94fcac067983766171f75dcf719ffd264f037b13b0c28d
+  metadata.gz: 0128a6bdf303a34f156916fb460c4e133277d41de5ff9b839fb19c969e569e71bdef2174a40be8e5bb5b43868ab41d192afb7a9320dbb750ca83990929fd734d
+  data.tar.gz: 30486a370eb854050e71dd0cdec598e17fe0aa3bec43feb6f1b20f7292c8b8d8362e29ce35d06a5757726d547c3f507af2751726092fbbf8580325d17cc66823

data/ChangeLog

@@ -1,3 +1,8 @@
+2016-08-02 version 0.4.13:
+
+* Added support for :http_proxy option to use a HTTP proxy server
+* Added support for hashed Client response using `run_with_names` (thanks to MoovWeb for allowing me to contribute)
+* Upgraded Presto model version to 0.134
 
 2015-04-01 version 0.4.5:
 
@@ -62,4 +67,3 @@ since Presto 0.78
 2014-01-07 version 0.1.0:
 
 * First release
-

data/README.md

@@ -21,6 +21,7 @@ client = Presto::Client.new(
   time_zone: "US/Pacific", # optional
   language: "English", # optional
   properties: {"hello" => "world", "mycatalog.hello" => "world"},  # optional
+  http_proxy: "proxy.example.com:8080", # optional
   http_debug: true,
 )
 
@@ -30,6 +31,15 @@ rows.each {|row|
   p row
 }
 
+# run a query and get results as a hash:
+results = client.run_with_names("select alpha, 1 AS beta from tablename")
+results.each {|row|
+  p row['alpha']   # access by name
+  p row['beta']
+  p row.values[0]  # access by index
+  p row.values[1]
+}
+
 # another way to run a query and fetch results streamingly:
 # start running a query on presto
 client.query("select * from sys.node") do |q|
@@ -54,6 +64,7 @@ end
 * **user** sets user name to connect to a Presto.
 * **time_zone** sets time zone of the query. Time zone affects some functions such as `format_datetime`.
 * **language** sets language of the query. Language affects some functions such as `format_datetime`.
+* **http_proxy** sets host:port of a HTTP proxy server.
 * **http_debug** enables debug message to STDOUT for each HTTP requests
 * **http_open_timeout** sets timeout in seconds to open new HTTP connection
 * **http_timeout** sets timeout in seconds to read data from a server

data/lib/presto/client/client.rb

@@ -48,10 +48,23 @@ module Presto::Client
         q.close
       end
     end
+
+    # Accepts the raw response from the Presto Client and returns an
+    # array of hashes where you can access the data in each row using the
+    # output name specified in the query with AS:
+    #   SELECT expression AS output_name
+    def run_with_names(query)
+      columns, rows = run(query)
+
+      column_names = columns.map(&:name)
+
+      rows.map do |row|
+        Hash[column_names.zip(row)]
+      end
+    end
   end
 
   def self.new(*args)
     Client.new(*args)
   end
-
 end

data/lib/presto/client/query.rb

@@ -27,7 +27,8 @@ module Presto::Client
         raise ArgumentError, ":server option is required"
       end
 
-      faraday = Faraday.new(url: "http://#{server}") do |faraday|
+      proxy = options[:http_proxy] || options[:proxy]  # :proxy is obsoleted
+      faraday = Faraday.new(url: "http://#{server}", proxy: "#{proxy}") do |faraday|
         #faraday.request :url_encoded
         faraday.response :logger if options[:http_debug]
         faraday.adapter Faraday.default_adapter

data/lib/presto/client/statement_client.rb

@@ -47,9 +47,39 @@ module Presto::Client
       @query = query
       @closed = false
       @exception = nil
+
+      @faraday.headers.merge!(optional_headers)
       post_query_request!
     end
 
+    def optional_headers
+      headers = {}
+      if v = @options[:user]
+        headers[PrestoHeaders::PRESTO_USER] = v
+      end
+      if v = @options[:source]
+        headers[PrestoHeaders::PRESTO_SOURCE] = v
+      end
+      if v = @options[:catalog]
+        headers[PrestoHeaders::PRESTO_CATALOG] = v
+      end
+      if v = @options[:schema]
+        headers[PrestoHeaders::PRESTO_SCHEMA] = v
+      end
+      if v = @options[:time_zone]
+        headers[PrestoHeaders::PRESTO_TIME_ZONE] = v
+      end
+      if v = @options[:language]
+        headers[PrestoHeaders::PRESTO_LANGUAGE] = v
+      end
+      if v = @options[:properties]
+        headers[PrestoHeaders::PRESTO_SESSION] = encode_properties(v)
+      end
+      headers
+    end
+
+    private :optional_headers
+
     def init_request(req)
       req.options.timeout = @options[:http_timeout] || 300
       req.options.open_timeout = @options[:http_open_timeout] || 60
@@ -61,28 +91,6 @@ module Presto::Client
       response = @faraday.post do |req|
         req.url "/v1/statement"
 
-        if v = @options[:user]
-          req.headers[PrestoHeaders::PRESTO_USER] = v
-        end
-        if v = @options[:source]
-          req.headers[PrestoHeaders::PRESTO_SOURCE] = v
-        end
-        if v = @options[:catalog]
-          req.headers[PrestoHeaders::PRESTO_CATALOG] = v
-        end
-        if v = @options[:schema]
-          req.headers[PrestoHeaders::PRESTO_SCHEMA] = v
-        end
-        if v = @options[:time_zone]
-          req.headers[PrestoHeaders::PRESTO_TIME_ZONE] = v
-        end
-        if v = @options[:language]
-          req.headers[PrestoHeaders::PRESTO_LANGUAGE] = v
-        end
-        if v = @options[:properties]
-          req.headers[PrestoHeaders::PRESTO_SESSION] = encode_properties(v)
-        end
-
         req.body = @query
         init_request(req)
       end

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.4.12"
+    VERSION = "0.4.13"
   end
 end

data/spec/client_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe Presto::Client::Client do
+  let(:client) { Presto::Client.new({}) }
+
+  describe 'rehashes' do
+    let(:columns) do
+      [
+        Models::Column.new(name: 'animal', type: 'string'),
+        Models::Column.new(name: 'score', type: 'integer'),
+        Models::Column.new(name: 'name', type: 'string')
+      ]
+    end
+
+    it 'multiple rows' do
+      rows = [
+        ['dog', 1, 'Lassie'],
+        ['horse', 5, 'Mr. Ed'],
+        ['t-rex', 37, 'Doug']
+      ]
+      client.stub(:run).and_return([columns, rows])
+
+      rehashed = client.run_with_names('fake query')
+
+      rehashed.length.should == 3
+
+      rehashed[0]['animal'].should == 'dog'
+      rehashed[0]['score'].should == 1
+      rehashed[0]['name'].should == 'Lassie'
+
+      rehashed[0].values[0].should == 'dog'
+      rehashed[0].values[1].should == 1
+      rehashed[0].values[2].should == 'Lassie'
+
+      rehashed[1]['animal'].should == 'horse'
+      rehashed[1]['score'].should == 5
+      rehashed[1]['name'].should == 'Mr. Ed'
+
+      rehashed[1].values[0].should == 'horse'
+      rehashed[1].values[1].should == 5
+      rehashed[1].values[2].should == 'Mr. Ed'
+    end
+
+    it 'empty results' do
+      rows = []
+      client.stub(:run).and_return([columns, rows])
+
+      rehashed = client.run_with_names('fake query')
+
+      rehashed.length.should == 0
+    end
+
+    it 'handles too few result columns' do
+      rows = [['wrong', 'count']]
+      client.stub(:run).and_return([columns, rows])
+
+      client.run_with_names('fake query').should == [{
+        "animal" => "wrong",
+        "score" => "count",
+        "name" => nil,
+      }]
+    end
+
+    it 'handles too many result columns' do
+      rows = [['wrong', 'count', 'too', 'much', 'columns']]
+      client.stub(:run).and_return([columns, rows])
+
+      client.run_with_names('fake query').should == [{
+        "animal" => "wrong",
+        "score" => "count",
+        "name" => 'too',
+      }]
+    end
+  end
+end

data/spec/statement_client_spec.rb

@@ -67,6 +67,12 @@ describe Presto::Client::StatementClient do
     stub_request(:get, "localhost/v1/next_uri").
       with(headers: {
               "User-Agent" => "presto-ruby/#{VERSION}",
+              "X-Presto-Catalog" => options[:catalog],
+              "X-Presto-Schema" => options[:schema],
+              "X-Presto-User" => options[:user],
+              "X-Presto-Language" => options[:language],
+              "X-Presto-Time-Zone" => options[:time_zone],
+              "X-Presto-Session" => options[:properties].map {|k,v| "#{k}=#{v}"}.join("\r\nX-Presto-Session: ")
     }).to_return(body: lambda{|req|if retry_p; response_json.to_json; else; retry_p=true; raise Timeout::Error.new("execution expired"); end })
 
     faraday = Faraday.new(url: "http://localhost")
@@ -75,5 +81,6 @@ describe Presto::Client::StatementClient do
     sc.advance.should be_true
     retry_p.should be_true
   end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -125,6 +125,7 @@ files:
 - modelgen/models.rb
 - modelgen/presto_models.rb
 - presto-client.gemspec
+- spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/statement_client_spec.rb
 homepage: https://github.com/treasure-data/presto-client-ruby
@@ -147,10 +148,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Presto client library
 test_files:
+- spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/statement_client_spec.rb