presto-client 0.2.0 → 0.3.0

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2014-01-22 version 0.3.0:
+
+* Added http_timeout option
+* Added http_open_timeout option
+* Changed Query.start API to start(query, options) to http options
+
 2014-01-22 version 0.2.0:
 
 * Added Query#cancel

data/lib/presto/client/client.rb

@@ -20,24 +20,24 @@ module Presto::Client
 
   class Client
     def initialize(options)
-      @session = ClientSession.new(options)
+      @options = options
     end
 
     def query(query, &block)
+      q = Query.start(query, @options)
       if block
-        q = Query.start(@session, query)
         begin
           yield q
         ensure
           q.close
         end
       else
-        return Query.start(@session, query)
+        return q
       end
     end
 
     def run(query)
-      q = Query.start(@session, query)
+      q = Query.start(query, @options)
       begin
         columns = q.columns
         if columns.empty?

data/lib/presto/client/models.rb

@@ -32,27 +32,6 @@ module Presto::Client
     end
   end
 
-  class ClientSession
-    def initialize(options)
-      @server = options[:server]
-      @user = options[:user]
-      @source = options[:source]
-      @catalog = options[:catalog]
-      @schema = options[:schema]
-      @debug = !!options[:debug]
-    end
-
-    attr_reader :server
-    attr_reader :user
-    attr_reader :source
-    attr_reader :catalog
-    attr_reader :schema
-
-    def debug?
-      @debug
-    end
-  end
-
   class StageStats
     attr_reader :stage_id
     attr_reader :state

data/lib/presto/client/query.rb

@@ -21,14 +21,19 @@ module Presto::Client
   require 'presto/client/statement_client'
 
   class Query
-    def self.start(session, query)
-      faraday = Faraday.new(url: "http://#{session.server}") do |faraday|
+    def self.start(query, options)
+      server = options[:server]
+      unless server
+        raise ArgumentError, ":server option is required"
+      end
+
+      faraday = Faraday.new(url: "http://#{server}") do |faraday|
         #faraday.request :url_encoded
         faraday.response :logger
         faraday.adapter Faraday.default_adapter
       end
 
-      new StatementClient.new(faraday, session, query)
+      new StatementClient.new(faraday, query, options)
     end
 
     def initialize(client)

data/lib/presto/client/statement_client.rb

@@ -36,31 +36,38 @@ module Presto::Client
       "User-Agent" => "presto-ruby/#{VERSION}"
     }
 
-    def initialize(faraday, session, query)
+    def initialize(faraday, query, options)
       @faraday = faraday
       @faraday.headers.merge!(HEADERS)
 
-      @session = session
+      @options = options
       @query = query
       @closed = false
       @exception = nil
       post_query_request!
     end
 
+    def init_request(req)
+      req.options.timeout = @options[:http_timeout] || 300
+      req.options.open_timeout = @options[:http_open_timeout] || 60
+    end
+
+    private :init_request
+
     def post_query_request!
       response = @faraday.post do |req|
         req.url "/v1/statement"
 
-        if v = @session.user
+        if v = @options[:user]
           req.headers[PrestoHeaders::PRESTO_USER] = v
         end
-        if v = @session.source
+        if v = @options[:source]
           req.headers[PrestoHeaders::PRESTO_SOURCE] = v
         end
-        if v = @session.catalog
+        if v = @options[:catalog]
           req.headers[PrestoHeaders::PRESTO_CATALOG] = v
         end
-        if v = @session.schema
+        if v = @options[:schema]
           req.headers[PrestoHeaders::PRESTO_SCHEMA] = v
         end
 
@@ -82,7 +89,7 @@ module Presto::Client
     attr_reader :query
 
     def debug?
-      @session.debug?
+      !!@options[:debug]
     end
 
     def closed?

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/statement_client_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe Presto::Client::StatementClient do
-  let :session do
-    session = ClientSession.new(
+  let :options do
+    {
       server: "localhost",
       user: "frsyuki",
       catalog: "native",
       schema: "default",
       debug: true,
-    )
+    }
   end
 
   let :query do
@@ -27,13 +27,13 @@ describe Presto::Client::StatementClient do
       with(body: query,
            headers: {
               "User-Agent" => "presto-ruby/#{VERSION}",
-              "X-Presto-Catalog" => session.catalog,
-              "X-Presto-Schema" => session.schema,
-              "X-Presto-User" => session.user,
+              "X-Presto-Catalog" => options[:catalog],
+              "X-Presto-Schema" => options[:schema],
+              "X-Presto-User" => options[:user],
     }).to_return(body: response_json.to_json)
 
     faraday = Faraday.new(url: "http://localhost")
-    StatementClient.new(faraday, session, query)
+    StatementClient.new(faraday, query, options)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 453544593424709681
+      hash: -2053006963209558154
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23