td-client 0.8.46 → 0.8.47

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2012-04-09 version 0.8.47
+
+* Fix HTTP proxy handlig issue which is overwritten with ENV['HTTP_PROXY']
+
+
 == 2012-03-29 version 0.8.46
 
 * Add IP limitation API

data/README.rdoc

@@ -4,6 +4,10 @@
 
     > gem install td-client
 
+== Running Tests
+    > gem install jeweler
+    > gem install webmock
+    > rake spec
 
 == Copyright
 

data/lib/td/client.rb

@@ -121,8 +121,11 @@ class Client
 
   # => Job
   def query(db_name, q, result_url=nil, priority=nil, retry_limit=nil, opts={})
-    job_id = @api.hive_query(q, db_name, result_url, priority, retry_limit, opts)
-    Job.new(self, job_id, :hive, q)
+    # for compatibility, assume type is hive unless specifically specified
+    type = opts[:type] || opts['type'] || :hive
+    raise ArgumentError, "only 'hive' and 'pig' types are supported" unless [:hive, :pig].include? type
+    job_id = @api.query(q, type, db_name, result_url, priority, retry_limit, opts)
+    Job.new(self, job_id, type, q)
   end
 
   # => [Job]

data/lib/td/client/api.rb

@@ -56,7 +56,7 @@ class API
     end
 
     @http_proxy = opts[:http_proxy] || ENV['HTTP_PROXY']
-    if @http_proxy = ENV['HTTP_PROXY']
+    if @http_proxy
       if @http_proxy =~ /\Ahttp:\/\/(.*)\z/
         @http_proxy = $~[1]
       end
@@ -474,11 +474,21 @@ class API
 
   # => jobId:String
   def hive_query(q, db=nil, result_url=nil, priority=nil, retry_limit=nil, opts={})
+    query(q, :hive, db, result_url, priority, retry_limit, opts)
+  end
+
+  # => jobId:String
+  def pig_query(q, db=nil, result_url=nil, priority=nil, retry_limit=nil, opts={})
+    query(q, :pig, db, result_url, priority, retry_limit, opts)
+  end
+
+  # => jobId:String
+  def query(q, type=:hive, db=nil, result_url=nil, priority=nil, retry_limit=nil, opts={})
     params = {'query' => q}.merge(opts)
     params['result'] = result_url if result_url
     params['priority'] = priority if priority
     params['retry_limit'] = retry_limit if retry_limit
-    code, body, res = post("/v3/job/issue/hive/#{e db}", params)
+    code, body, res = post("/v3/job/issue/#{type}/#{e db}", params)
     if code != "200"
       raise_error("Query failed", res)
     end

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.46'
+VERSION = '0.8.47'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.46
+  version: 0.8.47
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack