td-client 0.8.6 → 0.8.7

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-02-02 version 0.8.7
+
+* Added SSL support
+
+
 == 2012-01-19 version 0.8.6
 
 * Check JSON format of HTTP responses

data/lib/td/client.rb

@@ -6,19 +6,19 @@ require 'td/client/model'
 
 
 class Client
-  def self.authenticate(user, password)
-    api = API.new(nil)
+  def self.authenticate(user, password, opts={})
+    api = API.new(nil, opts)
     apikey = api.authenticate(user, password)
     new(apikey)
   end
 
-  def self.server_status
-    api = API.new(nil)
+  def self.server_status(opts={})
+    api = API.new(nil, opts)
     api.server_status
   end
 
-  def initialize(apikey)
-    @api = API.new(apikey)
+  def initialize(apikey, opts={})
+    @api = API.new(apikey, opts)
   end
 
   attr_reader :api
@@ -99,8 +99,8 @@ class Client
     raise NotFoundError, "Table '#{db_name}.#{table_name}' does not exist"
   end
 
-  def tail(db_name, table_name, count, to=nil, from=nil)
-    @api.tail(db_name, table_name, count, to, from)
+  def tail(db_name, table_name, count, to=nil, from=nil, &block)
+    @api.tail(db_name, table_name, count, to, from, &block)
   end
 
   # => Job

data/lib/td/client/api.rb

@@ -16,10 +16,40 @@ end
 
 
 class API
-  def initialize(apikey)
+  def initialize(apikey, opts={})
     require 'json'
     require 'time'
+    require 'uri'
     @apikey = apikey
+
+    endpoint = opts[:endpoint] || ENV['TD_API_SERVER'] || 'api.treasure-data.com'
+    uri = URI.parse(endpoint)
+
+    case uri.scheme
+    when 'http', 'https'
+      @host = uri.host
+      @port = uri.port
+      @ssl = uri.scheme == 'https'
+      @base_path = uri.path.to_s
+
+    else
+      if uri.port
+        # invalid URI
+        raise "Invalid endpoint: #{endpoint}"
+      end
+
+      # generic URI
+      @host, @port = endpoint.split(':', 2)
+      @port = @port.to_i
+      if opts[:ssl]
+        @port = 443 if @port == 0
+        @ssl = true
+      else
+        @port = 80 if @port == 0
+        @ssl = false
+      end
+      @base_path = ''
+    end
   end
 
   # TODO error check & raise appropriate errors
@@ -61,6 +91,7 @@ class API
     end
   end
 
+  # TODO support array types
   def self.normalize_type_name(name)
     case name
     when /int/i, /integer/i
@@ -183,7 +214,7 @@ class API
     return type
   end
 
-  def tail(db, table, count, to, from)
+  def tail(db, table, count, to, from, &block)
     params = {'format' => 'msgpack'}
     params['count'] = count.to_s if count
     params['to'] = to.to_s if to
@@ -193,11 +224,16 @@ class API
       raise_error("Tail table failed", res)
     end
     require 'msgpack'
-    result = []
-    MessagePack::Unpacker.new.feed_each(body) {|row|
-      result << row
-    }
-    return result
+    if block
+      MessagePack::Unpacker.new.feed_each(body, &block)
+      nil
+    else
+      result = []
+      MessagePack::Unpacker.new.feed_each(body) {|row|
+        result << row
+      }
+      return result
+    end
   end
 
 
@@ -611,23 +647,11 @@ class API
   end
 
   private
-  host = 'api.treasure-data.com'
-  port = 80
-  if e = ENV['TD_API_SERVER']
-    host, port_ = e.split(':',2)
-    port_ = port_.to_i
-    port = port_ if port_ != 0
-  end
-
-  HOST = host
-  PORT = port
-  USE_SSL = false
-  BASE_URL = ''
 
   def get(url, params=nil)
     http, header = new_http
 
-    path = BASE_URL + url
+    path = @base_path + url
     if params && !params.empty?
       path << "?"+params.map {|k,v|
         "#{k}=#{e v}"
@@ -643,7 +667,7 @@ class API
   def post(url, params=nil)
     http, header = new_http
 
-    path = BASE_URL + url
+    path = @base_path + url
 
     if params && !params.empty?
       request = Net::HTTP::Post.new(path, header)
@@ -662,7 +686,7 @@ class API
 
     http.read_timeout = 600
 
-    path = BASE_URL + url
+    path = @base_path + url
 
     header['Content-Type'] = 'application/octet-stream'
     header['Content-Length'] = size.to_s
@@ -686,8 +710,8 @@ class API
     require 'net/http'
     require 'time'
 
-    http = Net::HTTP.new(HOST, PORT)
-    if USE_SSL
+    http = Net::HTTP.new(@host, @port)
+    if @ssl
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       store = OpenSSL::X509::Store.new

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.6'
+VERSION = '0.8.7'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70253485013900 !ruby/object:Gem::Requirement
+  requirement: &70350055043760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70253485013900
+  version_requirements: *70350055043760
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70253485012660 !ruby/object:Gem::Requirement
+  requirement: &70350055042760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70253485012660
+  version_requirements: *70350055042760
 description: 
 email: 
 executables: []