algorithmia 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af5707cad45492ed4759ffcac8b783a607103ebd
-  data.tar.gz: 924fdf137930e6918776422a83375e3230ba8a2b
+  metadata.gz: 221b1eceac956d96b62ff29d39f7d3f922f17607
+  data.tar.gz: 9a95bdc4128ca4bfbbc72e2be46e6279cb807eed
 SHA512:
-  metadata.gz: ea5c9f40c37f248eafcbac914c3798826d5f3ad2950021be5bfccfe993a23504eded7d79a2675de9bad0e8e468d2fdaaff6f7287a76231a239066f5474f157da
-  data.tar.gz: 2384aa57d51524efbe30da2dbe1b16c678701e5e402deeed10f4aa4716357462536b262ebb1d1594b41457f57b27bc3d1d9b435a05fbb7f4f44211f9fad6c2ee
+  metadata.gz: 7ce500a43c125a943e498913dba6a5f99d2652c73d7a7db8f198759cf380475db0afd590f3a05b37369dd3f858c6df68e77e498bd51989c4a8e14e0830bdcea4
+  data.tar.gz: 2dc4531f7708d00e13806eb6102b91e81eff0404eace4e42824e0ae91ed877ad7d8669a4fb335be563eb8095ed651d4e611824ef40605929bc8da65b156852c9

data/lib/algorithmia/algorithm.rb

@@ -12,15 +12,15 @@ module Algorithmia
     end
 
     def set_options(options_hash)
-      @query_options.update(options_hash)
+      @query.update(options_hash)
     end
 
     def set_timeout(timeout)
-      @query_options[:timeout] = timeout.to_i
+      @query[:timeout] = timeout.to_i
     end
 
     def enable_stdout
-      @query_options[:stdout] = true
+      @query[:stdout] = true
     end
 
     def pipe(input)
@@ -38,7 +38,7 @@ module Algorithmia
       }
 
       response = Algorithmia::Requester.new(@client).post(@endpoint, input, query: @query, headers: headers)
-      Algorithmia::Response.new(response.parsed_response)
+      Algorithmia::Response.new(response.parsed_response, @query[:output])
     end
 
     def pipe_json(input)

data/lib/algorithmia/requester.rb

@@ -66,22 +66,39 @@ module Algorithmia
 
     def check_for_errors(response)
       if response.code >= 200 && response.code < 300
-        parse_error_message(response) if response['error']
+        if response.is_a?(Hash) and response['error']
+          parse_error_message(response) if response['error']
+        end
         return
       end
 
 
       case response.code
       when 401
-        raise Errors::UnauthorizedError.new("The request you are making requires authorization. Please check that you have permissions & that you've set your API key.", response)
+        if response.nil?
+          raise Errors::UnauthorizedError.new("The request you are making requires authorization. Please check that you have permissions & that you've set your API key.", nil)
+        end
+        raise Errors::UnauthorizedError.new(response["error"]["message"], response)
       when 400
+        if response.nil?
+          raise Errors::NotFoundError.new("The request was invalid", nil)
+        end
         parse_error_message(response)
       when 404
-        raise Errors::NotFoundError.new("The URI requested is invalid or the resource requested does not exist.", response)
+        if response.nil?
+          raise Errors::NotFoundError.new("The URI requested is invalid or the resource requested does not exist.", nil)
+        end
+        raise Errors::NotFoundError.new(response["error"]["message"], response)
       when 500
-        raise Errors::InternalServerError.new("Whoops! Something is broken.", response)
+        if response.nil?
+          raise Errors::InternalServerError.new("Whoops! Something is broken.", nil)
+        end
+        raise Errors::InternalServerError.new(response["error"]["message"], response)
       else
-        raise Errors::UnknownError.new("The error you encountered returned the message: #{response["error"]["message"]} with stacktrace: #{error["stacktrace"]}", response)
+        if response.nil?
+          raise Errors::UnknownError.new("An unknown error occurred", nil)
+        end
+        raise Errors::UnknownError.new("message: #{response["error"]["message"]} stacktrace: #{error["stacktrace"]}", response)
       end
     end
 
@@ -95,9 +112,9 @@ module Algorithmia
         raise Errors::JsonParseError.new("Unable to parse the input. Please make sure it matches the expected input of the algorithm and can be parsed into JSON.", response)
       else
         if error["stacktrace"].nil?
-          raise Errors::UnknownError.new("The error you encountered returned the message: #{error["message"]}", response)
+          raise Errors::UnknownError.new(error["message"], response)
         else
-          raise Errors::UnknownError.new("The error you encountered returned the message: #{error["message"]} with stacktrace: #{error["stacktrace"]}", response)
+          raise Errors::UnknownError.new("message: #{error["message"]} stacktrace: #{error["stacktrace"]}", response)
         end
       end
     end

data/lib/algorithmia/response.rb

@@ -2,38 +2,61 @@ require "base64"
 
 module Algorithmia
   class Response
-    attr_reader :json
+    attr_reader :response
 
-    def initialize(result)
-      @json = result
+    def initialize(response, output_type)
+      @response = response
+      @output_type = output_type
     end
 
     def result
-      if content_type == 'binary'
-        Base64.decode64(@json["result"])
+      if @output_type == 'raw'
+        @response
+      elsif content_type == 'binary'
+        Base64.decode64(@response["result"])
       else
-        @json["result"]
+        @response["result"]
       end
     end
 
     def metadata
-      @json["metadata"]
+      if @output_type == 'raw'
+        nil
+      else
+        @response["metadata"]
+      end
     end
 
     def duration
-      metadata["duration"]
+      if @output_type == 'raw'
+        nil
+      else
+        metadata["duration"]
+      end
     end
 
     def content_type
-      metadata["content_type"]
+      if @output_type == 'raw'
+        nil
+      else
+        metadata["content_type"]
+      end
     end
 
     def stdout
-      metadata["stdout"]
+      if @output_type == 'raw'
+        nil
+      else
+        metadata["stdout"]
+      end
     end
 
     def alerts
-      metadata["alerts"]
+      if @output_type == 'raw'
+        nil
+      else
+        metadata["alerts"]
+      end
     end
   end
 end

data/lib/algorithmia/version.rb

@@ -1,3 +1,3 @@
 module Algorithmia
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algorithmia
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Algorithmia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler