td-client 0.8.61 → 0.8.62

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 926ea0dac15ddb7e20599a09bfc0785bb84f35c9
-  data.tar.gz: d55cdc86f5b499860fd7ee0ffbeca4ca6f7bc3e2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDRiYWJjYzc1NDFiOTQzMzBkNjNmMGUwNDcxMDAzOWQ5Njg0NzVmNA==
+  data.tar.gz: !binary |-
+    Y2JkMzE0NTBhNWQ4YzZiZjY0MDY2ZmY4MmE2YmY4NWYzYmY2N2Q1NA==
 SHA512:
-  metadata.gz: c9640c8b51d3a16368c98b5f9ef6115927ed444eb510b5591bd3758c301dce59f19589a0586456e301d471de3caee348a1e9a83ae1ad146c31a1065069af0058
-  data.tar.gz: d844034ae124704a34f3a11d7cf6631a569afa40cd84012caf2b788c52a17db7f37b444aa9b2473ddf388a25cacc080ac438a4268b27865632d779e118bb55ec
+  metadata.gz: !binary |-
+    NTllMjQzNDUyOGVkNWM1MWMxNDY5YWMwOGE4ODNjM2M5N2ZjYjZhYWUzZWQ1
+    YTFlMmMyMzNkNjExZGFjOWUyMzMxODM3ZGQ4YjQ2ZGUzYWZhYzEwY2M3OWE4
+    ODA5ODI2NTQzNGE4ZDM0OTdiMzNjOGNlODFhNzZlNDU3YTY4M2Q=
+  data.tar.gz: !binary |-
+    MjVhNmU2MmI5NDNlZDliNDU1YzQzNjdmYzkwYWQ0YWU2ZWRjMWJjMDE0ZTdl
+    ZDgyMGYxY2Y3OTI4NmM4MDcwODJjMmJkNmE2NThiMGFkYzEyM2VjNTc0NzNh
+    MjQyMWI2MTFiOGIxYTgzNmEzZTEwYjc0NTNmOTVjYjcwZGMwNDk=

data/lib/td/client/api.rb

@@ -51,7 +51,9 @@ class API
     when 'http', 'https'
       @host = uri.host
       @port = uri.port
-      @ssl = uri.scheme == 'https'
+      # the opts[:ssl] option is ignored here, it's value
+      #   overridden by the scheme of the endpoint URI
+      @ssl = (uri.scheme == 'https')
       @base_path = uri.path.to_s
 
     else
@@ -80,7 +82,7 @@ class API
                    else
                      @http_proxy
                    end
-      proxy_host, proxy_port = http_proxy.split(':',2)
+      proxy_host, proxy_port = http_proxy.split(':', 2)
       proxy_port = (proxy_port ? proxy_port.to_i : 80)
       @http_class = Net::HTTP::Proxy(proxy_host, proxy_port)
     else
@@ -129,19 +131,19 @@ class API
   end
 
   def self.validate_database_name(name)
-    validate_name("database", 3, 256, name)
+    validate_name("database", 3, 255, name)
   end
 
   def self.validate_table_name(name)
-    validate_name("table", 3, 256, name)
+    validate_name("table", 3, 255, name)
   end
 
   def self.validate_result_set_name(name)
-    validate_name("result set", 3, 256, name)
+    validate_name("result set", 3, 255, name)
   end
 
   def self.validate_column_name(name)
-    validate_name("column", 2, 256, name)
+    validate_name("column", 1, 255, name)
   end
 
   def self.normalize_database_name(name)
@@ -150,10 +152,10 @@ class API
       raise "Empty name is not allowed"
     end
     if name.length < 3
-      name += "_"*(3-name.length)
+      name += "_" * (3 - name.length)
     end
     if 256 < name.length
-      name = name[0,254]+"__"
+      name = name[0,254] + "__"
     end
     name = name.downcase
     name = name.gsub(/[^a-z0-9_]/, '_')
@@ -448,11 +450,36 @@ class API
     if hive_result_schema.empty?
       hive_result_schema = nil
     else
-      hive_result_schema = JSON.parse(hive_result_schema)
+      begin
+        hive_result_schema = JSON.parse(hive_result_schema)
+      rescue JSON::ParserError => e
+        # this is a workaround for a Known Limitation in the Pig Engine which does not set a default, auto-generated
+        #   column name for anonymous columns (such as the ones that are generated from UDF like COUNT or SUM).
+        # The schema will contain 'nil' for the name of those columns and that breaks the JSON parser since it violates
+        #   the JSON syntax standard.
+        if type == :pig and hive_result_schema !~ /[\{\}]/
+          begin
+            # NOTE: this works because a JSON 2 dimensional array is the same as a Ruby one.
+            #   Any change in the format for the hive_result_schema output may cause a syntax error, in which case
+            #   this lame attempt at fixing the problem will fail and we will be raising the original JSON exception
+            hive_result_schema = eval(hive_result_schema)
+          rescue SyntaxError => ignored_e
+            raise e
+          end
+          hive_result_schema.each_with_index {|col_schema, idx|
+            if col_schema[0].nil?
+              col_schema[0] = "_col#{idx}"
+            end
+          }
+        else
+          raise e
+        end
+      end
     end
     priority = js['priority']
     retry_limit = js['retry_limit']
-    return [type, query, status, url, debug, start_at, end_at, cpu_time, result, hive_result_schema, priority, retry_limit, nil, database] # same as above
+    return [type, query, status, url, debug, start_at, end_at, cpu_time, result,
+            hive_result_schema, priority, retry_limit, nil, database]
   end
 
   def job_status(job_id)
@@ -933,7 +960,7 @@ class API
     result = js["users"].map {|roleinfo|
       name = roleinfo['name']
       email = roleinfo['email']
-      [name, nil, nil, email] # set nil to org and role for API compatibiilty
+      [name, nil, nil, email] # set nil to org and role for API compatibility
     }
     return result
   end

data/lib/td/client/model.rb

@@ -331,30 +331,32 @@ class Job < Model
 
   def finished?
     update_progress! unless @status
-    if FINISHED_STATUS.include?(@status)
-      return true
-    else
-      return false
-    end
-  end
-
-  def running?
-    !finished?
+    FINISHED_STATUS.include?(@status)
   end
 
   def success?
     update_progress! unless @status
-    @status == "success"
+    @status == STATUS_SUCCESS
   end
 
   def error?
     update_progress! unless @status
-    @status == "error"
+    @status == STATUS_ERROR
   end
 
   def killed?
     update_progress! unless @status
-    @status == "killed"
+    @status == STATUS_KILLED
+  end
+
+  def queued?
+    update_progress! unless @status
+    @status == STATUS_QUEUED
+  end
+
+  def running?
+    update_progress! unless @status
+    @status == STATUS_RUNNING
   end
 
   def update_progress!

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.61'
+    VERSION = '0.8.62'
   end
 end

data/spec/api_spec.rb

@@ -12,7 +12,7 @@ describe API do
 
   INVALID_NAMES = {
     'a' => 'a__',
-    'a'*257 => 'a'*254+'__',
+    'a' * 256 => 'a' * 253 + '__',
     'abcD' => 'abcd',
     'a-b*' => 'a_b_',
   }
@@ -39,22 +39,22 @@ describe API do
     INVALID_NAMES.each_pair {|ng,ok|
       lambda {
         API.validate_database_name(ng)
-      }.should raise_error(RuntimeError)
+      }.should raise_error(ParameterValidationError)
     }
     lambda {
       API.validate_database_name('')
-    }.should raise_error(RuntimeError)
+    }.should raise_error(ParameterValidationError)
   end
 
   it 'validate_table_name should raise errors' do
     INVALID_NAMES.each_pair {|ng,ok|
       lambda {
         API.validate_table_name(ng)
-      }.should raise_error(RuntimeError)
+      }.should raise_error(ParameterValidationError)
     }
     lambda {
       API.validate_table_name('')
-    }.should raise_error(RuntimeError)
+    }.should raise_error(ParameterValidationError)
   end
 
   it 'normalize_database_name should return valid data' do

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.61
+  version: 0.8.62
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Treasure Data API library for Ruby
@@ -171,12 +171,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []